Patrick Fic
|
512cd70d13
|
Merge branch 'feature/IO-2458-RO-Closer' into test-AIO
|
2024-04-09 12:23:49 -07:00 |
|
Patrick Fic
|
e5599ff4c4
|
Update prettier config and add as dev dependency.
|
2024-04-09 12:23:10 -07:00 |
|
Patrick Fic
|
f5b8bf1d74
|
Resolve unnecessary import.
|
2024-04-08 14:32:02 -07:00 |
|
Patrick Fic
|
706984a53b
|
Resolve CCC supplement import.
|
2024-04-08 14:27:33 -07:00 |
|
Patrick Fic
|
e137feca20
|
Resolve ESLint Warnings
|
2024-04-08 14:20:34 -07:00 |
|
Patrick Fic
|
9e66d7c929
|
Merge branch 'release/AIO/2024-04-05' into test-AIO
|
2024-04-08 13:56:10 -07:00 |
|
Patrick Fic
|
9605bf5c21
|
Merge branch 'release/2024-04-05' into release/AIO/2024-04-05
|
2024-04-08 13:55:43 -07:00 |
|
Allan Carr
|
c2cc7b1e9e
|
Merged in feature/IO-2731-Payment-Edit (pull request #1399)
IO-2731 Payment Edit
|
2024-04-08 19:56:43 +00:00 |
|
Allan Carr
|
fe55eccbf9
|
Merged in feature/IO-2749-Parts-Return-Pass-Jobs-Data (pull request #1398)
IO-2749 Pass Jobs data from Parts Return to Parts Order Modal
|
2024-04-08 19:55:49 +00:00 |
|
Patrick Fic
|
47e17dc78a
|
Merge branch 'feature/IO-2727-resolve-payment-refetch' into release/AIO/2024-04-05
|
2024-04-08 12:43:15 -07:00 |
|
Allan Carr
|
88a71dd647
|
IO-2731 Payment Edit
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-04-08 12:23:04 -07:00 |
|
Patrick Fic
|
ce0b3a8635
|
Merge branch 'feature/IO-2727-resolve-payment-refetch' into test-AIO
|
2024-04-08 11:08:57 -07:00 |
|
Patrick Fic
|
b8e4520366
|
Resolve ES Lint error.
|
2024-04-08 11:05:12 -07:00 |
|
Allan Carr
|
c3b395c99e
|
IO-2749 Pass Jobs data from Parts Return to Parts Order Modal
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-04-08 09:53:20 -07:00 |
|
Patrick Fic
|
a2a7c1c58c
|
Add contextRefect to payment export buttons.
|
2024-04-08 09:48:39 -07:00 |
|
Patrick Fic
|
1469960643
|
Resolve payment refetch.
|
2024-04-05 12:52:26 -07:00 |
|
Allan Carr
|
19a03ec080
|
Merge branch 'release/2024-04-05' into test-AIO
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
# Conflicts:
# client/src/components/print-center-jobs-labels/print-center-jobs-labels.component.jsx
|
2024-04-05 12:21:35 -07:00 |
|
Allan Carr
|
33d5d9b462
|
Merged in feature/IO-2568-Payment-Modal-Button-Spacing (pull request #1396)
IO-2568 Button Padding in Print Center Label Modal
|
2024-04-05 19:03:09 +00:00 |
|
Allan Carr
|
b5a371d0cf
|
IO-2568 Button Padding in Print Center Label Modal
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-04-05 12:01:26 -07:00 |
|
Dave Richer
|
b61fd17879
|
- add smart refetch to mark-export and reexport
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-04-05 14:54:16 -04:00 |
|
Dave Richer
|
6722f8b1e5
|
- reversion
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-04-05 13:41:37 -04:00 |
|
Dave Richer
|
69ff75157d
|
- reversion
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-04-05 13:35:44 -04:00 |
|
Allan Carr
|
7c619f5439
|
Merged in release/2024-04-05 (pull request #1395)
IO-2750 Missing Mutation return fields
|
2024-04-05 16:00:52 +00:00 |
|
Allan Carr
|
3b35f38ad5
|
Merged in feature/IO-2750-Missing-Jobline-Fields (pull request #1393)
IO-2750 Missing Mutation return fields
|
2024-04-05 15:55:13 +00:00 |
|
Dave Richer
|
4ff2ab1bc8
|
- Remove actions params in Payment modal, which was causing issues.
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-04-05 11:20:16 -04:00 |
|
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 |
|
Allan Carr
|
1f5c1b9658
|
IO-2750 Missing Mutation return fields
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
|
2024-04-04 17:00:30 -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
|
56dfd174dd
|
Merge branch 'hotfix/AIO/2024-04-04' into master-AIO
|
2024-04-04 11:32:09 -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
|
532cd4937b
|
Merge branch 'hotfix/AIO/2024-04-04' into master-AIO
|
2024-04-04 10:51:57 -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 |
|