Abubeker Yasin
|
6c5ab98e4e
|
Merge pull request #751 from Tria-plc/alpha
Alpha
|
2026-07-17 10:58:54 +03:00 |
|
marshal
|
2def8f9b0e
|
Merge pull request #753 from Tria-plc/freight_feature/usermanagement
Comment out payment event handling for local demos in BillingService
|
2026-07-17 10:49:46 +03:00 |
|
Marshal
|
5a1e0dba4d
|
Comment out payment event handling for local demos in BillingService
|
2026-07-17 07:43:17 +00:00 |
|
Roba Boru
|
0c584cce88
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-17 10:21:12 +03:00 |
|
Roba Boru
|
610580e15e
|
Added discrepancy management for duplicate seats
|
2026-07-17 10:20:35 +03:00 |
|
Nathnael Wondisha
|
f769d97135
|
Merge pull request #752 from Tria-plc/freight/feat/fixes-v1
Freight/feat/fixes v1
|
2026-07-17 10:01:44 +03:00 |
|
Roba Boru
|
4bc7d0ecf5
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-17 08:43:20 +03:00 |
|
Roba Boru
|
ea8f91a415
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-17 08:43:08 +03:00 |
|
Roba Boru
|
2366b28610
|
remove the cron job
|
2026-07-17 08:42:42 +03:00 |
|
Stephanos A
|
f3c0fd6cbb
|
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
|
2026-07-17 00:49:50 +03:00 |
|
Stephanos A
|
e59b797477
|
Minor updates
|
2026-07-17 00:49:35 +03:00 |
|
robiman
|
92aa0e9252
|
Merge pull request #750 from Tria-plc/alpha
Added cron job that check duplicate seat and assign if free available
|
2026-07-16 23:24:25 +03:00 |
|
Roba Boru
|
1bba6dd9fc
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-16 23:22:55 +03:00 |
|
Roba Boru
|
969c524afe
|
Added cron job that check duplicate seat and assign if free available
|
2026-07-16 23:22:20 +03:00 |
|
marshal
|
d8ec9b3436
|
Merge pull request #749 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
|
2026-07-16 23:13:01 +03:00 |
|
Marshal
|
71507b27fd
|
changes
|
2026-07-16 20:09:59 +00:00 |
|
Marshal
|
35c53e3f36
|
changes
|
2026-07-16 20:03:35 +00:00 |
|
Stephanos A.
|
5f5e6f6b4b
|
Merge pull request #748 from Tria-plc/alpha
Alpha
|
2026-07-16 21:53:01 +03:00 |
|
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 |
|
Nathnael
|
e626e1db63
|
Merge branch 'dev' into freight/feat/fixes-v1
|
2026-07-16 13:23:40 +00: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 |
|