Nathnael
f7f0f6aef3
fix: update the invoice generation to the new booking creation
2026-06-29 13:45:35 +00:00
Nathnael
662d96571e
fix
2026-06-29 11:14:42 +00:00
Nathnael
c37e8acfdc
Merge branch 'dev' into freight/feat/invoice
2026-06-29 10:58:12 +00:00
Eyob T.
580b484882
Merge pull request #329 from Tria-plc/alpha
...
Migration fix
2026-06-29 13:37:21 +03:00
marshal
943a986b05
Merge pull request #332 from Tria-plc/freight_feature/contrat
...
Freight feature/contrat
2026-06-29 13:36:14 +03:00
Marshal
1c170ec790
remove unused import for PackageCheck in step2-service-type.tsx
2026-06-29 10:34:40 +00:00
Marshal
15a19053d9
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-29 10:27:16 +00:00
Marshal
6be461bb2f
add profile creation flow with license upload in NewContractPage
2026-06-29 10:25:06 +00:00
marshal
bdca3a1e8d
Merge pull request #331 from Tria-plc/freight_feature/contrat
...
merge conflict
2026-06-29 12:52:50 +03:00
marshal
9fe90c8ef7
merge conflict
2026-06-29 12:50:47 +03:00
Nathnael
2551f76f8a
fix: reference type in payment and billing
2026-06-29 09:50:29 +00:00
marshal
7f63d4bd2b
Merge pull request #330 from Tria-plc/freight_feature/contrat
...
Freight feature/contrat
2026-06-29 12:49:33 +03:00
marshal
1c01c792fc
merge conflict
2026-06-29 12:45:40 +03:00
Stephanos A
7de3ec45e1
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-06-29 12:43:37 +03:00
natib21
fc03e27bdc
fix
2026-06-29 09:43:31 +00:00
Stephanos A
f8810253ff
Migration fix
2026-06-29 12:42:37 +03:00
natib21
9f0d16886d
fix
2026-06-29 09:33:56 +00:00
marshal
2ad384e63b
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-29 12:31:21 +03:00
Marshal
0f7cac2b68
add booking request functionality for GENERAL customs contracts
...
- Create migration for booking_requests table with necessary fields and indexes.
- Implement BookingRequestRepository for database operations related to booking requests.
- Develop BookingRequestService to handle business logic for submitting, accepting, rejecting, and canceling booking requests.
- Create DTOs for creating booking requests and reviewing them.
- Define BookingRequest entity to map to the booking_requests table.
- Add UI components for managing shipment requests, including detail and list pages.
- Implement OperationDatePicker component for selecting available shipment days.
2026-06-29 09:30:44 +00:00
natib21
31b38311ff
fix
2026-06-29 09:30:44 +00:00
natib21
4a7503a667
fix
2026-06-29 09:27:43 +00:00
Nathnael
4be4286fbf
feat: rewired up the billing and payment with the booking
2026-06-29 09:25:46 +00:00
natib21
9d7d08cf5d
fix
2026-06-29 09:24:45 +00:00
natib21
6aad868fb2
fix
2026-06-29 09:20:37 +00:00
natib21
8728347642
fix
2026-06-29 09:16:03 +00:00
natib21
8a8a1b7316
fix
2026-06-29 09:11:48 +00:00
natib21
6607fda5fd
fix
2026-06-29 08:57:34 +00: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
natib21
17ee6ea292
fix
2026-06-29 08:49:36 +00:00
natib21
0d922a132f
fix
2026-06-29 08:46:03 +00: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
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
yaschalew
a64e335be6
fix ui
2026-06-29 10:09:26 +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
