Commit Graph

330 Commits

Author SHA1 Message Date
Hagernesh
a8bc5b19de feat(warehouse): fetch all PAID bookings in one call, classified IMPORT/EXPORT by route
- eligibleBookings(direction?) now returns all import+export bookings when direction omitted
  (DOMESTIC excluded); per-direction filter preserved for backward compatibility
- GET /warehouse-inventory/eligible-bookings (no query) returns the combined set
- Frontend: single shared useEligibleBookings() query; both Receive tabs filter client-side
  by route-derived direction, so only one HTTP request fires

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-20 20:15:26 +00:00
Hagernesh
0ab508e377 feat(warehouse): Batch 6 — Export Loaded queue + Dispatch Queue with bulk dispatch
- GET /warehouse-inventory/loaded-export: EXPORT+LOADED items (route-derived direction)
- POST /warehouse-inventory/bulk-dispatch-export: reuses existing dispatch() transition
  (LOADED → DISPATCHED, capacity freed, movement/activity logged); skips non-LOADED/non-EXPORT
- Extracted shared exportInventoryByStatus() helper (readyToLoadExport now delegates to it)
- Frontend LoadedExportTab serves both Loaded (read-only) and Dispatch Queue (dispatchable)
  sub-tabs with Dispatch / Dispatch Selected / Dispatch All + per-row Dispatch
- Replaces "Loaded" and "Dispatch Queue — coming in the next batch" placeholders
- Train/schedule flow (DISPATCHED → IN_TRANSIT) unchanged

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-20 20:04:18 +00:00
Hagernesh
806fc4a8ca feat(warehouse): Batch 5 — Export Ready To Load queue + Auto Load Ready Items
- GET /warehouse-inventory/ready-to-load-export: EXPORT+PASSED+READY_FOR_LOADING items
  with booking details (customer, container, cargo type, route, inspection status)
- Direction filtering via deriveTradeDirection (route-based, not stored field)
- Frontend ReadyToLoadTab: full table (checkbox, booking ref/id, customer, container,
  cargo type, weight, route, inspection status, current status) with selection
- Auto Load Ready Items button reuses existing POST /load-passed-export endpoint
- Replaces "Ready To Load — coming in the next batch" placeholder in Export sub-tabs

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-20 18:03:11 +00:00
Hagernesh
50c6381341 feat(warehouse): Batch 3+4 — export receive-selected label + bulk-mark-inspected workflow
- BulkReceiveModal: Receive Selected shows "received at facility" for EXPORT
- Export inspection: POST /warehouse-inventory/bulk-mark-inspected reuses WarehouseInspectionService.create
- EXPORT items advance to READY_FOR_LOADING after inspection PASSED
- InventoryWorkbench: selection state + "Mark Selected as Inspected" bulk button
- WarehouseInventoryTable: optional Checkbox column for bulk selection
- Route-based direction in eligibleBookings, bulkReceive, getBookingDirection
- New BulkInspectDto; service + controller wired

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-20 17:52:01 +00:00
Hagernesh
b7a831b063 feat(warehouse): route-based receive direction + Export Receive Queue (Batch 2)
- Direction derived from route via existing deriveTradeDirection (eligible-bookings,
  bulk receive guard, getBookingDirection) instead of stored trade_direction
- Export tab sub-tabs (Receive Queue + Ready-to-Load/Loaded/Dispatch placeholders)
- Receive Queue: full column set + per-row Receive; eligible-bookings adds customerId
- create/update warehouse: map DB errors to 400; dashboard: distinct per-status colors

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 10:26:50 +00:00
Hagernesh
0005b2edb3 feat(warehouse): Receive Import/Export tabs with bulk receive + load-passed-export
- Backend: GET eligible-bookings?direction, POST receive-bulk, POST load-passed-export
  (reuse autoUnload/autoLoad patterns; no train-schedule/wagon logic changed)
- Frontend: ReceiveInventoryModal split into Import/Export tabs with eligible PAID
  bookings table, select-all/bulk receive, and Load Passed Export Items button
