Commit Graph

576 Commits

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