Commit Graph

641 Commits

Author SHA1 Message Date
Abubeker Yasin
8ce6483e26 Merge branch 'dev' into alpha 2026-08-10 14:38:44 +03:00
Abubeker Yasin
18c47ca4a3 recover: ( payment ) recover cancelation fix deleted by malware 2026-08-10 14:25:14 +03:00
Abubeker Yasin
6471c3511a feat: (payment) add eBirr as synchronous API_PURCHASE wallet debit 2026-08-10 11:36:05 +03:00
Stephanos A.
3a78605893 Merge pull request #1177 from Tria-plc/alpha
Alpha
2026-08-08 11:18:49 +03:00
Abubeker Yasin
f51ee7cf59 feat: (payment) add telebirr mini-app in-app payment flow 2026-08-07 13:48:58 +03:00
Sennay
1094342b74 Merge branch 'main' into dev 2026-08-07 12:04:39 +03:00
Abubeker Yasin
1c1fcb28a9 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-08-07 10:50:57 +03:00
Abubeker Yasin
7888dc771e fix: (passenger): block payment initiation too close to the booking deadline 2026-08-07 10:47:55 +03:00
Mulu Mehari
6c075bed7b Removing Blocked seat from dashboard 2026-08-07 10:40:05 +03:00
Abubeker Yasin
31ffb293b8 Update payment-deadline.utils.ts 2026-08-06 14:35:30 +03:00
Nathnael Wondisha
7f90ccc1b5 Merge pull request #1135 from Tria-plc/staging
Staging
2026-08-06 08:37:23 +03:00
Stephanos A.
ad186ece57 Merge pull request #1136 from Tria-plc/alpha
Excess baggage payment link quick fix
2026-08-06 08:30:33 +03:00
Stephanos A
405ba908c3 Excess baggage payment link quick fix 2026-08-06 08:14:34 +03:00
Stephanos A.
15c4113b28 Merge pull request #1118 from Tria-plc/alpha
Alpha
2026-08-06 07:49:35 +03:00
marshal
5ba414db00 Merge pull request #1134 from Tria-plc/freight_feature/usermanagement
add metadata to ignore audit logging in payment events
2026-08-06 01:28:56 +03:00
Marshal
5933795116 add metadata to ignore audit logging in payment events 2026-08-05 22:26:04 +00:00
Stephanos A
bf8906f983 Boarding status update issue fix 2026-08-05 21:32:23 +03:00
Stephanos A
9b62ca6922 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-08-05 10:39:35 +03:00
Stephanos A
d1a15a82e3 Excess baggage payment link changes 2026-08-05 10:37:49 +03:00
Abubeker Yasin
14af6374f8 Update payment-deadline.utils.ts 2026-08-04 15:44:57 +03:00
Abubeker Yasin
19ab3af1cb chore: ( iam ) update iam package 2026-08-04 10:56:47 +03:00
Abubeker Yasin
85d5faed34 chore: ( iam ) update iam package 2026-08-04 10:27:59 +03:00
Abubeker Yasin
6101a377f1 feat: ( bookings ) search backoffice bookings by provider transaction ID 2026-08-03 16:56:36 +03:00
Mulu Mehari
8594d75164 Adding more detail messages for seat blocking 2026-08-03 11:37:16 +03:00
Mulu Mehari
f0295f401a Adding seat blocking revenue loss dashboard 2026-08-02 23:08:15 +03:00
Abubeker Yasin
327f3b140c Merge pull request #1047 from Tria-plc/cbe-integration
feat: ( payment ) specific CBE query descriptions + Payment_Reason
2026-07-31 16:04:44 +03:00
Abubeker Yasin
aa4ce7fd23 feat: ( payment ) specific CBE query descriptions + Payment_Reason 2026-07-31 16:03:28 +03:00
Abubeker Yasin
5ebab56908 Merge pull request #1044 from Tria-plc/cbe-integration
Cbe integration
2026-07-31 14:50:21 +03:00
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
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
Abubeker Yasin
722c2feed2 Merge pull request #998 from Tria-plc/dev
Merge
2026-07-28 15:01:22 +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
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
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
Abubeker Yasin
236d55580a fix: ( bookings ) restrict reservation issuance to admins 2026-07-28 09:31:01 +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
Muluhabt
11e6d226df Fixing build issues 2026-07-27 15:30:28 +03:00
Muluhabt
e51d60d836 Adding train delay minutes and also disabling no schedule days in the booking selection 2026-07-27 15:10:10 +03:00