admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,138 Commits 1,012 Branches 0 Tags
db5740d487d7ffecff8f0697fac7affb945c160b
Commit Graph

6138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Richer
db5740d487 feature/IO-3000-messaging-sockets-migration2 - 
- Various work

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-28 09:57:35 -08:00
Dave Richer
08c0da1bed feature/IO-3000-messaging-sockets-migration2 - 
- Various work

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-28 09:10:23 -08:00
Dave Richer
ad1761096a feature/IO-3000-messaging-sockets-migration2 - 
- found small thing

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-27 14:08:52 -08:00
Dave Richer
aec7b40ae2 feature/IO-3000-messaging-sockets-migration2 - 
-misc

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-27 11:35:28 -08:00
Dave Richer
54d319f1e8 Merge remote-tracking branch 'origin/release/2024-11-22' into feature/IO-3000-messaging-sockets-migrationv2 2024-11-27 11:30:39 -08:00
Dave Richer
8d6fba2b61 feature/IO-3000-messaging-sockets-migration2 - 
-misc

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-27 11:27:34 -08:00
Dave Richer
70c31eae9e feature/IO-3000-messaging-sockets-migration2 - 
- [EXISTING BUG?] The updated at timeframes do not automatically update as time passes. If you receive a message, and it is changed to a few seconds ago, if you wait a few minutes, it does not change unless you interact with it forcing a re-render. This can be solved by adding a tick state and periodically refreshing - unsure of the performance impact for many elements however.

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-27 10:21:53 -08:00
Dave Richer
5e871b024d feature/IO-3000-messaging-sockets-migration2 - 
- Polling Mode indicator now pegged to socket.connected

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-27 10:13:38 -08:00
Dave Richer
eb1786d634 Merged in feature/IO-2959-crisp-status-page (pull request #1958) 
IO-2959 Remove debug for crisp status and add sig term handler.
 2024-11-27 18:03:02 +00:00
Patrick Fic
5e8d0fddbd IO-2959 Remove debug for crisp status and add sig term handler. 2024-11-27 09:44:42 -08:00
Allan Carr
5d690fd71f Merged in feature/IO-3040-Report-Selector-Date-Range-Restriction (pull request #1956) 
Feature/IO-3040 Report Selector Date Range Restriction

Approved-by: Dave Richer
 2024-11-27 16:48:07 +00:00
Allan Carr
79a2d902cd Merged in feature/IO-3037-Supplement-Existing-Lines (pull request #1957) 
IO-3037 Supplement Existing Lines

Approved-by: Dave Richer
 2024-11-27 16:47:52 +00:00
Allan Carr
77f340d08c IO-3037 Supplement Existing Lines 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-11-27 08:40:55 -08:00
Allan Carr
0770e7b50d IO-3040 Re-add Translations after Merge from Release 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-11-26 16:12:03 -08:00
Allan Carr
3147212b7b Merge branch 'release/2024-11-22' into feature/IO-3040-Report-Selector-Date-Range-Restriction 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/translations/en_us/common.json
#	client/src/translations/es/common.json
#	client/src/translations/fr/common.json
 2024-11-26 16:10:03 -08:00
Allan Carr
24cc9762b2 IO-3040 Report Selector Date Range Restriction 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-11-26 15:04:39 -08:00
Dave Richer
2d5153da5b Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1948) 
Feature/IO-3000 messaging sockets migrationv2 - Enhanced Socket Migrations

Approved-by: Patrick Fic
 2024-11-26 18:48:17 +00:00
Dave Richer
083534c3f3 Merge branch 'feature/IO-3000-messaging-sockets-migrationv2' of bitbucket.org:snaptsoft/bodyshop into feature/IO-3000-messaging-sockets-migrationv2 2024-11-26 10:30:16 -08:00
Dave Richer
63397769d2 feature/IO-3000-messaging-sockets-migration2 - Take last conversation if more than one exists. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-26 10:29:57 -08:00
Dave Richer
b5b7957b2f Merged release/2024-11-22 into feature/IO-3000-messaging-sockets-migrationv2 2024-11-26 17:56:41 +00:00
Patrick Fic
d50c73c82f Merged in feature/IO-2959-crisp-status-page (pull request #1954) 
Feature/IO-2959 crisp status page
 2024-11-26 16:53:57 +00:00
Patrick Fic
a4bff1a548 IO-2959 Implement logger & best practices. 2024-11-26 08:52:58 -08:00
Dave Richer
5f1daffb3e Merge branch 'feature/IO-3000-messaging-sockets-migrationv2' of bitbucket.org:snaptsoft/bodyshop into feature/IO-3000-messaging-sockets-migrationv2 2024-11-26 08:39:41 -08:00
Dave Richer
e9dfba7d31 feature/IO-3000-messaging-sockets-migration2 - Extra checks on scroll to index to prevent console warns when no messages exist in the conversation. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-26 08:39:21 -08:00
Dave Richer
2f0838b39c Merged release/2024-11-22 into feature/IO-3000-messaging-sockets-migrationv2 2024-11-26 15:30:41 +00:00
Dave Richer
d8311c5163 feature/IO-3000-messaging-sockets-migration2 - remove unused dep 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-26 07:00:54 -08:00
Patrick Fic
62e4843d5b Merged in master-AIO (pull request #1953) 
Merge Master into release to update.
 2024-11-25 23:46:46 +00:00
Patrick Fic
6058bb1b8f IO-2959 Add Crisp Status Reporter to API. 2024-11-25 15:44:15 -08:00
Patrick Fic
fa6c672583 Merge branch 'feature/IO-2920-cash-discounting' into release/2024-11-22 2024-11-25 14:15:37 -08:00
Patrick Fic
cb4d4e4c2c IO-2920 Remove shop config for intellipay amounts. 2024-11-25 14:09:09 -08:00
Patrick Fic
225b57fd58 IO-2920 Update checkfee method to get CC amount based on new information. 2024-11-25 14:08:38 -08:00
Dave Richer
e1ffcba32f Merge branch 'feature/IO-3000-messaging-sockets-migrationv2' of bitbucket.org:snaptsoft/bodyshop into feature/IO-3000-messaging-sockets-migrationv2 2024-11-25 13:45:25 -08:00
Dave Richer
5c30f33dac feature/IO-3000-messaging-sockets-migration2 - Additional logging 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-25 13:45:09 -08:00
Dave Richer
13908074c6 Merged release/2024-11-22 into feature/IO-3000-messaging-sockets-migrationv2 2024-11-25 21:33:59 +00:00
Dave Richer
c3c66f9646 feature/IO-3000-messaging-sockets-migration2 - Final Modifications 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-25 12:46:10 -08:00
Dave Richer
62dd3d7e8e feature/IO-3000-messaging-sockets-migration2 - Final fixes around sync / archive / receive 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-25 11:38:59 -08:00
Patrick Fic
268b1ba9c1 IO-2920 Refactor fee discounting to use API to check. 2024-11-25 10:51:48 -08:00
Dave Richer
239c1502f9 feature/IO-3000-messaging-sockets-migration2 - Fix console warn in archive/unarchive if one query is not existent 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-25 09:57:18 -08:00
Dave Richer
457a3b2d7a feature/IO-3000-messaging-sockets-migration2 - Handle some of the PR notes 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-25 08:42:02 -08:00
Dave Richer
5e2c0f9c4a feature/IO-3000-messaging-sockets-migration2 - Handle some of the PR notes 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-25 08:38:07 -08:00
Dave Richer
cbc8665636 feature/IO-3000-messaging-sockets-migration2 - Handle some of the PR notes 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-25 08:36:33 -08:00
Allan Carr
f6506d6073 Merged in feature/IO-2921-CARSTAR-Canada-Chatter-Integration (pull request #1949) 
IO-2921 Chatter Final mods and Cron Trigger

Approved-by: Dave Richer
 2024-11-22 19:50:27 +00:00
Allan Carr
91de311351 IO-2921 Chatter Final mods and Cron Trigger 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-11-22 10:55:19 -08:00
Dave Richer
49044e5669 feature/IO-3000-messaging-sockets-migrations2 - 
- Missed a check

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-22 10:03:41 -08:00
Dave Richer
8adaa12618 feature/IO-3000-messaging-sockets-migrations2 - 
- Merge release / fix conflicts

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-22 10:02:05 -08:00
Patrick Fic
36aad0f140 Merged in feature/IO-3001-us-est-scrubbing (pull request #1942) 
feature/IO-3001-us-est-scrubbing
 2024-11-22 17:18:47 +00:00
Patrick Fic
11ab7cd67e IO-3001 Null Coalesce for some items for better handling. 2024-11-22 09:18:09 -08:00
Dave Richer
3ab471e629 feature/IO-3000-messaging-sockets-migrations2 - 
- Final fix of unread messagages

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-22 08:23:24 -08:00
Dave Richer
6504b27eca feature/IO-3000-messaging-sockets-migrations2 - 
- A lot of a lot of testing....

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-21 22:14:39 -08:00
Allan Carr
d40579694f Merged in hotfix/2024-11-21 (pull request #1947) 
Hotfix/2024 11 21 IO-2921 IO-3027
 2024-11-22 04:41:29 +00:00