|
|
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 |
|
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 |
|
|
|
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 |
|
Alex
|
b4c1175ee1
|
fixed creating adoption for the backend and implemented adoption to andriod for changes
|
2026-04-07 07:27:37 -06:00 |
|
|
|
0f0a72455b
|
Merge pull request #145 from RecentRunner/AttachmentsToChat
AttachmentsToChat
|
2026-04-07 06:53:07 -06:00 |
|
Alex
|
0a55014f21
|
added my appointments button for logged in user on andriod
|
2026-04-07 06:48:36 -06:00 |
|
Alex
|
094c2d4a48
|
added filter options to appointments in the backend and andriod
|
2026-04-07 06:34:28 -06:00 |
|
Alex
|
9bab45f04b
|
updated Appointments on andriod for new backend
|
2026-04-07 06:14:17 -06:00 |
|
Alex
|
195c4605f0
|
changed backend so can sortBy productName and added search to productSupplier
|
2026-04-07 05:48:24 -06:00 |
|
Alex
|
1990022c1e
|
Added filter by store for inventory in back end and added search to inventory
|
2026-04-07 05:24:25 -06:00 |
|
Alex
|
ef5651d468
|
updated inventory backend to have filter by store and added more search features to andriod
|
2026-04-07 05:09:48 -06:00 |
|
Alex
|
863a85472f
|
updated search to call api for supplier
|
2026-04-07 04:19:51 -06:00 |
|
Alex
|
37bd69c6f1
|
updated search for service to call api
|
2026-04-07 04:12:29 -06:00 |
|
Alex
|
d37202edae
|
Updated Filterdropdown design for pets
|
2026-04-07 03:51:09 -06:00 |
|
Alex
|
0086bb4a5e
|
added more filter options to pets
|
2026-04-07 03:24:55 -06:00 |
|
Alex
|
6164a8746d
|
changed filtering and search in pets to use api calls
|
2026-04-07 02:46:00 -06:00 |
|
Alex
|
867322b462
|
changed petDetailFragment to support new backend
|
2026-04-07 02:23:58 -06:00 |
|
Alex
|
fdc6f62441
|
fixed pet DTO and how it interacts with new backend
|
2026-04-07 00:27:17 -06:00 |
|
Alex
|
12c7384951
|
Fixed backend missing file issue
|
2026-04-07 00:10:42 -06:00 |
|
Alex
|
2b097cf4a9
|
Merge branch 'main' into AttachmentsToChat
|
2026-04-06 23:27:47 -06:00 |
|
Alex
|
c86fbedd6f
|
Fixed seeding for backend
|
2026-04-06 23:27:23 -06:00 |
|
|
|
e3ebb93dd2
|
seed stores and suppliers before products on fresh DB
|
2026-04-06 21:18:30 -06:00 |
|
|
|
e1405984c4
|
Merge pull request #144 from RecentRunner/backend-refactor
backend-refactor
|
2026-04-06 21:13:48 -06:00 |
|
|
|
cf338920dd
|
fix local seed: add missing categories and storeId in inventory insert
|
2026-04-06 21:13:17 -06:00 |
|
|
|
a6485b1519
|
Merge pull request #143 from RecentRunner/backend-refactor
Fix sale inventory and switch to port 3306
|
2026-04-06 21:06:08 -06:00 |
|
|
|
1187c7bcc1
|
point to port 3306 Petstoredb
|
2026-04-06 21:06:01 -06:00 |
|
|
|
e631ae2953
|
scope inventory lookup by store on sale
|
2026-04-06 21:01:20 -06:00 |
|
|
|
bad16acefb
|
Merge pull request #142 from RecentRunner/backend-refactor
Fix lazy loading
|
2026-04-06 20:57:44 -06:00 |
|
|
|
2795511a41
|
fix lazy loading on me, services, refunds
|
2026-04-06 20:56:14 -06:00 |
|
|
|
07c370983d
|
Merge pull request #141 from RecentRunner/backend-refactor
Backend refactor
|
2026-04-06 20:51:44 -06:00 |
|
|
|
2420453daa
|
enable Hibernate validation
|
2026-04-06 20:46:27 -06:00 |
|
|
|
dac5f8c4a6
|
add activityLog store FK
|
2026-04-06 20:39:08 -06:00 |
|
|
|
6bde4f4e47
|
add message attachment fields
|
2026-04-06 20:38:29 -06:00 |
|
|
|
31a4356d83
|
add service species collection
|
2026-04-06 20:34:03 -06:00 |
|
|
|
a4ed9a7afc
|
add sale channel coupon cart columns
|
2026-04-06 20:32:05 -06:00 |
|
|
|
682bd12873
|
add coupon cart cartItem entities
|
2026-04-06 20:30:11 -06:00 |
|
|
|
969fbdfe8b
|
add adoption sourceStore FK
|
2026-04-06 20:28:31 -06:00 |
|
|
|
3f6dc132f4
|
add purchaseOrder store FK
|
2026-04-06 20:26:42 -06:00 |
|
|
|
f86cf72dd9
|
add storeLocation imageUrl
|
2026-04-06 20:25:33 -06:00 |
|
|
|
a74e2ac0ef
|
add store dimension to inventory
|
2026-04-06 20:24:23 -06:00 |
|
|
|
0482af966e
|
simplify appointment to single pet
|
2026-04-06 20:22:26 -06:00 |
|
|
|
2360dc2419
|
merge customer/employee into users
|
2026-04-06 20:17:27 -06:00 |
|
|
|
824ed7e5eb
|
expand User entity fields
|
2026-04-06 19:49:38 -06:00 |
|
|
|
24b11e4152
|
switch to target DB config
|
2026-04-06 19:47:18 -06:00 |
|
|
|
3e74cdd25e
|
Add target DB setup
|
2026-04-06 19:37:15 -06:00 |
|
Alex
|
0a659fad9e
|
Merge branch 'main' into AttachmentsToChat
|
2026-04-06 16:29:10 -06:00 |
|
|
|
7ffea449f7
|
Fix brittle migrations by replacing hardcoded IDs with robust subqueries
|
2026-04-06 16:25:45 -06:00 |
|
Alex
|
7f62331773
|
Merge branch 'main' into AttachmentsToChat
|
2026-04-06 16:13:50 -06:00 |
|
|
|
038afc415a
|
Merge pull request #139 from RecentRunner/pet-owner-store
Pet owner store
|
2026-04-06 16:12:09 -06:00 |
|
|
|
28e53a4379
|
Seed pets and appointments
|
2026-04-06 15:50:52 -06:00 |
|
|
|
b2f291f256
|
Update pet desktop
|
2026-04-06 15:50:49 -06:00 |
|
|
|
0cc4a2bedd
|
Pet owner and store
|
2026-04-06 15:50:45 -06:00 |
|
Alex
|
7673504d9e
|
Merge branch 'main' into AttachmentsToChat
|
2026-04-06 15:39:38 -06:00 |
|
|
|
a66a779bcb
|
Merge pull request #138 from RecentRunner/employee-phase
Employee phase
|
2026-04-06 13:37:38 -06:00 |
|
|
|
cd5dd32c73
|
Update Postman collection
|
2026-04-06 13:35:01 -06:00 |
|
|
|
b5b8290131
|
Fix Flyway migration
|
2026-04-06 13:35:01 -06:00 |
|
Alex
|
23d765c6b5
|
changed detailed fragment to fill data from the backend
|
2026-04-06 03:12:42 -06:00 |
|
|
|
419e5302f6
|
Fix availability checks
|
2026-04-06 01:51:58 -06:00 |
|
|
|
661c9b006a
|
Add Missed status
|
2026-04-06 00:39:37 -06:00 |
|
|
|
9ea5efe44e
|
Fix employee time conflicts
|
2026-04-06 00:18:49 -06:00 |
|
|
|
b70afd66aa
|
Allow cross-store staff selection
|
2026-04-05 23:58:21 -06:00 |
|
|
|
a3d454e119
|
Enforce pet ownership rules
|
2026-04-05 23:35:05 -06:00 |
|
Alex
|
d62113c0f5
|
Implemented View Binding to reduce code
- project uses view binding now so we don have to do
getViewbyId to refer to the xml
|
2026-04-05 22:50:25 -06:00 |
|
Alex
|
1137688d60
|
Edited RetrofitUtils to also call enqueue to reduce code in repository
|
2026-04-05 21:57:53 -06:00 |
|
Alex
|
b14e318df2
|
Fixed bug where it navigates back to petprofile after deleting the pet
|
2026-04-05 21:40:43 -06:00 |
|
Alex
|
3555b3d2a1
|
Refactored more of the project to MVVM and created helper class RetrofitUtil to reduce redundent code
|
2026-04-05 21:27:32 -06:00 |
|
Alex
|
c99d9d21f0
|
Created help class for displaying diolog and removed redundent code
|
2026-04-05 18:38:46 -06:00 |
|
Alex
|
6d990fbc63
|
Created Spinner Helper class and removed reducdent code
|
2026-04-05 18:15:36 -06:00 |
|
Alex
|
e354592c47
|
remove dead code
|
2026-04-05 17:48:14 -06:00 |
|
Alex
|
768103cbac
|
Added Helper class and commented most fragments
|
2026-04-05 17:16:40 -06:00 |
|
|
|
521537dc8f
|
Enforce staff-only assignments
|
2026-04-05 16:17:58 -06:00 |
|
|
|
153ec836cf
|
Restrict assignments to staff
|
2026-04-05 16:03:29 -06:00 |
|
|
|
890391f982
|
Allow admin ownership bypass
|
2026-04-05 16:01:46 -06:00 |
|
|
|
1f343f4132
|
Harden assignment rules
|
2026-04-05 15:51:11 -06:00 |
|
|
|
5d95613786
|
Harden staff assignment
|
2026-04-05 12:17:37 -06:00 |
|
Alex
|
453cb54f19
|
Refactored Andriod project to use MVVM structure (Need to apply this so sales too after merge)
- Used MVVM structure so fragments are not doing all the operation from views to data and calls
- organized the structure of our proejct
|
2026-04-04 23:35:38 -06:00 |
|
Alex
|
44877cd4ad
|
fix photo loading issue on pets and products
|
2026-04-04 21:21:25 -06:00 |
|
Alex
|
f59624f9c3
|
integrated Jetpack navigation to project so we dont have to manually code the functionallities of loading to different fragments
|
2026-04-04 20:08:40 -06:00 |
|
Alex
|
eee724d4f5
|
fixed retrofit client, but will delete this file after merges
- kept class so nothing will break when merge
- then delete after merge buy making other files use Hilt
|
2026-04-04 18:23:15 -06:00 |
|
Alex
|
1516b92a6c
|
integrated hilt so we dont have to manually pass context and inject retrofit in andriod
|
2026-04-04 18:15:05 -06:00 |
|
Alex
|
933a6bff6b
|
Added calendar view to adoptions in andriod
|
2026-04-04 17:16:44 -06:00 |
|
Alex
|
313ec4a57b
|
Added enter send message and login for andriod feilds
|
2026-04-04 16:54:29 -06:00 |
|
|
|
072c9aadea
|
Merge pull request #135 from RecentRunner/clean-demo-branch
Protect appointment visibility
|
2026-04-04 16:28:34 -06:00 |
|
|
|
1079abf0c5
|
Harden appointment dialog
|
2026-04-04 16:24:09 -06:00 |
|
|
|
109f967435
|
Fix appointment ownership
|
2026-04-04 16:24:09 -06:00 |
|
|
|
9a110d377f
|
Hide adopted pets
|
2026-04-04 16:24:09 -06:00 |
|
|
|
1043ac096f
|
Merge pull request #134 from RecentRunner/main
Update branch
|
2026-04-04 16:11:26 -06:00 |
|
|
|
721ec1c5ce
|
Merge pull request #133 from RecentRunner/AttachmentsToChat
Attachments to chat
|
2026-04-04 16:10:39 -06:00 |
|
Alex
|
5fa9cfd5d6
|
added calendar view to appointments
- NOTE: may have to change appointments abit after backend is updated
|
2026-04-03 19:37:43 -06:00 |
|
|
|
b86d03d399
|
Merge pull request #108 from RecentRunner/web-more-fixes
Web more fixes
|
2026-04-03 18:13:18 -06:00 |
|
augmentedpotato
|
63162487b5
|
Fix profile images
|
2026-04-03 15:30:43 -06:00 |
|
augmentedpotato
|
99855a6e99
|
Fix pet sorting
|
2026-04-03 15:21:15 -06:00 |
|
augmentedpotato
|
781eb48ca9
|
Fix item loading
|
2026-04-03 15:07:41 -06:00 |
|
augmentedpotato
|
a76895434d
|
Improve auth flows
|
2026-04-03 14:52:32 -06:00 |
|
augmentedpotato
|
3ee59521fd
|
Fix web routing
|
2026-04-03 14:48:24 -06:00 |
|
Alex
|
8401d9ef62
|
Added images to products for android
- also added the option to delete the images to profile and pets
|
2026-04-02 19:21:55 -06:00 |
|
Alex
|
0216435221
|
made it so we can put attachments to chat
- Sending not implemented until backend is complete
|
2026-04-02 18:23:49 -06:00 |
|
|
|
6afda8e7b8
|
Automate reset cleanup
|
2026-04-01 20:17:30 -06:00 |
|
|
|
c0f44842f7
|
Remove duplicate migration
|
2026-04-01 20:08:39 -06:00 |
|
|
|
3efb285e17
|
Integrate refund logic
|
2026-04-01 19:59:03 -06:00 |
|
|
|
a45a437d39
|
Merge pull request #75 from RecentRunner/fix-features-icons-v2
Finalize feature fixes
|
2026-04-01 19:31:28 -06:00 |
|
|
|
14e3b89baf
|
Add desktop icons
|
2026-04-01 18:10:20 -06:00 |
|
|
|
2ac2ce339f
|
Fix phone formatting
|
2026-04-01 18:08:37 -06:00 |
|
|
|
e1f6d8cae2
|
Apply service logic
|
2026-04-01 16:57:27 -06:00 |
|
|
|
3b31ef4020
|
Merge migration fixes
|
2026-04-01 16:55:36 -06:00 |
|
|
|
6f0eab23ee
|
Revert "Merge pull request #55 from RecentRunner/backend-normalize-users-payments"
This reverts commit 5bd836719b, reversing
changes made to f944124972.
|
2026-03-30 09:58:02 -06:00 |
|
|
|
2a0f5e760c
|
Fix migration versions
|
2026-03-30 09:57:46 -06:00 |
|
|
|
1c8d87ca54
|
Merge pull request #60 from RecentRunner/web-products
Web products
|
2026-03-30 09:51:34 -06:00 |
|
|
|
84c70a1568
|
Merge remote-tracking branch 'origin/main' into web-products
|
2026-03-30 09:50:57 -06:00 |
|
|
|
686bf1793f
|
Merge pull request #59 from RecentRunner/web-index
Web index
|
2026-03-30 09:48:50 -06:00 |
|
|
|
86841b035f
|
Merge pull request #58 from RecentRunner/refund-layout-spacing
Refund polish
|
2026-03-30 09:41:16 -06:00 |
|
|
|
4ef913dfd0
|
Fix refund display
|
2026-03-30 09:40:22 -06:00 |
|
|
|
a3851871c7
|
Stabilize refunds
|
2026-03-30 09:17:22 -06:00 |
|
|
|
33c9555564
|
Polish sales tables
|
2026-03-30 09:16:52 -06:00 |
|
augmentedpotato
|
00c5198c47
|
Appointments, account stuff, adopt a pet changes
|
2026-03-30 05:38:15 -06:00 |
|
|
|
410b68520a
|
Fix android backend url
|
2026-03-30 00:03:27 -06:00 |
|
|
|
2d4e1be832
|
Merge pull request #57 from RecentRunner/staff-self-analytics
Staff analytics
|
2026-03-29 23:55:33 -06:00 |
|
|
|
78aac62138
|
Fix staff analytics
|
2026-03-29 23:50:31 -06:00 |
|
|
|
d2a6332633
|
Show staff analytics
|
2026-03-29 23:34:52 -06:00 |
|
|
|
9c7f931df2
|
Scope staff analytics
|
2026-03-29 23:34:43 -06:00 |
|
|
|
7720fb6c34
|
Merge remote-tracking branch 'origin/FixedUIConsistancy'
|
2026-03-29 23:22:43 -06:00 |
|
|
|
4a68c99c4c
|
Merge pull request #56 from RecentRunner/expand-pets-products-data
Expand catalog
|
2026-03-29 23:08:37 -06:00 |
|
|
|
b18599c280
|
Tighten seed filters
|
2026-03-29 23:07:16 -06:00 |
|
|
|
d5fdee10d5
|
Add pet product filters
|
2026-03-29 22:54:25 -06:00 |
|
|
|
01550bac30
|
Expand pet product data
|
2026-03-29 22:54:16 -06:00 |
|
|
|
5bd836719b
|
Merge pull request #55 from RecentRunner/backend-normalize-users-payments
Normalize users
|
2026-03-29 22:40:13 -06:00 |
|
|
|
2cacf1f852
|
Clean up customer accounts
|
2026-03-29 22:37:18 -06:00 |
|
|
|
896f500552
|
Preserve backfill emails
|
2026-03-29 22:14:53 -06:00 |
|
|
|
b5efed880d
|
Disable generated user accounts
|
2026-03-29 22:09:39 -06:00 |
|
|
|
edbaabb42b
|
Tighten backfill migration
|
2026-03-29 22:02:44 -06:00 |
|
|
|
14ca0d8809
|
Tighten user linking
|
2026-03-29 21:59:43 -06:00 |
|
|
|
909026143d
|
Fix user linking
|
2026-03-29 21:52:45 -06:00 |
|
Alex
|
67f77f4b19
|
added pet images to petfragment and changed other views to look consistant
|
2026-03-29 21:47:49 -06:00 |
|
|
|
0c173060a8
|
Remove debit payment data
|
2026-03-29 21:44:10 -06:00 |
|
|
|
d8622df318
|
Backfill user accounts
|
2026-03-29 21:44:06 -06:00 |
|
|
|
f944124972
|
Merge pull request #54 from RecentRunner/backend-fixes-41-49
Fix backend appointments and chat
|
2026-03-29 21:24:36 -06:00 |
|
|
|
5d490d7d05
|
Remove chat close wrapper
|
2026-03-29 21:14:53 -06:00 |
|
|
|
72b423c8ad
|
Add appointment tests
|
2026-03-29 21:07:14 -06:00 |
|
|
|
36ac309442
|
Update chat conversation status
|
2026-03-29 21:07:10 -06:00 |
|
|
|
3b84eff536
|
Fix appointment overlap rules
|
2026-03-29 19:02:19 -06:00 |
|
|
|
ab97a86977
|
Add chat close endpoint
|
2026-03-29 19:02:12 -06:00 |
|
augmentedpotato
|
4dd57e3484
|
Merge branch 'web-index'
|
2026-03-29 17:47:33 -06:00 |
|
augmentedpotato
|
c048c4bdc3
|
Account login
|
2026-03-29 17:43:31 -06:00 |
|
augmentedpotato
|
1c0f55fbe5
|
Adopt page, minor adjustment to backend
|
2026-03-25 08:19:44 -06:00 |
|
