Nathnael
c6179c046c
feat(wip): up the settings onboaridng flow
2026-06-18 14:45:14 +00:00
Marshal
30bfc84f8f
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-18 14:13:50 +00:00
Marshal
421e0266bc
feat(train-scheduling): implement day-level booking pool
...
- Added `unplaced` method in `BookingNotifierService` to log warnings for bookings that cannot be placed on any train.
- Introduced `getAvailableDays` method in `TrainSchedulingService` to retrieve distinct days with open departures for a given route.
- Created `AvailableDaysQueryDto` for querying available days based on origin and destination yards.
- Updated `TrainSchedulingController` to expose an endpoint for available days.
- Modified frontend components to support day-level booking, allowing customers to select only a day without pinning to a specific train.
- Removed references to train schedules in booking forms and review steps, emphasizing day selection.
- Added a database migration to create an index for efficient querying of bookings by route and day.
2026-06-18 14:12:46 +00:00
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
ghost2023
e9149242b2
feat: setup the company profiles
2026-06-18 16:38:46 +03:00
ghost2023
f3be5e3d84
feat(company): introduce CompanyProfile entity for detailed company roles
2026-06-18 15:32:44 +03:00
marshal
8258429c28
fix: hardcode payment API URL to production endpoint
2026-06-18 15:09:09 +03:00
ghost2023
cd1fa385a3
refactor: rm the unused ff client stuff
2026-06-18 14:46:11 +03:00
ghost2023
81a495ec61
refactor: cut off the old customre entity
2026-06-18 14:41:16 +03:00
natib21
f1c2943854
driver
2026-06-18 09:51:31 +00:00
yaschalew
3352333bef
fix
2026-06-18 12:49:47 +03:00
natib21
fc702f0fbe
driver
2026-06-18 09:46:35 +00:00
yaschalew
4b46c44147
fix
2026-06-18 12:33:45 +03:00
yaschalew
5c070d239e
fix save
2026-06-18 12:32:44 +03:00
natib21
398bc9330e
fix migration
2026-06-18 09:11:10 +00:00
marshal
aef1214d1e
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-18 10:29:42 +03:00
Marshal
62038458f8
refactor: disable demo data seeders while retaining for easy re-enabling
2026-06-18 07:27:57 +00:00
natib21
58fcf9ce3f
fix data integrity issue
2026-06-18 07:13:08 +00:00
Marshal
16bb0b5246
changes
2026-06-18 06:58:01 +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
853c2b2765
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 22:50:01 +00:00
Stephanos A.
7a00955588
Revert "fix: add lockfile corruption handling to CI/CD and Dockerfiles"
2026-06-16 21:58:26 +03:00
Eyob T.
eb7db6db21
Merge pull request #187 from Tria-plc/alpha
...
fix: add lockfile corruption handling to CI/CD and Dockerfiles
2026-06-16 21:48:40 +03:00
Stephanos A
560aff222b
fix: add lockfile corruption handling to CI/CD and Dockerfiles
2026-06-16 21:40:01 +03:00
natib21
018ae5e059
fix prod issue
2026-06-16 16:39:29 +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
82954b1ec1
Merge pull request #182 from Tria-plc/freight_feature/priority
...
Freight feature/priority
2026-06-16 17:31:28 +03:00
marshal
ea9b9c7346
Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority
2026-06-16 17:20:31 +03:00
Marshal
2d0f5ce6ee
changes
2026-06-16 14:17:40 +00:00
