Commit Graph

2983 Commits

Author SHA1 Message Date
Abubeker
37855b0a83 feat: ( payment ) implement cbe payment 2026-07-31 07:50:10 +00:00
Abubeker Yasin
e4a2c61224 Update payment-sync.service.ts 2026-07-30 10:56:56 +03:00
Abubeker Yasin
920333bf2a fix: ( payment ) resolve PaymentsService via ModuleRef in TasksService 2026-07-30 04:57:25 +03: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
Abubeker Yasin
0551d2dd57 Merge pull request #1009 from Tria-plc/main
Main
2026-07-29 17:05:55 +03:00
Abubeker Yasin
adc4f7301a fix : ( ticket ) change kickets.generate to tickets.manage 2026-07-29 16:50:56 +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
marshal
60f391f246 Merge pull request #1006 from Tria-plc/freight_feature/usermanagement
Add ContractCourtBadge component and integrate into contract pages
2026-07-29 16:37:51 +03:00
Marshal
47c25d3f3a Add ContractCourtBadge component and integrate into contract pages
- Introduced ContractCourtBadge to display the responsible party for contract actions.
- Updated ContractStatusBadge to include new court badge.
- Enhanced ClearanceDocumentsPage with additional filters for trade direction, freight type, and ownership.
- Modified ContractRequestDetailPage and ContractRequestsPage to utilize ContractCourtBadge.
2026-07-29 13:37:17 +00:00
Abubeker Yasin
0d8901630b Merge pull request #1005 from Tria-plc/alpha
fix: ( payments ) allow telebirr checkout to bounce through /go
2026-07-29 14:52:41 +03:00
Abubeker Yasin
9a98d460b5 fix: ( payments ) allow telebirr checkout to bounce through /go 2026-07-29 14:42:30 +03:00
Hagernesh
1b1b0e7ade feat(booking-trucks-tab): show truck-level detention, gate times, inspection status, and cargo costs
Booking detail now has a Trucks tab displaying every EDR or customer truck
assigned to a booking's last mile. Each row shows warehouse-gate times
(arrival/departure) and destination-detention times (arrival/return), with
detention costs and inspection status. Detention rows only for EDR trucks;
customer self-haul shows —. Reuses existing TruckDetentionModal and
FeePreviewModal for edit/view actions.

Backend: arrivalTrucksForBooking() adds lastMileId per truck (direct chain to
detention preview), containerItems() adds inspection_status column to responses.
No new SQL, no migrations, no new endpoints.

