Commit Graph

2913 Commits

Author SHA1 Message Date
Marshal
e977893888 Implement comprehensive Global Logistics workflow for Unimodal Export and Import processes, including contract verification, documentation submission, compliance management, customs clearance, payment settlement, and last-mile transport handling. 2026-06-27 18:54:03 +00:00
hagiye
2a038c59db Import operation gate pass 2026-06-27 21:22:18 +03:00
hagiye
19e395abf6 Import operation gate pass 2026-06-27 21:13:53 +03:00
hagiye
9112e70400 Merge branch 'dev' of github.com:Tria-plc/edr-platform into Interchange 2026-06-27 21:05:20 +03:00
hagiye
fee4365b70 Import operation gate pass 2026-06-27 21:04:27 +03:00
Marshal
0a23ade118 enhance contract management features
- Update ContractActionsToolbar to streamline contract generation and signing processes.
- Introduce getStaffRowAction for improved action handling in contract list rows.
- Implement auto-generation of contracts upon final approval in useContracts hook.
- Refactor BookingDetailPage to remove unnecessary container type property.
- Add action buttons in ContractRequestsPage for better user interaction.
- Simplify container types configuration in resources.
- Remove unused properties from booking types.
- Introduce ContractViewPage for staff and customer contract signing.
- Enhance NewContractPage to validate document uploads before proceeding.
- Improve StepDocuments to ensure required documents are uploaded.
2026-06-27 17:38:26 +00:00
Marshal
3dff7ec189 Refactor contract form steps and improve UI components
- Updated Step 3: Cargo Scope to use Select and MultiSelect components for better user experience.
- Simplified loading states and improved layout in Step 4: Route.
- Enhanced Step 8: Review with a new SummaryItem component for better readability and organization.
- Adjusted navigation labels in payment pages to reflect contracts instead of bookings.
- Introduced RecentContractsSection component to display recent contracts with improved UI and functionality.
- Added clamping logic for step navigation in useContractDraft to handle older drafts.
2026-06-27 17:09:01 +00:00
yaschalew10
5c94a8648e Merge pull request #320 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-27 18:09:19 +03:00
natib21
9d3faf450f fix 2026-06-27 15:06:49 +00:00
natib21
970d02c8db fix 2026-06-27 15:02:04 +00:00
natib21
8c7f03c722 fix 2026-06-27 14:57:17 +00:00
natib21
8c82699699 fix 2026-06-27 14:40:29 +00:00
natib21
f5eaa87564 fix ui 2026-06-27 14:15:14 +00:00
natib21
df34a91e61 fix 2026-06-27 13:32:09 +00:00
yaschalew10
0d6d394fca Merge pull request #319 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-27 16:21:05 +03:00
natib21
2d962d79d8 fix 2026-06-27 11:00:28 +00:00
hagiye
3441ee4a0a interchange document generation and acknowledgement 2026-06-27 13:49:41 +03:00
hagiye
3decc9aeea interchange document generation and acknowledgement 2026-06-27 13:39:42 +03:00
natib21
de0e9e8c9c fix status update 2026-06-27 10:29:16 +00:00
yaschalew
421806e282 fix um 2026-06-27 12:54:57 +03:00
Nathnael
db305d6fcd chore: add company select to backoffice booking 2026-06-27 09:16:39 +00:00
Nathnael
98e34593c4 feat: add government support to the companies. add seeding and constrain on booking 2026-06-27 09:08:15 +00:00
natib21
92df6c427c fix 2026-06-27 09:07:28 +00:00
Nathnael
55c42058d0 chore: updating billing logic 2026-06-27 08:42:18 +00:00
natib21
cc0e6e7d87 :Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-27 08:30:29 +00:00
natib21
657e0bffc3 fix ui 2026-06-27 08:30:01 +00:00
Nathnael
1e27b96708 chore: setup migration for invoice 2026-06-27 07:18:50 +00:00
yaschalew
f8aa3b3968 fix 2026-06-27 10:02:05 +03:00
yaschalew
9ba520b6d8 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-27 09:30:09 +03:00
yaschalew
9f85d45b17 add package 2026-06-27 09:29:48 +03:00
Nathnael Wondisha
a652a0f2a1 Merge pull request #306 from Tria-plc/freight/fix/file-syncing
file syncing and some improvement to the onboarding
2026-06-27 09:29:19 +03:00
yaschalew10
7e3332156b Merge pull request #313 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-27 08:20:13 +03:00
yaschalew
33469801b7 resolve conflict 2026-06-27 08:14:05 +03:00
Eyob T.
3ecbc88fbb Merge pull request #311 from Tria-plc/alpha
Update fare display, notification for guest user and fix seat allocation
2026-06-27 08:11:58 +03:00
yaschalew
2373e0b8a4 user module 2026-06-27 08:11:06 +03:00
natib21
a013fe1c48 add health check 2026-06-27 05:07:11 +00:00
Roba Boru
81ae99cee3 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-27 07:16:31 +03:00
Roba Boru
c50abbffaa Update fare display based on currency and fix seat allocation 2026-06-27 07:16:08 +03:00
hagiye
d726927453 Notification for demurrage and invoice fee 2026-06-27 05:33:58 +03:00
hagiye
11803763b0 Invoice and clearance seal approval 2026-06-27 05:11:44 +03:00
hagiye
108d91b5fa Invoice and clearance seal approval 2026-06-27 04:58:21 +03:00
Roba Boru
d86cfa43ea Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-27 04:28:48 +03:00
hagiye
fafa64e4db Warehouse receiving for export and GRN generation 2026-06-27 04:20:23 +03:00
hagiye
15be978c42 Warehouse receiving for export and GRN generation 2026-06-27 04:19:32 +03:00
hagiye
6860b891f7 Interchange document 2026-06-27 02:27:40 +03:00
Marshal
01d53c218c contrat,booking,global logestic 2026-06-26 23:24:48 +00:00
Marshal
f931342f31 add contract management types and interfaces for freight contracts 2026-06-26 23:20:20 +00:00
hagiye
29bdf68742 Invoice and clearance seal approval 2026-06-27 01:22:14 +03:00
hagiye
b2b668a392 Invoice and clearance seal approval 2026-06-27 01:13:25 +03:00
hagiye
8005282f9e Invoice and clearance seal approval 2026-06-27 00:39:48 +03:00