marshal
3ad18277ea
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-18 17:04:35 +03:00
marshal
8258429c28
fix: hardcode payment API URL to production endpoint
2026-06-18 15:09:09 +03:00
natib21
58fcf9ce3f
fix data integrity issue
2026-06-18 07:13:08 +00:00
Hagernesh
be12a9d496
fee invoice frontend
2026-06-18 00:12:59 +00:00
Hagernesh
3860d17304
demurrage invoices
2026-06-18 00:05:50 +00:00
Hagernesh
33b74a5da9
demurrage invoices
2026-06-18 00:04:07 +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
270e39edd6
fix: post-merge cleanup after freight/develop merge
...
- Remove orphaned container publish route (service method dropped on develop)
- turbo.json concurrency as string "12" (parse + 11 persistent-task limit)
- database.config: synchronize false (migrations only; fixes weight_limit_rules boot crash)
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com >
2026-06-17 23:04:48 +00:00
Hagernesh
8db8bb1808
automation of loading and unloading
2026-06-17 22:33:51 +00:00
Hagernesh
89d651693b
automation of loading and unloading
2026-06-17 22:33:06 +00:00
Hagernesh
5b8cb16c1a
automation
2026-06-17 22:00:53 +00:00
Hagernesh
1db1467ea1
automated loading and unloading
2026-06-17 21:45:22 +00:00
Marshal
5b9fed57fe
add payment success and failure pages with environment variable support
2026-06-17 17:13:19 +00:00
Marshal
3798b28bcd
implement auto-consolidation for freight bookings at submission time
2026-06-17 16:46:44 +00:00
Marshal
c89f7dcc11
implement PayNowButton component and integrate payment functionality in booking rows
2026-06-17 13:50:57 +00:00
Marshal
7eb6228d31
feat: add shipment tracking feature with live updates
...
- Implemented tracking functionality for bookings, allowing users to track their shipments in real-time.
- Added new API endpoints for fetching tracking data.
- Created a ShipmentTrackingModal component to display tracking information, including current status, checkpoints, and estimated arrival times.
- Enhanced the booking detail view to include tracking options for eligible bookings.
- Updated the train scheduling service to include scheduled departure and arrival times in the response.
- Introduced utility functions for managing tracking stages and statuses.
2026-06-17 13:23:40 +00:00
Hagernesh
f528b75737
Warehouse
2026-06-17 12:44:57 +00:00
Marshal
cd31f3612c
Implement user-based booking access control and enhance booking filtering options
2026-06-17 12:35:29 +00:00
marshal
d7476a51c1
Removed console.log statements and corrected the amount calculation by removing the multiplication by 100.
2026-06-17 14:21:33 +03:00
marshal
2be9b948ba
Switch payment API URL from localhost to production domain in payment client service
2026-06-17 09:31:18 +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
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
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
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
524d3b6418
add reusable per-user contract signatures with profile prefill and approval
2026-06-16 13:34:04 +00:00
Nathnael Wondisha
8777c5e26f
Merge pull request #176 from Tria-plc/freight_feature/priority
...
Freight feature/priority
2026-06-16 16:19:55 +03:00
Nathnael Wondisha
ab3583d9ee
Merge pull request #178 from Tria-plc/freight/fix/fixes
...
Freight/fix/fixes
2026-06-16 16:19:14 +03:00
Nathnael
9afa23cc47
feat: add dashboard summary endpoint and related DTOs for company KPIs
2026-06-16 13:11:56 +00:00
Marshal
64fad99bdc
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 12:21:16 +00:00
Marshal
52a9462228
add booking endpoint for featch payable bookings
2026-06-16 12:20:49 +00:00
marshal
23272f972a
Merge pull request #171 from Tria-plc/freight_feature/priority
...
Freight feature/priority
2026-06-16 13:34:18 +03:00
ghost2023
b6ece994fc
Merge branch 'freight/feat/booking-schedule' into freight/develop
2026-06-16 12:39:56 +03:00
Hagernesh
314e9b79cc
Faciklity add
2026-06-16 09:06:11 +00:00
Marshal
7151bce288
changes
2026-06-16 08:56:52 +00:00
marshal
1f0a642c03
Merge branch 'freight_feature/payments' of github.com:Tria-plc/edr-platform into freight_feature/payments
2026-06-15 16:16:33 +03:00
Marshal
87c6e12fbd
fix allocate bookigns
2026-06-15 13:15:22 +00:00
marshal
0aed9824ae
cac payemnt integration and cbe rate exchange webscrabing
2026-06-15 14:54:20 +03:00
marshal
fe1bed8c4b
payment integration
2026-06-15 11:09:58 +03:00
ghost2023
44aef8c1b3
feat: add more fields to the reference service array
2026-06-15 09:56:59 +03:00
ghost2023
9aecbb6508
feat(booking): Implement train schedule selection and update booking data structures
2026-06-15 09:56:59 +03:00
marshal
484151d909
payments
2026-06-14 15:59:52 +03:00
marshal
87b0ce6339
Replace wagon/locomotive readiness with yard tracking, assign unassigned bookings from origin-yard fleet, standardize rates on USD with CBE ETB conversion, and update fleet/scheduling UI
2026-06-14 02:13:08 +03:00
Marshal
b73bf2154e
add detail batch and allocation monitoring page
2026-06-13 18:28:39 +00:00
Marshal
b2f13c95c5
update window range
2026-06-13 07:59:48 +00:00
Hagernesh
95c6a71438
feat(warehouse): batch 3 — loading, dispatch & train-departure visibility
...
- WarehouseLoading entity + Batch3 migration (wagon loading records)
- wagon-aware load() with validation; dispatch moved to PATCH
- read-only SchedulingReadFacade (schedule/wagon/departure) — never writes scheduling
- new endpoints: GET /warehouse-loadings, loadable-wagons, booking schedule
- Loading Queue / Loaded Inventory / Dispatch Queue pages + routes + sidebar
- FreightVisual illustrations (page heroes + empty states)
- booking detail: loaded/dispatched/wagon + read-only train schedule
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com >
2026-06-12 12:44:40 +00:00
marshal
ef0abf1c41
auto allocation and batch managemnt, tracking the train
2026-06-12 11:42:46 +03:00
