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

6176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Allan Carr
241322fa30 IO-3046 purchase_return_ratio_excel 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-12-02 11:09:30 -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
Dave Richer
11b906103a Merged in release/2024-11-22 (pull request #1977) 
Release/2024-11-22  /  2024-11-29 - into master-AIO - IO-2920, IO-2921, IO-2959, IO-3000, IO-3001, IO-3037, IO-3040
 2024-11-30 05:02:46 +00:00
Patrick Fic
3f006f431e Merged in feature/IO-3001-us-est-scrubbing (pull request #1980) 
IO-3001 Update job costing label for ttl_adjustment
 2024-11-29 19:56:47 +00:00
Patrick Fic
6f2b5e4c55 IO-3001 Update job costing label for ttl_adjustment 2024-11-29 11:56:18 -08:00
Patrick Fic
50d7c5dace Merged in feature/IO-3001-us-est-scrubbing (pull request #1978) 
IO-3001 Add in adjustments to subtotal scrubbing.
 2024-11-29 19:34:01 +00:00
Patrick Fic
9ac27b6090 IO-3001 Add in adjustments to subtotal scrubbing. 2024-11-29 11:33:19 -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
9fcc01aa9f IO-3000 FInal updates to firebase SW. 2024-11-28 12:11:30 -08:00
Patrick Fic
cb46ee5700 Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1973) 
IO-3000 update firebase js version, and add back testing route.
 2024-11-28 19:41:05 +00:00
Patrick Fic
43bf1fc8cf IO-3000 update firebase js version, and add back testing route. 2024-11-28 11:39:17 -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
2937a07379 Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1963) 
feature/IO-3000-messaging-sockets-migration2 -
 2024-11-27 22:09:27 +00: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
Patrick Fic
6a7548d11b Merged in feature/IO-2920-cash-discounting (pull request #1962) 
IO-2920 Rever test URL to correct value for intellipay.
 2024-11-27 21:17:56 +00:00
Patrick Fic
affbb3f168 IO-2920 Rever test URL to correct value for intellipay. 2024-11-27 13:15:03 -08:00
Dave Richer
0522747b49 Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1960) 
Feature/IO-3000 messaging sockets migrationv2
 2024-11-27 19:36:29 +00: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