Frontend: BookingTrucksPanel.tsx self-fetches all data via existing warehouse +
last-mile services, renders adaptive table with cargo-cost strip above.
Wired into BookingRequestDetailPage.tsx tab bar.
2026-07-29 11:13:20 +00:00
marshal
fe79c2442c Merge pull request #1003 from Tria-plc/freight_feature/usermanagement
fix gl steps
2026-07-29 10:33:03 +03:00
Marshal
f6e363cd6f fix gl steps 2026-07-29 07:32:26 +00:00
Abubeker Yasin
edc6439216 Merge pull request #1002 from Tria-plc/alpha
feat: ( payment ) free method changes, register every payment, confi...
2026-07-29 09:57:28 +03:00
Abubeker Yasin
e76ff5e159 feat: ( payment ) free method changes, register every payment, confirm booking once 2026-07-29 09:55:45 +03:00
marshal
fcbfb72be8 Merge pull request #1001 from Tria-plc/freight_feature/usermanagement
Refactor EdrOrgSeeder
2026-07-29 09:32:49 +03:00
Marshal
dfde6b9021 Refactor EdrOrgSeeder 2026-07-29 06:28:42 +00:00
marshal
69f4616480 Merge pull request #1000 from Tria-plc/freight_feature/usermanagement
New Transit Agents admin table (name, valid-from/to, active/suspended…
2026-07-29 08:46:14 +03:00
Marshal
b17a72c280 New Transit Agents admin table (name, valid-from/to, active/suspended, validity badge) — DJ assign step now picks from it, active+valid only. 2026-07-29 05:38:35 +00:00
mulish77
25bac0af52 Merge pull request #999 from Tria-plc/tests
Fixing the round trip disabling dates
2026-07-28 16:27:22 +03:00
mulish77
804f3bc3d4 Update main.ts 2026-07-28 16:25:30 +03:00
mulish77
9231f89736 Update main.ts 2026-07-28 16:24:21 +03:00
mulish77
0e8c6e0345 Update main.ts 2026-07-28 16:18:07 +03:00
Muluhabt
0dfb0cbe28 Fixing the round trip disabling dates 2026-07-28 16:12:44 +03:00
Nathnael Wondisha
8309483d8f Merge pull request #996 from Tria-plc/freight/fix/auth-separation
feat(auth): add login audience middleware (EDRFREIGHT-415)
2026-07-28 13:52:42 +03:00
marshal
3e828d3a3b Merge pull request #997 from Tria-plc/freight_feature/usermanagement
let customers dispute booking duty/tax advice so GL Ethiopia can re-a…
2026-07-28 13:49:47 +03:00
Marshal
891311d861 let customers dispute booking duty/tax advice so GL Ethiopia can re-advise 2026-07-28 10:48:27 +00:00
Nathnael
e823874d39 feat(auth): add login audience middleware (EDRFREIGHT-415) 2026-07-28 10:46:55 +00:00
mulish77
881f7e1e56 Merge pull request #994 from Tria-plc/tests
Fixing cors issue in produciton
2026-07-28 13:37:53 +03:00
Muluhabt
83137ea0ef Fixing cors issue in produciton 2026-07-28 13:37:10 +03:00
Abubeker Yasin
7e1727a7bf Merge pull request #993 from Tria-plc/alpha
fix: ( bookings ) require explicit tickets:generate to issue reservat…
2026-07-28 12:19:47 +03:00
Abubeker Yasin
ed09bfd8b6 fix: ( bookings ) require explicit tickets:generate to issue reservations 2026-07-28 12:18:25 +03:00
marshal
9911d862f7 Merge pull request #992 from Tria-plc/freight_feature/usermanagement
Pre-declaration Djibouti GL assignee request flow
2026-07-28 12:17:50 +03:00
Marshal
e1c831211f Pre-declaration Djibouti GL assignee request flow 2026-07-28 09:01:23 +00:00
Abubeker Yasin
7276c9881f Merge pull request #991 from Tria-plc/alpha
Alpha
2026-07-28 11:41:33 +03:00
Abubeker Yasin
0d46f3715e fix: ( payments ) bounce D-Money checkout via /go and follow user domain 2026-07-28 11:39:48 +03:00
Abubeker Yasin
686350135d refactor: ( payment ) allow payment change based on platform change 2026-07-28 10:42:02 +03:00
marshal
2d8b9203d5 Merge pull request #989 from Tria-plc/freight_feature/usermanagement
update body-parser implementation to use Nest's API and improve depe…
2026-07-28 10:25:05 +03:00
Marshal
653d5782ee update body-parser implementation to use Nest's API and improve dependency handling 2026-07-28 07:21:04 +00:00
mulish77
b14c1e9ad8 Merge pull request #988 from Tria-plc/tests
fix(bookings): apply promo discount to client-subtotal totals in gues…
2026-07-28 09:58:39 +03:00
Muluhabt
acd4b37d59 fix(bookings): apply promo discount to client-subtotal totals in guest/authenticated booking
createGuestBooking (ONE_WAY) and createGuestRoundTripBooking overwrote the
authoritative discounted total with an undiscounted client-provided subtotal
(per-seat sum or reviewedTotalMinor) whenever one was present, silently
dropping a valid promos discount at booking-creation time, even though the
same promo was correctly applied in the fare-breakdown/quote step. Only the
no-client-subtotal fallback branch subtracted discountMinor.

Mirrors the existing usedClientSubtotal fix already present in
BookingsService.createOneWayBooking (H-13): subtract discountMinor from the
client subtotal before storing it, in ETB and display currency. TRANSIT and
ROUND_TRIP_TRANSIT were unaffected since neither overrides with a client
subtotal.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-28 09:42:27 +03:00
Abubeker Yasin
99838aa8b6 Merge pull request #987 from Tria-plc/alpha
Alpha
2026-07-28 09:36:03 +03:00
marshal
646a029d1a Merge pull request #986 from Tria-plc/freight_feature/usermanagement
update body-parser implementation to use Nest's API and improve depe…
2026-07-28 09:34:01 +03:00
Marshal
7fcf3a7084 update body-parser implementation to use Nest's API and improve dependency handling 2026-07-28 06:33:26 +00:00
Abubeker Yasin
236d55580a fix: ( bookings ) restrict reservation issuance to admins 2026-07-28 09:31:01 +03:00
mulish77
3646f4cfb8 Merge pull request #985 from Tria-plc/tests
fix(search): compute next-day date bound with real arithmetic, not st…
2026-07-28 09:30:13 +03:00
Muluhabt
1d6f89df29 fix(search): compute next-day date bound with real arithmetic, not string padding
Searching on the last day of a month (e.g. 2026-07-31) built an invalid
"next day" string like "2026-07-32" for the Prisma date-range filter,
crashing POST /search with a PrismaClientValidationError in production.
Affected searchSchedules, searchAlternatives, classifyEmptySearch, and
searchTransitOptions — all four built the bound the same way.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-28 09:28:34 +03:00
marshal
161bdfff71 Merge pull request #984 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-28 09:21:12 +03:00