Dave Richer
|
83a976e98f
|
- Add ESLint back to Vite
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-04-05 09:59:30 -04:00 |
|
Patrick Fic
|
d7caaecaf7
|
Merge branch 'feature/IO-2458-RO-Closer' into test-AIO
|
2024-04-04 20:42:17 -07:00 |
|
Patrick Fic
|
96242a555a
|
RO Closer bug fixes.
|
2024-04-04 20:41:39 -07:00 |
|
Patrick Fic
|
7ece1256f2
|
Uncomment ProManager calculations.
|
2024-04-04 20:01:47 -07:00 |
|
Patrick Fic
|
a43134511b
|
Merge branch 'release/2024-04-05' into test-AIO
|
2024-04-04 12:56:09 -07:00 |
|
Patrick Fic
|
b188cce3ea
|
Merge branch 'test-AIO' of bitbucket.org:snaptsoft/bodyshop into test-AIO
|
2024-04-04 12:52:02 -07:00 |
|
Patrick Fic
|
39d4f56812
|
Merge branch 'hotfix/AIO/2024-04-04' into test-AIO
|
2024-04-04 11:32:01 -07:00 |
|
Patrick Fic
|
f85e3d8d60
|
Resolve job costing.
|
2024-04-04 11:31:37 -07:00 |
|
Patrick Fic
|
c33eaa6c68
|
Merged in feature/IO-2458-RO-Closer (pull request #1390)
Feature/IO-2458 RO Closer
|
2024-04-04 18:14:11 +00:00 |
|
Patrick Fic
|
c4d39cf3d3
|
Merge branch 'test-AIO' into feature/IO-2458-RO-Closer
# Conflicts:
# client/src/components/job-bills-total/job-bills-total.component.jsx
# client/src/components/job-costing-statistics/job-costing-statistics.component.jsx
# client/src/components/job-lifecycle/job-lifecycle.component.jsx
# client/src/components/job-payments/job-payments.component.jsx
# client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
# client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
# client/src/components/shop-info/shop-info.component.jsx
# client/src/graphql/bodyshop.queries.js
# client/src/graphql/jobs.queries.js
# client/src/pages/jobs-close/jobs-close.component.jsx
# client/src/utils/instanceRenderMgr.js
|
2024-04-04 11:12:49 -07:00 |
|
Patrick Fic
|
926c13569d
|
Merge branch 'hotfix/AIO/2024-04-04' into test-AIO
|
2024-04-04 10:51:25 -07:00 |
|
Patrick Fic
|
cbf5c5729f
|
Resolve instancemgr arg for supplement import.
|
2024-04-04 10:51:10 -07:00 |
|
Patrick Fic
|
5e63ce7271
|
Final changes for RO closer.
|
2024-04-03 14:18:45 -07:00 |
|
Patrick Fic
|
37196e65c3
|
Add schema changes for RO Guard to bodyshop table.
|
2024-04-03 09:46:52 -07:00 |
|
Patrick Fic
|
5c0f228876
|
Remove debug statement.
|
2024-04-03 09:27:29 -07:00 |
|
Allan Carr
|
b20c605c85
|
Merged in feature/IO-2568-Payment-Modal-Button-Spacing (pull request #1384)
IO-2568 Payment Modal Button Spacing
Approved-by: Dave Richer
|
2024-04-02 19:03:49 +00:00 |
|
Allan Carr
|
d8ac708536
|
Merged in feature/IO-2552-PVRT-Button-Spacing (pull request #1386)
IO-2552 PVRT Button Spacing and Alignment
Approved-by: Dave Richer
|
2024-04-02 19:03:36 +00:00 |
|
Allan Carr
|
8a32fe50f3
|
Merged in feature/IO-2730-Bill-Search-Result-Align (pull request #1383)
IO-2730 Bill Search Result Align
Approved-by: Dave Richer
|
2024-04-02 19:03:06 +00:00 |
|
Allan Carr
|
7897a490bd
|
Merged in feature/IO-2563-Repair-Line-Expander-Bills-Transaltion (pull request #1385)
IO-2563 Repair LIne Expander Bills Translation
Approved-by: Dave Richer
|
2024-04-02 19:02:50 +00:00 |
|
Allan Carr
|
17d73fc6d7
|
Merged in feature/IO-2553-Edit-CC-Unsaved-Changes (pull request #1388)
IO-2553 Unsaved Changes on Edit CC
Approved-by: Dave Richer
|
2024-04-02 19:02:28 +00:00 |
|
Allan Carr
|
7d1910086e
|
IO-2553 Unsaved Changes on Edit CC
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-04-02 10:39:41 -07:00 |
|
Patrick Fic
|
46def33bc8
|
Merge branch 'test-AIO' into master-AIO
|
2024-04-01 15:02:56 -07:00 |
|
Patrick Fic
|
fc41226404
|
CI Fixes.
|
2024-04-01 15:02:13 -07:00 |
|
Patrick Fic
|
a51e088f69
|
Merged in test-AIO (pull request #1387)
Rome Deployment & minor bug fixes for IO.
|
2024-04-01 21:55:37 +00:00 |
|
Patrick Fic
|
3683bc161d
|
Minor bug fixes & Rome CI
|
2024-04-01 14:42:05 -07:00 |
|
Allan Carr
|
817c41afb9
|
IO-2552 PVRT Button Spacing and Alignment
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-04-01 14:27:25 -07:00 |
|
Allan Carr
|
04315a9045
|
IO-2563 Repair LIne Expander Bills Translation
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-04-01 14:07:58 -07:00 |
|
Allan Carr
|
d0871ffe21
|
IO-2568 Payment Modal Button Spacing
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-04-01 13:52:25 -07:00 |
|
Allan Carr
|
dca587d6e0
|
IO-2730 Bill Search Result Align
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-04-01 13:20:30 -07:00 |
|
Patrick Fic
|
72aece7f14
|
Minor Changes.
|
2024-04-01 12:34:44 -07:00 |
|
Patrick Fic
|
a3d6d44089
|
IO-2723 Change tech sider order.
|
2024-04-01 10:46:22 -07:00 |
|
Patrick Fic
|
07a18bcd8c
|
IO-2661 Rename CSR labels to Writer for Rome & PM
|
2024-04-01 10:44:57 -07:00 |
|
Patrick Fic
|
9b9ac505e9
|
Refactor task modal opening.
|
2024-03-28 14:41:54 -07:00 |
|
Patrick Fic
|
8f7e2bd9d3
|
Merged in test-AIO (pull request #1379)
Test AIO
|
2024-03-28 21:21:32 +00:00 |
|
Allan Carr
|
19ec4cb021
|
Merged in release/2024-03-28 (pull request #1382)
Release/2024 03 28
|
2024-03-28 21:15:25 +00:00 |
|
Patrick Fic
|
a7aa2a31a6
|
Merge branch 'release/2024-03-28' into test-AIO
|
2024-03-28 13:29:58 -07:00 |
|
Allan Carr
|
346e82bdbc
|
Merged in feature/IO-2702-Limit-Production-Colors-to-Production-Statuses (pull request #1380)
IO-2702 Adjust concat
|
2024-03-28 20:24:19 +00:00 |
|
Allan Carr
|
fd9575e5a5
|
IO-2702 Adjust concat
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-03-28 13:25:13 -07:00 |
|
Patrick Fic
|
3acf271dcf
|
Merge branch 'release/2024-03-28' into test-AIO
|
2024-03-28 10:30:06 -07:00 |
|
Patrick Fic
|
af6bc0fb5a
|
Resolve hasura API url again.
|
2024-03-28 10:23:22 -07:00 |
|
Allan Carr
|
d0e289757f
|
Merged in feature/IO-2705-Insurance-Co-ID (pull request #1375)
IO-2705 Insurance Co Id and correct Select Insurance and Layout for concistency
Approved-by: Dave Richer
|
2024-03-28 16:59:52 +00:00 |
|
Allan Carr
|
becc54f7b3
|
Merged in feature/IO-2714-New-Payment-Cache (pull request #1376)
IO-2714 New Payment Cache
Approved-by: Dave Richer
|
2024-03-28 16:51:59 +00:00 |
|
Allan Carr
|
e3fabdac91
|
Merged in feature/IO-2727-Payment-Export-Re-Export-Button (pull request #1377)
IO-2727 Payment Re-export/Export button
Approved-by: Dave Richer
|
2024-03-28 16:51:20 +00:00 |
|
Allan Carr
|
40621db556
|
Merged in feature/IO-2702-Limit-Production-Colors-to-Production-Statuses (pull request #1374)
IO-2702 Limit Production Colors to Production Statuses
Approved-by: Dave Richer
|
2024-03-28 16:50:51 +00:00 |
|
Patrick Fic
|
c3fa4ef8af
|
Minor fixes.
|
2024-03-28 09:26:24 -07:00 |
|
Patrick Fic
|
0a784c6873
|
Resolve gallery issues.
|
2024-03-27 15:47:00 -07:00 |
|
Patrick Fic
|
e1df64d592
|
Reformat all project files to use the prettier config file.
|
2024-03-27 15:35:07 -07:00 |
|
Patrick Fic
|
b161530381
|
Minor Test Changes.
|
2024-03-27 15:13:47 -07:00 |
|
Patrick Fic
|
136ef63c14
|
Add PPC.
|
2024-03-27 13:26:28 -07:00 |
|
Patrick Fic
|
c2e64a124d
|
Cherry picked from Rome changes to apply to IO.
|
2024-03-27 12:21:28 -07:00 |
|