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

5499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allan Carr
a5033e10cd Merged in release/2024-08-02 (pull request #1556) 
Correct for Labor Adjustment being null
 2024-08-01 21:40:13 +00:00
Allan Carr
00f0952ab2 Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1555) 
Correct for Labor Adjustment being null
 2024-08-01 21:39:34 +00:00
Allan Carr
49a1f0c42c Correct for Labor Adjustment being null 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-08-01 14:42:07 -07:00
Allan Carr
ec5b636c26 Merge branch 'release/2024-08-02' into test-AIO 
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-08-01 13:57:45 -07:00
Allan Carr
7126cc0d56 Correction for upsteam change 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-08-01 13:31:44 -07:00
Allan Carr
568d8887ce Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1554) 
Correction for upsteam change
 2024-08-01 20:29:37 +00:00
Allan Carr
d2d8039cb9 Merged in feature/IO-2857-Tech-Job-Drawer-PartsOrderDrawer-Component (pull request #1553) 
IO-2857 Tech console fixes

Approved-by: Dave Richer
 2024-08-01 19:46:10 +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
4f9afc8578 Merged in feature/IO-2743-Production-Board-GridDND (pull request #1552) 
- fix regression in settings - add defaults
 2024-08-01 15:52:27 +00: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
82be3853f0 Merged in feature/IO-2743-Production-Board-GridDND (pull request #1551) 
Feature/IO-2743 Production Board GridDND
 2024-08-01 15:31:32 +00: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
Allan Carr
805c924a15 Merged in feature/IO-2852-Production-Add-Job-Note (pull request #1550) 
IO-2852 Production Add Job Note
 2024-07-31 22:26:56 +00:00
Allan Carr
10ff8fc432 Reverting in favor of correcting in new Production Board 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-31 15:22:22 -07:00
Allan Carr
e2db0bab9f Merged in feature/IO-2854-ProManager-Profile-Discounts (pull request #1549) 
IO-2854 Profile Adjustments for LA and MA

Approved-by: Dave Richer
 2024-07-31 22:14:59 +00:00
Allan Carr
92ee5169ab IO-2852 Production Add Job Note 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-31 14:49:01 -07:00
Allan Carr
5cf2345dca IO-2854 Profile Adjustments for LA and MA 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-07-31 14:15:31 -07:00
Dave Richer
0accf6a18f Merged in feature/IO-2743-Production-Board-GridDND (pull request #1548) 
Feature/IO-2743 Production Board GridDND

Approved-by: Allan Carr
 2024-07-31 20:47:28 +00: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
5169fd178a Merged in feature/IO-2743-Production-Board-GridDND (pull request #1547) 
Statistics and Tool Tip Bug fix
 2024-07-30 21:31:20 +00: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
4baa26cb25 Merged in release/2024-07-26 (pull request #1545) 
Release/2024 07 26
 2024-07-29 19:52:48 +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
7b814329da Merged in release/2024-07-26 (pull request #1542) 
IO-2564 Revert location of query
 2024-07-26 20:27:00 +00: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
Allan Carr
ba3f98aeb4 Merged in release/2024-07-26 (pull request #1540) 
Release/2024 07 26
 2024-07-26 16:15:53 +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
b37c70494b Merged in feature/IO-2743-Production-Board-GridDND (pull request #1539) 
Feature/IO-2743 Production Board GridDND
 2024-07-25 17:18:28 +00: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
Dave Richer
a9aad2a751 Merged in feature/IO-2743-Production-Board-GridDND (pull request #1535) 
Production Board Update 1

Approved-by: Allan Carr
 2024-07-23 16:50:24 +00: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