Commit Graph

6307 Commits

Author SHA1 Message Date
Patrick Fic
2209f49696 IO-3020 IO-3096 Additional cleanup. 2024-12-10 08:19:20 -08:00
Patrick Fic
c7a2c8209a IO-3020 IO-3036 Add additional upsell components. 2024-12-09 18:47:32 -08:00
Dave Richer
962f471f0f Merge remote-tracking branch 'origin/test-AIO' into feature/IO-3020-IO-3036-imex-lite-rome-lite 2024-12-09 07:26:15 -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
Dave Richer
92a5c27da4 Merged in release/2024-12-06 (pull request #2003)
IO-3051 Replace inlince css with juice. into TEST-aio
2024-12-05 23:32:06 +00:00
Dave Richer
09b8a05b5a Merged in feature/IO-3051-canvas-handler-optimization (pull request #2002)
IO-3051 Replace inlince css with juice.
2024-12-05 23:31:44 +00:00
Patrick Fic
83a1952880 IO-3051 Replace inlince css with juice. 2024-12-05 15:30:37 -08:00
Dave Richer
9949d12317 Merged in release/2024-12-06 (pull request #2001)
Release/2024 12 06 into test-AIO - IO-3052 IO-3053
2024-12-05 21:07:41 +00:00
Dave Richer
e5d55f27b5 Merged in feature/IO-3052-Skia-Canvas-Handler (pull request #2000)
Feature/IO-3052 Skia Canvas Handler
2024-12-05 21:06:33 +00:00
Dave Richer
bfde72eed8 feature/IO-3052-Skia-Canvas-Handler: Fix missing checks
Signed-off-by: Dave Richer <dave@imexsystems.ca>
2024-12-05 12:29:11 -08:00
Dave Richer
8fbd08d57f Merge branch 'feature/IO-3052-Skia-Canvas-Handler' of bitbucket.org:snaptsoft/bodyshop into feature/IO-3052-Skia-Canvas-Handler 2024-12-05 12:16:47 -08:00
Dave Richer
20bddb43b6 feature/IO-3052-Skia-Canvas-Handler: Fix missing checks
Signed-off-by: Dave Richer <dave@imexsystems.ca>
2024-12-05 12:16:32 -08:00
Dave Richer
b38e0f611b Merged release/2024-12-06 into feature/IO-3052-Skia-Canvas-Handler 2024-12-05 20:14:53 +00:00
Dave Richer
c84fbcaba1 feature/IO-3052-Skia-Canvas-Handler: Optimizations
Signed-off-by: Dave Richer <dave@imexsystems.ca>
2024-12-05 12:14:06 -08:00
Dave Richer
8f752d575a feature/IO-3052-Skia-Canvas-Handler: Optimizations
Signed-off-by: Dave Richer <dave@imexsystems.ca>
2024-12-05 12:13:49 -08:00
Patrick Fic
2fe9ae513d Merged in feature/IO-3053-datadog (pull request #1999)
IO-3053 Add datadog watcher for Production and Test instances.
2024-12-05 20:10:24 +00:00
Patrick Fic
5cb93b1a2c IO-3053 Add datadog watcher for Production and Test instances. 2024-12-05 12:07:16 -08:00
Dave Richer
a04dcffc4c feature/IO-3052-Skia-Canvas-Handler: Merge release and fix PR's
Signed-off-by: Dave Richer <dave@imexsystems.ca>
2024-12-05 12:01:58 -08:00
Dave Richer
50c99f7a1e feature/IO-3052-Skia-Canvas-Handler: Cleanup
Signed-off-by: Dave Richer <dave@imexsystems.ca>
2024-12-05 11:52:14 -08:00
Dave Richer
86f3179bc0 feature/IO-3052-Skia-Canvas-Handler: Initial commit
Signed-off-by: Dave Richer <dave@imexsystems.ca>
2024-12-05 11:26:36 -08:00
Dave Richer
6336e7568f feature/IO-3052-Skia-Canvas-Handler: Initial commit
Signed-off-by: Dave Richer <dave@imexsystems.ca>
2024-12-05 11:26:23 -08:00
Dave Richer
2b9e0932bd Merged in release/2024-12-06 (pull request #1997)
Release/2024 12 06 into test-AIO IO-3051 IO-3050 IO-3042
2024-12-05 17:23:58 +00:00
Allan Carr
f0f199335c Merged in feature/IO-3050-QBO-BillEmail (pull request #1995)
IO-3050 QBO BillEmail required if NeedToSend

Approved-by: Dave Richer
2024-12-05 17:23:18 +00:00
Allan Carr
9c7c9f4b6d Merged in feature/IO-3042-Jobs-Marked-Total-Loss (pull request #1996)
IO-3042 Jobs Marked as Total Loss

Approved-by: Dave Richer
2024-12-05 17:23:01 +00:00
Allan Carr
9001ceaed8 Merged in feature/IO-3051-canvas-handler-optimization (pull request #1994)
IO-3051 canvas-handler optimization

Approved-by: Dave Richer
2024-12-05 17:22:42 +00:00
Allan Carr
ab82e85c57 Merge branch 'release/2024-12-06' into feature/IO-3042-Jobs-Marked-Total-Loss
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/utils/TemplateConstants.js
2024-12-04 18:33:35 -08:00
Allan Carr
2effe5ef50 IO-3042 Jobs Marked as Total Loss
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
2024-12-04 18:30:22 -08:00
Allan Carr
006a2a5dca IO-3050 QBO BillEmail required if NeedToSend
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
2024-12-04 15:59:05 -08:00
Patrick Fic
43b1ad78a3 IO-3020 IO-3036 Additional blurred components. 2024-12-04 15:37:08 -08:00
Allan Carr
a885bdec74 IO-3051 canvas-handler optimization
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
2024-12-04 14:22:04 -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
8d2bdb171b Merged in feature/IO-3048-Fix-Job-Bug-Messaging (pull request #1986)
feature/IO-3048-Fix-Job-Bug-Messaging - Job Tag weirdness, Messaging Name  Display, Unread Messages
2024-12-03 23:51:54 +00:00
Dave Richer
3fc24677c5 Merged in release/2024-12-06 (pull request #1993)
feature/IO-3048-Fix-Job-Bug-Messaging - Unread count
2024-12-03 22:02:23 +00: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
b741e29374 Merged in release/2024-12-06 (pull request #1991)
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:31 +00: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
08d50f90d6 Merged in release/2024-12-06 (pull request #1988)
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:41:31 +00: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
29bbf4badb Merged in release/2024-12-06 (pull request #1985)
Release/2024 12 06 into test-AIO - IO-3047 IO-3046 IO-3048
2024-12-03 17:56:53 +00: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
aad22f2e2d Merged in feature/IO-3047-accountingid-on-Owner-Page (pull request #1982)
IO-3047 Accounting ID on Owner Page

Approved-by: Dave Richer
2024-12-02 20:30:50 +00:00
Allan Carr
7a11b18037 Merged in feature/IO-3046-purchase_return_ratio_excel (pull request #1983)
IO-3046 purchase_return_ratio_excel

Approved-by: Dave Richer
2024-12-02 20:30:16 +00:00