Commit Graph

695 Commits

Author SHA1 Message Date
Alex
f3fc93d6e5 added filter to analytics desktop 2026-04-14 04:39:38 -06:00
Alex
eefb8de460 added filters to desktop 2026-04-14 04:29:28 -06:00
Alex
f623c17071 added filter by customer for sales to backend and android 2026-04-14 04:03:15 -06:00
Alex
4594139f8e added clendar to adoptions and appointments on desktop 2026-04-14 03:48:46 -06:00
Alex
a860a1c247 updated sales on desktop, and fixed sales with points again on back end 2026-04-14 03:32:29 -06:00
Alex
a3fcebfa15 Merge branch 'main' into AttachmentsToChat 2026-04-14 01:10:14 -06:00
Alex
6c4b3ef120 Merge branch 'main' into AttachmentsToChat 2026-04-14 00:57:16 -06:00
Alex
d4958ec914 fixes to desktop part 1 2026-04-14 00:55:51 -06:00
8e205ebca2 add webp support desktop 2026-04-14 00:17:43 -06:00
cf274f9013 consolidate migrations 2026-04-14 00:11:13 -06:00
3c4743fa70 fix image paths 2026-04-14 00:11:07 -06:00
168ebe94fc add cart points fields 2026-04-14 00:11:02 -06:00
Alex
94344b146f Merge branch 'AttachmentsToChat' 2026-04-13 22:36:53 -06:00
Alex
d898732a17 seperated staff and customer on desktop 2026-04-13 22:15:41 -06:00
2757bc66da Merge pull request #253 from RecentRunner/images
seed images
2026-04-13 21:58:01 -06:00
b115a4b66c localize seed image URLs to upload paths 2026-04-13 21:57:29 -06:00
Alex
c38bb24e94 fixed phone validation desktop 2026-04-13 21:52:53 -06:00
Alex
98584f1324 added dropdowns for breed desktop 2026-04-13 21:40:34 -06:00
Alex
3ef6604884 fixed pet busniss logic desktop 2026-04-13 21:10:35 -06:00
Alex
044e9ba7b2 made it so staff cannot change the status of pets for desktop for adopted or owned 2026-04-13 20:49:22 -06:00
f93f4f576b Merge pull request #252 from RecentRunner/merge-migration
merge migration
2026-04-13 19:48:37 -06:00
1b00366a1e make ActivityLog entity immutable 2026-04-13 19:47:45 -06:00
Alex
572895efa9 added correct refund logic and points for sales 2026-04-13 19:46:52 -06:00
Alex
c244e5742a added points to sale and logic backend 2026-04-13 19:46:28 -06:00
Alex
6efa440bbc added loyaltypoint usage to sales unfinished still needs to work with the backend 2026-04-13 18:52:07 -06:00
0e53b16d6c seed normalization 2026-04-13 18:29:49 -06:00
Alex
884f56c9a7 Can now edit loyalty points for customer on andriod, and pets now have breed dropdown 2026-04-13 18:25:11 -06:00
0e997071c3 Merge pull request #251 from RecentRunner/payment-fixes
Payment safety fixes
2026-04-13 17:52:21 -06:00
68893b1318 Unique sale constraint 2026-04-13 17:49:59 -06:00
a221f2a91b Add payment features 2026-04-13 17:49:59 -06:00
1577ed41cd Add checkout snapshot 2026-04-13 17:49:59 -06:00
Alex
1b4069e7e4 made sales readonly for andriod 2026-04-13 17:25:28 -06:00
Alex
a6f90f8477 Fixed phone validation for andriod 2026-04-13 17:18:46 -06:00
Alex
aefa00f95d 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
c145b3e552 Merge branch 'AttachmentsToChat' 2026-04-13 15:07:28 -06:00
Alex
c5de2fdd87 added store column to desktop and display only logged in data 2026-04-13 15:06:04 -06:00
ef3318a4ff Merge pull request #172 from RecentRunner/web-adopt-filter
Adopt page filter
2026-04-13 11:08:41 -06:00
39e30aa8d5 Remove XML declaration from misc.xml 2026-04-13 11:08:23 -06:00
augmentedpotato
de5bbbf3f7 Adopt page filter added 2026-04-13 10:34:26 -06:00
Alex
fba042d2b9 fixed rotated image for pets and product as well 2026-04-13 00:30:26 -06:00
Alex
d85530dd2c Fix profile image squish and rotate isusse 2026-04-13 00:07:58 -06:00
Alex
326182aeef added coupons to desktop app 2026-04-12 23:47:22 -06:00
Alex
2172bede74 desktop: added confirmation to change onwer and only admins can change this 2026-04-12 20:01:06 -06:00
Alex
f497251873 added closed chat section and fixed closed chat bug for desktop 2026-04-12 19:49:12 -06:00
Alex
e4e04940a9 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
b493357f31 adjusted so only available pets for the selected store is displayed when adopting 2026-04-12 18:00:24 -06:00
Alex
4eaf98834d Modified project to use our utils on areas we arnt to manage code 2026-04-12 17:49:24 -06:00
Alex
7cdab36f5d Fixed Log filters and fixed chat attachment download 2026-04-12 17:28:40 -06:00
Alex
6831123aed added Activitylogs andriod 2026-04-12 16:58:12 -06:00
Alex
f7b8648778 Merge branch 'AttachmentsToChat' 2026-04-12 01:09:25 -06:00