Commit Graph

701 Commits

Author SHA1 Message Date
7281691448 Updated the example environment file 2026-04-14 10:02:02 -06:00
augmentedpotato
505560e7da Favicon updated 2026-04-14 07:35:06 -06:00
augmentedpotato
580813792a Pet adoption appointments (currently has a small issue) 2026-04-14 07:14:54 -06:00
8f704eda15 Merge pull request #254 from RecentRunner/web-v1
Web v1
2026-04-14 07:06:21 -06:00
augmentedpotato
995088ece2 Chat now present in the bottom right. 2026-04-14 05:59:33 -06:00
augmentedpotato
4c3c11995a Cart fixes (backend), adjusted header, added footer, mobile formatting updates 2026-04-14 05:24:40 -06:00
Alex
582918e9e1 added filter to analytics desktop 2026-04-14 04:39:38 -06:00
Alex
62434020e2 added filters to desktop 2026-04-14 04:29:28 -06:00
Alex
27e570156c added filter by customer for sales to backend and android 2026-04-14 04:03:15 -06:00
Alex
0b2c7bda13 added clendar to adoptions and appointments on desktop 2026-04-14 03:48:46 -06:00
Alex
5c57cabb4f updated sales on desktop, and fixed sales with points again on back end 2026-04-14 03:32:29 -06:00
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