e16e7f5f22
Merge remote-tracking branch 'origin/main' into azure-deploy
2026-04-14 23:32:16 -06:00
f940ac4c10
Merge pull request #299 from RecentRunner/web-v1
...
Merge web-v1 into main
2026-04-14 23:29:51 -06:00
a4beb245a4
merge main
2026-04-14 23:29:46 -06:00
Alex
2151ac56cd
Merge branch 'AttachmentsToChat'
2026-04-14 23:20:16 -06:00
ca3e272fd9
lazy init
2026-04-14 23:19:34 -06:00
Alex
c5a59e8de3
made admin analyics able to select store
2026-04-14 23:17:12 -06:00
Alex
1b4a96c923
added personal and store analytics
2026-04-14 23:10:03 -06:00
1b873f7012
Merge remote-tracking branch 'origin/main' into azure-deploy
2026-04-14 23:06:48 -06:00
0c9feefeb5
show error details
2026-04-14 22:56:54 -06:00
Alex
08337145f0
Changed android phone validation
2026-04-14 22:53:42 -06:00
88bf6f8428
runtime backend proxy
2026-04-14 22:52:01 -06:00
a241024ced
use middleware for runtime backend proxy
2026-04-14 22:48:00 -06:00
Alex
7baa780c7f
added staff and customer images to desktop
2026-04-14 22:43:24 -06:00
Alex
2b4fcfe24c
maade it so sales display points earned
2026-04-14 22:33:10 -06:00
Alex
b7d6adc1cc
implemented forget password for desktop
2026-04-14 22:15:15 -06:00
Alex
01cce24997
fixed chat loading issue andriod
2026-04-14 22:08:14 -06:00
2a2c9ac707
fix lowercase image name in workflow
2026-04-14 21:37:16 -06:00
ae8b58a82a
trigger CI on azure-deploy branch
2026-04-14 21:35:36 -06:00
316f6f45ed
Azure deployment setup
2026-04-14 21:29:00 -06:00
Alex
49cf88f790
Merge branch 'AttachmentsToChat'
2026-04-14 21:15:19 -06:00
Alex
d9fca5b72d
added forget password
2026-04-14 21:13:57 -06:00
aa9f3ad444
Merge pull request #296 from RecentRunner/easy-fixes
...
Logs folder and activity log defaults
2026-04-14 20:50:14 -06:00
92e5919c23
Logs folder and activity log date default
2026-04-14 20:50:03 -06:00
572461b179
Merge pull request #280 from RecentRunner/chat-fixes
...
Fix chat attachments and avatars
2026-04-14 20:26:03 -06:00
42fb086d02
Fix chat attachments and avatars
2026-04-14 20:25:54 -06:00
413cbae2bc
Merge pull request #278 from RecentRunner/desktop-backend-fixes
...
Activity log, staff role, chat
2026-04-14 20:17:21 -06:00
5420fb3c9e
Activity log filters, staff role, chat fix
2026-04-14 20:17:03 -06:00
41b840da96
Merge pull request #275 from RecentRunner/backend-fixes
...
Backend bug fixes
2026-04-14 20:03:32 -06:00
c00afd2256
Block chat injection
2026-04-14 20:03:11 -06:00
7db8e966fc
Add species filtering
2026-04-14 20:03:11 -06:00
f68c23b209
Drop status column
2026-04-14 20:03:11 -06:00
2f4477d28a
Fix stuck pet status
2026-04-14 20:03:11 -06:00
677959e3e6
Fix backend issues
2026-04-14 20:03:11 -06:00
d99e476860
Merge pull request #274 from RecentRunner/desktop-notifications
...
desktop chat notifications
2026-04-14 19:59:57 -06:00
52a3b2cd3b
add desktop chat notifications
2026-04-14 19:59:42 -06:00
dcf41675e4
fix backend issues
2026-04-14 19:59:39 -06:00
5c2a29cc91
Merge pull request #268 from RecentRunner/fix/admin-account-guard
...
Harden admin guards
2026-04-14 16:10:10 -06:00
7194ba12e7
Harden admin guards
2026-04-14 16:09:39 -06:00
d19d633ef0
use openrouter/free model
2026-04-14 15:46:42 -06:00
4164e6ff21
Merge pull request #267 from RecentRunner/nullable-appointment-pet
...
nullable appointment pet
2026-04-14 15:41:18 -06:00
a8389d00be
nullable petId in appointment
2026-04-14 15:39:30 -06:00
ffa84949ef
Merge pull request #266 from RecentRunner/resend-email
...
resend email
2026-04-14 15:23:49 -06:00
d43942fb76
add rate limiting
2026-04-14 15:23:26 -06:00
0411e4be06
add email flows
2026-04-14 15:23:07 -06:00
augmentedpotato
2282f0da6f
Profile image works, editing profile works, now uses first/last name
2026-04-14 15:02:57 -06:00
augmentedpotato
c5448b95c9
Age input when editing/adding pet profile
2026-04-14 13:56:21 -06:00
augmentedpotato
5dbddfdc1f
Navbar fixed
2026-04-14 13:44:13 -06:00
augmentedpotato
2d27f95f7d
Removed addresses, adjusted contact page
2026-04-14 13:31:56 -06:00
augmentedpotato
deccb27213
Fixes for appointments and My Pets fields.
2026-04-14 12:20:48 -06:00
7281691448
Updated the example environment file
2026-04-14 10:02:02 -06:00
augmentedpotato
505560e7da
Favicon updated
2026-04-14 07:35:06 -06:00
augmentedpotato
580813792a
Pet adoption appointments (currently has a small issue)
2026-04-14 07:14:54 -06:00
8f704eda15
Merge pull request #254 from RecentRunner/web-v1
...
Web v1
2026-04-14 07:06:21 -06:00
augmentedpotato
995088ece2
Chat now present in the bottom right.
2026-04-14 05:59:33 -06:00
augmentedpotato
4c3c11995a
Cart fixes (backend), adjusted header, added footer, mobile formatting updates
2026-04-14 05:24:40 -06:00
Alex
582918e9e1
added filter to analytics desktop
2026-04-14 04:39:38 -06:00
Alex
62434020e2
added filters to desktop
2026-04-14 04:29:28 -06:00
Alex
27e570156c
added filter by customer for sales to backend and android
2026-04-14 04:03:15 -06:00
Alex
0b2c7bda13
added clendar to adoptions and appointments on desktop
2026-04-14 03:48:46 -06:00
Alex
5c57cabb4f
updated sales on desktop, and fixed sales with points again on back end
2026-04-14 03:32:29 -06:00
Alex
9c2300ad11
Merge branch 'main' into AttachmentsToChat
2026-04-14 01:10:14 -06:00
Alex
1f86158cef
Merge branch 'main' into AttachmentsToChat
2026-04-14 00:57:16 -06:00
Alex
98bd619ba6
fixes to desktop part 1
2026-04-14 00:55:51 -06:00
5bd1933ea6
add webp support desktop
2026-04-14 00:17:43 -06:00
a1e930254f
consolidate migrations
2026-04-14 00:11:13 -06:00
599104677d
fix image paths
2026-04-14 00:11:07 -06:00
f4b62bc8c4
add cart points fields
2026-04-14 00:11:02 -06:00
Alex
6fb7ac7817
Merge branch 'AttachmentsToChat'
2026-04-13 22:36:53 -06:00
Alex
3b07eeaee2
seperated staff and customer on desktop
2026-04-13 22:15:41 -06:00
adc8c477c2
Merge pull request #253 from RecentRunner/images
...
seed images
2026-04-13 21:58:01 -06:00
f7480f5e80
localize seed image URLs to upload paths
2026-04-13 21:57:29 -06:00
Alex
52624118f6
fixed phone validation desktop
2026-04-13 21:52:53 -06:00
Alex
819109893c
added dropdowns for breed desktop
2026-04-13 21:40:34 -06:00
Alex
954154e99c
fixed pet busniss logic desktop
2026-04-13 21:10:35 -06:00
Alex
83507f4207
made it so staff cannot change the status of pets for desktop for adopted or owned
2026-04-13 20:49:22 -06:00
a04cdd60d6
Merge pull request #252 from RecentRunner/merge-migration
...
merge migration
2026-04-13 19:48:37 -06:00
e0297dff6a
make ActivityLog entity immutable
2026-04-13 19:47:45 -06:00
Alex
0f65d6c242
added correct refund logic and points for sales
2026-04-13 19:46:52 -06:00
Alex
f13bb90aa0
added points to sale and logic backend
2026-04-13 19:46:28 -06:00
Alex
9dad410c54
added loyaltypoint usage to sales unfinished still needs to work with the backend
2026-04-13 18:52:07 -06:00
1b1236bfb2
seed normalization
2026-04-13 18:29:49 -06:00
Alex
40955b616b
Can now edit loyalty points for customer on andriod, and pets now have breed dropdown
2026-04-13 18:25:11 -06:00
af5e3a88ea
Merge pull request #251 from RecentRunner/payment-fixes
...
Payment safety fixes
2026-04-13 17:52:21 -06:00
b64b426406
Unique sale constraint
2026-04-13 17:49:59 -06:00
a5a1757af7
Add payment features
2026-04-13 17:49:59 -06:00
141ca34ea0
Add checkout snapshot
2026-04-13 17:49:59 -06:00
Alex
53a11449ac
made sales readonly for andriod
2026-04-13 17:25:28 -06:00
Alex
cba39e8a3c
Fixed phone validation for andriod
2026-04-13 17:18:46 -06:00
Alex
688a04c3bc
added pending status on pets andiord, also made pets automatically switch to pending when an adoption is in pending
2026-04-13 17:12:41 -06:00
Alex
9fdb3087da
Merge branch 'AttachmentsToChat'
2026-04-13 15:07:28 -06:00
Alex
facf1d588b
added store column to desktop and display only logged in data
2026-04-13 15:06:04 -06:00
3000a64be3
Merge pull request #172 from RecentRunner/web-adopt-filter
...
Adopt page filter
2026-04-13 11:08:41 -06:00
de58b0b131
Remove XML declaration from misc.xml
2026-04-13 11:08:23 -06:00
augmentedpotato
23125418c3
Adopt page filter added
2026-04-13 10:34:26 -06:00
Alex
d9c34abcf8
fixed rotated image for pets and product as well
2026-04-13 00:30:26 -06:00
Alex
296f99900a
Fix profile image squish and rotate isusse
2026-04-13 00:07:58 -06:00
Alex
227eb9cac8
added coupons to desktop app
2026-04-12 23:47:22 -06:00
Alex
1f801d7486
desktop: added confirmation to change onwer and only admins can change this
2026-04-12 20:01:06 -06:00
Alex
5f7f40f98a
added closed chat section and fixed closed chat bug for desktop
2026-04-12 19:49:12 -06:00
Alex
d870475bc9
Fixed minor bugs
...
- in sales we can no longer select 0 product for a sale
- ActivityLogFragment is locked to admin
- Spinners are loaded aftrer a selection if the spinner depends on a parent spinner
2026-04-12 18:34:43 -06:00
Alex
077780c0c3
adjusted so only available pets for the selected store is displayed when adopting
2026-04-12 18:00:24 -06:00
Alex
42c9e96500
Modified project to use our utils on areas we arnt to manage code
2026-04-12 17:49:24 -06:00
Alex
e6e8dc1b23
Fixed Log filters and fixed chat attachment download
2026-04-12 17:28:40 -06:00
Alex
7a4c711e7f
added Activitylogs andriod
2026-04-12 16:58:12 -06:00
Alex
0e9bbcbcea
Merge branch 'AttachmentsToChat'
2026-04-12 01:09:25 -06:00
Alex
30f14a5152
added Forgetpassword page with no logic yet
2026-04-12 01:08:25 -06:00
Alex
a6d1c089ac
Faded text for disabled spinners in staff
2026-04-12 00:51:49 -06:00
Alex
0df8212a65
staff cant change status or store for pets
2026-04-12 00:49:15 -06:00
Alex
16c832bd14
Made it so only admins can change pet owners
2026-04-12 00:37:15 -06:00
Alex
57e5b06666
Fixed Coupon to use in sales
2026-04-12 00:25:33 -06:00
Alex
54139e9e13
Used the wrong endpoint for populating species, changed to to the correct one
...
also added coupon option to sales
2026-04-11 23:50:22 -06:00
7f7b9d2ed7
Merge pull request #171 from RecentRunner/admin-activity-logs
...
Add activity logging
2026-04-11 23:32:38 -06:00
a3e1f67779
restrict activity logging to admin and staff only
2026-04-11 23:29:23 -06:00
79b4f7a3e8
Harden startup config
2026-04-11 23:10:18 -06:00
Alex
2075d0ba17
added petspecies spinner
2026-04-11 23:04:14 -06:00
Alex
9ee3436aa3
Made it so staffs can only manage their own store and they cannot see other branches data
2026-04-11 23:02:52 -06:00
299462d231
Consolidate log migrations
2026-04-11 22:54:43 -06:00
93fed57d4b
Add log viewer
2026-04-11 22:54:27 -06:00
933db5304f
Add activity logging
2026-04-11 22:54:23 -06:00
Alex
c503ddbbc2
added sort so appointment and adoption display the most recent created first
2026-04-11 22:18:39 -06:00
Alex
6245fa88da
fixed bug on appointments where spinners was not populating the correct data
2026-04-11 22:02:06 -06:00
Alex
e7a4e2be7a
replaced observer in viewmodels to observe only once to fix memleek
2026-04-11 15:46:30 -06:00
Alex
b69d1c8ce9
Added null checks for Appointment and Adoptions to make sure the spinner can load
2026-04-10 19:49:54 -06:00
Alex
6ee60164ce
Added Customer CRUD
2026-04-10 19:34:28 -06:00
c11790c8b2
Merge pull request #170 from RecentRunner/fix-web-pr
...
Fix web
2026-04-10 12:52:44 -06:00
2db5532078
Fix web
2026-04-10 09:17:31 -06:00
acd52a5fa3
Update postman tests
2026-04-10 09:01:09 -06:00
94c9d65ee9
Fix collection
2026-04-10 08:58:44 -06:00
1a25681f36
Ignore .env files
2026-04-10 08:58:44 -06:00
9b6b04796d
Add close chat and closed status
2026-04-10 08:58:44 -06:00
1cc6381e9b
Sync postman
2026-04-10 08:58:44 -06:00
865cfb7bc4
Merge pull request #168 from RecentRunner/ai-chat-merge
...
Add AI chat
2026-04-10 08:58:23 -06:00
bd717c388e
Fix duplicate openrouter config
2026-04-10 08:28:43 -06:00
d412490706
Fix sales UI
2026-04-10 08:20:25 -06:00
588ddd7fec
Clean up OpenRouterService
2026-04-10 08:19:24 -06:00
973ee4c1d0
Update bot model
2026-04-10 08:18:54 -06:00
c0c984d82e
Fix bot runtime
2026-04-10 08:18:54 -06:00
998f476319
OpenRouter bot fixes
2026-04-10 08:18:54 -06:00
1d2f5eab2f
Add OpenRouter bot
2026-04-10 08:18:54 -06:00
augmentedpotato
50150b22b7
Web and AI chat
2026-04-10 08:18:54 -06:00
Alex
9d1ccb8e68
Merge branch 'AttachmentsToChat'
2026-04-10 07:43:24 -06:00
Alex
8fc6f4b8d1
added close chat option to chat
2026-04-10 07:36:54 -06:00
Alex
5850adedc3
fixed staff accounts and added coupons andriod
2026-04-10 07:17:19 -06:00
Alex
32e41397d4
Sales bug fix
2026-04-10 05:56:05 -06:00
Alex
9d7c577f85
added Analytics filter
2026-04-10 05:03:36 -06:00
Alex
49ee40b912
Added so adoption status can be missed and fixed adoption bugs for andriod
2026-04-10 04:31:10 -06:00
Alex
3bb399e6e4
fixed spinners to populate the correct pets in edit mode for adoptions
2026-04-10 02:58:14 -06:00
Alex
5340ddf98b
added viewstates to Supplier and Product
2026-04-10 00:28:01 -06:00
Alex
0ee097e82d
Fixed profile issue with camera and added viewstate to pet and service
2026-04-09 23:39:34 -06:00
be3763c94f
Merge pull request #164 from RecentRunner/implement-chat-notifications
...
implement chat notifications
2026-04-09 23:36:36 -06:00
da95606f64
Restore Main Attachments
2026-04-09 23:28:14 -06:00
738ad0003b
Defer Chat Attachments
2026-04-09 23:28:14 -06:00
801b7dc872
Implement chat features
2026-04-09 23:28:14 -06:00
de4fe97dc1
Merge pull request #160 from RecentRunner/gui-fixes
...
Refactor user management
2026-04-09 23:23:57 -06:00
ba8573f288
resolve merge conflict
2026-04-09 23:23:39 -06:00
ff97839cb7
fix table column bindings using lambdas
2026-04-09 23:18:14 -06:00
e3eaeb0b99
fix duplicate refresh in StaffAccountsController
2026-04-09 23:16:24 -06:00
ef0f46c621
Merge pull request #163 from RecentRunner/stripe-payment
...
Stripe Payments
2026-04-09 23:12:14 -06:00
5c8c11b03f
move stripe keys to .env
2026-04-09 23:01:41 -06:00
014a70b8fc
fix user id getter in completeCheckout
2026-04-09 22:57:00 -06:00
ae0ccfd45b
fix stripe payment flow
2026-04-09 22:52:57 -06:00
82c39f3993
Merge pull request #162 from RecentRunner/AttachmentsToChat
...
Attachments to Chat
2026-04-09 22:34:59 -06:00
augmentedpotato
4d91d8b331
Stripe Payment
2026-04-09 22:27:03 -06:00
5b3961064e
Merge pull request #161 from RecentRunner/table-fixes
...
Merge Table Fixes
2026-04-09 21:49:18 -06:00
Alex
1dd350fc8a
cleaning code
2026-04-09 21:16:11 -06:00
ef5054e8e3
Restore Table Layout
2026-04-09 21:12:04 -06:00
Alex
c2faeb06ce
made chat more user frendly
2026-04-09 19:47:43 -06:00
Alex
9b4aad0c36
fixed sending message with attachments
2026-04-09 18:55:12 -06:00
793053a621
Space Out Tables
2026-04-09 17:57:01 -06:00
0b25e0422a
Add Sales Scroll
2026-04-09 17:39:52 -06:00
Alex
f3932b226d
added attachments to chat
2026-04-09 17:39:45 -06:00
82e8e04e55
Shrink Sales View
2026-04-09 17:36:31 -06:00
51d063f95c
Format Appointment Times
2026-04-09 17:29:18 -06:00
8b4e39416b
Refine Desktop Pricing
2026-04-09 17:29:03 -06:00
1205459e53
Refine GUI Behavior
2026-04-09 15:51:21 -06:00
Alex
3db45bde6c
fixed bug again
2026-04-09 15:37:24 -06:00
Alex
bc55580831
bug fix
2026-04-09 15:24:20 -06:00
Alex
75341c93d8
deleted unused viewmodels
2026-04-09 15:17:11 -06:00
Alex
38b830509f
refactored viewmodels for listfragments
2026-04-09 14:44:04 -06:00
Alex
863692c058
created viewmodels for detailFragments
2026-04-09 14:17:51 -06:00
Alex
30ff2fe04e
Merge branch 'main' into AttachmentsToChat
2026-04-09 13:44:24 -06:00
675bf36908
Refactor user management
2026-04-09 12:28:33 -06:00
39fdf8814a
Adjust Sales Layout
2026-04-09 11:49:55 -06:00
3ddc9fdf92
Improve Desktop Tables
2026-04-09 11:49:14 -06:00
0cc160a02c
Unify Table Behavior
2026-04-09 11:48:30 -06:00
70c883b01b
Merge pull request #158 from RecentRunner/remove-sidebar-emojis
...
Remove sidebar emojis
2026-04-09 11:11:28 -06:00
0930bfcc9a
Remove sidebar emojis
2026-04-09 11:10:59 -06:00
9a764222c4
Merge pull request #156 from RecentRunner/early-fixes
...
Merge Early Fixes
2026-04-09 10:39:53 -06:00
Alex
4664fe177b
fixed spinner infinite loop in appointments
2026-04-09 02:48:55 -06:00
Alex
992da24260
split viewmodels for appointments
2026-04-09 02:07:35 -06:00
Alex
2d1c1f8a46
Moved appointments businiss logic to modelview andriod
2026-04-09 00:55:00 -06:00
Alex
071973e787
small change
2026-04-08 21:30:40 -06:00
Alex
05a19ac7c0
Appointments should be fully user frendly now
2026-04-08 20:14:52 -06:00
Alex
e41c4d41d0
helper class added to enable and disable fields
2026-04-08 19:57:04 -06:00
Alex
9998b31ab4
updated backend so booked appointment automatically changes to completed
2026-04-08 19:16:18 -06:00
Alex
ccb0d0dc14
fixing dropdowns
2026-04-08 18:10:18 -06:00
Alex
1e37f25a7a
update dropdowns to use backend dropdown endpoints part 1
2026-04-08 17:34:33 -06:00
Alex
8d5d6f3872
making appointment userfrendly part1 andriod
2026-04-08 16:53:42 -06:00
76f22ae16a
Update early fixes
2026-04-08 16:43:50 -06:00
be9f07236a
Merge pull request #155 from RecentRunner/AttachmentsToChat
...
Merged attachments branch
2026-04-08 13:44:13 -06:00
3beb4105ea
Merge main branch
2026-04-08 13:43:20 -06:00
e9d5c701f0
Fix adoption dialog
2026-04-08 11:23:02 -06:00
78da8716af
Show store dropdown
2026-04-08 11:23:02 -06:00
3b9e1374f3
Update pet dialog
2026-04-08 11:23:02 -06:00
28f9fdcff6
Create adoption sale
2026-04-08 11:23:02 -06:00
0fdd603232
Fix dialog issues
2026-04-08 11:23:02 -06:00
8fb4c82a67
Fix desktop chat
2026-04-08 11:23:02 -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
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
Nikitha
ff53e4a1ec
Employee files
...
Add, edit employee (staff and admin)
2026-04-06 22:56:40 -06:00
Nikitha
74472976d5
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
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 5bd836719bf944124972
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
c37a2fdf45
Merge pull request #53 from RecentRunner/nomorebreaking
...
Merging in Nikitha's work
2026-03-29 18:21:56 -06:00
c397bfcad1
Fix status bar and navigation bar layout
2026-03-29 18:20:10 -06:00
d66508137b
Fix Android app connection and timeout issues
...
Add proper timeout configuration to OkHttpClient (30s connect/read/write)
Update OkHttp logging-interceptor to 4.12.0 to match OkHttp version
Improve error messages to show server URL for debugging
Configure backend to listen on all interfaces (0.0.0.0)
Remove EdgeToEdge calls that interfered with layout
2026-03-29 17:54:23 -06:00
augmentedpotato
4dd57e3484
Merge branch 'web-index'
2026-03-29 17:47:33 -06:00
55caf434d6
Merge main into nomorebreaking
2026-03-29 17:07:35 -06:00
fdf438f3dd
Merge pull request #52 from RecentRunner/desktop-pet-product-pictures
...
Add desktop pet and product images
2026-03-29 16:58:06 -06:00
Nikitha
324e5d4e17
sales files
...
basic sale view and builtfiles
2026-03-29 16:54:41 -06:00
93e71434df
fix desktop pet and product dialogs
2026-03-29 16:54:01 -06:00
Nikitha
c4775bcbfa
Backend a small change
...
small change in appointment service to validate time for appointments.
2026-03-29 16:35:18 -06:00
Nikitha
862ece691a
purchaseorder view
...
Purchase Order view only so changes only to view
2026-03-29 16:33:27 -06:00
Nikitha
13916236eb
connected files
...
files connected to load
2026-03-29 16:32:25 -06:00
Nikitha
2ad097413b
Product files
...
loads details of product, categories and cost of it
2026-03-29 16:29:40 -06:00
Nikitha
653ae3f233
ProductSupplier
...
prodcutSupllier -loads all product supplier details and with cost details
2026-03-29 16:28:19 -06:00
Nikitha
87a4404c20
Inventory
...
Inventory- details of product loads with id and described with filter, and categories selection
2026-03-29 16:26:21 -06:00
Nikitha
55f40572de
Adoption files
...
adoption
2026-03-29 16:24:14 -06:00
Nikitha
7e832a139f
Appointments
...
validation, time slots for booking appointment , date, store. connected to service Type, pet name, customer name. Loads from database
2026-03-29 16:20:38 -06:00
8c6a53250a
add desktop pet and product images
2026-03-27 10:07:37 -06:00
Alex
8272c49b44
Changed android app icon
2026-03-26 22:45:28 -06:00
Alex
38e1a29f34
Added petprofile images and uploads in petprofilefragment
2026-03-26 22:07:51 -06:00
Alex
5d8d37dee4
Merge branch 'MorePushNotification'
2026-03-26 21:39:38 -06:00
Alex
2c61e6e664
Make chat notification display messengers name and disable notifying if already in chat view
2026-03-26 21:31:36 -06:00
2fb409f0d9
add pet and product images
2026-03-26 20:36:04 -06:00
Alex
dbb24085b2
Added push notifications when reciving any message and added filter status on pets in Andriod
2026-03-26 20:13:27 -06:00
Alex
75c39312fe
Added profile photo loading and uploading
...
- profile photos now load from backend
- profile photos can be uploaded to the backend
- RetrofitClient now automatically determines if the device is an emulator or hardware so we dont have to comment and uncomment everytime we test with a different device
2026-03-26 16:50:02 -06:00
Alex
aec9f7b9e0
Added role based access to android login
...
- Admin has access to everything
- Staff has limited access to what they can edit in listfragment
- Customers cannot login to app
- added validations to pets, supplier and services in their detailed view
2026-03-26 16:50:02 -06:00
5477c4beee
use swing picker on wayland
2026-03-25 23:55:40 -06:00
4659aa44df
readd secure avatar endpoints
2026-03-25 22:58:04 -06:00
b1fe03410c
Merge pull request #30 from RecentRunner/WorkingOnProfileAndPushNotification
...
Working on profile and push notification
2026-03-25 09:18:48 -06:00
Alex
d3a69b7aea
added push notification when a new conversation is made
2026-03-24 22:41:54 -06:00
d3fdf4f823
Merge pull request #29 from RecentRunner/desktop---validator-fixes
...
added null checks to validator, created a bunch of junit tests
2026-03-24 20:43:54 -06:00
augmentedpotato
dbdf5e54ab
added null checks to validator, created a bunch of junit tests
2026-03-24 20:42:45 -06:00
Alex
b46705396d
Profile now loads from backend
...
- can update profile from app
- loads profile details from backend to display
- changed inputValidator to use andriod phone pattern
- added ErrorResponse so we can fetch error messages from the backend
- Added UserDTO to get profile info
TODO:
Still need to get profile images from the backend and beable to load and update them using the backend
2026-03-24 18:31:12 -06:00
b012c91b3b
Merge pull request #28 from RecentRunner/web-index
...
uploading index to repo
2026-03-24 16:59:39 -06:00
