Commit Graph

1833 Commits

Author SHA1 Message Date
yaschalew
d970cfb08f Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 11:57:54 +03:00
natib21
6607fda5fd fix 2026-06-29 08:57:34 +00:00
yaschalew
397a36cd8d Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 11:56:03 +03:00
natib21
8bb1cb18b5 fix 2026-06-29 08:55:40 +00:00
Abubeker Yasin
b70e9ea2cd feat: ( payments ) convert ETB to method currency before charging 2026-06-29 11:55:31 +03:00
yaschalew10
f3e27fb607 Merge pull request #326 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-29 11:53:31 +03:00
yaschalew
cdba937a9f Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 11:49:56 +03:00
natib21
17ee6ea292 fix 2026-06-29 08:49:36 +00:00
yaschalew
bee842bac5 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 11:47:04 +03:00
natib21
0d922a132f fix 2026-06-29 08:46:03 +00:00
yaschalew
fcad1b7fac Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 11:40:42 +03:00
yaschalew
18fb16f741 fix 2026-06-29 11:40:14 +03:00
natib21
40320d247a fix 2026-06-29 08:37:48 +00:00
Nathnael
9cd24d9b51 feat(WIP): Wire up the invoice with the booking. 2026-06-29 08:29:07 +00:00
Nathnael
36711eace4 chore: type updates on the billing service 2026-06-29 08:28:12 +00:00
marshal
95af66f547 changes 2026-06-29 11:11:44 +03:00
marshal
8b80415d8c Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 11:08:43 +03:00
Marshal
aeb5e0046e implement Global Logistics booking process for customs contracts and enhance contract document handling 2026-06-29 08:08:10 +00:00
Yonas Tewabe
86c51574b9 Update deploy.yml 2026-06-29 10:36:33 +03:00
Yonas Tewabe
0f33076b4c Update Dockerfile 2026-06-29 10:35:28 +03:00
Yonas Tewabe
6e3d2bc0d2 Refactor Dockerfile for separate migration and seed process
Updated Dockerfile to change the startup process for the API. Migrations and seeding now run separately in CI before deployment.
2026-06-29 10:34:47 +03:00
Nathnael
1da5af94ab feat: scoped the payables by type 2026-06-29 07:32:42 +00:00
Nathnael
5bad245ce8 feat: setup billing services 2026-06-29 07:11:52 +00:00
yaschalew10
3a0b34d3b6 Merge pull request #325 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-29 10:11:21 +03:00
yaschalew
fadc98056d Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 10:10:43 +03:00
yaschalew
a64e335be6 fix ui 2026-06-29 10:09:26 +03:00
yaschalew
3b380a5bb3 fix um 2026-06-29 10:08:33 +03:00
yaschalew10
82a249e582 Merge pull request #324 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-29 09:50:49 +03:00
yaschalew
48a3dbb12c Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 09:49:08 +03:00
yaschalew
382c9c4b80 fix 2026-06-29 09:48:41 +03:00
Eyob T.
334755432d Merge pull request #323 from Tria-plc/alpha
Boarding, payment methods, journey direction on seat hold, and more updates
2026-06-29 08:52:28 +03:00
Stephanos A
c6e56d1c4f Boarding, payment methods, journey direction on seat hold, and more updates 2026-06-29 08:44:38 +03:00
marshal
418ba10858 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 02:55:27 +03:00
Marshal
4be4cc9054 feat: implement first and last mile trucking pricing logic in booking and contract services 2026-06-28 23:54:51 +00:00
marshal
1b8a765ee4 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 02:40:02 +03:00
Marshal
947dcbed3d ui on new contrat page 2026-06-28 23:39:35 +00:00
marshal
0dc553d06d Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 02:03:05 +03:00
Marshal
47c91cad03 feat: enhance locomotive creation and management with optional code generation and default max pull weight 2026-06-28 23:02:40 +00:00
marshal
bd3f4553b8 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 01:24:16 +03:00
Marshal
d6ae1ac18d implement BookingsManager component for managing batch bookings with search and filter functionality 2026-06-28 22:23:51 +00:00
marshal
9863f6b951 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 00:48:00 +03:00
Marshal
506b269207 update booking process for customs clearance contracts, allowing customers to create bookings post-clearance finalization 2026-06-28 21:47:40 +00:00
marshal
aa104d0264 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 00:34:21 +03:00
Marshal
f45d260c53 enhance contract clearance details with service type and customs information 2026-06-28 21:34:06 +00:00
marshal
8d6b7f3391 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 00:15:34 +03:00
Marshal
006b4226e8 update navigation paths for contract clearance pages 2026-06-28 21:15:10 +00:00
marshal
4489658f12 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 00:03:01 +03:00
Marshal
01172daaa5 feat: enhance contract clearance functionality and UI, update routing and status handling 2026-06-28 21:02:37 +00:00
marshal
aaa9b8f994 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-28 23:13:13 +03:00
Marshal
fc1adce909 feat: implement PDF regeneration for contracts and enhance document upload handling in clearance sections 2026-06-28 20:12:45 +00:00