Commit Graph

886 Commits

Author SHA1 Message Date
natib21
6bf8da2934 mile 2026-07-03 21:21:42 +00:00
natib21
7155ec7e01 mile 2026-07-03 20:59:21 +00:00
natib21
90ab1bd042 mile 2026-07-03 20:51:32 +00:00
natib21
4ddf03e357 mile 2026-07-03 20:43:26 +00:00
natib21
05f7fc254e mile 2026-07-03 20:25:53 +00:00
natib21
16bd7fabcc mile 2026-07-03 20:21:16 +00:00
natib21
5d1a2aa319 mile 2026-07-03 20:11:30 +00:00
natib21
6a49bf1b96 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-03 20:01:04 +00:00
natib21
77dc14f6a5 mile 2026-07-03 20:00:41 +00:00
yaschalew
feb9315f47 fix 2026-07-03 22:58:11 +03:00
natib21
8d17d9111e mile 2026-07-03 19:44:27 +00:00
natib21
a1dfb439ff mile 2026-07-03 19:17:45 +00:00
natib21
2550172480 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-03 17:08:57 +00:00
natib21
aaaa38f234 fix 2026-07-03 17:04:41 +00:00
natib21
284c85e0e7 fix 2026-07-03 16:58:42 +00:00
natib21
ac55a867c0 fix 2026-07-03 16:56:23 +00:00
natib21
f0035a3695 fix 2026-07-03 16:52:31 +00:00
natib21
b7f6c3150e fix 2026-07-03 16:46:31 +00:00
natib21
482c569216 fix 2026-07-03 16:43:58 +00:00
natib21
53229f3da9 fix 2026-07-03 16:42:38 +00:00
natib21
aeb06e8a55 fix 2026-07-03 16:39:41 +00:00
natib21
e02cb52e19 fix 2026-07-03 16:34:06 +00:00
natib21
8661586301 fix 2026-07-03 16:21:07 +00:00
natib21
c643d30624 fix 2026-07-03 15:47:12 +00:00
natib21
f2f6c89c0e fix 2026-07-03 15:37:24 +00:00
natib21
e893af8133 fix 2026-07-03 15:22:51 +00:00
natib21
0e6ebda6f6 fix 2026-07-03 15:21:23 +00:00
Hagernesh Tadesse
f0eb96d2f9 Merge pull request #426 from Tria-plc/naming_convention
Naming convention no digit or symbol allowed
2026-07-03 17:45:18 +03:00
Hagernesh
44317a6bbc Naming convention no digit or symbol allowed 2026-07-03 14:39:47 +00:00
yaschalew
47f87e8435 fix conflict 2026-07-03 17:31:29 +03:00
natib21
c2535bec5e fix 2026-07-03 14:14:35 +00:00
natib21
e14e02e7f2 fix 2026-07-03 14:07:43 +00:00
Hagernesh
01bd01cc05 approve-delivery exit-gate fix + Import Loading Confirmation frontend panel — done this session, not yet committed 2026-07-03 14:06:34 +00:00
Hagernesh
bf5b0b5dc8 approve-delivery exit-gate fix + Import Loading Confirmation frontend panel — done this session, not yet committed 2026-07-03 14:03:02 +00:00
marshal
7eb62a0ba2 Merge pull request #423 from Tria-plc/freight_feature/usermanagement
fix issues
2026-07-03 16:55:26 +03:00
Marshal
57d3752ea5 fix issues 2026-07-03 13:53:17 +00:00
natib21
782f4184ef fix 2026-07-03 13:49:55 +00:00
Hagernesh
e2867e3086 import loading backend 2026-07-03 13:47:45 +00:00
marshal
6570268d91 Merge pull request #422 from Tria-plc/freight_feature/usermanagement
fix issues
2026-07-03 16:28:49 +03:00
Marshal
e14df58a47 fix issues 2026-07-03 13:26:40 +00:00
Nathnael
64fa2862eb Merge branch 'dev' into freight/feat/fixes-v1 2026-07-03 12:19:45 +00:00
Nathnael
79731e58ec feat: add otp to contract 2026-07-03 12:19:07 +00:00
Nathnael
d3707fe704 feat: merge the role and nationality step 2026-07-03 12:09:35 +00:00
Nathnael
2d71f24937 chore: rm the verify step in onboarding 2026-07-03 11:08:57 +00:00
marshal
a4c6848233 user managemnt and wight limit rule 2026-07-03 14:06:18 +03:00
marshal
07e524eea4 user managemnt and wight limit rule 2026-07-03 13:56:34 +03:00
marshal
02ee4cc743 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-03 13:54:29 +03:00
marshal
130625df54 user managemnt and wight limit rule 2026-07-03 13:54:12 +03:00
Marshal
35cb20da0b feat: implement 20ft container weight-pairing validation
- Added ContainerValidationService to handle 20ft weight-pairing logic.
- Introduced validate20ftWeightPairing utility function to check weight differences.
- Updated BookingPricingService to include overweight line details and pairing errors in price response.
- Enhanced BookingTransitionService to reject submissions with unpairable 20ft containers.
- Created ShipmentValidation interface for pre-submit validation of container contracts.
- Integrated shipment validation into the contract booking process, providing warnings for overweight containers and hard blocks for pairing errors.
- Updated front-end components to display validation results and prevent submission when errors are present.
2026-07-03 09:26:27 +00:00
natib21
b218179d72 :wqMerge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-03 09:10:31 +00:00