Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,719 Commits 96 Branches 0 Tags
eims-integration
Commit Graph

662 Commits

Author SHA1 Message Date
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
mulish77
fd699e824e Merge branch 'dev' into tests 2026-07-27 14:59:00 +03:00
Muluhabt
d9998ffba7 Merge remote-tracking branch 'origin/dev' into tests 
Merging remote repo
 2026-07-27 14:44:50 +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
Nathnael Wondisha
32093ec1c1 Merge pull request #975 from Tria-plc/dev 
syncing
 2026-07-27 14:19:45 +03:00
Nathnael Wondisha
8449ce0ef3 Merge pull request #972 from Tria-plc/freight/nati-1 
IAM Seeder centralized
 2026-07-27 14:11:16 +03:00
Nathnael
03b8ca0ce7 refactor: centralized the iam seeder 2026-07-27 08:42:27 +00: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
f5bdc6971d Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-27 11:07:44 +03:00
Abubeker Yasin
afcae037fc refactor: ( bookings ) unify authenticated booking flow with guest service 2026-07-27 11:07:33 +03:00
mulish77
d4695ba9eb Merge pull request #959 from Tria-plc/tests 
Adding exact reason why train is not available to users search results
 2026-07-25 12:29:41 +03:00
Muluhabt
d175514f85 Adding exact reason why train is not available to users search results 2026-07-25 12:28:07 +03:00
Nathnael Wondisha
da51e83152 Merge pull request #958 from Tria-plc/dev 
syncing
 2026-07-25 12:25:56 +03:00
mulish77
f24c7015e0 Merge pull request #956 from Tria-plc/tests 
Adding ticket generation and booking for staff employees logic
 2026-07-25 11:22:59 +03:00
Muluhabt
2a0fd9bda5 Adding ticket generation and booking for staff employees logic 2026-07-25 11:20:47 +03:00
Stephanos A
fa7fb6b7ea Set boardedAt in addition to validatedAt on ticket boarding action 2026-07-24 19:57:29 +03:00
Stephanos A
e4b60f28b5 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-24 16:49:50 +03:00
Stephanos A
050a08f330 Boarding report added 2026-07-24 16:09:27 +03:00
Abubeker Yasin
dfef97a718 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-24 13:59:21 +03:00
Abubeker Yasin
3d1b06b7ee fix: ( payment ) prevent duplicate booking charges and fix D-Money queryOrder 2026-07-24 13:51:53 +03:00
Roba Boru
5a89e296d6 Fix checkin time cutoff 2026-07-24 11:37:52 +03:00
mulish77
ac9ba43bd3 Merge pull request #948 from Tria-plc/tests 
Cut off time configuration
 2026-07-24 09:02:25 +03:00
Muluhabt
7320c359d1 Cut off time configuration 2026-07-24 09:01:27 +03:00
mulish77
114709c995 Merge pull request #947 from Tria-plc/tests 
Tests
 2026-07-23 20:15:42 +03:00
Muluhabt
64e1130f7d Commiting stop based booking 2026-07-23 20:11:11 +03:00
Muluhabt
8bba882710 Adding stop based booking configuration 2026-07-23 20:03:35 +03:00
Stephanos A.
ac4fdf03ba Merge pull request #946 from Tria-plc/alpha 
Generate missing ticket and payment report currency updates
 2026-07-23 19:51:13 +03:00
Stephanos A
84346d77ac Generate missing ticket and payment report currency updates 2026-07-23 19:39:39 +03:00
marshal
7608207633 Merge pull request #940 from Tria-plc/dev 
deploy freight
 2026-07-23 16:40:26 +03:00