|
|
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 |
|
Alex
|
77e93a38b7
|
added my appointments button for logged in user on andriod
|
2026-04-07 06:48:36 -06:00 |
|
Alex
|
6f646a7cf0
|
added filter options to appointments in the backend and andriod
|
2026-04-07 06:34:28 -06:00 |
|
Alex
|
b7f97c45a5
|
updated Appointments on andriod for new backend
|
2026-04-07 06:14:17 -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 |
|
Alex
|
1d00a3b55c
|
updated search to call api for supplier
|
2026-04-07 04:19:51 -06:00 |
|
Alex
|
5823152c56
|
updated search for service to call api
|
2026-04-07 04:12:29 -06:00 |
|
Alex
|
3d403ee35e
|
Updated Filterdropdown design for pets
|
2026-04-07 03:51:09 -06:00 |
|
Alex
|
230f2715ca
|
added more filter options to pets
|
2026-04-07 03:24:55 -06:00 |
|
Alex
|
6b3979c68f
|
changed filtering and search in pets to use api calls
|
2026-04-07 02:46:00 -06:00 |
|
Alex
|
003c7ec58a
|
changed petDetailFragment to support new backend
|
2026-04-07 02:23:58 -06:00 |
|
Alex
|
5cb625a710
|
fixed pet DTO and how it interacts with new backend
|
2026-04-07 00:27:17 -06:00 |
|
Alex
|
5a1ff67db4
|
Fixed backend missing file issue
|
2026-04-07 00:10:42 -06:00 |
|
Alex
|
870920f67e
|
Merge branch 'main' into AttachmentsToChat
|
2026-04-06 23:27:47 -06:00 |
|
Alex
|
d9db1f778e
|
Fixed seeding for backend
|
2026-04-06 23:27:23 -06:00 |
|
Nikitha
|
bb7fbf9f78
|
Employee files
Add, edit employee (staff and admin)
|
2026-04-06 22:56:40 -06:00 |
|
Nikitha
|
53246a78c6
|
Sale, refund and analytics documents
view sale history and refund for sales
analytics of sale , employee and store performances
|
2026-04-06 22:55:45 -06:00 |
|
|
|
5a691a5ddf
|
seed stores and suppliers before products on fresh DB
|
2026-04-06 21:18:30 -06:00 |
|
|
|
7a70d163c7
|
Merge pull request #144 from RecentRunner/backend-refactor
backend-refactor
|
2026-04-06 21:13:48 -06:00 |
|
