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
augmentedpotato
c048c4bdc3
Account login
2026-03-29 17:43:31 -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
