Commit Graph

315 Commits

Author SHA1 Message Date
natib21
8e0cc7d5ee fix: vehicles data extraction in maintenance + financial pages
Both MaintenancePage and FinancialReportsPage were calling
vehiclesService.getAll() but not extracting res.data property.
Result was vehicles being undefined, causing .map error.

Fixed to match FuelPurchasePage pattern:
  const res = await vehiclesService.getAll()
  return res.data || []

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 13:10:47 +00:00
natib21
373c0356f2 feat: maintenance + financial reports frontend
MaintenancePage:
- Schedule maintenance (PREVENTIVE/CORRECTIVE/INSPECTION/REPAIR)
- View upcoming by vehicle
- Modal form with date, cost, provider, notes

FinancialReportsPage:
- Aggregate fuel + maintenance costs
- Period selector (3/6/12 months)
- Cost breakdown (percentages, ring progress)
- Operating insights (purchases, efficiency, items, avg cost)
- Cost per month calculation

Routes:
- /dashboard/maintenance
- /dashboard/financial-reports

Sidebar:
- "Maintenance" in Fleet Management
- "Financial Reports" in Fleet Management

QUERY_KEYS:
- FUEL, MAINTENANCE, FINANCIAL_REPORTS cache patterns

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 12:41:23 +00:00
natib21
f27f00d480 fix: use vehiclesService and add VEHICLES QUERY_KEYS
- Add VEHICLES to QUERY_KEYS constant
- Use vehiclesService.getAll() instead of direct API call
- Remove duplicate Vehicle type definitions
- Fix TypeScript type references

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 10:15:43 +00:00
natib21
3f81bb77ad feat: add fuel management frontend pages
- FuelPurchasePage: Record fuel purchases, calculate total costs
- FuelStatsPage: View fuel consumption stats, efficiency metrics
- Routes: /dashboard/fuel-purchases and /dashboard/fuel-stats
- Sidebar menu items in Fleet Management section

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 10:11:13 +00:00
natib21
360e61ac15 fix: use byId() instead of detail() in QUERY_KEYS
QUERY_KEYS.FIRST_MILE and QUERY_KEYS.LAST_MILE have byId() not detail().

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 04:04:56 +00:00
natib21
0bc9534172 fix: replace apiClient with api in FirstMilePage
Use correct import 'api' from '@/auth/http' instead of undefined 'apiClient'.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 04:03:29 +00:00
natib21
b142552f17 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-06-30 03:46:26 +00:00
natib21
b1d9045d0b fix: remove isPostPaymentCompleted filter check
Property removed from entities until migration creates column.
Temporarily skip this filter until feature is fully implemented.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 03:15:58 +00:00
natib21
d94b73fe02 fix 2026-06-29 15:09:34 +00:00
natib21
9b11eeb623 fix 2026-06-29 14:54:34 +00:00
natib21
6fa315db0f fix 2026-06-29 14:45:22 +00:00
Nathnael Wondisha
4cf8e89780 Merge branch 'dev' into freight/feat/invoice 2026-06-29 17:24:29 +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
835facc65a fix 2026-06-29 11:12:51 +00:00
Nathnael
c37e8acfdc Merge branch 'dev' into freight/feat/invoice 2026-06-29 10:58:12 +00:00
hagiye
9176df5e4b Marshaling document Receive Export and import handover to customer 2026-06-29 13:48:58 +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
natib21
fc03e27bdc fix 2026-06-29 09:43:31 +00:00
natib21
9f0d16886d fix 2026-06-29 09:33:56 +00:00
natib21
31b38311ff fix 2026-06-29 09:30:44 +00: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
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
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
aeb5e0046e implement Global Logistics booking process for customs contracts and enhance contract document handling 2026-06-29 08:08:10 +00: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
d6ae1ac18d implement BookingsManager component for managing batch bookings with search and filter functionality 2026-06-28 22:23:51 +00: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
f45d260c53 enhance contract clearance details with service type and customs information 2026-06-28 21:34:06 +00:00
Marshal
006b4226e8 update navigation paths for contract clearance pages 2026-06-28 21:15:10 +00:00
Marshal
01172daaa5 feat: enhance contract clearance functionality and UI, update routing and status handling 2026-06-28 21:02:37 +00: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
7af2ecc76e add clearance history and operations history endpoints, update UI components for history view 2026-06-28 19:08:30 +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
da533a488d Refactor file handling to improve URL safety and enhance file viewing capabilities across components 2026-06-28 08:19:21 +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
9112e70400 Merge branch 'dev' of github.com:Tria-plc/edr-platform into Interchange 2026-06-27 21:05:20 +03:00