group-2-threaded-project-petshop

RecentRunner/group-2-threaded-project-petshop

Fork 0

Commit Graph

Select branches

Hide Pull Requests

local-dev

main

#108

#133

#134

#135

#138

#139

#141

#142

#143

#144

#145

#146

#152

#154

#155

#156

#158

#160

#161

#162

#163

#164

#168

#169

#170

#171

#172

#251

#252

#253

#254

#266

#267

#268

#274

#275

#278

#28

#280

#29

#296

#297

#299

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#320

#322

#324

#325

#326

#335

#336

#337

#338

#47

#48

#50

#52

#53

#54

#55

#56

#57

#58

#59

#60

#75

d15940a5f2 Made it so staffs can only manage their own store and they cannot see other branches data Alex 2026-04-11 23:02:52 -06:00
9ee3436aa3 Made it so staffs can only manage their own store and they cannot see other branches data Alex 2026-04-11 23:02:52 -06:00
a7f2fc5b92 Consolidate log migrations Harkamal Randhawa 2026-04-11 22:54:43 -06:00
299462d231 Consolidate log migrations Harkamal Randhawa 2026-04-11 22:54:43 -06:00
50c344091f Add log viewer Harkamal Randhawa 2026-04-11 22:54:27 -06:00
93fed57d4b Add log viewer Harkamal Randhawa 2026-04-11 22:54:27 -06:00
c69820241f Add activity logging Harkamal Randhawa 2026-04-11 22:54:23 -06:00
933db5304f Add activity logging Harkamal Randhawa 2026-04-11 22:54:23 -06:00
26bfd3973c added sort so appointment and adoption display the most recent created first Alex 2026-04-11 22:18:39 -06:00
c503ddbbc2 added sort so appointment and adoption display the most recent created first Alex 2026-04-11 22:18:39 -06:00
c0ebef7e96 fixed bug on appointments where spinners was not populating the correct data Alex 2026-04-11 22:02:06 -06:00
6245fa88da fixed bug on appointments where spinners was not populating the correct data Alex 2026-04-11 22:02:06 -06:00
cd74e5f06f replaced observer in viewmodels to observe only once to fix memleek Alex 2026-04-11 15:46:30 -06:00
e7a4e2be7a replaced observer in viewmodels to observe only once to fix memleek Alex 2026-04-11 15:46:30 -06:00
bb62b5d352 Added null checks for Appointment and Adoptions to make sure the spinner can load Alex 2026-04-10 19:49:54 -06:00
b69d1c8ce9 Added null checks for Appointment and Adoptions to make sure the spinner can load Alex 2026-04-10 19:49:54 -06:00
f26c795d46 Added Customer CRUD Alex 2026-04-10 19:34:28 -06:00
6ee60164ce Added Customer CRUD Alex 2026-04-10 19:34:28 -06:00
d6c4be3acf Merge pull request #170 from RecentRunner/fix-web-pr Harkamal 2026-04-10 12:52:44 -06:00
c11790c8b2 Merge pull request #170 from RecentRunner/fix-web-pr Harkamal 2026-04-10 12:52:44 -06:00
b888307ce7 Fix web Harkamal Randhawa 2026-04-10 09:17:31 -06:00
2db5532078 Fix web Harkamal Randhawa 2026-04-10 09:17:31 -06:00
6b15207ad0 Update postman tests Harkamal Randhawa 2026-04-10 09:01:09 -06:00
acd52a5fa3 Update postman tests Harkamal Randhawa 2026-04-10 09:01:09 -06:00
ce04f16f97 Fix collection Harkamal Randhawa 2026-04-10 08:58:24 -06:00
94c9d65ee9 Fix collection Harkamal Randhawa 2026-04-10 08:58:24 -06:00
6d7524c859 Ignore .env files Harkamal Randhawa 2026-04-10 08:51:36 -06:00
1a25681f36 Ignore .env files Harkamal Randhawa 2026-04-10 08:51:36 -06:00
2f705b87f7 Add close chat and closed status Harkamal Randhawa 2026-04-10 08:44:20 -06:00
9b6b04796d Add close chat and closed status Harkamal Randhawa 2026-04-10 08:44:20 -06:00
37410b2f7a Sync postman Harkamal Randhawa 2026-04-10 08:36:16 -06:00
1cc6381e9b Sync postman Harkamal Randhawa 2026-04-10 08:36:16 -06:00
b043577da0 Merge pull request #168 from RecentRunner/ai-chat-merge Harkamal 2026-04-10 08:58:23 -06:00
865cfb7bc4 Merge pull request #168 from RecentRunner/ai-chat-merge Harkamal 2026-04-10 08:58:23 -06:00
4cfed522eb Fix duplicate openrouter config Harkamal Randhawa 2026-04-10 08:28:43 -06:00
bd717c388e Fix duplicate openrouter config Harkamal Randhawa 2026-04-10 08:28:43 -06:00
289a404c0a Fix sales UI Harkamal Randhawa 2026-04-10 08:20:25 -06:00
d412490706 Fix sales UI Harkamal Randhawa 2026-04-10 08:20:25 -06:00
08e074607e Clean up OpenRouterService Harkamal Randhawa 2026-04-10 08:19:24 -06:00
588ddd7fec Clean up OpenRouterService Harkamal Randhawa 2026-04-10 08:19:24 -06:00
8de2612b05 Update bot model Harkamal Randhawa 2026-04-10 07:24:18 -06:00
973ee4c1d0 Update bot model Harkamal Randhawa 2026-04-10 07:24:18 -06:00
fb36a00fbf Fix bot runtime Harkamal Randhawa 2026-04-10 07:20:15 -06:00
c0c984d82e Fix bot runtime Harkamal Randhawa 2026-04-10 07:20:15 -06:00
bb28a8f31d OpenRouter bot fixes Harkamal Randhawa 2026-04-10 06:36:56 -06:00
998f476319 OpenRouter bot fixes Harkamal Randhawa 2026-04-10 06:36:56 -06:00
33bf63cb1e Add OpenRouter bot Harkamal Randhawa 2026-04-10 06:04:02 -06:00
1d2f5eab2f Add OpenRouter bot Harkamal Randhawa 2026-04-10 06:04:02 -06:00
a50fa82a50 Web and AI chat augmentedpotato 2026-04-10 07:34:53 -06:00
50150b22b7 Web and AI chat augmentedpotato 2026-04-10 07:34:53 -06:00
b9635cae68 Merge branch 'AttachmentsToChat' Alex 2026-04-10 07:43:24 -06:00
9d1ccb8e68 Merge branch 'AttachmentsToChat' Alex 2026-04-10 07:43:24 -06:00
5ecf322f0c added close chat option to chat Alex 2026-04-10 07:36:54 -06:00
8fc6f4b8d1 added close chat option to chat Alex 2026-04-10 07:36:54 -06:00
1e7d56499b fixed staff accounts and added coupons andriod Alex 2026-04-10 07:17:19 -06:00
5850adedc3 fixed staff accounts and added coupons andriod Alex 2026-04-10 07:17:19 -06:00
dff379c99d Sales bug fix Alex 2026-04-10 05:56:05 -06:00
32e41397d4 Sales bug fix Alex 2026-04-10 05:56:05 -06:00
79261274f6 added Analytics filter Alex 2026-04-10 05:03:36 -06:00
9d7c577f85 added Analytics filter Alex 2026-04-10 05:03:36 -06:00
3a78021b98 Added so adoption status can be missed and fixed adoption bugs for andriod Alex 2026-04-10 04:31:10 -06:00
49ee40b912 Added so adoption status can be missed and fixed adoption bugs for andriod Alex 2026-04-10 04:31:10 -06:00
5b1e0ea115 fixed spinners to populate the correct pets in edit mode for adoptions Alex 2026-04-10 02:58:14 -06:00
3bb399e6e4 fixed spinners to populate the correct pets in edit mode for adoptions Alex 2026-04-10 02:58:14 -06:00
57ad824d67 added viewstates to Supplier and Product Alex 2026-04-10 00:28:01 -06:00
5340ddf98b added viewstates to Supplier and Product Alex 2026-04-10 00:28:01 -06:00
6ece516cc6 Fixed profile issue with camera and added viewstate to pet and service Alex 2026-04-09 23:39:34 -06:00
0ee097e82d Fixed profile issue with camera and added viewstate to pet and service Alex 2026-04-09 23:39:34 -06:00
b1f574b5a4 Merge pull request #164 from RecentRunner/implement-chat-notifications Harkamal 2026-04-09 23:36:36 -06:00
be3763c94f Merge pull request #164 from RecentRunner/implement-chat-notifications Harkamal 2026-04-09 23:36:36 -06:00
31398fdcac Restore Main Attachments Harkamal Randhawa 2026-04-09 23:25:05 -06:00
da95606f64 Restore Main Attachments Harkamal Randhawa 2026-04-09 23:25:05 -06:00
12aa06f953 Defer Chat Attachments Harkamal Randhawa 2026-04-09 22:47:57 -06:00
738ad0003b Defer Chat Attachments Harkamal Randhawa 2026-04-09 22:47:57 -06:00
6b055c4364 Implement chat features Harkamal Randhawa 2026-04-09 21:48:39 -06:00
801b7dc872 Implement chat features Harkamal Randhawa 2026-04-09 21:48:39 -06:00
4bd44727a5 Merge pull request #160 from RecentRunner/gui-fixes Harkamal 2026-04-09 23:23:57 -06:00
de4fe97dc1 Merge pull request #160 from RecentRunner/gui-fixes Harkamal 2026-04-09 23:23:57 -06:00
6be0099048 resolve merge conflict Harkamal Randhawa 2026-04-09 23:23:39 -06:00
ba8573f288 resolve merge conflict Harkamal Randhawa 2026-04-09 23:23:39 -06:00
9bfd3a48dc fix table column bindings using lambdas Harkamal Randhawa 2026-04-09 23:18:14 -06:00
ff97839cb7 fix table column bindings using lambdas Harkamal Randhawa 2026-04-09 23:18:14 -06:00
92b66d7995 fix duplicate refresh in StaffAccountsController Harkamal Randhawa 2026-04-09 23:16:24 -06:00
e3eaeb0b99 fix duplicate refresh in StaffAccountsController Harkamal Randhawa 2026-04-09 23:16:24 -06:00
d28fced5b3 Merge pull request #163 from RecentRunner/stripe-payment Harkamal 2026-04-09 23:12:14 -06:00
ef0f46c621 Merge pull request #163 from RecentRunner/stripe-payment Harkamal 2026-04-09 23:12:14 -06:00
fa01645d31 move stripe keys to .env Harkamal Randhawa 2026-04-09 23:01:41 -06:00
5c8c11b03f move stripe keys to .env Harkamal Randhawa 2026-04-09 23:01:41 -06:00
666c7e0ca6 fix user id getter in completeCheckout Harkamal Randhawa 2026-04-09 22:57:00 -06:00
014a70b8fc fix user id getter in completeCheckout Harkamal Randhawa 2026-04-09 22:57:00 -06:00
39e4a3896e fix stripe payment flow Harkamal Randhawa 2026-04-09 22:52:57 -06:00
ae0ccfd45b fix stripe payment flow Harkamal Randhawa 2026-04-09 22:52:57 -06:00
67b5da131e Merge pull request #162 from RecentRunner/AttachmentsToChat Harkamal 2026-04-09 22:34:59 -06:00
82c39f3993 Merge pull request #162 from RecentRunner/AttachmentsToChat Harkamal 2026-04-09 22:34:59 -06:00
1010d57b79 Stripe Payment augmentedpotato 2026-04-09 22:27:03 -06:00
4d91d8b331 Stripe Payment augmentedpotato 2026-04-09 22:27:03 -06:00
3270971c7f Merge pull request #161 from RecentRunner/table-fixes Harkamal 2026-04-09 21:49:18 -06:00
5b3961064e Merge pull request #161 from RecentRunner/table-fixes Harkamal 2026-04-09 21:49:18 -06:00
a8b5ee361e cleaning code Alex 2026-04-09 21:16:11 -06:00
1dd350fc8a cleaning code Alex 2026-04-09 21:16:11 -06:00

... 5 6 7 8 9 ...