Nathnael
a47c7f6b7a
Merge branch 'dev' into freight/nati-2
2026-08-09 13:44:18 +00:00
Nathnael
5e0674e2fb
fix: poa email
2026-08-09 13:28:45 +00:00
Nathnael
ff9bb4954a
fix: the content document
2026-08-09 13:27:05 +00:00
Nathnael
182787e143
fix: gm email
2026-08-09 07:57:45 +00:00
Marshal
622c690ed1
keep cents in CBE bills and prices
2026-08-08 20:58:37 +00:00
Marshal
80a14c176b
keep cents in CBE bills and prices
2026-08-08 20:45:05 +00:00
Nathnael
e03ccf0f69
fix
2026-08-08 18:09:40 +00:00
Marshal
aad9ebaf78
fix issue
2026-08-08 18:06:47 +00:00
Nathnael Wondisha
12eb07752e
Merge pull request #1192 from Tria-plc/freight/nati-2
...
Freight/nati 2
2026-08-08 20:38:37 +03:00
Marshal
fb6f8afc0c
add usd for import
2026-08-08 15:14:10 +00:00
Nathnael
7a32bb95ff
refactor: rm company profile
2026-08-08 15:06:46 +00:00
Marshal
4b8119fd3c
chnages
2026-08-08 14:02:58 +00:00
Marshal
1700ae0747
chnages
2026-08-08 14:00:45 +00:00
Hagernesh
204bfd2421
fix: let trains dispatch with cargo still in the warehouse
...
The export-only assertAllocatedCargoLoaded guard threw a
BadRequestException whenever a booking on the schedule had warehouse
inventory in RECEIVED, STORED or READY_FOR_LOADING, making it
impossible to dispatch a train whose cargo had not been inspected and
loaded onto a wagon.
Leaving cargo behind is an operational decision, not an error state.
The dispatch confirm dialog already lists unassigned and unloaded
bookings and offers Dispatch anyway, so the readiness signal is
preserved — only the hard block is gone.
Wagon/locomotive conflicts and the Djibouti gatepass check still block
dispatch: those are physical and legal conflicts, not cargo readiness.
2026-08-08 13:17:43 +00:00
Marshal
83b9e32670
usd remove from the portal
2026-08-08 12:40:07 +00:00
marshal
1b0978bc1e
Merge pull request #1183 from Tria-plc/freight_feature/usermanagement
...
feat(freight-web): restrict booking currency to ETB and portal ETB pa…
2026-08-08 13:49:16 +03:00
Marshal
229d9c6651
feat(freight-web): restrict booking currency to ETB and portal ETB payments to CBE bill only
2026-08-08 10:47:48 +00:00
Nathnael Wondisha
a140add64e
Merge pull request #1181 from Tria-plc/freight/nati-2
...
Freight/nati 2
2026-08-08 12:38:32 +03:00
Nathnael
41e8c08ba3
feat: WIP Contnet managemtn
2026-08-08 09:37:28 +00:00
Hagernesh Tadesse
268737cc4f
Merge pull request #1180 from Tria-plc/lastmilerequest
...
Lastmilerequest
2026-08-08 12:30:43 +03:00
Hagernesh
375cf55e5f
LM map missing map api fall back fix
2026-08-08 07:51:41 +00:00
Hagernesh
e12cb78e9b
feat(portal): pay-later last-mile note, gated by service type
...
Last-mile toggle explains deferred billing (confirm containers after
Djibouti departure, sign supplementary LM contract on truck approval,
pay advance) — shown only when the service defers mile billing, not
for RAIL_CONTAINER_PAID_MILE where the mile is priced into the booking.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com >
2026-08-08 05:24:22 +00:00
Nathnael
7d2f17d767
Merge branch 'dev' into freight/nati-2
2026-08-07 08:09:34 +00:00
Marshal
fc7f40a373
fix wagon cancellation
2026-08-07 07:18:12 +00:00
Marshal
296878cbde
fix wagon cncellation
2026-08-07 06:59:31 +00:00
Nathnael
828392dd04
feat: edr help video
2026-08-07 06:57:55 +00:00
Marshal
3db14bc09a
fix wagon cncellation
2026-08-07 06:31:25 +00:00
Marshal
17f6230129
fix wagon cancellation
2026-08-07 05:53:55 +00:00
Marshal
eb1349e846
fix wagon cncellation
2026-08-07 05:48:23 +00:00
Marshal
2321c9b893
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement
2026-08-06 23:49:48 +00:00
Marshal
0f4aa1128f
giveme git commit message 50 char
2026-08-06 23:48:06 +00:00
Nathnael Wondisha
eff60885cd
Merge pull request #1146 from Tria-plc/freight/nati-2
...
Freight/nati 2
2026-08-07 01:41:42 +03:00
marshal
4a02eca537
Merge pull request #1145 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-07 01:35:39 +03:00
Marshal
96a4dd2e7f
exclude self from container clash
2026-08-06 22:34:53 +00:00
Marshal
1b8c7e4296
full change-booking flow for op revisions
2026-08-06 21:57:08 +00:00
Marshal
c61b66fd23
feat(bookings): show allocated wagons in portal
2026-08-06 20:40:28 +00:00
Nathnael
30b0eff603
feat: add faq, help, privacy policy and tos
2026-08-06 20:40:05 +00:00
Marshal
4eb0d56faf
feat(bookings): show allocated wagons in portal
2026-08-06 20:25:08 +00:00
Marshal
7db03ea347
customer cancel + revise edit flow
2026-08-06 20:16:48 +00:00
Marshal
9a50df2be3
add cancellation for booking
2026-08-06 20:05:13 +00:00
Nathnael
dd2b624aa6
fix: onboarding validation
2026-08-06 18:54:54 +00:00
Marshal
3a2f1a46d6
fix(auth): resolve position-type permissions so GL staff can open clearance pages
2026-08-06 13:24:42 +00:00
Hagernesh
4786c896b5
feat(last-mile): customer-signed LM contract gates the advance invoice
...
Approval now snapshots the rate estimate and generates a last-mile
contract instead of invoicing immediately. The customer picks a delivery
date on the confirm form, then reviews and signs the contract in the
portal (saved signature or drawn); the signed PDF is stored as
LM_<CustomerName>.pdf and only then is the advance invoice issued.
Backoffice shows signature status and the contract download.
2026-08-06 07:11:23 +00:00
Hagernesh
1f4d659ffb
Last mile confirmation request , approval, payment Feature
2026-08-05 20:01:48 +00:00
Nathnael Wondisha
37d0cc966a
Merge pull request #1124 from Tria-plc/freight/nati-2
...
Audit log and presistent cbe pnr
2026-08-05 17:23:54 +03:00
Marshal
b5eeb7c3a3
fix issue
2026-08-05 14:01:01 +00:00
Nathnael
4f08b370e1
Merge branch 'dev' into freight/nati-2
2026-08-05 13:27:10 +00:00
Nathnael
8476a6a00e
fix: the fayda and etrade syncing
2026-08-05 13:06:56 +00:00
Marshal
b7dcc1bf0a
feat(billing): add PAYMENT_PROCESSING invoice status on payment success redirect (all except CBE bill)
2026-08-05 12:59:37 +00:00
marshal
26837d5a7d
Merge pull request #1120 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-05 13:08:23 +03:00
