Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 22:30:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,726 Commits 96 Branches 0 Tags
aac790292beb7e3a7cb1978f929343cfa9ea6307
Commit Graph

1293 Commits

Author SHA1 Message Date
natib21
aac790292b Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 12:15:53 +00:00
natib21
a64e531324 fix 2026-06-29 12:15:30 +00:00
marshal
d22fb6bb22 Merge pull request #338 from Tria-plc/freight_feature/contrat 
payemnt
 2026-06-29 15:10:57 +03:00
yaschalew
75ff175538 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 15:09:20 +03:00
marshal
a83a686f37 payemnt 2026-06-29 15:09:19 +03:00
marshal
f958a7639a Merge pull request #336 from Tria-plc/freight_feature/contrat 
payemnt
 2026-06-29 15:08:50 +03:00
natib21
b22ab739db fix 2026-06-29 12:08:16 +00:00
marshal
09e1429c38 payemnt 2026-06-29 15:08:12 +03:00
marshal
1795bb8830 Merge pull request #335 from Tria-plc/freight_feature/contrat 
Freight feature/contrat
 2026-06-29 15:07:25 +03:00
marshal
211301b7ce Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 15:06:23 +03:00
marshal
b688a76550 payemnt 2026-06-29 15:05:50 +03:00
marshal
1491db304b payemnt 2026-06-29 15:04:01 +03:00
yaschalew10
db7f0cb601 Merge pull request #334 from Tria-plc/freight/feature/last_mile_invoice 
Freight/feature/last mile invoice
 2026-06-29 15:03:00 +03:00
natib21
5c36c09dae fix 2026-06-29 12:01:19 +00:00
natib21
835facc65a fix 2026-06-29 11:12:51 +00:00
hagiye
64cab3ecd0 Merge branch 'dev' of github.com:Tria-plc/edr-platform into handover 2026-06-29 13:49:25 +03:00
hagiye
9176df5e4b Marshaling document Receive Export and import handover to customer 2026-06-29 13:48:58 +03: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
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
natib21
9d7d08cf5d fix 2026-06-29 09:24:45 +00:00
hagiye
d55f9312bf Marshaling document Receive Export and import handover to customer 2026-06-29 12:24:14 +03: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
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