Dave Richer
|
4475bf038b
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta
|
2024-01-26 11:50:07 -05:00 |
|
Dave Richer
|
29d5465afc
|
Merge branch 'release/2024-01-26' into feature/IO-1828-Front-End-Package-Updates
|
2024-01-26 11:49:29 -05:00 |
|
Dave Richer
|
efd1c17033
|
- Revert Hasura
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-26 08:21:43 -08:00 |
|
Allan Carr
|
e4d3b53349
|
Merged in feature/IO-2543-AR-Aging (pull request #1215)
IO-2543 Revert Lost Sales for Datedisable
Approved-by: Dave Richer
|
2024-01-26 16:10:08 +00:00 |
|
Allan Carr
|
908942ec09
|
IO-2543 Revert Lost Sales for Datedisable
|
2024-01-26 08:11:29 -08:00 |
|
Dave Richer
|
53044d2790
|
Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1214)
- Fix CC Cart stuff
|
2024-01-25 21:04:44 +00:00 |
|
Dave Richer
|
2b0ecbdd91
|
- Fix CC Cart stuff
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-25 16:03:34 -05:00 |
|
Dave Richer
|
7a36e48401
|
Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1213)
Feature/IO-1828 Front End Package Updates
|
2024-01-25 20:27:01 +00:00 |
|
Dave Richer
|
461bc726aa
|
- progress update.
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-25 15:23:42 -05:00 |
|
Dave Richer
|
80483b617b
|
Merge branch 'release/2024-01-26' into feature/IO-1828-Front-End-Package-Updates
# Conflicts:
# client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
# client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
# client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx
# client/src/components/report-center-modal/report-center-modal.component.jsx
|
2024-01-25 14:11:33 -05:00 |
|
Dave Richer
|
f9528c5ff7
|
Merge branch 'release/2024-01-26' into feature/IO-1828-Front-End-Package-Updates
|
2024-01-25 13:59:18 -05:00 |
|
Allan Carr
|
b5d4944ad8
|
Merged in feature/IO-2543-AR-Aging (pull request #1210)
IO-2543 AR Aging
Approved-by: Dave Richer
Approved-by: Patrick Fic
|
2024-01-25 18:33:20 +00:00 |
|
Patrick Fic
|
50f84d40e1
|
Allow negative balance for AR.
|
2024-01-25 10:30:03 -08:00 |
|
Dave Richer
|
ebc75e71d3
|
Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1211)
- Fix empty strings passing validation.
|
2024-01-25 18:09:51 +00:00 |
|
Dave Richer
|
16b0381007
|
- Fix empty strings passing validation.
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-25 13:04:53 -05:00 |
|
Allan Carr
|
eb8519dc1d
|
IO-2543 Move queries to jobs.queries.js and correct layout
|
2024-01-24 18:37:41 -08:00 |
|
Allan Carr
|
36dd97394f
|
IO-2543 Adjust for having no dates
|
2024-01-24 16:15:32 -08:00 |
|
Allan Carr
|
03d4e4dcd1
|
IO-2543 AR Aging
|
2024-01-24 16:01:48 -08:00 |
|
Dave Richer
|
1c779b05c3
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta
|
2024-01-24 17:29:16 -05:00 |
|
Dave Richer
|
da5739be8f
|
- Progress
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-24 17:27:49 -05:00 |
|
Dave Richer
|
9e6ee505ca
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta
|
2024-01-24 12:50:49 -05:00 |
|
Dave Richer
|
397ae72626
|
- Fix issues
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-24 12:49:18 -05:00 |
|
Dave Richer
|
ed15620884
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta
|
2024-01-24 12:20:49 -05:00 |
|
Dave Richer
|
f138ab82fb
|
- update npm packages
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-24 11:18:34 -05:00 |
|
Dave Richer
|
680583addf
|
Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1208)
Feature/IO-1828 Front End Package Updates
|
2024-01-24 15:10:54 +00:00 |
|
Dave Richer
|
9e127d1c71
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' of bitbucket.org:snaptsoft/bodyshop into feature/IO-1828-Front-End-Package-Updates
|
2024-01-24 10:07:27 -05:00 |
|
Dave Richer
|
cdec9840bf
|
Merged in feature/IO-2477 (pull request #1207)
Feature/IO-2477 - EULA
Approved-by: Patrick Fic
|
2024-01-23 23:23:56 +00:00 |
|
Dave Richer
|
9deab7d5d5
|
- Theme provider update
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-22 15:30:43 -05:00 |
|
Patrick Fic
|
d61ed03ef1
|
Merge in EULA changes & update to AR Tracking schema.
|
2024-01-22 11:52:42 -08:00 |
|
Dave Richer
|
e46be6c12b
|
- Add OnlyToday
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-22 14:38:56 -05:00 |
|
Dave Richer
|
cac4f800ed
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta
|
2024-01-20 21:22:37 -05:00 |
|
Dave Richer
|
f02aa36b8d
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into feature/IO-2477
|
2024-01-20 21:20:53 -05:00 |
|
Dave Richer
|
d7faf11e27
|
- Restore the color diffs between dev and prod
- Clean up Craco config
- Updated SplitFactoryProvider
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-20 21:20:36 -05:00 |
|
Dave Richer
|
b25df2c7a8
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta
|
2024-01-20 19:24:53 -05:00 |
|
Dave Richer
|
73058c4405
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into feature/IO-2477
|
2024-01-20 19:22:42 -05:00 |
|
Dave Richer
|
72e8aba546
|
- Merge master
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-20 19:21:31 -05:00 |
|
Dave Richer
|
039f1e6a91
|
- move lib
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-19 22:30:35 -05:00 |
|
Dave Richer
|
ddea46ddef
|
- Remove test data
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-19 22:28:47 -05:00 |
|
Dave Richer
|
2ada4ac44b
|
- Eula finished
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-19 22:27:03 -05:00 |
|
Dave Richer
|
6937f33134
|
- Eula Progress
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-01-19 20:55:15 -05:00 |
|
Allan Carr
|
9274742520
|
Merged in release/2024-01-19 (pull request #1206)
Release/2024 01 19
|
2024-01-20 01:03:59 +00:00 |
|
Patrick Fic
|
9b4c85c9e3
|
IO-2543 additional schema correction.
|
2024-01-19 13:50:14 -08:00 |
|
Allan Carr
|
66c64ce9e0
|
Merged in feature/IO-2599-Techstation-Linking (pull request #1204)
IO-2599 Remove Space and put Div in to space components
Approved-by: Patrick Fic
|
2024-01-19 21:18:39 +00:00 |
|
Patrick Fic
|
c9cbffdec8
|
IO-2543 Schema changes for AR calculation.
|
2024-01-19 13:15:06 -08:00 |
|
Allan Carr
|
ca3145ce0f
|
IO-2599 Remove Space and put Div in to space components
|
2024-01-19 12:19:07 -08:00 |
|
Dave Richer
|
06a8d4257a
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into feature/IO-2477
|
2024-01-19 12:31:46 -05:00 |
|
Dave Richer
|
1cf47b91e2
|
Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1202)
Feature/IO-1828 Front End Package Updates
|
2024-01-19 17:12:21 +00:00 |
|
Dave Richer
|
44a13ca0d5
|
Merge branch 'release/2024-01-19' into feature/IO-1828-Front-End-Package-Updates
# Conflicts:
# client/src/App/App.jsx
# client/src/components/shop-employees/shop-employees-list.component.jsx
|
2024-01-19 12:08:34 -05:00 |
|
Allan Carr
|
52f9106776
|
Merged in feature/IO-2608-Employee-Filter-and-Sort (pull request #1197)
IO-2608 Filter and Sort columns in Employee table
Approved-by: Dave Richer
|
2024-01-19 16:58:45 +00:00 |
|
Allan Carr
|
1a2cc5623d
|
Merged in feature/IO-2598-Tech-Create-IOU (pull request #1201)
IO-2598 Restrict IOU from Tech Console
Approved-by: Dave Richer
|
2024-01-19 16:58:13 +00:00 |
|