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
marshal
7f63d4bd2b
Merge pull request #330 from Tria-plc/freight_feature/contrat
...
Freight feature/contrat
2026-06-29 12:49:33 +03:00
marshal
160840a22f
merge conflict
2026-06-29 12:46:56 +03:00
yaschalew10
750577d72b
Merge pull request #328 from Tria-plc/freight/feature/vehicle_2
...
Freight/feature/vehicle 2
2026-06-29 12:46:13 +03:00
marshal
1c01c792fc
merge conflict
2026-06-29 12:45:40 +03:00
natib21
69e5359783
:wqMerge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-29 09:43:56 +00: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
yaschalew10
1225990a69
Merge pull request #327 from Tria-plc/freight/feature/vehicle_2
...
Freight/feature/vehicle 2
2026-06-29 12:38:16 +03:00
yaschalew
b95bd76774
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-29 12:37:28 +03:00
yaschalew
0ad399cdc5
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-29 12:34:15 +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
yaschalew
be2f59beff
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-29 12:31:05 +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
yaschalew
b23066006f
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-29 12:28:07 +03:00
natib21
4a7503a667
fix
2026-06-29 09:27:43 +00:00
yaschalew
ef0b4d389c
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-29 12:25:23 +03:00
natib21
9d7d08cf5d
fix
2026-06-29 09:24:45 +00:00
yaschalew
f3ad44bf11
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-29 12:20:59 +03:00
natib21
6aad868fb2
fix
2026-06-29 09:20:37 +00:00
yaschalew
09e4501708
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-29 12:16:24 +03:00
natib21
8728347642
fix
2026-06-29 09:16:03 +00:00
yaschalew
7841c5c2b5
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-29 12:12:07 +03:00
natib21
8a8a1b7316
fix
2026-06-29 09:11:48 +00:00
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
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
