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

5328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Richer
bb7f7deb50 - Package updates / Base update to clear stage prior to merging in changes 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-24 14:22:09 -04:00
Dave Richer
55c10890bd Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2743-Production-Board-GridDND 2024-06-24 14:10:24 -04:00
Dave Richer
fc7da187f4 Merged in release/2024-06-21 (pull request #1498) 
Release/2024 06 21
 2024-06-21 22:47:20 +00:00
Allan Carr
f593f83ec1 Merged in feature/IO-2820-Adjust-to-Bottom-Line-State-Tax (pull request #1496) 
IO-2820 Adjustment to Bottom Line
 2024-06-21 22:32:03 +00:00
Allan Carr
5752f123ac IO-2820 Adjustment to Bottom Line 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-21 15:32:55 -07:00
Allan Carr
6396d68584 Merged in feature/IO-2828-Deliver-Checklist-Delete (pull request #1494) 
IO-2828 Add InstanceManager and correct delete button for delivery checklist
 2024-06-21 18:14:38 +00:00
Allan Carr
bfd29f25dd IO-2828 Add InstanceManager and correct delete button for delivery checklist 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-21 11:12:10 -07:00
Allan Carr
e75e35e4ee Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1493) 
Feature/IO-2793 State Tax Null QBO
 2024-06-20 21:39:24 +00:00
Allan Carr
d7ddbf7e8d IO-2793 Change Additional Costs tax item 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-20 14:15:10 -07:00
Allan Carr
1b0198af63 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1491) 
IO-2793 Change Additional Costs tax item
 2024-06-20 21:14:35 +00:00
Allan Carr
ace16ba873 IO-2793 Adjustment for parts 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-20 13:46:54 -07:00
Allan Carr
f57a4bd948 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1489) 
IO-2793 Adjustment for parts
 2024-06-20 20:45:44 +00:00
Allan Carr
fef4393f9c Merged in feature/IO-2795-Delivery-Checklist-Option (pull request #1487) 
IO-2795 Delivery Date required on Delivery Checklist

Approved-by: Dave Richer
 2024-06-20 18:43:20 +00:00
Allan Carr
47adb6d40a IO-2795 Delivery Date required on Delivery Checklist 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-20 11:26:05 -07:00
Allan Carr
4940b10910 IO-2793 Adjustmnet for OP14 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-20 08:30:58 -07:00
Allan Carr
9c8e241ef7 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1486) 
IO-2793 Adjustmnet for OP14
 2024-06-20 15:30:14 +00:00
Dave Richer
36f7b7a1a1 - Clear stage (progress update), moving branches to verify some outputs. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-19 14:06:39 -04:00
Allan Carr
c3d6b98c89 Merged in feature/IO-2820-Adjust-to-Bottom-Line-State-Tax (pull request #1483) 
IO-2820 State Tax & Adjustment to Bottom Line

Approved-by: Dave Richer
 2024-06-18 20:39:40 +00:00
Allan Carr
4b49654083 Merged in feature/IO-2814-Job-Costing-Correction (pull request #1484) 
IO-2814 Job Costing Correction for OP14 Duplication

Approved-by: Dave Richer
 2024-06-18 20:39:16 +00:00
Allan Carr
78223078f4 Merged in feature/IO-2816-Unsaved-Changes-Manual-Creation-of-Job (pull request #1485) 
IO-2816 Unsaved Changes on Manual Job Creation

Approved-by: Dave Richer
 2024-06-18 20:39:03 +00:00
Allan Carr
ca4b78d44c IO-2816 Unsaved Changes on Manual Job Creation 
Correct Hardcoded button labels

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-18 13:16:58 -07:00
Dave Richer
b0a5f2d998 - Fix Horizontal mode lanes wrapping 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-18 15:31:56 -04:00
Dave Richer
19c980bc3b - CSS Fine tuning :( 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-18 15:22:06 -04:00
Dave Richer
78d6b9699b - Dependency Update Checkpoint 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-18 14:01:40 -04:00
Dave Richer
82d8cb22df Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2743-Production-Board-GridDND 2024-06-18 13:48:21 -04:00
Allan Carr
d7bfc789e2 IO-2814 Job Costing Correction for OP14 Duplication 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-18 08:44:35 -07:00
Allan Carr
b54d0ed62a Merge branch 'master-AIO' into feature/IO-2814-Job-Costing-Correction 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-18 08:43:51 -07:00
Allan Carr
8386443cb0 IO-2820 State Tax & Adjustment to Bottom Line 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-17 10:13:36 -07:00
Dave Richer
9c41af82d7 - Progress Check 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-14 23:50:10 -04:00
Dave Richer
2997dd4e4d - Update the DND createStore due to it being marked for deprecation. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-14 13:39:51 -04:00
Dave Richer
4602648fe5 - Begin to integrate DND with trello 
- Resolve all ESLint issues in DND

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-13 17:52:03 -04:00
Dave Richer
a8f2ca5643 - MAJOR DND PROGRESS UPDATE 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-12 17:27:38 -04:00
Dave Richer
7959dc67ce Merged in release/AIO/2024-06-07 (pull request #1482) 
Release/AIO/2024 06 07
 2024-06-11 00:38:31 +00:00
Allan Carr
0d2cdec75c IO-2793 Correction for Sublet Part Tax 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-10 14:42:21 -07:00
Allan Carr
a4116b6c28 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1480) 
IO-2793 Correction for Sublet Part Tax
 2024-06-10 21:41:17 +00:00
Allan Carr
269ef25ece IO-2793 Better tax handling 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-10 14:14:15 -07:00
Allan Carr
575fbd5357 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1478) 
IO-2793 Better tax handling
 2024-06-10 21:13:20 +00:00
Dave Richer
10f60752c8 - Add in new DND Library (react-beautiful-dnd-grid), resides in client/src/components/trello-board/dnd/lib/index.js 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-10 15:54:29 -04:00
Allan Carr
2ad887fb82 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1476) 
IO-2793 Correct passed Variable
 2024-06-10 18:25:27 +00:00
Allan Carr
40a1a86f72 IO-2793 Correct passed Variable 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-10 11:25:06 -07:00
Allan Carr
95d43d936c Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1474) 
IO-2793 Correct variables
 2024-06-10 18:03:12 +00:00
Allan Carr
9f56568680 IO-2793 Correct variables 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-10 10:58:01 -07:00
Allan Carr
3428940c72 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1472) 
IO-2793 Change to function for better clarity
 2024-06-10 17:49:06 +00:00
Allan Carr
ea604a5e64 IO-2793 Change to function for better clarity 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-10 09:59:45 -07:00
Allan Carr
5b76473cbc IO-2793 Correct Parts Side for Taxes 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-07 15:59:51 -07:00
Allan Carr
db5359e086 Merged in feature/IO-2793-State-Tax-Null-QBO (pull request #1470) 
Feature/IO-2793 State Tax Null QBO
 2024-06-07 22:58:58 +00:00
Allan Carr
35046f11c2 IO-2793 Add Comment to see output for testing 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-07 14:31:33 -07:00
Allan Carr
f4c4005a2a IO-2814 Remove Comment as api.test.romeonline.io doesn't update w/ CICD 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-06-07 12:16:59 -07:00
Allan Carr
69d8d27ad3 Merged in feature/IO-2814-Job-Costing-Correction (pull request #1467) 
IO-2814 Remove Comment as api.test.romeonline.io doesn't update w/ CICD
 2024-06-07 19:16:01 +00:00
Dave Richer
6cf4a50a83 - Clear stage before moving to a sub-sub branch. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-06-07 15:04:36 -04:00