admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,746 Commits 1,012 Branches 0 Tags
cc30ea658ef2ccc06f57de3e720357a2bfa4516a
Commit Graph

3666 Commits

Author SHA1 Message Date
Allan Carr
453812222b Merged in feature/IO-2948-Production-Job-Status-Filter (pull request #1738) 
IO-2948 Production Job Status Filter

Approved-by: Dave Richer
 2024-09-19 17:00:39 +00:00
Allan Carr
c09e22ed96 IO-2948 Production Job Status Filter 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-19 09:45:32 -07:00
Dave Richer
1cbca1ddf0 Merged in feature/IO-2932-Scheduling-Lag-on-AIO-HotFix (pull request #1735) 
IO-2932-Scheduling-Lag-on-AIO-HotFix - Remove timezone from DayJS for scheduling by adjusting the localizer
 2024-09-18 19:15:25 +00:00
Dave Richer
eeed004fe2 IO-2932-Scheduling-Lag-on-AIO-HotFix - Remove timezone from DayJS for scheduling by adjusting the localizer 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-09-18 15:00:32 -04:00
Patrick Fic
5a180b86fb Merged in feature/IO-2933-ip-short-url-email (pull request #1728) 
Feature/IO-2933 ip short url email
 2024-09-18 18:21:53 +00:00
Patrick Fic
e3059b41ae IO-2933 Resolve PR comments. 2024-09-18 11:19:43 -07:00
Dave Richer
a088f27f1d release/2024-09-20 - Revert and add back ZOHO changes 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-09-17 14:09:02 -04:00
Patrick Fic
2a33f462a3 IO-2933 Add in email for succesful postback from Short URL. 2024-09-16 16:02:19 -07:00
Patrick Fic
cbc164dbeb IO-2933 Add in ability to text payments for multiple ROs. 2024-09-16 14:33:17 -07:00
Allan Carr
0bfc7033a9 Merged in feature/IO-2936-Scoreboard-AsOfToday (pull request #1727) 
IO-2936 Scoreboard AsOfToday

Approved-by: Dave Richer
 2024-09-16 21:06:39 +00:00
Allan Carr
2ec0d90a58 Merged in feature/IO-2934-Active-Jobs-Estimator-Filter-Sorter (pull request #1726) 
IO-2934 Active Jobs Estimator Filter/Sorter

Approved-by: Dave Richer
 2024-09-16 21:05:02 +00:00
Patrick Fic
9287e6608d IO-2920 Pretty JSON Translation 2024-09-16 12:23:29 -07:00
Allan Carr
0fcee5b25e IO-2936 Scoreboard AsOfToday 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-16 12:20:17 -07:00
Patrick Fic
b39a5b755e IO-2920 Add hasura changes for cash discount & add config page. 2024-09-16 12:07:35 -07:00
Allan Carr
30cb4ef562 IO-2934 Active Jobs Estimator Filter/Sorter 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-16 11:06:56 -07:00
Dave Richer
fcab5e6ef2 Merged in feature/IO-2926-Vendor-Discount-Wrapping-In-Parts-Order (pull request #1723) 
feature/IO-2926-Vendor-Discount-Wrapping-In-Parts-Order - Fix Wrapping in Vendor Search Select
 2024-09-16 16:18:05 +00:00
Dave Richer
0212b837ea feature/IO-2926-Vendor-Discount-Wrapping-In-Parts-Order - Fix Wrapping in Vendor Search Select 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-09-16 12:16:29 -04:00
Patrick Fic
e7438a099e Merged in feature/IO-2733-pwa-timer (pull request #1721) 
IO-2733 Add loading state and further delay reload.
 2024-09-13 18:24:11 +00:00
Patrick Fic
b3303e3c38 IO-2733 Add loading state and further delay reload. 2024-09-13 11:22:38 -07:00
Patrick Fic
c69c86d193 Merged in feature/IO-2733-pwa-timer (pull request #1719) 
IO-2733 Resolve notification showing incorrect time.
 2024-09-13 17:51:33 +00:00
Patrick Fic
73ec8b8a70 IO-2733 Resolve notification showing incorrect time. 2024-09-13 10:51:04 -07:00
Patrick Fic
af09796df8 Merged in feature/IO-2733-pwa-timer (pull request #1717) 
IO-2733 Add Timer Started check to prevent auto refresh early.
 2024-09-13 16:59:58 +00:00
Patrick Fic
954504de8d IO-2733 Add Timer Started check to prevent auto refresh early. 2024-09-13 09:58:46 -07:00
Allan Carr
c3bfe87674 Merge branch 'feature/IO-2913-ADP-Payroll' into release/2024-09-13 
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-09-12 19:59:47 -07:00
Allan Carr
9aa1279144 IO-2913 Add in Translations 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-12 19:53:50 -07:00
Patrick Fic
80efea02c6 Merged in feature/IO-2925-ppc-40-points (pull request #1704) 
IO-2925 Add 40% as PPC choice.

Approved-by: Allan Carr
 2024-09-12 17:15:03 +00:00
Patrick Fic
9f5c282b41 IO-2925 Add 40% as PPC choice. 2024-09-12 09:19:49 -07:00
Allan Carr
b2602c3385 Merged in feature/IO-2923-Edit-Bill-Line-original_actual_price (pull request #1702) 
IO-2923 Edit Bill Line original_actual_price

Approved-by: Dave Richer
 2024-09-12 15:54:58 +00:00
Allan Carr
0e584af424 IO-2923 Edit Bill Line original_actual_price 
IO-2923 Edit Bill Line original_actual_price

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-11 16:36:28 -07:00
Patrick Fic
cdc3de2a33 Merge branch 'feature/IO-2733-pwa-timer' into release/2024-09-13 2024-09-10 15:58:59 -07:00
Patrick Fic
3bfa556b02 IO-2733 Added countdown timer to PWA Refresh & cache busting meta. 2024-09-10 15:54:15 -07:00
Allan Carr
44cb7577e2 Merged in feature/IO-2913-ADP-Payroll (pull request #1698) 
IO-2913 ADP Payroll Reports

Approved-by: Dave Richer
 2024-09-10 20:24:51 +00:00
Allan Carr
0193ff9e65 IO-2915 Customer Portion Totals - Federal Tax 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-10 11:55:42 -07:00
Allan Carr
fd9a51209f IO-2913 ADP Payroll Reports 
Uses ADPPayroll Split

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-10 11:21:03 -07:00
Dave Richer
799b24c90e feature/IO-2916-Remove-Beta-Switch-LEGACY - Remove cookie 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-09-10 13:16:08 -04:00
Dave Richer
3e1a8c87d1 feature/IO-2916-Remove-Beta-Switch-AIO - Remove cookie 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-09-10 13:10:49 -04:00
Dave Richer
c886d874de feature/IO-2916-Remove-Beta-Switch-AIO - Remove Beta Switch 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-09-09 23:34:54 -04:00
Allan Carr
43963a3e91 Merged in feature/IO-2904-Production-Board-Visual-Subtotal (pull request #1687) 
IO-2904 Production Board Visual Subtotal

Approved-by: Dave Richer
 2024-09-06 18:10:49 +00:00
Allan Carr
4287311adb Merged in feature/IO-2902-Duplicate-RBAC-Items (pull request #1686) 
IO-2902 Duplicate RBAC Items

Approved-by: Dave Richer
 2024-09-06 18:09:15 +00:00
Allan Carr
d0e8589a76 Merged in feature/IO-2893-Editing-Shift-Tickets (pull request #1685) 
IO-2893 Enhance disable of editing of tickets

Approved-by: Dave Richer
 2024-09-06 18:08:26 +00:00
Allan Carr
c4bab72947 DB change to .env 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-05 16:36:59 -07:00
Allan Carr
aa4b4998fa IO-2904 Production Board Visual Subtotal 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-05 16:18:49 -07:00
Patrick Fic
ed4566e00f Merge branch 'feature/IO-2707-timeticket-rerender' into release/2024-09-06 2024-09-05 13:51:42 -07:00
Patrick Fic
5c2cdfe16c Merge branch 'feature/IO-2724-tech-modal-duplicated' into release/2024-09-06 2024-09-05 13:51:34 -07:00
Patrick Fic
12c75357b5 Revert IP tracking to only single device users. 2024-09-05 11:53:48 -07:00
Patrick Fic
d40f3ee45a Add in IP tracking for SingleDeviceOnly checks. 2024-09-05 11:52:06 -07:00
Allan Carr
96a0def846 IO-2902 Fix prettier formatting 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-05 11:44:26 -07:00
Allan Carr
1fd595d0de IO-2902 Duplicate RBAC Items 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-05 11:42:11 -07:00
Allan Carr
52cf4f3d1f IO-2893 Enhance disable of editing of tickets 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-05 11:27:51 -07:00
Dave Richer
4d9be1d232 Merged in bugfix/dinero-for-production-board-amounts (pull request #1684) 
- removed unused function
 2024-09-05 17:59:41 +00:00