Hagernesh
33956d07dc
Fix customer_truck_containers status
2026-07-08 13:56:56 +00:00
Nathnael Wondisha
90a2416dcf
Merge pull request #540 from Tria-plc/freight/feat/fixes-v1
...
Added a changes approval system to the customer data and fix various things
2026-07-08 14:09:15 +03:00
Hagernesh
80904eeeb2
Handover SIGN notification, resending until signed no exit before sign
2026-07-08 09:33:19 +00:00
Nathnael
3bc4514b04
feat: implemented the changes request to the company profile to backoffice
2026-07-08 08:07:10 +00:00
Marshal
94904ea6d0
resolve conflict
2026-07-07 21:46:25 +00:00
Marshal
f300600bfa
changes
2026-07-07 12:28:47 +00:00
marshal
2a8d514b98
Merge pull request #503 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-07-07 12:05:49 +03:00
Hagernesh
48b36a2621
Merge remote-tracking branch 'origin/dev' into Truckdetantion
2026-07-07 08:49:20 +00:00
Marshal
75f30e2054
Add reject step functionality to contract approval process
...
- Implemented rejection handling in ContractApprovalStepsCard with a modal for rejection reasons.
- Updated useContractMutations to include rejectStep mutation.
- Added REJECT_STEP URL constant for API integration.
- Enhanced ContractClearanceDetailPage to utilize linkedBookingId for improved booking handling.
2026-07-07 08:46:31 +00:00
Hagernesh
392038852e
Truck detention on lastmile
2026-07-07 08:45:51 +00:00
natib21
fdd7b1711e
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-07 08:33:25 +00:00
natib21
75427ea63a
fix tracker
2026-07-07 06:39:02 +00:00
Hagernesh Tadesse
8b5ba8415f
Merge pull request #494 from Tria-plc/PertruckExit
...
Export Loading to train
2026-07-06 22:21:03 +03:00
Hagernesh
bc47a42e1e
export loading
2026-07-06 18:53:25 +00:00
natib21
42710261e2
fix
2026-07-06 13:49:30 +00:00
Hagernesh
692d9074d0
feat: container/bulk items datatable on warehouse view details
...
Adds a per-container/bulk items view for a booking with derived lifecycle
stage (PENDING -> RECEIVED -> GRN -> LOADED -> LEFT -> DELIVERED) and reference
badges (booking, contract, last-mile). Backend containerItems() aggregates
booking_container_units + customer_truck_containers + inventory; exposed at
GET warehouse-inventory/bookings/:id/container-items.
Frontend ContainerItemsModal (opened from the View Details eye): stage tabs
with counts, ref columns, checkbox multiselect of loadable items -> pick truck
-> load (Truck_dispatch), and per-row per-truck Exit Paper.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com >
2026-07-06 13:46:16 +00:00
marshal
1531c16d1a
Merge pull request #491 from Tria-plc/freight_feature/usermanagement
...
implement intercity booking management and booking window websocket i…
2026-07-06 16:44:56 +03:00
Marshal
fed5f2f43f
implement intercity booking management and booking window websocket integration
2026-07-06 13:28:21 +00:00
Hagernesh
756ad73e9c
pERTRUCK EXIT
2026-07-06 13:16:34 +00:00
Hagernesh
551a5fdeed
list trucks + loadable containers → load)
2026-07-06 12:40:34 +00:00
Hagernesh
fe9503638b
separte handover edr lastmile and customer last mile flow
2026-07-06 12:27:58 +00:00
natib21
fb4ffa5d67
fix
2026-07-06 12:23:25 +00:00
natib21
6b0db45be2
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-06 12:06:22 +00:00
natib21
998a6801ab
fleet
2026-07-06 12:05:52 +00:00
Marshal
3485a7d63d
add loading confirmation for import-Djibouti trains before dispatch
2026-07-05 21:07:03 +00:00
Marshal
1433796db0
add loading status management for bookings
2026-07-05 19:56:21 +00:00
Marshal
3e2299960a
add script to seed freight contracts across flow variants
2026-07-05 18:06:24 +00:00
Marshal
3447394e32
add bookings management and settings
2026-07-05 10:22:58 +00:00
marshal
4f31794abd
Merge pull request #458 from Tria-plc/freight_feature/usermanagement
...
refactor: remove gate pass granting logic from clearance services and UI
2026-07-04 10:45:22 +03:00
Marshal
145240d3bd
refactor: remove gate pass granting logic from clearance services and UI
...
- Removed the gate pass granting functionality from the BookingClearanceService and ContractClearanceService, replacing it with a new method to retrieve gate pass status from train schedules.
- Updated the ContractsController to eliminate endpoints related to gate pass granting.
- Refactored the UI components (ExportClearanceStepper and PhasedClearanceActionPanel) to reflect the new gate pass securing process, linking to the train scheduling interface instead.
- Cleaned up related constants and query hooks, removing unused code and references to the gate pass functionality.
- Adjusted types in the contracts to accommodate changes in the gate pass handling logic.
2026-07-04 07:43:03 +00:00
natib21
9d3efe7f15
fix
2026-07-04 03:47:36 +00:00
natib21
2e31fd12e1
fix
2026-07-04 02:26:19 +00:00
natib21
bd88424167
fix
2026-07-04 01:47:28 +00:00
natib21
58c49d34b2
fix
2026-07-04 01:31:08 +00:00
marshal
82cefc63d2
Merge pull request #442 from Tria-plc/freight_feature/usermanagement
...
add hard capacity ceiling to weight limit rules
2026-07-04 04:13:01 +03:00
Marshal
8ea2c8e95a
add hard capacity ceiling to weight limit rules
2026-07-04 01:11:23 +00:00
marshal
21d8b44518
Merge pull request #440 from Tria-plc/freight_feature/usermanagement
...
enhance booking windows section with pagination and improved UI
2026-07-04 03:43:46 +03:00
Marshal
97cc9d76b1
enhance booking windows section with pagination and improved UI
2026-07-04 00:41:28 +00:00
yaschalew10
ee3657467d
Merge pull request #435 from Tria-plc/freight/feature/first_mile_invoice
...
Freight/feature/first mile invoice
2026-07-04 01:57:06 +03:00
natib21
1d8f095831
fix
2026-07-03 22:43:45 +00:00
natib21
7155ec7e01
mile
2026-07-03 20:59:21 +00:00
natib21
4ddf03e357
mile
2026-07-03 20:43:26 +00:00
natib21
16bd7fabcc
mile
2026-07-03 20:21:16 +00:00
natib21
77dc14f6a5
mile
2026-07-03 20:00:41 +00:00
yaschalew10
aeb8095809
Merge pull request #431 from Tria-plc/freight/feature/first_mile_invoice
...
Freight/feature/first mile invoice
2026-07-03 22:59:10 +03:00
natib21
8d17d9111e
mile
2026-07-03 19:44:27 +00:00
yaschalew10
dc9e54764e
Merge pull request #430 from Tria-plc/freight/feature/first_mile_invoice
...
mile
2026-07-03 22:22:42 +03:00
natib21
a1dfb439ff
mile
2026-07-03 19:17:45 +00:00
Marshal
ff9cb4e6cd
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement
2026-07-03 18:48:18 +00:00
natib21
e893af8133
fix
2026-07-03 15:22:51 +00:00
