Commit Graph

141 Commits

Author SHA1 Message Date
33bf63cb1e Add OpenRouter bot 2026-04-10 08:18:54 -06:00
augmentedpotato
a50fa82a50 Web and AI chat 2026-04-10 08:18:54 -06:00
Alex
b9635cae68 Merge branch 'AttachmentsToChat' 2026-04-10 07:43:24 -06:00
Alex
1e7d56499b fixed staff accounts and added coupons andriod 2026-04-10 07:17:19 -06:00
Alex
dff379c99d Sales bug fix 2026-04-10 05:56:05 -06:00
Alex
3a78021b98 Added so adoption status can be missed and fixed adoption bugs for andriod 2026-04-10 04:31:10 -06:00
31398fdcac Restore Main Attachments 2026-04-09 23:28:14 -06:00
12aa06f953 Defer Chat Attachments 2026-04-09 23:28:14 -06:00
6b055c4364 Implement chat features 2026-04-09 23:28:14 -06:00
d28fced5b3 Merge pull request #163 from RecentRunner/stripe-payment
Stripe Payments
2026-04-09 23:12:14 -06:00
fa01645d31 move stripe keys to .env 2026-04-09 23:01:41 -06:00
666c7e0ca6 fix user id getter in completeCheckout 2026-04-09 22:57:00 -06:00
39e4a3896e fix stripe payment flow 2026-04-09 22:52:57 -06:00
augmentedpotato
1010d57b79 Stripe Payment 2026-04-09 22:27:03 -06:00
Alex
b9b74d2447 fixed sending message with attachments 2026-04-09 18:55:12 -06:00
Alex
872e3a27f1 added attachments to chat 2026-04-09 17:39:45 -06:00
Alex
67cb178f46 Merge branch 'main' into AttachmentsToChat 2026-04-09 13:44:24 -06:00
Alex
5f9d7a848c updated backend so booked appointment automatically changes to completed 2026-04-08 19:16:18 -06:00
Alex
271314f990 fixing dropdowns 2026-04-08 18:10:18 -06:00
Alex
6f11f4ebbb making appointment userfrendly part1 andriod 2026-04-08 16:53:42 -06:00
5734ceca6e Update early fixes 2026-04-08 16:43:50 -06:00
75aec048ae Merge main branch 2026-04-08 13:43:20 -06:00
0f2b94a277 Create adoption sale 2026-04-08 11:23:02 -06:00
b80ffff296 Fix dialog issues 2026-04-08 11:23:02 -06:00
cbdec1882c Fix desktop chat 2026-04-08 11:23:02 -06:00
a7ba0fb4b4 fix empty desktop lists 2026-04-08 08:18:01 -06:00
4845aeb479 restrict adoption pets 2026-04-08 08:11:20 -06:00
808b6e3d2b remove debit payments 2026-04-08 07:57:39 -06:00
1fc675a138 Merge branch 'main' into web-more-fixes-for-wednesday 2026-04-08 07:17:26 -06:00
Alex
57ac8ad2ce added filtering for Sales and added helper method for setting up filtertoggle andriod 2026-04-08 01:32:34 -06:00
Alex
526650bd98 fix minor bugs and UI inconsistancy 2026-04-08 00:22:25 -06:00
augmentedpotato
a6b188e0d6 Feature parity with admins and users (also a minor backend change) 2026-04-07 23:23:05 -06:00
ef1b7ac716 fix image error responses 2026-04-07 22:41:32 -06:00
1de6c981dc fix backend merge conflicts 2026-04-07 21:13:47 -06:00
9ca647f0cc merge origin/main into morefiles, resolve all conflicts 2026-04-07 20:29:54 -06:00
Alex
332f38db57 added filter by date for adoptions to backend 2026-04-07 18:34:08 -06:00
Alex
155c64a729 added adoption search and filter andriod and backend 2026-04-07 18:06:07 -06:00
f17ad44155 fix alias folder ordering and request bodies in Postman collection 2026-04-07 16:16:11 -06:00
4500b213c6 fix audit report mismatches across backend and android 2026-04-07 16:06:44 -06:00
0173123898 update postman collection 2026-04-07 15:19:25 -06:00
4d7f452a97 add my pets api 2026-04-07 09:15:01 -06:00
ee2cab953d fix web registration 2026-04-07 09:10:11 -06:00
Nikitha
c61f71d226 loading employee in appointments and adoptions
changes in backend and android
2026-04-07 08:43:49 -06:00
6d77a98d92 merge main 2026-04-07 08:23:23 -06:00
7e3d094217 update postman collection 2026-04-07 08:17:41 -06:00
Alex
8c5348dbb6 fixed creating adoption for the backend and implemented adoption to andriod for changes 2026-04-07 07:27:37 -06:00
Alex
6f646a7cf0 added filter options to appointments in the backend and andriod 2026-04-07 06:34:28 -06:00
Alex
5c9d04fc88 changed backend so can sortBy productName and added search to productSupplier 2026-04-07 05:48:24 -06:00
Alex
cbd038d8fb Added filter by store for inventory in back end and added search to inventory 2026-04-07 05:24:25 -06:00
Alex
6c832e01f3 updated inventory backend to have filter by store and added more search features to andriod 2026-04-07 05:09:48 -06:00