Commit Graph

113 Commits

Author SHA1 Message Date
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
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
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
236d55580a fix: ( bookings ) restrict reservation issuance to admins 2026-07-28 09:31:01 +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
mulish77
fd699e824e Merge branch 'dev' into tests 2026-07-27 14:59:00 +03:00
Muluhabt
d71f6dc1b3 Adding train delay minutes and also disabling no schedule days in the booking selection 2026-07-27 14:42:57 +03:00
Abubeker Yasin
93615158ab fix: ( booking ) remove duplicated auditservice 2026-07-27 11:27:21 +03:00
Abubeker Yasin
3e2ae80e5a Merge pull request #969 from Tria-plc/alpha
Alpha
2026-07-27 11:08:44 +03:00
Abubeker Yasin
afcae037fc refactor: ( bookings ) unify authenticated booking flow with guest service 2026-07-27 11:07:33 +03:00
Muluhabt
d175514f85 Adding exact reason why train is not available to users search results 2026-07-25 12:28:07 +03:00
Muluhabt
2a0fd9bda5 Adding ticket generation and booking for staff employees logic 2026-07-25 11:20:47 +03:00
Muluhabt
7320c359d1 Cut off time configuration 2026-07-24 09:01:27 +03:00
Muluhabt
87ebec8b51 Merge remote-tracking branch 'origin/dev' into tests 2026-07-22 16:33:07 +03:00
Stephanos A
2632e2d50c Ticketing updates 2026-07-22 14:06:00 +03:00
Stephanos A
44b4779ca6 Ticketing updates 2026-07-22 12:54:21 +03:00
Muluhabt
7e6778d025 Adding all the tests and fixes to the passengers app 2026-07-21 15:26:29 +03:00
Muluhabt
f2ae9c883f Adding all the tests and fixes to the passengers app 2026-07-21 13:45:49 +03:00
Roba Boru
d43229528e Fix price inconsistency 2026-07-19 22:46:36 +03:00
Stephanos A
854177c93b Seat reservation unique constrains, package totalMinor updates 2026-07-18 11:30:43 +03:00
Stephanos A
8eb0582e4e Dashboard, seats report, package pricing updates 2026-07-18 00:34:12 +03:00
Stephanos A
f2c037a5b7 Package pricing issue resolution, passenger report, tickets filter updates 2026-07-17 23:18:52 +03:00
Stephanos A
b2ab65245a totalMinor with displayTotalMinor updates 2026-07-16 13:38:34 +03:00
Stephanos A
3bc492ea83 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-16 08:41:53 +03:00
Stephanos A
b2b31f30bb Generate ticket, dashboard, excess luggage rate updates 2026-07-16 08:41:35 +03:00
Roba Boru
f185da2163 Update seatmap for blocked seats 2026-07-15 21:28:35 +03:00
Stephanos A
8bda06b226 Currency issue resolution 2026-07-15 19:50:32 +03:00
Stephanos A
7bbd34f159 Currency issue resolution 2026-07-15 19:18:35 +03:00
Stephanos A
e2529b9317 Payment amount for non ETB and exchange fixes 2026-07-15 10:27:17 +03:00
Stephanos A
25fdf88a77 Booking currency updates, audit logging updates 2026-07-15 00:39:53 +03:00
Roba Boru
89b99b0a08 Fix seat label 2026-07-14 21:57:34 +03:00
Roba Boru
660c611a1c Fix route datetime on lookup page 2026-07-14 21:22:04 +03:00
Stephanos A
05ff0c2595 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 20:58:36 +03:00
Stephanos A
f243fdd4e3 Currency and converted amount for non ETB 2026-07-14 20:51:40 +03:00
Roba Boru
12ab3f33b1 Fix stop route 2026-07-14 16:54:24 +03:00
Stephanos A
ed901777a6 Price issue on sign in path addressed, Djibouti side pricing updates added 2026-07-14 16:00:39 +03:00
Roba Boru
7cb6d028cf Remove rate time 2026-07-14 10:46:27 +03:00
SennayT
8f45d7ae1f remove throttler 2026-07-14 10:30:22 +03:00
Roba Boru
dc269bed89 Fix roundtrip in voucher 2026-07-13 22:31:35 +03:00
Stephanos A
94b9f99531 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-11 12:16:20 +03:00
Stephanos A
50ebe8ddda Backoffice contact details, currency mgmt. updates 2026-07-11 12:16:05 +03:00
Roba Boru
33a9129e8b Fix look up by phone number 2026-07-11 12:13:05 +03:00
Roba Boru
122c57debb Add booking lookup by phone number 2026-07-11 11:12:16 +03:00
Stephanos A
3c3924b33f Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-11 00:55:09 +03:00
Stephanos A
8e2b8c9b87 Admin rule settings, minor issues resolution 2026-07-11 00:52:57 +03:00
Roba Boru
c1db1c8a99 Fix voucher ticket number 2026-07-11 00:45:14 +03:00
Stephanos A
acc93aeffc UAT fixes and enhancements 2026-07-10 10:33:36 +03:00