Commit Graph

3165 Commits

Author SHA1 Message Date
Abubeker Yasin
85de05cb40 feat: ( payments ) add merchant-order and booking/PNR payment status lookups 2026-07-18 09:55:09 +03:00
Abubeker Yasin
718c384a06 Update tickets.controller.ts 2026-07-16 21:15:10 +03:00
Stephanos A
3726ac8390 Add seat block schedule id for consistency 2026-07-16 20:11:42 +03:00
Stephanos A
8ae327e779 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-16 19:28:12 +03:00
Stephanos A
e3075d1486 Seats holding, booking, blocking inconsistencies resolution 2026-07-16 19:28:00 +03:00
Roba Boru
08dae58fbe Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 17:27:50 +03:00
Roba Boru
6d524ce6be Fix payment fallback redirect 2026-07-16 17:27:32 +03:00
robiman
51e85dc0eb Merge pull request #743 from Tria-plc/alpha
Fix confirmation page pending payment
2026-07-16 17:03:37 +03:00
Roba Boru
1df5099cb6 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 17:02:43 +03:00
Roba Boru
fe5b258fca Fix confirmation page pending payment 2026-07-16 17:02:23 +03:00
robiman
93645f1f76 Merge pull request #742 from Tria-plc/alpha
Fix waiting time loading
2026-07-16 16:43:13 +03:00
Roba Boru
bc8571cbd2 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 16:42:10 +03:00
Roba Boru
e6d85f0ac4 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 16:42:00 +03:00
Roba Boru
f9b87b9911 Fix waiting time loading 2026-07-16 16:41:36 +03:00
marshal
8955139150 Merge pull request #741 from Tria-plc/dev
freight production
2026-07-16 16:40:53 +03:00
robiman
65d1472600 Merge pull request #740 from Tria-plc/alpha
Fix loading message
2026-07-16 16:18:12 +03:00
Roba Boru
842dc92a5a Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 16:17:25 +03:00
Roba Boru
e3e70707a3 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 16:17:15 +03:00
Roba Boru
8790e020ee Fix loading message 2026-07-16 16:16:51 +03:00
Abubeker Yasin
615054bd66 Merge pull request #739 from Tria-plc/dev
merge
2026-07-16 16:03:41 +03:00
marshal
1a3fa4bc5a Merge pull request #738 from Tria-plc/freight_feature/usermanagement
fix issue
2026-07-16 16:00:07 +03:00
Marshal
b50adc4666 fix issue 2026-07-16 12:59:28 +00:00
robiman
1ef5a589b6 Merge pull request #737 from Tria-plc/alpha
Check payment before generating ticket
2026-07-16 15:46:34 +03:00
Roba Boru
10968410b2 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 15:45:13 +03:00
Roba Boru
43c0f5b01e Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 15:45:01 +03:00
Roba Boru
0142c94bb0 Check payment before generating ticket 2026-07-16 15:44:47 +03:00
Abubeker Yasin
cc56ad7748 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-16 15:37:25 +03:00
Abubeker Yasin
e0abfddf10 Update payment-events.consumer.ts 2026-07-16 15:36:02 +03:00
Stephanos A.
211505a585 Merge pull request #736 from Tria-plc/alpha
Alpha
2026-07-16 15:19:07 +03:00
Stephanos A
e28372306f Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-16 15:18:16 +03:00
Stephanos A
6b5a80b597 Supplementary payments client pages 2026-07-16 15:18:01 +03:00
Nathnael Wondisha
8ee3f13bdb Merge pull request #735 from Tria-plc/freight/feat/payment-revert
fix: revert the testing
2026-07-16 15:13:30 +03:00
Nathnael
c19e4260c1 fix: revert the testing 2026-07-16 12:04:58 +00:00
marshal
35a9d25aaa Merge pull request #734 from Tria-plc/freight_feature/usermanagement
fix u=issue
2026-07-16 15:02:40 +03:00
Marshal
e8e12c1363 fix u=issue 2026-07-16 12:02:11 +00:00
Eyob T.
72a11901c7 Merge pull request #733 from Tria-plc/alpha
Fallback cron job for ticketing if rabbitmq disconnected.
2026-07-16 14:38:54 +03:00
Roba Boru
fa7a517410 Fallback cron job for ticketing if rabbitmq disconnected. 2026-07-16 14:34:53 +03:00
Roba Boru
767690236a Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 13:54:45 +03:00
Roba Boru
8a1c9bfeb7 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 13:54:33 +03:00
Roba Boru
9161b24f98 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 13:54:22 +03:00
Stephanos A.
478d52a623 Merge pull request #732 from Tria-plc/alpha
totalMinor with displayTotalMinor updates
2026-07-16 13:40:51 +03:00
Roba Boru
e316e59eda Update altenative dates 2026-07-16 13:39:44 +03:00
Stephanos A
b2ab65245a totalMinor with displayTotalMinor updates 2026-07-16 13:38:34 +03:00
Hagernesh Tadesse
5cedd43436 Merge pull request #731 from Tria-plc/wh-dashboard
EDR truck last mile conatiner and bulk pick up ,

