Commit Graph

675 Commits

Author SHA1 Message Date
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