Commit Graph

66 Commits

Author SHA1 Message Date
Stephanos A
755b8b2939 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 14:18:33 +03:00
Stephanos A
86760933e8 IAM, package, luggage, app health, rate limit, and more 2026-06-24 14:02:51 +03:00
Roba Boru
4c9c5f7e2f Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 11:56:30 +03:00
Roba Boru
bdcadeca81 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 11:53:32 +03:00
Roba Boru
9320e0e9ab Update seatmap configuration 2026-06-24 11:50:44 +03:00
Abubeker Yasin
1dfe4b9c37 refactor: ( iam ) add public decorator for public endpoins 2026-06-24 11:39:31 +03:00
Abubeker Yasin
545a25afcf Merge branch 'alpha' into passenger/feat/iam 2026-06-23 14:47:24 +03:00
Abubeker Yasin
1eaffa7ba0 feat: ( passenger ) wire IAM global guard, org seeder, and backoffice auth 2026-06-23 14:25:10 +03:00
Stephanos A
2bd76756a4 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-23 10:13:36 +03:00
Stephanos A
2d51787383 Backoffice updates, boarding pass, alternative schedule search and more 2026-06-23 10:10:55 +03:00
Abubeker Yasin
4b3c47ca03 refactor: ( iam ) remove user relations 2026-06-22 15:01:16 +03:00
Abubeker Yasin
177e1cea8d Merge branch 'dev' into passenger/feat/iam 2026-06-22 10:12:39 +03:00
Abubeker Yasin
2288a9efda feat: ( notifications ) add payment/cancellation events and ticket confirmation 2026-06-19 15:49:30 +03:00
Abubeker Yasin
525e724461 fix: ( payment ) pass major amount to the payment provider 2026-06-19 10:19:11 +03:00
Abubeker Yasin
5d0812ade1 Merge pull request #201 from Tria-plc/feat/payment-microservice
Feat/payment microservice
2026-06-17 16:00:52 +03:00
Abubeker Yasin
58af6ee2db fix:( payment ) fix date and add waafi demo callback 2026-06-17 12:31:20 +03:00
Stephanos A
81a9c614b7 Update pnpm-lock.yaml 2026-06-17 08:10:59 +03:00
Nathnael Wondisha
b82e4ac46e Merge branch 'dev' into freight/develop 2026-06-16 16:22:38 +03:00
Abubeker Yasin
c56e0e794c Update payments.module.ts 2026-06-16 15:25:14 +03:00
Abubeker Yasin
1ed2c4d2f0 Merge branch 'dev' into feat/payment-microservice 2026-06-16 15:24:33 +03:00
Abubeker Yasin
e5850fbc63 feat: ( payment ) return url based on payment method 2026-06-16 15:23:32 +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
marshal
dc5929e7ae changes 2026-06-16 11:11:32 +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
marshal
0aed9824ae cac payemnt integration and cbe rate exchange webscrabing 2026-06-15 14:54:20 +03:00
Abubeker Yasin
73eeee175f Update payments.service.ts 2026-06-15 11:26:51 +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
3b961f17f5 refactor: ( rabbitmq ) temporary remove the rabbitmq 2026-06-14 18:47:41 +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
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
Abubeker Yasin
431b1c4f3c refactor( iam ): replace prisma.user joins with batch IAM fetch in bookings, tickets, and payments e2e 2026-06-09 13:54:38 +03:00
Hagernesh Tadesse
8f99069fb6 Merge pull request #121 from Tria-plc/freight/develop
Freight/develop
2026-06-08 16:55:57 +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
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
Abubeker Yasin
3922d813b1 fix: ( telebirr ): fix payment status 2026-06-04 14:24:38 +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