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

3163 Commits

Author SHA1 Message Date
Patrick Fic
c7a2c8209a IO-3020 IO-3036 Add additional upsell components. 2024-12-09 18:47:32 -08:00
Patrick Fic
cc7cea7139 IO-3020 IO-3036 Additional cleanup. 2024-12-06 15:13:56 -08:00
Patrick Fic
eaea73a955 IO-3020 IO-3036 Add upsell components to several components. Add upsell mask wrapper. 2024-12-06 14:24:03 -08:00
Patrick Fic
77e966dfe1 Merge branch 'release/2024-12-06' into feature/IO-3020-IO-3036-imex-lite-rome-lite 2024-12-06 11:00:00 -08:00
Patrick Fic
b052e97b73 IO-3020 IO-3036 Add basic upsell component and blur out reports. 2024-12-06 10:58:07 -08:00
Patrick Fic
43b1ad78a3 IO-3020 IO-3036 Additional blurred components. 2024-12-04 15:37:08 -08:00
Patrick Fic
d9c9466953 Merge branch 'master-AIO' into feature/IO-3020-IO-3036-imex-lite-rome-lite 2024-12-04 12:58:23 -08:00
Patrick Fic
6b3fb00cc0 IO-3020 IO-3036 Extend blur wrapper, add lock wrapper to components throughout the system. Many placeholders still left for upsell components. 2024-12-04 11:51:54 -08:00
Dave Richer
5d7eabbfa9 Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1992) 
feature/IO-3048-Fix-Job-Bug-Messaging - Unread count
 2024-12-03 22:01:37 +00:00
Dave Richer
a2ada7d88e feature/IO-3048-Fix-Job-Bug-Messaging - Unread count 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-12-03 13:58:16 -08:00
Dave Richer
3a6af12446 Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1990) 
feature/IO-3048-Fix-Job-Bug-Messaging - Do not allow more than 1 of the same job to be associated with a conversation
 2024-12-03 20:24:09 +00:00
Dave Richer
b490ab96be feature/IO-3048-Fix-Job-Bug-Messaging - Do not allow more than 1 of the same job to be associated with a conversation 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-12-03 12:17:11 -08:00
Dave Richer
ca462f51ec Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1987) 
feature/IO-3048-Fix-Job-Bug-Messaging - Do not allow more than 1 of the same job to be associated with a conversation
 2024-12-03 18:40:29 +00:00
Dave Richer
44721019fa feature/IO-3048-Fix-Job-Bug-Messaging - Do not allow more than 1 of the same job to be associated with a conversation 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-12-03 10:39:14 -08:00
Dave Richer
8ed81e9aed Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1984) 
feature/IO-3048-Fix-Job-Bug-Messaging - Fix tag weirdness and a vite error

Approved-by: Patrick Fic
 2024-12-03 17:55:30 +00:00
Dave Richer
15ba2a1caf feature/IO-3048-Fix-Job-Bug-Messaging - Fix tag weirdness and a vite error 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-12-03 09:48:52 -08:00
Allan Carr
f0461270de IO-3047 Accounting ID on Owner Page 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-12-02 08:52:18 -08:00
Patrick Fic
c85a5eb208 IO-3020 IO-3036 Update job actions menu & improve feature wrapper/blur wrapper trace 2024-11-29 15:55:20 -08:00
Patrick Fic
801cd724ac IO-3020 IO-3036 Update ESLint. Add LockWrapper for Header. Add Blur Wrapper. 2024-11-29 14:38:56 -08:00
Dave Richer
51a1b48da9 Merge remote-tracking branch 'origin/feature/IO-3000-messaging-sockets-migrationv2' into release/2024-11-22 2024-11-28 12:27:39 -08:00
Dave Richer
648a9b8f64 feature/IO-3000-messaging-sockets-migration2 - 
- Small change

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-28 12:27:06 -08:00
Dave Richer
7402679091 Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1974) 
Feature/IO-3000 messaging sockets migrationv2
 2024-11-28 20:16:43 +00:00
Dave Richer
627174b7d3 feature/IO-3000-messaging-sockets-migration2 - 
- Bring back subscription for fallback

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-11-28 12:14:35 -08:00
Patrick Fic
73af18f287 Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1970) 
IO-3000 Add back FCM notification subscribe
 2024-11-28 19:06:17 +00:00
Patrick Fic
90f4977924 IO-3000 Add back FCM notification subscribe 2024-11-28 11:05:50 -08:00
Dave Richer
c3b184d17b Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1968) 
Feature/IO-3000 messaging sockets migrationv2
 2024-11-28 18:02:13 +00:00
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
Allan Carr
4d35976241 Merged in feature/IO-3040-Report-Selector-Date-Range-Restriction (pull request #1965) 
IO-3040 Report Selector Date Range Restriction for Prod

Approved-by: Patrick Fic
 2024-11-28 15:56:25 +00:00
Allan Carr
5edbed3f0b Merged in feature/IO-3001-us-est-scrubbing (pull request #1966) 
IO-3001 Correct Commenting of Button
 2024-11-28 15:55:59 +00:00
Allan Carr
3d79be06de IO-3001 Correct Commenting of Button 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-11-27 18:02:28 -08:00
Allan Carr
fd9e7b4d4b IO-3040 Report Selector Date Range Restriction for Prod 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-11-27 16:24:10 -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
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
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
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
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
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
Patrick Fic
4433f0f57f IO-3020 IO-3036 Remove additional TODOs. 2024-11-25 12:29:09 -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