Abubeker Yasin
|
ef7b85c8cb
|
feat: ( payment ) integrate the passenger to payment microservice
|
2026-06-12 11:47:11 +03:00 |
|
Abubeker Yasin
|
2b430f8e76
|
feat: ( payment ) create payment microservice
|
2026-06-11 15:25:24 +03:00 |
|
Abubeker Yasin
|
3235567b41
|
feat( waafi ): wire Waafi HPP into passenger API
|
2026-06-10 16:23:33 +03:00 |
|
Abubeker Yasin
|
3f1a673356
|
Merge branch 'alpha' into feat/telebirr-integration
|
2026-06-10 13:22:47 +03:00 |
|
Abubeker Yasin
|
214feaedb5
|
Update seed.ts
|
2026-06-10 11:21:34 +03:00 |
|
Abubeker Yasin
|
310c0a0bc8
|
Update seed.ts
|
2026-06-10 11:04:57 +03:00 |
|
Abubeker Yasin
|
66b45ce22c
|
feat(payment-providers): implement Waafi in provider package
|
2026-06-10 09:14:18 +03:00 |
|
Stephanos A
|
ceb7f17e88
|
refactor: replace static IDs with UUIDs in seed functions for improved uniqueness
|
2026-06-09 21:43:24 +03:00 |
|
Stephanos A
|
df75c68bf6
|
seed fix: update last station code and correct route reference in seedTrips and seedFareRules functions
|
2026-06-09 20:32:24 +03:00 |
|
Stephanos A
|
89c29e5e90
|
Resolved EventEmitterModule build issue
|
2026-06-09 17:00:17 +03:00 |
|
Stephanos A.
|
983dbde868
|
Merge pull request #126 from Tria-plc/dev
Pull from dev to alpha to get latest changes
|
2026-06-09 16:53:54 +03:00 |
|
Eyob T.
|
dcfb6d6a62
|
Merge pull request #125 from Tria-plc/freigh/fix/dmoney
fix
|
2026-06-09 16:48:13 +03:00 |
|
ghost2023
|
4afe07c19b
|
fix
|
2026-06-09 16:37:11 +03:00 |
|
Stephanos A.
|
9219119ad1
|
Merge pull request #124 from Tria-plc/dev
Pull changes from dev
|
2026-06-09 15:54:06 +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 |
|
hagiye
|
eda21e22d8
|
Resolve merge conflicts from Train-Scheduling
|
2026-06-08 16:51:29 +03:00 |
|
Eyosiyas Girma
|
5786952ede
|
Merge pull request #120 from Tria-plc/freight/feature/telebirr-integration
Freight/feature/telebirr integration
|
2026-06-08 16:35:33 +03:00 |
|
Eyosiyas Girma
|
7c5e7408b0
|
Merge branch 'freight/develop' into freight/feature/telebirr-integration
|
2026-06-08 16:35:18 +03:00 |
|
Eyosiyas
|
3a66242f8b
|
working on dmoney
|
2026-06-08 16:29:20 +03:00 |
|
Stephanos A.
|
bf8cc7e6cf
|
Merge pull request #119 from Tria-plc/dev
From dev to alpha
|
2026-06-08 16:23:02 +03:00 |
|
Stephanos A.
|
edcb1b6fb1
|
Update tailwind.config.js (removed malicious code)
|
2026-06-08 16:20:59 +03:00 |
|
Stephanos A.
|
28e9203ccb
|
Update tailwind.config.js (removed malicious code)
|
2026-06-08 16:20:57 +03:00 |
|
Stephanos A.
|
c54aeb5040
|
Merge pull request #118 from Tria-plc/revert-117-dev
Revert "From dev to alpha"
|
2026-06-08 16:12:53 +03:00 |
|
Stephanos A.
|
383b630407
|
Revert "From dev to alpha"
|
2026-06-08 16:11:59 +03:00 |
|
Stephanos A.
|
00553b7959
|
Merge pull request #117 from Tria-plc/dev
From dev to alpha
|
2026-06-08 16:01:11 +03:00 |
|
Abubeker Yasin
|
1d9c8d5d0d
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into dev
|
2026-06-08 12:01:59 +03:00 |
|
Abubeker Yasin
|
d07f522a60
|
fix(passenger-api): fix seed errors and add missing stop times
|
2026-06-08 12:00:01 +03:00 |
|
Eyosiyas
|
a1940c4901
|
telebirr out in the payment
|
2026-06-08 11:49:50 +03:00 |
|
Abubeker Yasin
|
f5c9a72521
|
fix(passenger-api): fix seed TypeScript errors for dev
|
2026-06-08 01:35:12 -07:00 |
|
Abubeker Yasin
|
11192b6d49
|
fix(passenger-api): fix seed TypeScript errors for dev
|
2026-06-08 11:35:12 +03:00 |
|
Abubeker Yasin
|
72f8441a2b
|
fix: ( prisma ) remove orphaned TicketSeat migration
|
2026-06-08 10:17:22 +03:00 |
|
Nathnael Wondisha
|
95fb544ec2
|
Merge pull request #116 from Tria-plc/freight/feat/payment
freight/feat/payment
|
2026-06-08 08:52:39 +03:00 |
|
ghost2023
|
df725015a1
|
fix(api): improve payment status API handling and frontend user experience
|
2026-06-08 08:51:54 +03:00 |
|
hagiye
|
bffa5020ac
|
wagon types added UI with API integrations
|
2026-06-07 21:56:33 +03:00 |
|
Stephanos A.
|
67319a467e
|
Merge pull request #115 from Tria-plc/alpha
Update Prisma migration script to use deploy command
|
2026-06-07 19:43:50 +03:00 |
|
Stephanos A
|
193485d911
|
Update Prisma migration script to use deploy command
|
2026-06-07 19:43:02 +03:00 |
|
Stephanos A.
|
cfff533066
|
Merge pull request #114 from Tria-plc/alpha
Fix Prisma schema path in package.json
|
2026-06-07 19:26:46 +03:00 |
|
Stephanos A
|
e3fb81317e
|
Fix Prisma schema path in package.json
|
2026-06-07 19:24:46 +03:00 |
|
Stephanos A.
|
0666fd06cf
|
Merge pull request #113 from Tria-plc/alpha
Add Prisma schema configuration to package.json
|
2026-06-07 19:11:09 +03:00 |
|
Stephanos A
|
09317a3d56
|
Add Prisma schema configuration to package.json
|
2026-06-07 19:10:00 +03:00 |
|
Stephanos A.
|
12fabc3fa1
|
Merge pull request #112 from Tria-plc/alpha
Update PORT configuration in .env.example from 3002 to 4000
|
2026-06-07 18:58:15 +03:00 |
|
Stephanos A
|
75b7ec1baf
|
Update PORT configuration in .env.example from 3002 to 4000
|
2026-06-07 18:57:34 +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 |
|
marshal
|
b9cfce70fe
|
Merge pull request #110 from Tria-plc/freight_feature/change_to_mantine
Freight feature/change to mantine
|
2026-06-07 01:23:02 +03:00 |
|
marshal
|
4993453993
|
generate contract by the system, add waggon type,fix ui
|
2026-06-07 01:20:52 +03:00 |
|
marshal
|
3fa1f54e3a
|
fix ui
|
2026-06-07 00:32:07 +03:00 |
|
Marshal
|
08b46c306f
|
ui improvemnt
|
2026-06-06 21:17:20 +00:00 |
|