Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 21:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,012 Commits 96 Branches 0 Tags
71e1ab98f4812b18f74b04487cbf45490c54750c
Commit Graph

2012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yaschalew
71e1ab98f4 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-02 17:37:54 +03:00
natib21
b7da024968 fix 2026-07-02 14:37:38 +00:00
yaschalew
9198fcd3e7 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-02 17:34:40 +03:00
natib21
2424e96e74 fix 2026-07-02 14:34:22 +00:00
yaschalew
60eba409ae Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-02 17:27:25 +03:00
natib21
e5fed081fc fix 2026-07-02 14:27:09 +00:00
yaschalew
86090d5c37 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-02 17:19:09 +03:00
natib21
7d85f5dc2e fix 2026-07-02 14:18:53 +00:00
yaschalew
8f152466e8 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-02 17:14:31 +03:00
natib21
c2c29f0735 fix 2026-07-02 14:14:13 +00:00
yaschalew
245dd2da88 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-02 17:07:04 +03:00
natib21
34b87bbcee fix 2026-07-02 14:06:45 +00:00
yaschalew
86b1534ed4 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-02 16:56:04 +03:00
yaschalew
fb8dcb0217 fix 2026-07-02 16:55:51 +03:00
natib21
7f6c9c6313 fix 2026-07-02 13:55:08 +00:00
natib21
d8f1ed8899 fix issue 2026-07-02 13:44:19 +00:00
natib21
1869790eab fix 2026-07-02 13:18:34 +00:00
natib21
e429a2cebf fix 2026-07-02 13:15:44 +00:00
natib21
64e346324b fix issue 2026-07-02 13:11:12 +00:00
natib21
c8b7d76073 fix 2026-07-02 12:50:49 +00:00
natib21
43a32f192f fix 2026-07-02 12:47:10 +00:00
natib21
58b3805d0b fix 2026-07-02 12:43:03 +00:00
natib21
657f3bd2ab fix 2026-07-02 12:39:47 +00:00
natib21
a0f4de05f8 log full error 2026-07-02 12:37:02 +00:00
natib21
adde596289 fix 2026-07-02 11:32:16 +00:00
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