Commit Graph

494 Commits

Author SHA1 Message Date
3beb4105ea Merge main branch 2026-04-08 13:43:20 -06:00
559f3bc343 fix empty desktop lists 2026-04-08 08:18:01 -06:00
9e83d7929b restrict adoption pets 2026-04-08 08:11:20 -06:00
930e561ce0 fix desktop chat 2026-04-08 08:07:17 -06:00
39f4b6bd8a remove debit payments 2026-04-08 07:57:39 -06:00
f2932d80c8 fix desktop forms 2026-04-08 07:55:55 -06:00
2ddf5d3249 fix web appointments 2026-04-08 07:17:48 -06:00
656311f185 Merge branch 'main' into web-more-fixes-for-wednesday 2026-04-08 07:17:26 -06:00
Alex
a76dfe4d9c updated sales to have new backend data 2026-04-08 03:19:16 -06:00
Alex
4ad94a318f converted new fragments to use hilt, MVVM and jetpack nav 2026-04-08 02:22:34 -06:00
Alex
f908169bcf Converted merged fragments to viewbinding 2026-04-08 02:06:07 -06:00
Alex
30ae416ba4 Added hamburger menu helperfunction 2026-04-08 01:50:18 -06:00
Alex
3e01ad07cd added filtering for Sales and added helper method for setting up filtertoggle andriod 2026-04-08 01:32:34 -06:00
Alex
4fc33fedf4 fix minor bugs and UI inconsistancy 2026-04-08 00:22:25 -06:00
augmentedpotato
2469c07fef Can now add pets in the appointments page. 2026-04-07 23:53:48 -06:00
augmentedpotato
83477904be Feature parity with admins and users (also a minor backend change) 2026-04-07 23:23:05 -06:00
augmentedpotato
ffef9243dd Fixed(?) being unable to create appointments on today's date 2026-04-07 22:44:50 -06:00
26f9f8c0d8 fix image error responses 2026-04-07 22:41:32 -06:00
d1e77f8ef3 revert adoption fragment 2026-04-07 22:17:15 -06:00
f54bc906f1 Merge branch 'morefiles' 2026-04-07 21:43:20 -06:00
888591c970 finish android merge wiring 2026-04-07 21:15:31 -06:00
60f344d207 fix backend merge conflicts 2026-04-07 21:13:47 -06:00
507314b7e3 merge origin/main into morefiles, resolve all conflicts 2026-04-07 20:29:54 -06:00
Alex
6eddcc49ec added filter by date for adoptions to backend 2026-04-07 18:34:08 -06:00
Alex
9498128ab1 added helper method for filter spinners to maintain code 2026-04-07 18:12:02 -06:00
Alex
492591752d added adoption search and filter andriod and backend 2026-04-07 18:06:07 -06:00
Alex
31df67ef33 fixed purchase order for android on new backend 2026-04-07 17:31:43 -06:00
Alex
ce5adccdfe Merge branch 'main' into AttachmentsToChat 2026-04-07 16:24:17 -06:00
Alex
01f5efa991 added bulk delete for ProductSupplier, appointments, and adoptions 2026-04-07 16:20:51 -06:00
fa4529e123 fix alias folder ordering and request bodies in Postman collection 2026-04-07 16:16:11 -06:00
2f369c0b17 fix audit report mismatches across backend and android 2026-04-07 16:06:44 -06:00
Alex
713e919c10 bluk delete added for Service and suppliers on andriod 2026-04-07 15:24:25 -06:00
b423912a9a update postman collection 2026-04-07 15:19:25 -06:00
Alex
93b4ad8c50 added helper class for bulk delete and mad pets have bulk delete 2026-04-07 15:13:15 -06:00
Alex
0813bb4b44 Did the same to inventory 2026-04-07 14:55:43 -06:00
ada9f7fcf9 update web packages 2026-04-07 14:36:20 -06:00
Alex
679c451c04 updard Adoptions in andriod for new backend 2026-04-07 14:35:57 -06:00
Alex
baa143ff00 edited adapters in andriod to use viewbinding 2026-04-07 14:17:24 -06:00
89c706b893 stabilize desktop chat 2026-04-07 09:38:17 -06:00
7980a7b930 fix desktop chat 2026-04-07 09:34:31 -06:00
3d0e7011c1 fix desktop user inventory crud 2026-04-07 09:31:26 -06:00
f0025886e9 fix desktop adoption save 2026-04-07 09:27:34 -06:00
0cb2ecff02 add my pets api 2026-04-07 09:15:01 -06:00
4d244cc1c5 fix web registration 2026-04-07 09:10:11 -06:00
d3563e1f75 fix desktop appointments 2026-04-07 09:05:08 -06:00
Nikitha
d3b9d28513 loading employee in appointments and adoptions
changes in backend and android
2026-04-07 08:43:49 -06:00
dee517593c Merge pull request #146 from RecentRunner/AttachmentsToChat
AttachmentsToChat
2026-04-07 08:23:47 -06:00
e497abb09d merge main 2026-04-07 08:23:23 -06:00
98a589ec33 update postman collection 2026-04-07 08:17:41 -06:00
Alex
8261cdfc2d 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