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

5456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Richer
d67d2aa064 Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2743-Production-Board-GridDND 2024-08-02 16:32:17 -04:00
Dave Richer
208f3281a9 - V1 Finished 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-08-02 16:28:50 -04:00
Dave Richer
fb7e3bc812 - Check Point 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-08-02 15:49:09 -04:00
Dave Richer
a297bba193 - Check Point 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-08-02 11:29:31 -04:00
Allan Carr
375a3fe386 Merged in hotfix/AIO/2024-08-01 (pull request #1558) 
Hotfix/AIO/2024 08 01
 2024-08-01 21:59:59 +00:00
Allan Carr
d837754ef6 Merged in feature/IO-2857-Tech-Job-Drawer-PartsOrderDrawer-Component (pull request #1557) 
Feature/IO-2857 Tech Job Drawer PartsOrderDrawer Component
 2024-08-01 21:58:49 +00:00
Allan Carr
4927e84a88 Adjustment to only have PartsDrawer show if not a technician 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-08-01 12:47:41 -07:00
Allan Carr
5da242d785 Remove unneeded spaces 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-08-01 12:29:04 -07:00
Allan Carr
87f25b1ed4 IO-2857 Tech console fixes 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-08-01 12:16:56 -07:00
Dave Richer
defadf70e3 - fix regression in settings 
- add defaults

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-08-01 11:51:13 -04:00
Dave Richer
ff184926fc - add noteupsert modal to PB 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-08-01 11:31:06 -04:00
Dave Richer
0e9768c0f6 - fix regression in card sizes 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-08-01 11:27:46 -04:00
Dave Richer
52e46aad86 - fix bug with body empty 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-31 14:18:01 -04:00
Dave Richer
43f49e5e51 - minor refactor to defaults 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-31 14:07:36 -04:00
Dave Richer
60908b123d - Clean up Card Settings 
- Code refactor for maintainability
- Allow users to adjust the order of the statistics via drag and drop

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-31 14:04:50 -04:00
Dave Richer
bbc446ef01 - Finish up with Statistics 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-30 17:24:55 -04:00
Dave Richer
65bb8c6f26 Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2743-Production-Board-GridDND 2024-07-30 13:01:46 -04:00
Allan Carr
171f40819c Merged in release/2024-07-26 (pull request #1546) 
Release/2024 07 26

Approved-by: Dave Richer
 2024-07-29 21:27:54 +00:00
Allan Carr
01da7fde31 Merged in feature/IO-2564-Row-Expander-Links (pull request #1543) 
IO-2564 Row Expander Links

Approved-by: Dave Richer
 2024-07-29 18:57:50 +00:00
Allan Carr
3c8234d715 Merged in feature/IO-2853-Production-Board-Date-Modal (pull request #1544) 
IO-2853 Production Board Date Modal

Approved-by: Dave Richer
 2024-07-29 18:53:48 +00:00
Allan Carr
866f242465 IO-2853 Production Board Date Modal 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-29 11:30:52 -07:00
Allan Carr
f690596825 IO-2564 Row Expander Links 
Move Drawer from Parts Order into seperate componenet and pass props down from main page and then link the BillDetailEdit Container into joblines

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-29 11:21:40 -07:00
Allan Carr
5f494e4b78 IO-2564 Revert location of query 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-26 13:28:29 -07:00
Allan Carr
2fc0e1cf50 Merged in feature/IO-2564-Row-Expander-Links (pull request #1541) 
IO-2564 Revert location of query
 2024-07-26 20:26:20 +00:00
Dave Richer
f49818ade3 - Alans tool tip issue 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-25 14:07:15 -04:00
Dave Richer
ff1db26f41 - fix minor issue with production notes / add some notes on 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-25 13:16:30 -04:00
Allan Carr
3550c97966 Merged in feature/IO-2849-Missing-Translation-from-Shop-Config (pull request #1538) 
IO-2849 Missing Translation from Shop Config

Approved-by: Dave Richer
 2024-07-25 16:57:22 +00:00
Allan Carr
956c686360 Merged in feature/IO-2850-Missing-Fields-from-Shop-Config (pull request #1537) 
IO-2850 Missing fields from save on Shop Config Taxes
 2024-07-25 16:56:26 +00:00
Allan Carr
508b0d7711 Merged in feature/IO-2851-Rome-Manual-Job-Creation-Taxes (pull request #1536) 
IO-2851 Manual Job Creation Taxes

Approved-by: Dave Richer
 2024-07-25 16:55:41 +00:00
Allan Carr
abb1464e30 IO-2849 Missing Translation from Shop Config 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-25 08:39:42 -07:00
Allan Carr
704d5415d6 IO-2850 Missing fields from save on Shop Config Taxes 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-25 08:38:01 -07:00
Allan Carr
6cc1cfd1b0 IO-2851 Manual Job Creation Taxes 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-25 08:36:08 -07:00
Dave Richer
e6455a7fd3 - Fix a zooming issue (zoom far in, then out, lanes don't adjust back) I noticed during the call. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-23 16:08:48 -04:00
Allan Carr
1bf745345d Merged in feature/IO-2564-Row-Expander-Links (pull request #1533) 
IO-2564 Row Expander Links

Approved-by: Dave Richer
 2024-07-23 03:36:53 +00:00
Allan Carr
63c71ed923 Merged in feature/IO-2848-Update_Job-Query (pull request #1534) 
IO-2848 UPDATE_JOB query

Approved-by: Dave Richer
 2024-07-23 03:35:53 +00:00
Dave Richer
3a844aefa0 - Merge Master, update packages. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-22 23:34:46 -04:00
Allan Carr
4a16df36dd IO-2848 UPDATE_JOB query 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-22 17:35:05 -07:00
Allan Carr
93c92e8976 IO-2564 Row Expander Links 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-22 13:30:08 -07:00
Dave Richer
d20048026c Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2743-Production-Board-GridDND 2024-07-19 16:17:22 -04:00
Dave Richer
7ba3ed2b89 Merged in release/2024-07-19 (pull request #1531) 
Release/2024 07 19
 2024-07-19 20:02:39 +00:00
Dave Richer
2cc0b7d741 Merged in bugfix/ProductFruitsWrapper (pull request #1530) 
Bugfix/ProductFruitsWrapper
 2024-07-19 20:02:11 +00:00
Dave Richer
97693fbcff - Add Prop Types to ProductFruitsWrapper.jsx 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-19 16:01:40 -04:00
Dave Richer
5e94b1a71e - Improve product fruits wrapper for extra checks 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-19 15:50:09 -04:00
Allan Carr
970275e62a Merged in release/2024-07-19 (pull request #1529) 
Release/2024 07 19
 2024-07-19 19:02:15 +00:00
Dave Richer
aa076da255 Merged in bugfix/ProductFruitsWrapper (pull request #1527) 
- Improve product fruits wrapper for extra checks

Approved-by: Allan Carr
 2024-07-19 17:24:22 +00:00
Dave Richer
3dd154de79 - Improve product fruits wrapper for extra checks 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-19 13:23:43 -04:00
Dave Richer
72a2366abe - Improve product fruits wrapper for extra checks 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-19 13:18:10 -04:00
Allan Carr
36f517e8e1 Merged in feature/IO-2845-Payment-by-Date-Grouped-by-Payment-Type (pull request #1525) 
IO-2845 Payments Grouped by Payment Type

Approved-by: Dave Richer
 2024-07-19 17:16:26 +00:00
Allan Carr
981fb57d36 Merged in feature/IO-2847-Employee-Rate-Filter (pull request #1526) 
IO-2847 Employee Rate Filter

Approved-by: Dave Richer
 2024-07-19 17:15:04 +00:00
Dave Richer
3149c3cfc6 - Patricks request for card settings to be buttons and not switches 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-07-19 11:54:50 -04:00