Commit Graph

1987 Commits

Author SHA1 Message Date
natib21
ff7e20d2ee fix 2026-07-02 11:22:35 +00:00
natib21
bab329e8e5 fix 2026-07-02 10:57:35 +00:00
natib21
e59a8f9802 fix delete api 2026-07-02 10:54:43 +00:00
natib21
f4f98575f1 fix error 2026-07-02 10:48:31 +00:00
natib21
4519a1d75d fix 2026-07-02 10:33:32 +00:00
natib21
4e4d81479b Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-02 10:27:33 +00:00
natib21
1c88bd8d68 fix 2026-07-02 10:27:01 +00:00
yaschalew
10e442deb1 fix 2026-07-02 13:18:49 +03:00
natib21
e0010695be fix 2026-07-02 09:41:52 +00:00
natib21
07abe9b679 fix 2026-07-02 08:51:21 +00:00
yaschalew
db8ead322c Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-07-02 11:29:27 +03:00
yaschalew
54b2114e7f fix issue 2026-07-02 11:28:56 +03:00
Abubeker Yasin
c349f9e08d Merge pull request #395 from Tria-plc/alpha
Alpha
2026-07-02 10:31:21 +03:00
Abubeker Yasin
d6938df66c feat: ( iam ) add forgot and change password to passenger backoffice 2026-07-02 10:27:08 +03:00
Abubeker Yasin
448e64da02 feat: ( iam ) add Station Master and Ticket Officer roles with positions 2026-07-02 09:38:30 +03:00
yaschalew
8b8a993953 fix conflict 2026-07-02 09:28:02 +03:00
Abubeker Yasin
8f2919f4be Merge branch 'alpha' into passenger/feat/iam 2026-07-02 09:10:37 +03:00
Eyob T.
118ba46930 Merge pull request #394 from Tria-plc/alpha
Added tour package booking
2026-07-01 20:48:38 +03:00
Roba Boru
305e850073 Added tour package booking option 2026-07-01 20:45:40 +03:00
Roba Boru
5bfcde0c40 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-01 19:26:49 +03:00
Nathnael Wondisha
0d41d4bd20 Merge pull request #393 from Tria-plc/freight/feat/invoice
Freight/feat/invoice integration enhancement expiry,payment and booking
2026-07-01 16:18:09 +03:00
ghost2023
2f79178496 fix: booking invoice issue 2026-07-01 16:11:47 +03:00
ghost2023
43d1634823 feat: add payment modal to the invoice detail page 2026-07-01 16:11:32 +03:00
ghost2023
174df0b7aa chore: fix script and add seed company 2026-07-01 15:46:25 +03:00
ghost2023
aef868bc40 fix: the invoice status syncing with booking payment window 2026-07-01 15:46:13 +03:00
Stephanos A
b511da2821 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-01 15:40:33 +03:00
Abubeker Yasin
a1d6d09056 Merge pull request #392 from Tria-plc/alpha
Alpha
2026-07-01 15:30:56 +03:00
Abubeker Yasin
33d90df5a9 feat: ( dmoney ) create redirect page to dmoney 2026-07-01 15:29:49 +03:00
Stephanos A
924cce5716 More production clearances 2026-07-01 15:20:39 +03:00
ghost2023
7e96fa65b9 feat: rm the hardcoded invoice types 2026-07-01 15:10:04 +03:00
Stephanos A
103117d88b Production checklists, issue fixes 2026-07-01 15:04:38 +03:00
ghost2023
1754c18ede fix: apiconfig 2026-07-01 14:46:24 +03:00
ghost2023
fbda15bac8 Merge branch 'dev' into freight/feat/invoice 2026-07-01 14:40:58 +03:00
Nathnael Wondisha
a4b9cf68b5 Merge pull request #391 from Tria-plc/freight/feat/script
Freight/feat/script
2026-07-01 14:39:03 +03:00
ghost2023
b7be6d6229 feat: add the seed schedules 2026-07-01 14:37:47 +03:00
ghost2023
abdf459289 feat: add the seed contracts 2026-07-01 14:26:32 +03:00
Stephanos A
0015f645cf Coach edit related fixes 2026-07-01 13:38:08 +03:00
Eyob T.
a6eb8966e9 Merge pull request #390 from Tria-plc/alpha
Route stops distance and other fixes
2026-07-01 13:37:32 +03:00
Stephanos A
74bdbecefd Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-01 13:32:09 +03:00
Stephanos A
4f1fc6c439 Route stops distance and other fixes 2026-07-01 13:31:31 +03:00
ghost2023
c88c5ee450 chore: setup script 2026-07-01 12:26:37 +03:00
Abubeker Yasin
6a4604ddcd Merge pull request #389 from Tria-plc/alpha
Update dmoney.provider.ts
2026-07-01 12:20:10 +03:00
Abubeker Yasin
f831c164e7 Update dmoney.provider.ts 2026-07-01 12:18:43 +03:00
Abubeker Yasin
61c08eb0dc Merge pull request #388 from Tria-plc/alpha
Update dmoney-webhook.service.ts
2026-07-01 12:09:27 +03:00
Abubeker Yasin
8705b98407 Update dmoney-webhook.service.ts 2026-07-01 12:08:05 +03:00
Abubeker Yasin
46f5207054 Merge branch 'alpha' into passenger/feat/iam 2026-07-01 11:09:43 +03:00
Abubeker Yasin
50b6b7c3ee Merge pull request #387 from Tria-plc/alpha
feat: ( fayda ) use platform-specific Fayda redirect_uri
2026-07-01 10:29:56 +03:00
Abubeker Yasin
3308c775e6 feat: ( fayda ) use platform-specific Fayda redirect_uri 2026-07-01 10:24:42 +03:00
Nathnael
e5aab84f51 feat: ui changes and pdf setup on the clients 2026-07-01 06:56:58 +00:00
Nathnael
94982d3c5a feat: setup pdf on the central billing 2026-07-01 06:25:24 +00:00