Commit Graph

3180 Commits

Author SHA1 Message Date
Stephanos A
93c583edf6 Report number updates 2026-07-19 08:07:59 +03:00
Stephanos A
4805a54bf7 Report figures correction updates 2026-07-18 20:16:24 +03:00
Stephanos A
554baf2595 Build issue resolution 2026-07-18 19:51:27 +03:00
Stephanos A
6ddcc73847 Boarding icon added to dashboard 2026-07-18 19:12:02 +03:00
Stephanos A
3e76069e9f Merge branch 'main' of github.com:Tria-plc/edr-platform into quick-fix 2026-07-18 19:01:23 +03:00
Stephanos A
e84ab9e2b5 Passenger list report 2026-07-18 18:59:02 +03:00
Stephanos A.
b96972e86d Merge pull request #790 from Tria-plc/quickfix
Reports update
2026-07-18 12:55:15 +03:00
Stephanos A
aac162ca3c Reports update 2026-07-18 12:52:28 +03:00
Stephanos A
8f0670ff9c Passengers report 2026-07-18 12:27:59 +03:00
mulish77
5f000edbed Merge pull request #775 from Tria-plc/stephpaymentfix
Steph payment isssues fix
2026-07-17 19:51:18 +03:00
Muluhabt
ffafd9bcfc Steph payment isssues fix 2026-07-17 19:50:35 +03:00
mulish77
266331ec26 Merge pull request #774 from Tria-plc/stephpaymentfix
Steph payment isssues fix
2026-07-17 19:26:12 +03:00
Muluhabt
daeabe1d79 Steph payment isssues fix 2026-07-17 19:24:27 +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