Commit Graph

111 Commits

Author SHA1 Message Date
Stephanos A
ad83c87e2f Enhance deletion logic in Fleet and Schedules services to prevent deletion of records with active dependencies; update Seats and Stations pages to improve UI and remove unused fields. 2026-06-16 19:30:09 +03:00
Stephanos A
eb60fc340d Refactor booking creation to support one-way and round-trip bookings with enhanced DTOs and service methods 2026-06-16 18:44:09 +03:00
Stephanos A
421e30dc6c Enhance DTOs and services to support sequence and operational status for coaches and stations 2026-06-16 16:25:33 +03:00
Stephanos A
eb97c11ddb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 14:41:33 +03:00
Stephanos A
fc5f77c817 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 14:40:09 +03:00
Roba Boru
1a71f654b1 Update email and sms services 2026-06-16 14:21:56 +03:00
Stephanos A
75c8423f50 Round trip journeys, feedback items, backoffice documentation 2026-06-16 13:33:03 +03:00
Roba Boru
db54a6870d Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 11:13:01 +03:00
Abubeker Yasin
06c7fea330 Merge branch 'feat/payment-microservice' into alpha 2026-06-16 11:02:41 +03:00
Roba Boru
03c4ec33c3 Added get ticketing info by reference number endpoint and update payment methods to dynamic 2026-06-16 09:47:05 +03:00
Abubeker Yasin
ca9a67837c feat: ( payment ) implement d-money payment 2026-06-16 08:49:41 +03:00
Abubeker Yasin
e4805824ce Merge pull request #162 from Tria-plc/feat/payment-microservice
Update payments.service.ts
2026-06-15 11:28:05 +03:00
Abubeker Yasin
73eeee175f Update payments.service.ts 2026-06-15 11:26:51 +03:00
Abubeker Yasin
3a9f0dd0a8 Merge pull request #157 from Tria-plc/feat/payment-microservice
Revert "refactor: ( rabbitmq ) temporary remove the rabbitmq"
2026-06-14 21:55:15 +03:00
Abubeker Yasin
4ab987e8fe Revert "refactor: ( rabbitmq ) temporary remove the rabbitmq"
This reverts commit 3b961f17f5.
2026-06-14 21:44:36 +03:00
Abubeker Yasin
b7cc05a631 Merge pull request #155 from Tria-plc/feat/payment-microservice
refactor: ( rabbitmq ) temporary remove the rabbitmq
2026-06-14 18:48:53 +03:00
Abubeker Yasin
3b961f17f5 refactor: ( rabbitmq ) temporary remove the rabbitmq 2026-06-14 18:47:41 +03:00
Eyob T.
d6247e0e2b Merge pull request #148 from Tria-plc/feat/payment-microservice
refactor: ( payment ) use rabbitmq for webhooks event
2026-06-14 15:24:25 +03:00
Stephanos A
f8701eacfb Merge branch 'dev' into alpha 2026-06-14 10:47:51 +03:00
Stephanos A
1cd0a55305 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-14 10:31:27 +03:00
Stephanos A
20d483ed00 Backoffice portal updates: dashboard, seat management, pricing, audit logging, reporting 2026-06-14 10:26:22 +03:00
Abubeker Yasin
c35b5089ce refactor: ( payment ) use rabbitmq for webhooks event 2026-06-13 20:19:23 +03:00
Abubeker Yasin
eb94d58a4e Update payment-client.service.ts 2026-06-13 10:48:19 +03:00
Abubeker Yasin
e558912ab7 chore: ( payment ) add log 2026-06-13 09:42:43 +03:00
Abubeker Yasin
fa6233923c Update internal-payments.dto.ts 2026-06-12 12:20:05 +03:00
Abubeker Yasin
ef7b85c8cb feat: ( payment ) integrate the passenger to payment microservice 2026-06-12 11:47:11 +03:00
Abubeker Yasin
3235567b41 feat( waafi ): wire Waafi HPP into passenger API 2026-06-10 16:23:33 +03:00
Stephanos A
89c29e5e90 Resolved EventEmitterModule build issue 2026-06-09 17:00:17 +03:00
Eyob T.
409870c2f0 Merge pull request #123 from Tria-plc/alpha
Seat rendering and other updates
2026-06-09 15:34:28 +03:00
Stephanos A
c2bab6cae8 Seatmap rendering and other updates 2026-06-09 15:22:27 +03:00
Hagernesh Tadesse
8f99069fb6 Merge pull request #121 from Tria-plc/freight/develop
Freight/develop
2026-06-08 16:55:57 +03:00
Eyosiyas
a1940c4901 telebirr out in the payment 2026-06-08 11:49:50 +03:00
Stephanos A.
f3400b36f2 Merge pull request #111 from Tria-plc/alpha
Coaches, seats, schedules, and pricing related updates
2026-06-07 17:53:19 +03:00
Stephanos A
bb10e7fdf2 Coaches, seats, schedules, and pricing related updates 2026-06-07 17:41:31 +03:00
Abubeker Yasin
1d11cbda4d feat: ( payment ) create payment microservice 2026-06-05 21:29:55 +03:00
Marshal
67037ba748 fix the seed for rules 2026-06-05 17:25:16 +00:00
Stephanos A.
474c87a8ec Merge pull request #91 from Tria-plc/alpha
Add device management to user profile and enhance seat hold expiratio…
2026-06-04 16:41:02 +03:00
Stephanos A
af14535e08 Add device management to user profile and enhance seat hold expiration handling 2026-06-04 16:38:58 +03:00
Stephanos A.
18c61dfe2e Merge pull request #90 from Tria-plc/alpha
Booking and ticketing related updates
2026-06-04 16:22:39 +03:00
Stephanos A
bc4d6d079b Booking and ticketing related updates 2026-06-04 16:21:22 +03:00
Stephanos A.
e44e80c200 Merge pull request #87 from Tria-plc/alpha
Add endpoint to retrieve bookings by device ID and update related API…
2026-06-04 14:35:27 +03:00
Stephanos A
681825f36c Add endpoint to retrieve bookings by device ID and update related API methods 2026-06-04 14:28:49 +03:00
Abubeker Yasin
3922d813b1 fix: ( telebirr ): fix payment status 2026-06-04 14:24:38 +03:00
Stephanos A.
ef940a61bd Merge pull request #85 from Tria-plc/alpha
Alpha
2026-06-04 13:46:33 +03:00
Abubeker Yasin
ffdb095a28 Update telebirr-webhook.service.ts 2026-06-04 11:26:01 +03:00
Abubeker Yasin
1784f05d31 Update webhooks.controller.ts 2026-06-04 10:38:11 +03:00
Abubeker Yasin
26cec36685 refactor: ( telebirr ) update the webhook to accept any request 2026-06-04 10:15:20 +03:00
Abubeker Yasin
1fbedff810 Update payments.types.ts 2026-06-04 09:01:19 +03:00
Abubeker Yasin
848cb530ee fix: ( telebirr ) : change the payer id to appid 2026-06-04 08:46:37 +03:00
Stephanos A
375cd184c4 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-04 08:19:52 +03:00