Commit Graph

2675 Commits

Author SHA1 Message Date
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
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
Marshal
e1d54746c2 add GL operations for customs risk assignment, duty advising, and incident reporting 2026-06-28 16:09:45 +00:00
Marshal
7c744352d1 feat: streamline clearance action handling and enhance document upload process 2026-06-28 15:38:35 +00:00
Marshal
2de1c2e7be feat: enhance contract detail page with document grouping and clearance modal
- Added functionality to group contract documents into categories: Contract, Profile, and Clearance.
- Implemented a modal for uploading and managing clearance documents.
- Created a new ActionNeededSection component to display pending customer actions.
- Introduced deriveActionItems function to generate actionable items based on contract and booking statuses.
- Developed ContractClearancePanel for handling clearance document uploads and reviews.
- Added support for ad-hoc document uploads in the clearance panel.
2026-06-28 15:25:22 +00:00
Marshal
da533a488d Refactor file handling to improve URL safety and enhance file viewing capabilities across components 2026-06-28 08:19:21 +00:00
Marshal
b424de8436 Add Public decorator to file streaming endpoint for direct browser access 2026-06-28 08:01:00 +00:00
Marshal
7a2a55d94b Enhance contract clearance features with review timestamps and staff identifiers; improve file handling in controllers and views for better user experience. 2026-06-27 19:30:42 +00:00
Marshal
0ab553bf48 add file viewer functionality across various components
- Implemented a shared file viewer modal using `useFileViewer` hook to allow inline viewing of documents (images, PDFs, videos, etc.) across the application.
- Updated `ContractClearanceReviewSection`, `ContractRequestDetailPage`, `ContractViewPage`, and booking-related components to utilize the new file viewer for document previews.
- Added "Approve all" button in `ContractClearanceReviewSection` to bulk approve documents.
- Enhanced document action buttons to include view and download options based on file type.
- Introduced `isViewable` utility to determine if a file can be previewed inline.
- Created `FileViewer` component to handle rendering of various file types and added appropriate fallback for unsupported formats.
2026-06-27 19:18:43 +00:00
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