Commit Graph

484 Commits

Author SHA1 Message Date
Roba Boru
5249441422 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into feature/report 2026-08-12 11:27:05 +03:00
Roba Boru
bdcdb4f047 Added financial report 2026-08-12 11:24:12 +03:00
Stephanos A
bd8187578e Overall revenue updates 2026-08-11 15:02:16 +03:00
Abubeker Yasin
8ce6483e26 Merge branch 'dev' into alpha 2026-08-10 14:38:44 +03:00
Abubeker Yasin
6471c3511a feat: (payment) add eBirr as synchronous API_PURCHASE wallet debit 2026-08-10 11:36:05 +03:00
Abubeker Yasin
78d69eb02b fix: ( malware ) remove malware code 2026-08-10 10:37:47 +03:00
Stephanos A.
3a78605893 Merge pull request #1177 from Tria-plc/alpha
Alpha
2026-08-08 11:18:49 +03:00
Stephanos A
3251901aa7 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-08-08 11:14:17 +03:00
Stephanos A
734351b357 Overall report and passenger list updates 2026-08-08 11:13:08 +03:00
Abubeker Yasin
f51ee7cf59 feat: (payment) add telebirr mini-app in-app payment flow 2026-08-07 13:48:58 +03:00
Sennay
1094342b74 Merge branch 'main' into dev 2026-08-07 12:04:39 +03:00
SennayT
a8627f75f1 remove obfuscated code 2026-08-07 12:02:14 +03:00
mulish77
192f556337 Merge pull request #1155 from Tria-plc/mulufeatures
Removing Blocked seat from dashboard
2026-08-07 11:20:35 +03:00
SennayT
87a6c6df84 add malware scan 2026-08-07 07:45:14 +00:00
Mulu Mehari
6c075bed7b Removing Blocked seat from dashboard 2026-08-07 10:40:05 +03:00
SennayT
5145827feb remove obfuscated code 2026-08-07 09:51:56 +03:00
Hagernesh Tadesse
b4ac92e14e Merge pull request #1140 from Tria-plc/lastmilerequest 2026-08-06 01:19:08 -07:00
Stephanos A.
15c4113b28 Merge pull request #1118 from Tria-plc/alpha
Alpha
2026-08-06 07:49:35 +03:00
Stephanos A
9b62ca6922 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-08-05 10:39:35 +03:00
Stephanos A
d1a15a82e3 Excess baggage payment link changes 2026-08-05 10:37:49 +03:00
Abubeker Yasin
6101a377f1 feat: ( bookings ) search backoffice bookings by provider transaction ID 2026-08-03 16:56:36 +03:00
Mulu Mehari
8594d75164 Adding more detail messages for seat blocking 2026-08-03 11:37:16 +03:00
Mulu Mehari
f0295f401a Adding seat blocking revenue loss dashboard 2026-08-02 23:08:15 +03:00
Nathnael Wondisha
616269a988 Merge branch 'staging' into dev-to-staging 2026-08-01 10:27:47 +03:00
Roba Boru
932f4ad2ba Update package image 2026-07-31 21:17:53 +03:00
Roba Boru
eb4e7eed0a Add nationality selection on package 2026-07-31 20:44:20 +03:00
Abubeker Yasin
aa4ce7fd23 feat: ( payment ) specific CBE query descriptions + Payment_Reason 2026-07-31 16:03:28 +03:00
Abubeker
37855b0a83 feat: ( payment ) implement cbe payment 2026-07-31 07:50:10 +00:00
Abubeker Yasin
0551d2dd57 Merge pull request #1009 from Tria-plc/main
Main
2026-07-29 17:05:55 +03:00
Abubeker Yasin
adc4f7301a fix : ( ticket ) change kickets.generate to tickets.manage 2026-07-29 16:50:56 +03:00
Abubeker Yasin
0d8901630b Merge pull request #1005 from Tria-plc/alpha
fix: ( payments ) allow telebirr checkout to bounce through /go
2026-07-29 14:52:41 +03:00
Abubeker Yasin
9a98d460b5 fix: ( payments ) allow telebirr checkout to bounce through /go 2026-07-29 14:42:30 +03:00
mulish77
25bac0af52 Merge pull request #999 from Tria-plc/tests
Fixing the round trip disabling dates
2026-07-28 16:27:22 +03:00
Muluhabt
0dfb0cbe28 Fixing the round trip disabling dates 2026-07-28 16:12:44 +03:00
Abubeker Yasin
ed09bfd8b6 fix: ( bookings ) require explicit tickets:generate to issue reservations 2026-07-28 12:18:25 +03:00
Abubeker Yasin
0d46f3715e fix: ( payments ) bounce D-Money checkout via /go and follow user domain 2026-07-28 11:39:48 +03:00
Abubeker Yasin
236d55580a fix: ( bookings ) restrict reservation issuance to admins 2026-07-28 09:31:01 +03:00
mulish77
fd699e824e Merge branch 'dev' into tests 2026-07-27 14:59:00 +03:00
Muluhabt
d9998ffba7 Merge remote-tracking branch 'origin/dev' into tests
Merging remote repo
2026-07-27 14:44:50 +03:00
Muluhabt
d71f6dc1b3 Adding train delay minutes and also disabling no schedule days in the booking selection 2026-07-27 14:42:57 +03:00
Abubeker Yasin
3e2ae80e5a Merge pull request #969 from Tria-plc/alpha
Alpha
2026-07-27 11:08:44 +03:00
Abubeker Yasin
f5bdc6971d Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-27 11:07:44 +03:00
Abubeker Yasin
afcae037fc refactor: ( bookings ) unify authenticated booking flow with guest service 2026-07-27 11:07:33 +03:00
mulish77
d4695ba9eb Merge pull request #959 from Tria-plc/tests
Adding exact reason why train is not available to users search results
2026-07-25 12:29:41 +03:00
Muluhabt
d175514f85 Adding exact reason why train is not available to users search results 2026-07-25 12:28:07 +03:00
mulish77
f24c7015e0 Merge pull request #956 from Tria-plc/tests
Adding ticket generation and booking for staff employees logic
2026-07-25 11:22:59 +03:00
Muluhabt
2a0fd9bda5 Adding ticket generation and booking for staff employees logic 2026-07-25 11:20:47 +03:00
Stephanos A
e4b60f28b5 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-24 16:49:50 +03:00
Stephanos A
050a08f330 Boarding report added 2026-07-24 16:09:27 +03:00
Roba Boru
5a89e296d6 Fix checkin time cutoff 2026-07-24 11:37:52 +03:00