Commit Graph

1910 Commits

Author SHA1 Message Date
natib21
b300fd1de5 user permition 2026-07-07 10:00:48 +00:00
natib21
ffff212187 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-07 09:09:10 +00:00
natib21
00c5c4b67b fix 2026-07-07 09:07:28 +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
Marshal
f4d28e77fa Implement reject step functionality for contract approval process and enhance contract editing experience 2026-07-07 08:56:44 +00: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
5a7133b599 fix 2026-07-07 08:42:01 +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
811c1b7a54 fix icon 2026-07-07 08:24:18 +00:00
natib21
ba895e4ba4 add tracker 2026-07-07 08:19:30 +00:00
marshal
b3ea550b42 Merge pull request #500 from Tria-plc/freight_feature/usermanagement
run
2026-07-07 11:00:58 +03:00
Marshal
561d0b2344 run 2026-07-07 08:00:22 +00:00
natib21
66167e8ac5 fix 2026-07-07 07:55:15 +00:00
marshal
86c7e0cbe8 Merge pull request #499 from Tria-plc/freight_feature/usermanagement
implement self-healing for freight payment milestones and enhance con…
2026-07-07 10:51:23 +03:00
Marshal
05d71eb6da implement self-healing for freight payment milestones and enhance contract change request visibility 2026-07-07 07:45:59 +00:00
Hagernesh Tadesse
ff0fa6bb9e Merge pull request #498 from Tria-plc/Doublehandling
Doublehandling
2026-07-07 09:48:26 +03:00
natib21
75427ea63a fix tracker 2026-07-07 06:39:02 +00:00
Hagernesh
24fa6ab83b Doublehandling 2026-07-07 06:25:58 +00:00
marshal
a171cf1f96 Merge pull request #497 from Tria-plc/freight_feature/usermanagement
enhance booking and contract notification systems
2026-07-07 09:07:31 +03:00
Stephanos A.
323bc9fcca Merge pull request #496 from Tria-plc/alpha
UAT - total fare amount display issues resolution
2026-07-07 08:52:42 +03:00
Stephanos A
30661a2699 Build issue resolutions 2026-07-07 08:52:00 +03:00
Stephanos A
ae0e48e6ed UAT - total fare amount display issues resolution 2026-07-07 08:16:48 +03:00
Hagernesh
96b78fc72e Login fixed — freight-api boots (PgBouncer search_path + migrations-table reconcile).
Invoice PDF styled (vector fallback, no Docker change).
Marshalling doc styled (table-aware fallback, portrait/landscape).
Load to Train tab — per-train arrived containers → multiselect → load onto wagons.
Yard/zone list filtered by freight type.
2026-07-06 21:09:56 +00:00
Marshal
05b13e84a8 enhance booking and contract notification systems
- Added detailed logging for socket connection events in useBookingWindowSocket.
- Introduced new notification types for contract status and schedule updates.
- Updated notification visuals to include new icons for contract status.
- Enhanced notification href resolution for contract status and schedule updates.
- Implemented booking lifecycle notifier service for customer and staff notifications.
- Created contract notifier service for managing contract lifecycle notifications.
- Added end-to-end tests for booking window socket functionality.
2026-07-06 21:03:08 +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
Stephanos A.
22daeb7f17 Merge pull request #495 from Tria-plc/alpha
Alpha
2026-07-06 22:13:42 +03:00
Hagernesh
838895897d Marshaling doc fix 2026-07-06 19:12:14 +00:00
Stephanos A
36055d0d82 Package booking new rules update, cascade delete option updates 2026-07-06 22:12:04 +03:00
Hagernesh
8785d992ab export loading 2026-07-06 19:00:04 +00:00
Hagernesh
bc47a42e1e export loading 2026-07-06 18:53:25 +00:00
Marshal
8bd00ea78a enhance user management and booking features with permissions and real-time updates 2026-07-06 17:15:22 +00:00
natib21
8328543686 fix file uplaod 2026-07-06 14:18:51 +00:00
Nathnael
1fdd5e3c4c feat: add permissions 2026-07-06 14:10:44 +00:00
Nathnael
894474704b fix: unused var 2026-07-06 14:09:55 +00:00
natib21
7913a448a9 fix file uplaod 2026-07-06 14:08:49 +00:00
natib21
42710261e2 fix 2026-07-06 13:49:30 +00:00
Nathnael
46e5761405 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-06 13:46:27 +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
Stephanos A
f52d7442ac Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-06 16:31:21 +03:00
Stephanos A
9b6423392b UAT issues resolution 2026-07-06 16:30:48 +03:00
Marshal
fed5f2f43f implement intercity booking management and booking window websocket integration 2026-07-06 13:28:21 +00:00
Hagernesh Tadesse
f4ed9db8e4 Merge pull request #490 from Tria-plc/PertruckExit
Pertruck exit

Per-truck Exit Paper button in the TruckDispatchModal → downloads that truck's PDF.
Rule applied

Single truck / whole booking → the existing per-booking release doc.
Multiple trucks → one exit paper per truck (its containers).
2026-07-06 16:22:38 +03:00
Hagernesh
756ad73e9c pERTRUCK EXIT 2026-07-06 13:16:34 +00:00
Abubeker Yasin
995e75652b Merge pull request #488 from Tria-plc/alpha
fix: lock file
2026-07-06 15:55:51 +03:00
natib21
458198be11 fix 2026-07-06 12:54:31 +00:00
Abubeker Yasin
96a9f40b93 fix: lock file 2026-07-06 15:49:22 +03:00
Hagernesh
551a5fdeed list trucks + loadable containers → load) 2026-07-06 12:40:34 +00:00