Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 20:10:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,167 Commits 96 Branches 0 Tags
e02cb52e19e85d40482b9aa704e929bcbc0ace41
Commit Graph

2167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
natib21
e02cb52e19 fix 2026-07-03 16:34:06 +00:00
natib21
8661586301 fix 2026-07-03 16:21:07 +00:00
natib21
ed388042af fix 2026-07-03 16:14:33 +00:00
natib21
c61bb787f2 fix 2026-07-03 16:01:59 +00:00
natib21
4ec38bf028 fix 2026-07-03 15:56:28 +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
yaschalew
47f87e8435 fix conflict 2026-07-03 17:31:29 +03:00
yaschalew
83887471a4 fix 2026-07-03 17:25:33 +03:00
natib21
e881e8de84 fix 2026-07-03 14:21:46 +00:00
ghost2023
4a6e42ccd9 fix: logger 2026-07-03 17:21:26 +03:00
natib21
c2535bec5e fix 2026-07-03 14:14:35 +00:00
Hagernesh Tadesse
7d921a295d Merge pull request #424 from Tria-plc/import_loading 
Import loading

Import loading confirmation — backend done, frontend panel + page wiring plus frontend
Approve-delivery → exit gating gap — confirmed real: release() exit-paper generation doesn't check whether customer approved/signed delivery. Fix proposed, awaiting your go-ahead.
Terminal inventory filter — done, confirmed correct, no data to show until bookings exist.
 2026-07-03 17:09:31 +03: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
b53c088eff Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-03 13:50:18 +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
52f48b688d fix issues 2026-07-03 13:40:10 +00:00
yaschalew
a63a16a0b7 fix 2026-07-03 16:36:08 +03: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
Abubeker Yasin
cd9a38b0fc Merge pull request #420 from Tria-plc/alpha 
fix: passenger dob error
 2026-07-03 15:24:27 +03:00
Abubeker Yasin
209701aa34 fix: passenger dob error 2026-07-03 15:23:32 +03:00
Nathnael Wondisha
39d63be84c Merge pull request #419 from Tria-plc/freight/feat/fixes-v1 
Freight/feat/fixes v1
 2026-07-03 15:23:28 +03:00
Nathnael
f938107245 chore: add logger to mark-paid 2026-07-03 12:22:46 +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
414c9610dc chore: migrate to otp table 2026-07-03 11:57:40 +00:00
Nathnael
37ec1c40ab chore: add loger 2026-07-03 11:48:39 +00:00
marshal
c0d0b87c71 Merge pull request #418 from Tria-plc/freight_feature/usermanagement 
user managemnt and wight limit rule
 2026-07-03 14:12:28 +03: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
Nathnael
4e6e614b48 feat: add email to notification and otp 2026-07-03 10:59:58 +00:00
marshal
3d8e130f47 Merge pull request #417 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-07-03 13:58:09 +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
natib21
48db0b240b fix fayda 2026-07-03 09:32:41 +00:00
Abubeker Yasin
39d8a98e22 Merge pull request #416 from Tria-plc/alpha 
Alpha
 2026-07-03 12:26:39 +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
Abubeker Yasin
91e59abf0e fix: passenger id 2026-07-03 12:21:41 +03: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
natib21
e4b0c73c63 fix fayda 2026-07-03 09:10:05 +00:00