Commit Graph

792 Commits

Author SHA1 Message Date
4845aeb479 restrict adoption pets 2026-04-08 08:11:20 -06:00
55b61d3908 fix desktop chat 2026-04-08 08:07:17 -06:00
808b6e3d2b remove debit payments 2026-04-08 07:57:39 -06:00
56ffecba92 fix desktop forms 2026-04-08 07:55:55 -06:00
548d7629d3 fix web appointments 2026-04-08 07:17:48 -06:00
1fc675a138 Merge branch 'main' into web-more-fixes-for-wednesday 2026-04-08 07:17:26 -06:00
Alex
aeca5e4341 updated sales to have new backend data 2026-04-08 03:19:16 -06:00
Alex
811edf842b converted new fragments to use hilt, MVVM and jetpack nav 2026-04-08 02:22:34 -06:00
Alex
a35b432b54 Converted merged fragments to viewbinding 2026-04-08 02:06:07 -06:00
Alex
627ce7a987 Added hamburger menu helperfunction 2026-04-08 01:50:18 -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
21d086a816 Can now add pets in the appointments page. 2026-04-07 23:53:48 -06:00
augmentedpotato
a6b188e0d6 Feature parity with admins and users (also a minor backend change) 2026-04-07 23:23:05 -06:00
augmentedpotato
bd46968b90 Fixed(?) being unable to create appointments on today's date 2026-04-07 22:44:50 -06:00
ef1b7ac716 fix image error responses 2026-04-07 22:41:32 -06:00
b3ff789f1b revert adoption fragment 2026-04-07 22:17:15 -06:00
3baef0e1ab Merge branch 'morefiles' 2026-04-07 21:43:20 -06:00
65140d77ac finish android merge wiring 2026-04-07 21:15:31 -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
54ab737e2d added helper method for filter spinners to maintain code 2026-04-07 18:12:02 -06:00
Alex
155c64a729 added adoption search and filter andriod and backend 2026-04-07 18:06:07 -06:00
Alex
538b4440d8 fixed purchase order for android on new backend 2026-04-07 17:31:43 -06:00
Alex
5a3229eb19 Merge branch 'main' into AttachmentsToChat 2026-04-07 16:24:17 -06:00
Alex
c232f193d1 added bulk delete for ProductSupplier, appointments, and adoptions 2026-04-07 16:20:51 -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
Alex
4ccfe55174 bluk delete added for Service and suppliers on andriod 2026-04-07 15:24:25 -06:00
0173123898 update postman collection 2026-04-07 15:19:25 -06:00
Alex
9eaf64c7a9 added helper class for bulk delete and mad pets have bulk delete 2026-04-07 15:13:15 -06:00
Alex
aa30efd3b6 Did the same to inventory 2026-04-07 14:55:43 -06:00
852a8a0eb2 update web packages 2026-04-07 14:36:20 -06:00
Alex
4e887c1a73 updard Adoptions in andriod for new backend 2026-04-07 14:35:57 -06:00
Alex
108de589bc edited adapters in andriod to use viewbinding 2026-04-07 14:17:24 -06:00
27871d96f5 stabilize desktop chat 2026-04-07 09:38:17 -06:00
c776c579ab fix desktop chat 2026-04-07 09:34:31 -06:00
9096f4fd29 fix desktop user inventory crud 2026-04-07 09:31:26 -06:00
858d13cadc fix desktop adoption save 2026-04-07 09:27:34 -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
0655dfdfea fix desktop appointments 2026-04-07 09:05:08 -06:00
Nikitha
c61f71d226 loading employee in appointments and adoptions
changes in backend and android
2026-04-07 08:43:49 -06:00
de654e487b Merge pull request #146 from RecentRunner/AttachmentsToChat
AttachmentsToChat
2026-04-07 08:23:47 -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
7c0ab0bfae added an api connection to Users in Andriod
NOTE Will have to change backend so staffs can access other staffs
2026-04-07 07:46:22 -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
3c35e05e47 Merge pull request #145 from RecentRunner/AttachmentsToChat
AttachmentsToChat
2026-04-07 06:53:07 -06:00