Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,025 Commits 96 Branches 0 Tags
4aadf588d4436a7a1db6790024176390450c976f
Commit Graph

2025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephanos A
4aadf588d4 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-02 16:23:25 +03:00
Stephanos A
9494d57343 Boarding, ticketing, class fare edit updates 2026-07-02 16:20:15 +03:00
Roba Boru
83eafacee1 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-02 16:08:20 +03:00
Roba Boru
93f2d12d3c Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-02 16:07:46 +03:00
Roba Boru
f2ee62b95f Refine booking flow 2026-07-02 16:03:57 +03:00
Hagernesh Tadesse
a5d7384f59 Merge pull request #404 from Tria-plc/truckassign 
Truckassign

Import: customer can assign truck when there is no last-mile delivery.
Export: customer can assign truck when there is no first-mile pickup.
Other/domestic: customer can assign truck only when neither first nor last mile is selected.
Booking must still be PAID and in an allowed status.
 2026-07-02 16:00:00 +03:00
hagiye
5af45c2643 Customer Truck Assignment and Portal Delivary Approval 2026-07-02 15:54:16 +03:00
Nathnael
03740ee719 fix: types isses 2026-07-02 11:09:25 +00:00
ghost2023
79490d5979 fix 2026-07-02 13:44:20 +03:00
marshal
a1109c6623 Merge pull request #402 from Tria-plc/contrat-backup2 
fix error
 2026-07-02 13:42:17 +03:00
Marshal
7d3eb39625 fix error 2026-07-02 10:40:31 +00:00
ghost2023
cdc2592bc7 fix: script fial 2026-07-02 13:30:09 +03:00
marshal
d169b45c04 Merge pull request #401 from Tria-plc/contrat-backup2 
merg conflict
 2026-07-02 13:25:31 +03:00
Marshal
a0edf3cd7f merg conflict 2026-07-02 10:24:29 +00:00
marshal
be56f43d59 Merge pull request #399 from Tria-plc/contrat-backup2 
Contrat backup2
 2026-07-02 13:17:33 +03:00
Marshal
adddb24033 add public to InternalPaymentController 2026-07-02 10:16:58 +00:00
marshal
7b3f9094ed changes 2026-07-02 13:02:33 +03:00
Nathnael Wondisha
e874de25fe Merge pull request #397 from Tria-plc/feight/fix/ui-ux-issues 
Feight/fix/UI ux issues
 2026-07-02 12:49:07 +03:00
Nathnael
41fc0cabdf fix: duplicate invoice 2026-07-02 09:44:56 +00:00
Nathnael
5aafa436c1 fixes 2026-07-02 09:38:14 +00:00
hagiye
ad9f9de7a8 Truck Assign by customer plus Handover signature on portal 2026-07-02 12:32:18 +03:00
Nathnael
63937db32b fix: update the updateStatus iss 2026-07-02 09:22:25 +00:00
marshal
56bb75c9a8 fix transi permit file upload 2026-07-02 12:22:07 +03:00
Nathnael
602453ff7a fix: invoice based payment on the client 2026-07-02 09:22:07 +00:00
marshal
4fefe4f827 finilize gl 2026-07-02 12:06:17 +03:00
yaschalew10
d324516693 Merge pull request #396 from Tria-plc/freight/feature/first_mile_invoice 
Freight/feature/first mile invoice
 2026-07-02 12:01:26 +03:00
natib21
07abe9b679 fix 2026-07-02 08:51:21 +00:00
ghost2023
1c012ce1e2 refactor(payment): centralize invoice processing with detailed tracking and configurable logging 2026-07-02 11:47:35 +03: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
hagiye
129448e437 frist mile receive to warehouse and last mile truck arrival integration 2026-07-02 01:08:37 +03:00
marshal
9c18d086d7 changes 2026-07-01 20:55:17 +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
hagiye
14a00af341 train gate pass, Telebirr and Wafi 2026-07-01 16:23:52 +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