- Single-booking receive and all existing inventory row actions preserved

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 08:29:59 +00:00
Hagernesh
e40318c847 Dashboard enhancement 2026-06-19 11:29:05 +00:00
Hagernesh
be12a9d496 fee invoice frontend 2026-06-18 00:12:59 +00:00
Hagernesh
01aec12ee9 feat(warehouse): Batch 5 — config-driven allocation + storage/demurrage fee rules
- Allocation rules engine: cargo/container/trade criteria -> deterministic yard/warehouse/zone by code; wired into auto-unload (fallback to default)
- Storage/demurrage fee rules: configurable freeDays + ratePerDay; most-specific match; fee preview per inventory item
- Inventory demurrage timestamps: inspectionStartedAt, inspectionCompletedAt, readyForPickupAt, releaseDate, gateClearedAt
- Migration 1790000000000 (allocation_rules + fee_rules tables + inventory date columns)
- Frontend: Allocation & Fees config page, automatic Fee Preview modal, plumbing/hooks
- No invoice/payment (Batch 6)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-17 23:53:04 +00:00
Hagernesh
89d651693b automation of loading and unloading 2026-06-17 22:33:06 +00:00
Hagernesh
ff79657018 automation 2026-06-17 22:16:01 +00:00
Hagernesh
5a6e1ef363 automation 2026-06-17 22:01:47 +00:00
Hagernesh
5b8cb16c1a automation 2026-06-17 22:00:53 +00:00
Hagernesh
f528b75737 Warehouse 2026-06-17 12:44:57 +00:00
ghost2023
a4a58d264a fix 2026-06-17 13:43:35 +03:00
ghost2023
dcb2de7631 fix: settings page 2026-06-17 13:34:23 +03:00
ghost2023
2a0f16241b fix: improve the setting onboarding flow 2026-06-17 13:17:09 +03:00
ghost2023
e007b28285 fix: type errors 2026-06-17 13:16:06 +03:00
Nathnael Wondisha
cae2848db7 Merge pull request #195 from Tria-plc/freight/feat/portal-fixes
Freight/feat/portal fixes
2026-06-17 11:02:33 +03:00
Nathnael
8b7dcdb897 fixes 2026-06-17 08:00:58 +00:00
Nathnael
24f314150c fix 2026-06-17 08:00:58 +00:00
Nathnael
c59e100e5e style: ui fix in scheduling 2026-06-17 08:00:58 +00:00
Nathnael Wondisha
815c3f4548 Merge branch 'dev' into freight/develop 2026-06-17 10:19:43 +03:00
ghost2023
c96c863070 fix 2026-06-17 10:15:14 +03:00
Nathnael
3919464acb fix: the route direction 2026-06-17 07:14:21 +00:00
Nathnael
4f20b07d81 refactor: the portal dashboard 2026-06-17 07:02:15 +00:00
Nathnael
1ca98f32ea style: improved the review ui 2026-06-17 06:24:03 +00:00
marshal
0b7492c502 Switch API configuration from localhost to production URL in portal and add localhost comment in backoffice 2026-06-17 07:47:09 +03:00
Marshal
2de3f78fb0 Add payments management features including summary and listing, and integrate with the dashboard 2026-06-17 04:35:43 +00:00
Marshal
648f4f2ee4 Add fleet management and admin permissions, and update controllers to enforce new permissions 2026-06-17 01:56:56 +00:00
Marshal
fe679d23d4 Refactor payment method handling and simplify provider options in PaymentMethodModal 2026-06-17 01:19:04 +00:00
Marshal
c76f8648a9 Updated signature handling, added booking detail components, introduced a signature management page, updated routing, enabled document downloads, and simplified the profile page. 2026-06-17 01:02:09 +00:00
Marshal
e65addc619 Add signature menu item and wrap MySignatureCard in a div on ProfilePage 2026-06-17 00:09:28 +00:00
Marshal
7106a549ab Add signature management features for booking contracts
- Implement MySignatureCard component for viewing and updating saved signatures.
- Enhance BookingContractPage to utilize saved signatures for contract signing.
- Introduce hooks for fetching and saving user signatures.
- Update ContractView interface to include saved signature details.
- Create signatures service for API interactions related to user signatures.
2026-06-16 23:06:41 +00:00
Marshal
853c2b2765 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 22:50:01 +00:00
marshal
dbe4983b75 Pin Mantine dependencies to portal's node_modules and optimize dependency pre-bundling to prevent React version conflicts 2026-06-17 01:29:48 +03:00
marshal
b191fe2335 Update Vite configuration to use Vitest for testing, add TypeScript source resolution for types, and deduplicate Mantine dependencies to ensure shared context. 2026-06-17 00:44:39 +03:00
marshal
6d8eb65a36 Add TypeScript type annotations to Vite config and dedupe Mantine dependencies 2026-06-16 23:26:03 +03:00
marshal
e815b4d976 Refactor API base URL configuration to use centralized constant across applications 2026-06-16 23:06:46 +03:00
ghost2023
1861d45f1e feat: add the payment to booking page 2026-06-16 20:38:48 +03:00
ghost2023
f3284a13d0 refactor(workflow): Revamp booking progress stages and status mapping 2026-06-16 20:37:40 +03:00
Marshal
e8c6a2bbd2 Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 15:28:38 +00:00
Marshal
052829c7e6 Add freight demo data seeder and permissions management
- Introduced `DemoFreightDataSeeder` to seed demo freight data including wagons, approval rules, and staff users.
- Added `seed:freight-demo` script to `package.json` for easy execution.
- Updated permissions for operations officer and added permission checks in various components.
- Enhanced sidebar and booking actions to respect user permissions.
2026-06-16 15:28:10 +00:00
marshal
369f2892fb Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 18:13:25 +03:00
marshal
82954b1ec1 Merge pull request #182 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-16 17:31:28 +03:00
Marshal
f6c28635bc add 'My signature' menu item to user menu 2026-06-16 14:26:17 +00:00
Marshal
2d0f5ce6ee changes 2026-06-16 14:17:40 +00:00
yaschalew10
fef2239d39 Merge pull request #181 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-16 17:02:49 +03:00
Marshal
62ce2dc64f Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 13:27:29 +00:00
Marshal
366a335f85 add reusable per-user contract signatures with profile prefill and approval 2026-06-16 13:26:45 +00:00