marshal
1c01c792fc
merge conflict
2026-06-29 12:45:40 +03: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
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
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
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
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
marshal
d0fa4e498c
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-28 22:39:49 +03:00
Marshal
1b37914201
feat: enhance form styling and validation for contract creation
2026-06-28 19:39:26 +00:00
marshal
09a9f87100
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-28 22:09:17 +03:00
marshal
c73ab878e3
changes
2026-06-28 22:08:58 +03:00
Marshal
7af2ecc76e
add clearance history and operations history endpoints, update UI components for history view
2026-06-28 19:08:30 +00:00
marshal
41dfe1f70a
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-28 21:52:23 +03:00
marshal
ee11cb0c35
changes
2026-06-28 21:51:58 +03:00
Marshal
258f1eb45a
feat: implement booking action logic for contracts and enhance RecentContractsSection
2026-06-28 18:50:50 +00:00
Marshal
a34e846d90
add contracts overview tab with KPIs, recent contracts, and charts
...
- Introduced OverviewContractKpisDto and OverviewRecentContractDto for contract metrics.
- Implemented OverviewContractsTabDto to structure the contracts tab response.
- Added contract-related constants for status groupings and pipeline stages.
- Created OverviewContractsTabPanel and OverviewRecentContractsTable components for UI representation.
- Updated OverviewService and OverviewRepository to fetch contract data.
- Integrated contracts tab into OverviewController and OverviewTabContent.
- Added hooks for fetching contracts data in useOverview.
- Updated types in the overview module to include contracts.
- Enhanced the contract detail page with a "View contract" button for generated PDFs.
2026-06-28 17:54:03 +00:00
Marshal
11c7f1bb74
add quantity cap for GENERAL contracts and implement capacity tracking
...
- Updated ContractClearanceService and ContractsController to remove region parameter from queue method.
- Enhanced ContractsRepository to attach contract files for download and added attachContractFiles method.
- Modified ContractsService to persist cargo scope with quantity cap based on contract kind.
- Introduced quantityCap field in CreateContractCargoScopeDto and ContractCargoScope entity.
- Implemented capacity tracking in the frontend with ContractCapacityNotice component to display remaining bookable quantities.
- Updated various components and services to support new capacity features, including hooks and API calls.
- Added migration to include quantity_cap column in contract_cargo_scope table.
2026-06-28 17:32:18 +00:00