Per truck exit and handover paper
2026-07-16 12:28:08 +03:00
Hagernesh
d5182c5d85 feat(last-mile): wire multi-container assignment, bulk drawdown + EDR exit papers
Frontend for the per-truck EDR backend:

- Assign modal takes a container LOAD per truck (MultiSelect, max 2) instead of a
  single container, so a truck can carry one 40ft or two 20ft. Sends
  containerNumbers[]; the API enforces the size rule.
- requiredVehicles is now size-aware: a 40ft fills a truck (1 each), two 20ft
  share one. It previously assumed ceil(containers / 2) regardless of size, so a
  2x40ft booking under-counted the trucks needed.
- Bulk bookings show the drawdown in the assign modal — remaining vs total
  tonnage, what's been hauled, and a "fully hauled" state when it reaches 0.
- New "Truck exit papers" row action opens a per-truck list (plate, containers,
  arrival, exit, net weight) with a per-truck exit-paper download.
- last-mile findAll/findById now load each assignment's containers so the UI can
  hydrate a truck's load.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-16 09:24:22 +00:00
Hagernesh
ff49554cc2 feat(last-mile): per-truck EDR arrival/exit, exit paper, bulk drawdown, departure notify
EDR last-mile is multi-truck but was modelled as one: setVehicles accepted any
number of trucks with no validation, arrival/delivery were stamped once per
last_mile record (N trucks shared one timestamp), EDR trucks got no exit paper,
and the per-truck EDR handover never happened because deliver() resolved the
plate via last_mile_container_allocations — a table nothing writes.

- Migration 2260000000000: per-truck arrived_at/departed_at/gross_weight_tons/
  net_weight_tons on last_mile_vehicle_assignments, plus a
  last_mile_vehicle_containers child table (a truck holds 1x40ft OR 2x20ft, so
  the single container_number scalar could not express a load). Weights are
  TONNES and named accordingly — the older gross_weight_kg lies about its unit.
- setVehicles: enforce the size rule (one 40ft, or two 20ft), container
  membership, one-container-one-truck, and never more trucks than containers.
  Bulk carries no containers and is instead gated on tonnage remaining.
- Bulk drawdown: remainingTonsForBooking = booking VGM minus the net weighed off
  every departed truck (both tonnes, no conversion), exposed as
  GET /last-mile/booking/:bookingId/remaining-tons.
- release() now stamps the EDR truck's own arrival and exit (matched by plate, so
  it works for bulk too) alongside the existing customer-truck stamp. The exit
  weighing itself is untouched.
- New GET /warehouse-inventory/edr-truck-exit-paper/:assignmentId — per-truck
  exit paper for EDR trucks. Deliberately not signature-gated: EDR handovers are
  generated at delivery, after the truck has left.
- deliver(): resolve the handover plate from the truck's own containers instead
  of the dead allocations table, so EDR handovers are genuinely per-truck.
- Notify the customer (portal inbox + SMS/email) when a truck leaves — one hook
  in release() covers both self-haul and EDR, since it is the single exit path.

Self-haul is intentionally unchanged (one booking-level handover signed once).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-16 09:24:22 +00:00
Abubeker Yasin
8b7f4dc563 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-16 12:06:00 +03:00
Abubeker Yasin
c6ca5ed8e8 add provider detail on the 2026-07-16 12:05:47 +03:00
Stephanos A.
a85bae1002 Merge pull request #729 from Tria-plc/alpha
Alpha
2026-07-16 12:04:32 +03:00
Stephanos A
2b4eeea8d7 Excess luggage tarif management issue resolution 2026-07-16 12:01:44 +03:00