Alex
9c2300ad11
Merge branch 'main' into AttachmentsToChat
2026-04-14 01:10:14 -06:00
Alex
1f86158cef
Merge branch 'main' into AttachmentsToChat
2026-04-14 00:57:16 -06:00
Alex
98bd619ba6
fixes to desktop part 1
2026-04-14 00:55:51 -06:00
5bd1933ea6
add webp support desktop
2026-04-14 00:17:43 -06:00
a1e930254f
consolidate migrations
2026-04-14 00:11:13 -06:00
599104677d
fix image paths
2026-04-14 00:11:07 -06:00
f4b62bc8c4
add cart points fields
2026-04-14 00:11:02 -06:00
Alex
6fb7ac7817
Merge branch 'AttachmentsToChat'
2026-04-13 22:36:53 -06:00
Alex
3b07eeaee2
seperated staff and customer on desktop
2026-04-13 22:15:41 -06:00
adc8c477c2
Merge pull request #253 from RecentRunner/images
...
seed images
2026-04-13 21:58:01 -06:00
f7480f5e80
localize seed image URLs to upload paths
2026-04-13 21:57:29 -06:00
Alex
52624118f6
fixed phone validation desktop
2026-04-13 21:52:53 -06:00
Alex
819109893c
added dropdowns for breed desktop
2026-04-13 21:40:34 -06:00
Alex
954154e99c
fixed pet busniss logic desktop
2026-04-13 21:10:35 -06:00
Alex
83507f4207
made it so staff cannot change the status of pets for desktop for adopted or owned
2026-04-13 20:49:22 -06:00
a04cdd60d6
Merge pull request #252 from RecentRunner/merge-migration
...
merge migration
2026-04-13 19:48:37 -06:00
e0297dff6a
make ActivityLog entity immutable
2026-04-13 19:47:45 -06:00
Alex
0f65d6c242
added correct refund logic and points for sales
2026-04-13 19:46:52 -06:00
Alex
f13bb90aa0
added points to sale and logic backend
2026-04-13 19:46:28 -06:00
Alex
9dad410c54
added loyaltypoint usage to sales unfinished still needs to work with the backend
2026-04-13 18:52:07 -06:00
1b1236bfb2
seed normalization
2026-04-13 18:29:49 -06:00
Alex
40955b616b
Can now edit loyalty points for customer on andriod, and pets now have breed dropdown
2026-04-13 18:25:11 -06:00
af5e3a88ea
Merge pull request #251 from RecentRunner/payment-fixes
...
Payment safety fixes
2026-04-13 17:52:21 -06:00
b64b426406
Unique sale constraint
2026-04-13 17:49:59 -06:00
a5a1757af7
Add payment features
2026-04-13 17:49:59 -06:00
141ca34ea0
Add checkout snapshot
2026-04-13 17:49:59 -06:00
Alex
53a11449ac
made sales readonly for andriod
2026-04-13 17:25:28 -06:00
Alex
cba39e8a3c
Fixed phone validation for andriod
2026-04-13 17:18:46 -06:00
Alex
688a04c3bc
added pending status on pets andiord, also made pets automatically switch to pending when an adoption is in pending
2026-04-13 17:12:41 -06:00
Alex
9fdb3087da
Merge branch 'AttachmentsToChat'
2026-04-13 15:07:28 -06:00
Alex
facf1d588b
added store column to desktop and display only logged in data
2026-04-13 15:06:04 -06:00
3000a64be3
Merge pull request #172 from RecentRunner/web-adopt-filter
...
Adopt page filter
2026-04-13 11:08:41 -06:00
de58b0b131
Remove XML declaration from misc.xml
2026-04-13 11:08:23 -06:00
augmentedpotato
23125418c3
Adopt page filter added
2026-04-13 10:34:26 -06:00
Alex
d9c34abcf8
fixed rotated image for pets and product as well
2026-04-13 00:30:26 -06:00
Alex
296f99900a
Fix profile image squish and rotate isusse
2026-04-13 00:07:58 -06:00
Alex
227eb9cac8
added coupons to desktop app
2026-04-12 23:47:22 -06:00
Alex
1f801d7486
desktop: added confirmation to change onwer and only admins can change this
2026-04-12 20:01:06 -06:00
Alex
5f7f40f98a
added closed chat section and fixed closed chat bug for desktop
2026-04-12 19:49:12 -06:00
Alex
d870475bc9
Fixed minor bugs
...
- in sales we can no longer select 0 product for a sale
- ActivityLogFragment is locked to admin
- Spinners are loaded aftrer a selection if the spinner depends on a parent spinner
2026-04-12 18:34:43 -06:00
Alex
077780c0c3
adjusted so only available pets for the selected store is displayed when adopting
2026-04-12 18:00:24 -06:00
Alex
42c9e96500
Modified project to use our utils on areas we arnt to manage code
2026-04-12 17:49:24 -06:00
Alex
e6e8dc1b23
Fixed Log filters and fixed chat attachment download
2026-04-12 17:28:40 -06:00
Alex
7a4c711e7f
added Activitylogs andriod
2026-04-12 16:58:12 -06:00
Alex
0e9bbcbcea
Merge branch 'AttachmentsToChat'
2026-04-12 01:09:25 -06:00
Alex
30f14a5152
added Forgetpassword page with no logic yet
2026-04-12 01:08:25 -06:00
Alex
a6d1c089ac
Faded text for disabled spinners in staff
2026-04-12 00:51:49 -06:00
Alex
0df8212a65
staff cant change status or store for pets
2026-04-12 00:49:15 -06:00
Alex
16c832bd14
Made it so only admins can change pet owners
2026-04-12 00:37:15 -06:00
Alex
57e5b06666
Fixed Coupon to use in sales
2026-04-12 00:25:33 -06:00
