Commit Graph

3923 Commits

Author SHA1 Message Date
Hagernesh Tadesse
319ebb42ec Merge pull request #1028 from Tria-plc/edrmiles
empty container return feature emplimented

feat: add EDR Last Mile Returns page with bulk/single form
feat: add warehouse selection to empty container returns form
feat: add Container Returns page with EDR/Customer filter
2026-07-30 17:08:32 +03:00
Hagernesh
c0d6b1a1c5 feat: add Container Returns page with EDR/Customer filter
Separate page for tracking empty container returns by type: EDR returns
(empty containers from EDR first-mile) or Customer returns (customer
self-haul). Segmented control filter, expandable booking rows showing
containers, modal to record return with warehouse selection. Accessible
via sidebar menu under Import Operations.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-07-30 14:07:09 +00:00
Hagernesh
154b7d11d5 feat: add warehouse selection to empty container returns form
Replace manual facility/yard input with warehouse dropdown. Form fetches
available warehouses and auto-populates facility (warehouse name) and yard
(warehouse code) from selection, eliminating manual entry.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-07-30 14:07:09 +00:00
Hagernesh
c9300ab4cd feat: add EDR Last Mile Returns page with bulk/single form
New page for empty container returns: tables show EDR trucks with company
names and return containers. Modal form for processing single or bulk
returns, with fields for facility, yard, condition, return date, and
handover notes. Accessible via sidebar menu under Import Operations.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-07-30 14:07:09 +00:00
marshal
4937bcec53 Merge pull request #1027 from Tria-plc/freight_feature/usermanagement
fix issue
2026-07-30 16:33:38 +03:00
Marshal
8f25fb3e8b fix issue 2026-07-30 13:33:07 +00:00
Nathnael Wondisha
7d3002ca4c Merge pull request #1026 from Tria-plc/freight/nati-1
chore: update the iamapi package to 0.7.15
2026-07-30 16:24:32 +03:00
Nathnael
eefbc7b111 chore: update the iamapi package to 0.7.15 2026-07-30 13:22:20 +00:00
marshal
ceaf0ba7eb Merge pull request #1025 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-30 16:16:52 +03:00
Marshal
2cdf8bd161 export flow and fix intercity issue 2026-07-30 13:15:56 +00:00
Marshal
e80aac877f export flow and fix intercity issue 2026-07-30 13:11:35 +00:00
Nathnael Wondisha
349ff436d8 Merge pull request #1024 from Tria-plc/freight/chore/payment-test
fix: support widget peak and onboarding wizard responsivness
2026-07-30 16:10:05 +03:00
Nathnael
bfb4991234 fix: support widget peak and onboarding wizard responsivness 2026-07-30 13:08:51 +00:00
marshal
9973f57571 Merge pull request #1023 from Tria-plc/freight_feature/usermanagement
fix rate issue
2026-07-30 15:23:27 +03:00
Marshal
9208050cb5 fix rate issue 2026-07-30 12:18:50 +00:00
Hagernesh Tadesse
2927a433a7 Merge pull request #1022 from Tria-plc/edrmiles
feat: repeat truck column labels inside each expanded booking
2026-07-30 15:17:13 +03:00
Hagernesh
fd1646e4d5 feat: repeat truck column labels inside each expanded booking
Extract the truck column list to TRUCK_COLUMNS and drive both the table
head and a per-booking label row from it, so an expanded booking's rows
are labelled without scrolling back to the head.
2026-07-30 12:15:56 +00:00
marshal
cb0704a76b Merge pull request #1021 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-30 15:15:37 +03:00
Marshal
acb6f286d4 fix(payments): reconcile with gateway before expiring unpaid holds
Replace the fixed 5-minute grace with a settlement check at expiry:
expire() calls the payment API's reconcile endpoint — paid intents are
kept and allocated via payment.succeeded, unverifiable results defer
expiry to the next tick, only verifiably unpaid holds expire.
2026-07-30 12:01:59 +00:00
Marshal
22de05fe8e Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-30 11:31:02 +00:00
Marshal
2ca04b8f98 changes export flow 2026-07-30 11:30:34 +00:00
Hagernesh Tadesse
6790450bf2 Merge pull request #1019 from Tria-plc/edrmiles
feat: add warehouse gate times editor modal for import trucks
2026-07-30 13:06:00 +03:00
Hagernesh
fe04d2edd6 feat: add warehouse gate times editor modal for import trucks
Enable per-truck editing of warehouse gate arrival/departure times
(arrivedAt/departedAt) via modal on Import Trucks page. Accessible via
row action menu for EDR-haulage trucks. Includes backend endpoint
POST /last-mile/:id/warehouse-gate-times and frontend modal with
DateTimePicker inputs.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-07-30 10:04:32 +00:00
Marshal
b671f07ce6 fix(rule-engine): merge duplicate Sebeta yards, block dupes
Two active Sebeta yards (LEGACY_DEST/'Sebeta' and SEBETA/'sebeta')
split rates and routes across different yard ids, so route-scoped rate
lookups missed. Migration repoints every yard reference to the survivor,
retires the duplicate, and adds partial unique indexes on active label
and code. Service now rejects case-insensitive duplicate labels on
create/update - the old guard only compared generated codes, which
missed labels whose existing code differs (LEGACY_DEST).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-30 09:25:02 +00:00
Marshal
9241ce01d2 fix(contracts): price base freight from contract lane only
Contract pricing matched base container/bulk rates by type+currency
with no origin/destination filter, so a lane with no configured rate
silently froze another lane's price into the contract snapshot
(CTR-2026-00065: DCT-Sebeta contract froze DCT-GMP rates) and bookings
then billed off it. Now scoped to the contract's first route and a
missing lane rate hard-blocks pricing with a 422, matching the
customs-clearance and booking-side behaviour.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-30 09:24:37 +00:00
Abubeker Yasin
68e3061619 Merge pull request #1018 from Tria-plc/alpha
Update payment-sync.service.ts
2026-07-30 11:00:29 +03:00
Abubeker Yasin
e4a2c61224 Update payment-sync.service.ts 2026-07-30 10:56:56 +03:00
Hagernesh Tadesse
fd407ba5b9 Merge pull request #1017 from Tria-plc/edrmiles
feat: add truck arrival/departure times to import trucks page
2026-07-30 10:30:08 +03:00
Hagernesh
4cb4d177d9 feat: add truck arrival/departure times to import trucks page
Show per-truck warehouse gate arrival (arrivedAt) and departure
(departedAt) timestamps on the Import Trucks page, enabling staff to see
when each truck entered and exited the warehouse. Times displayed in local
format; EDR and customer trucks both supported.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-07-30 07:26:58 +00:00
Abubeker Yasin
541f2a11c1 Merge pull request #1016 from Tria-plc/alpha
fix: ( payment ) resolve PaymentsService via ModuleRef in TasksService
2026-07-30 04:58:09 +03:00
Abubeker Yasin
920333bf2a fix: ( payment ) resolve PaymentsService via ModuleRef in TasksService 2026-07-30 04:57:25 +03:00
Abubeker Yasin
6108f0117f Merge pull request #1015 from Tria-plc/alpha
Alpha
2026-07-29 22:11:58 +03:00
Marshal
63604b0cf4 changes 2026-07-29 19:00:32 +00:00
Hagernesh Tadesse
e6c8b8225c Merge pull request #1014 from Tria-plc/edrmiles
implemented import truck page
2026-07-29 17:53:31 +03:00
Hagernesh
a6749df65f implemented import truck page 2026-07-29 14:46:41 +00:00
Nathnael Wondisha
b140a720db Merge pull request #1013 from Tria-plc/freight/fix/auth-separation
Freight/fix/auth separation
2026-07-29 17:37:41 +03:00
Nathnael Wondisha
49fce33832 Merge pull request #1012 from Tria-plc/freight/nati-1
fayda verification and validation
2026-07-29 17:36:43 +03:00
Nathnael
848c0d7768 fix: customer settings fix 2026-07-29 14:30:35 +00:00
Abubeker Yasin
ce878a3777 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-29 17:30:20 +03:00
Abubeker Yasin
d7168a8d77 feat: ( payment ): verify-before-cancel never cancel a paid booking 2026-07-29 17:29:59 +03:00
Hagernesh Tadesse
efae463b0a Merge pull request #1011 from Tria-plc/edrmiles
fix(train-scheduling): marshalling doc 40ft/20ft counts were always 0 no w counts exat numbers
2026-07-29 17:14:30 +03:00
Hagernesh
e2ad024da1 fix(train-scheduling): marshalling doc 40ft/20ft counts were always 0
findByIdWithFullGraph loaded containerItems but not
containerItems.bookingContainer, so item.bookingContainer was always
undefined and the 40ft/20ft/total tallies on the Import/Export
Marshalling Document silently read as 0. Load containerType on both the
item and its bookingContainer, and resolve size from whichever is set.
2026-07-29 14:13:09 +00:00
Abubeker Yasin
66bc0f461c Merge pull request #1010 from Tria-plc/dev
merge
2026-07-29 17:08:25 +03:00
Abubeker Yasin
0551d2dd57 Merge pull request #1009 from Tria-plc/main
Main
2026-07-29 17:05:55 +03:00
Abubeker Yasin
e6ad9008c2 Merge pull request #1008 from Tria-plc/guard-fix
fix : ( ticket ) change kickets.generate to tickets.manage
2026-07-29 16:51:42 +03:00
Abubeker Yasin
adc4f7301a fix : ( ticket ) change kickets.generate to tickets.manage 2026-07-29 16:50:56 +03:00
Hagernesh Tadesse
6fae6fe4a1 Merge pull request #1007 from Tria-plc/edrmiles
feat(marshalling-documents): add company column and container summary
2026-07-29 16:48:39 +03:00
Hagernesh
78b5665ea7 feat(marshalling-documents): add company column and container summary
Export and import marshalling documents now include:
- Company name column per cargo allocation row
- Executive summary with container counts (40ft, 20ft, total)
- Total weight already shown, now grouped with container data

Both export and import load list templates enhanced with same structure
for consistency. Container size calculated from booking container data.
2026-07-29 13:47:54 +00:00
Nathnael
aba39b0ec3 Merge branch 'dev' into freight/nati-1 2026-07-29 13:39:20 +00:00
Nathnael
16ef64fae2 feat: expose eTrade registration and fayda birthdate/gender in company profile 2026-07-29 13:38:39 +00:00