Roba Boru
|
bf5f62a9ca
|
Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 21:51:41 +03:00 |
|
Roba Boru
|
5bcc32cc79
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 21:51:22 +03:00 |
|
Stephanos A
|
ef37ce4c31
|
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
|
2026-07-16 21:31:13 +03:00 |
|
Abubeker Yasin
|
718c384a06
|
Update tickets.controller.ts
|
2026-07-16 21:15:10 +03:00 |
|
Stephanos A
|
17c0123161
|
Add unique constraint to JourneySegment for seat bookings per schedule
|
2026-07-16 21:10:02 +03:00 |
|
Abubeker Yasin
|
49a51c4bcc
|
Merge pull request #747 from Tria-plc/dev
merge
|
2026-07-16 20:46:01 +03:00 |
|
Stephanos A.
|
19b5f366e2
|
Merge pull request #746 from Tria-plc/alpha
Add seat block schedule id for consistency
|
2026-07-16 20:13:02 +03:00 |
|
Stephanos A
|
3726ac8390
|
Add seat block schedule id for consistency
|
2026-07-16 20:11:42 +03:00 |
|
Stephanos A.
|
80652bb0dc
|
Merge pull request #745 from Tria-plc/alpha
Alpha
|
2026-07-16 19:38:38 +03:00 |
|
Stephanos A
|
8ae327e779
|
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
|
2026-07-16 19:28:12 +03:00 |
|
Stephanos A
|
e3075d1486
|
Seats holding, booking, blocking inconsistencies resolution
|
2026-07-16 19:28:00 +03:00 |
|
robiman
|
7fb5a58ab0
|
Merge pull request #744 from Tria-plc/alpha
Fix payment fallback redirect
|
2026-07-16 17:28:42 +03:00 |
|
Roba Boru
|
08dae58fbe
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 17:27:50 +03:00 |
|
Roba Boru
|
6d524ce6be
|
Fix payment fallback redirect
|
2026-07-16 17:27:32 +03:00 |
|
robiman
|
51e85dc0eb
|
Merge pull request #743 from Tria-plc/alpha
Fix confirmation page pending payment
|
2026-07-16 17:03:37 +03:00 |
|
Roba Boru
|
1df5099cb6
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 17:02:43 +03:00 |
|
Roba Boru
|
fe5b258fca
|
Fix confirmation page pending payment
|
2026-07-16 17:02:23 +03:00 |
|
robiman
|
93645f1f76
|
Merge pull request #742 from Tria-plc/alpha
Fix waiting time loading
|
2026-07-16 16:43:13 +03:00 |
|
Roba Boru
|
bc8571cbd2
|
Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 16:42:10 +03:00 |
|
Roba Boru
|
e6d85f0ac4
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 16:42:00 +03:00 |
|
Roba Boru
|
f9b87b9911
|
Fix waiting time loading
|
2026-07-16 16:41:36 +03:00 |
|
marshal
|
8955139150
|
Merge pull request #741 from Tria-plc/dev
freight production
|
2026-07-16 16:40:53 +03:00 |
|
robiman
|
65d1472600
|
Merge pull request #740 from Tria-plc/alpha
Fix loading message
|
2026-07-16 16:18:12 +03:00 |
|
Roba Boru
|
842dc92a5a
|
Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 16:17:25 +03:00 |
|
Roba Boru
|
e3e70707a3
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 16:17:15 +03:00 |
|
Roba Boru
|
8790e020ee
|
Fix loading message
|
2026-07-16 16:16:51 +03:00 |
|
Abubeker Yasin
|
615054bd66
|
Merge pull request #739 from Tria-plc/dev
merge
|
2026-07-16 16:03:41 +03:00 |
|
marshal
|
1a3fa4bc5a
|
Merge pull request #738 from Tria-plc/freight_feature/usermanagement
fix issue
|
2026-07-16 16:00:07 +03:00 |
|
Marshal
|
b50adc4666
|
fix issue
|
2026-07-16 12:59:28 +00:00 |
|
robiman
|
1ef5a589b6
|
Merge pull request #737 from Tria-plc/alpha
Check payment before generating ticket
|
2026-07-16 15:46:34 +03:00 |
|
Roba Boru
|
10968410b2
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 15:45:13 +03:00 |
|
Roba Boru
|
43c0f5b01e
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 15:45:01 +03:00 |
|
Roba Boru
|
0142c94bb0
|
Check payment before generating ticket
|
2026-07-16 15:44:47 +03:00 |
|
Abubeker Yasin
|
cc56ad7748
|
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
|
2026-07-16 15:37:25 +03:00 |
|
Abubeker Yasin
|
e0abfddf10
|
Update payment-events.consumer.ts
|
2026-07-16 15:36:02 +03:00 |
|
Stephanos A.
|
211505a585
|
Merge pull request #736 from Tria-plc/alpha
Alpha
|
2026-07-16 15:19:07 +03:00 |
|
Stephanos A
|
e28372306f
|
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
|
2026-07-16 15:18:16 +03:00 |
|
Stephanos A
|
6b5a80b597
|
Supplementary payments client pages
|
2026-07-16 15:18:01 +03:00 |
|
Nathnael Wondisha
|
8ee3f13bdb
|
Merge pull request #735 from Tria-plc/freight/feat/payment-revert
fix: revert the testing
|
2026-07-16 15:13:30 +03:00 |
|
Nathnael
|
c19e4260c1
|
fix: revert the testing
|
2026-07-16 12:04:58 +00:00 |
|
marshal
|
35a9d25aaa
|
Merge pull request #734 from Tria-plc/freight_feature/usermanagement
fix u=issue
|
2026-07-16 15:02:40 +03:00 |
|
Marshal
|
e8e12c1363
|
fix u=issue
|
2026-07-16 12:02:11 +00:00 |
|
Eyob T.
|
72a11901c7
|
Merge pull request #733 from Tria-plc/alpha
Fallback cron job for ticketing if rabbitmq disconnected.
|
2026-07-16 14:38:54 +03:00 |
|
Roba Boru
|
fa7a517410
|
Fallback cron job for ticketing if rabbitmq disconnected.
|
2026-07-16 14:34:53 +03:00 |
|
Roba Boru
|
767690236a
|
Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 13:54:45 +03:00 |
|
Roba Boru
|
8a1c9bfeb7
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 13:54:33 +03:00 |
|
Roba Boru
|
9161b24f98
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 13:54:22 +03:00 |
|
Stephanos A.
|
478d52a623
|
Merge pull request #732 from Tria-plc/alpha
totalMinor with displayTotalMinor updates
|
2026-07-16 13:40:51 +03:00 |
|
Roba Boru
|
e316e59eda
|
Update altenative dates
|
2026-07-16 13:39:44 +03:00 |
|
Stephanos A
|
b2ab65245a
|
totalMinor with displayTotalMinor updates
|
2026-07-16 13:38:34 +03:00 |
|