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

5733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Allan Carr
fc4e97c9b5 Merged in feature/IO-2939-CDK-Local-Tax-IMEX (pull request #1732) 
IO-2939 CDK Local Tax for ImEX Instance

Approved-by: Dave Richer
 2024-09-18 15:54:57 +00:00
Allan Carr
3cd3d7414d IO-2939 CDK Local Tax for ImEX Instance 
Local Tax doesn't exist for ImEX Instance

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-17 14:08:35 -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
6382fdf19c Merge branch 'feature/IO-2920-cash-discounting' into release/2024-09-20 2024-09-16 12:23:53 -07: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
d221763064 Merge branch 'feature/IO-2920-cash-discounting' into release/2024-09-20 2024-09-16 12:13:13 -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
449330441a Merged in release/2024-09-13 (pull request #1725) 
Release/2024 09 13 - IO-2913 - IO-2915 - IO-2733 - IO-2923 - IO-2925 - IO-2928 - IO-2927 - IO-2928 - IO-2913 - IO-2733 - IO-2926
 2024-09-16 16:28:40 +00: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
0aba040338 Merged in feature/IO-2928-QBO-CAUSA-Payable-TAX (pull request #1714) 
IO-2928 QBO CA US Tax  Accumulator

Approved-by: Patrick Fic
 2024-09-13 14:43:58 +00: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
Allan Carr
4e6c45b195 IO-2928 Null coalesce billline amount 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-12 17:13:29 -07:00
Allan Carr
4fdb939bd2 Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1715) 
IO-2927 Extend Logging passthru

Approved-by: Patrick Fic
 2024-09-12 23:58:24 +00:00
Allan Carr
062a1dcc72 IO-2927 Extend Logging passthru 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-12 16:29:37 -07:00
Allan Carr
7b420b1855 IO-2928 QBO CA US Tax Accumulator 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-12 16:27:43 -07:00
Allan Carr
40f61bbc8f Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1713) 
IO-2927 Correct accountmeta
 2024-09-12 22:23:54 +00:00
Allan Carr
f5d821c394 Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1712) 
IO-2927 Correct accountmeta
 2024-09-12 22:12:32 +00:00
Allan Carr
3958ec9189 IO-2927 Correct accountmeta 
accounts doesn't exist in recievables, switch to items

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-09-12 15:11:06 -07:00
Allan Carr
1e4f52e541 Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1710) 
Feature/IO-2927 qbo usa gst itc

IO-2927
 2024-09-12 20:33:27 +00:00
Patrick Fic
5cc5cb444e Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1709) 
IO-2997 Add better error handling for 400 requests.

Approved-by: Allan Carr
 2024-09-12 20:26:16 +00:00
Patrick Fic
4acf0c59ca IO-2997 Remove unnecessary comment. 2024-09-12 13:25:14 -07:00
Patrick Fic
2858a5e871 IO-2997 Add better error handling for 400 requests. 2024-09-12 13:23:53 -07:00
Patrick Fic
24496d3ee1 Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1707) 
IO-2927 Update QBO Payable to use ITC.

Approved-by: Allan Carr
 2024-09-12 20:04:33 +00:00
Patrick Fic
0a5df69b12 IO-2927 Update QBO Payable to use ITC. 2024-09-12 13:03:23 -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
46d2b08477 Merged in feature/IO-2915-Customer-Portion-Totals-Federal-Tax (pull request #1699) 
IO-2915 Customer Portion Totals - Federal Tax

Approved-by: Dave Richer
 2024-09-10 20:24:13 +00:00