Commit Graph

383 Commits

Author SHA1 Message Date
31a11656c4 Stabilize refunds 2026-03-30 09:17:22 -06:00
07cd4f6c0e Polish sales tables 2026-03-30 09:16:52 -06:00
augmentedpotato
3b8b1e9b97 Appointments, account stuff, adopt a pet changes 2026-03-30 05:38:15 -06:00
8f05f22b23 Fix android backend url 2026-03-30 00:03:27 -06:00
467daa35f0 Merge pull request #57 from RecentRunner/staff-self-analytics
Staff analytics
2026-03-29 23:55:33 -06:00
0f20523b3c Fix staff analytics 2026-03-29 23:50:31 -06:00
a9fc3e3227 Show staff analytics 2026-03-29 23:34:52 -06:00
061275ba30 Scope staff analytics 2026-03-29 23:34:43 -06:00
edea9ef315 Merge remote-tracking branch 'origin/FixedUIConsistancy' 2026-03-29 23:22:43 -06:00
a7162682c4 Merge pull request #56 from RecentRunner/expand-pets-products-data
Expand catalog
2026-03-29 23:08:37 -06:00
5791ddc47d Tighten seed filters 2026-03-29 23:07:16 -06:00
e572d9f3cf Add pet product filters 2026-03-29 22:54:25 -06:00
c48e3b8a95 Expand pet product data 2026-03-29 22:54:16 -06:00
aa0950df9b Merge pull request #55 from RecentRunner/backend-normalize-users-payments
Normalize users
2026-03-29 22:40:13 -06:00
5d3efa0af5 Clean up customer accounts 2026-03-29 22:37:18 -06:00
3fbb108646 Preserve backfill emails 2026-03-29 22:14:53 -06:00
1a0fe7f95d Disable generated user accounts 2026-03-29 22:09:39 -06:00
f6147aa810 Tighten backfill migration 2026-03-29 22:02:44 -06:00
277d1dce8f Tighten user linking 2026-03-29 21:59:43 -06:00
24041f4242 Fix user linking 2026-03-29 21:52:45 -06:00
Alex
26c437261f added pet images to petfragment and changed other views to look consistant 2026-03-29 21:47:49 -06:00
1bab36f727 Remove debit payment data 2026-03-29 21:44:10 -06:00
a727878b0c Backfill user accounts 2026-03-29 21:44:06 -06:00
fdd4af6746 Merge pull request #54 from RecentRunner/backend-fixes-41-49
Fix backend appointments and chat
2026-03-29 21:24:36 -06:00
54b3b1d457 Remove chat close wrapper 2026-03-29 21:14:53 -06:00
9dba49e141 Add appointment tests 2026-03-29 21:07:14 -06:00
df42f68c04 Update chat conversation status 2026-03-29 21:07:10 -06:00
3cb3faa073 Fix appointment overlap rules 2026-03-29 19:02:19 -06:00
c5e9baad5e Add chat close endpoint 2026-03-29 19:02:12 -06:00
32ce987fbc Merge pull request #53 from RecentRunner/nomorebreaking
Merging in Nikitha's work
2026-03-29 18:21:56 -06:00
b8fa6b730f Fix status bar and navigation bar layout 2026-03-29 18:20:10 -06:00
8d419b0dd9 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
cce97b7509 Merge branch 'web-index' 2026-03-29 17:47:33 -06:00
augmentedpotato
c048c4bdc3 Account login 2026-03-29 17:43:31 -06:00
d3723b8ae5 Merge main into nomorebreaking 2026-03-29 17:07:35 -06:00
a254d88775 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
b3a30e10d1 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
8a278cd6e2 add desktop pet and product images 2026-03-27 10:07:37 -06:00
Alex
f5e031484e Changed android app icon 2026-03-26 22:45:28 -06:00
Alex
1360fa1592 Added petprofile images and uploads in petprofilefragment 2026-03-26 22:07:51 -06:00
Alex
998390c063 Merge branch 'MorePushNotification' 2026-03-26 21:39:38 -06:00