Commit Graph

498 Commits

Author SHA1 Message Date
Nathnael
625b33733d Merge branch 'dev' into freight/feat/fixes-v1 2026-07-10 12:22:41 +00:00
Marshal
a58650bdfb update booking logic for train schedules and customs contracts 2026-07-10 12:13:08 +00:00
Nathnael
f737e401b3 fix: the issue in the sheets file 2026-07-10 12:10:17 +00:00
marshal
4fe31614cf Merge pull request #596 from Tria-plc/freight_feature/usermanagement
enhance shipment requests page with filtering and sorting options
2026-07-10 13:33:40 +03:00
Marshal
1abef3ce34 enhance shipment requests page with filtering and sorting options
- Added status and cargo filters to the ShipmentRequestsPage.
- Implemented date range filtering for preferred dates.
- Introduced sorting options for shipment requests based on submission date and reference.
- Enhanced the display of shipment request details, including status badges and customer information.
- Updated the UI to include a search input with clear functionality and improved layout for filters.

feat: add equipment return option in new shipment form

- Introduced a toggle for equipment return in the NewShipmentPage.
- Updated form schema to include  field for container contracts.
- Enhanced user experience with visual feedback on the equipment return selection.

fix: update booking DTO to include equipment return option

- Added  field to CreateBookingUnderContractDto for per-shipment override.
- Updated related types and schemas to accommodate the new field for better contract handling.
2026-07-10 10:32:41 +00:00
Nathnael
bd4d7b72fd fix 2026-07-10 09:09:05 +00:00
Nathnael
151d9c48c3 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-10 08:54:34 +00:00
Nathnael
e5fce529fe feat: add poa to the changes approval 2026-07-10 08:45:39 +00:00
Nathnael
78cb1ac5d3 feat: add poa and poa delegation file to onboarding 2026-07-10 08:18:37 +00:00
Marshal
2fb1917956 merge 2026-07-09 21:15:07 +00:00
marshal
516dfd4032 Merge pull request #588 from Tria-plc/freight_feature/usermanagement
fix issues
2026-07-09 23:27:02 +03:00
Marshal
e4429592d3 fix issues 2026-07-09 20:26:14 +00:00
marshal
0a73d968b8 Merge pull request #587 from Tria-plc/freight_feature/usermanagement
add Excel import functionality for container bookings
2026-07-09 21:12:19 +03:00
Marshal
1d77cc9219 add Excel import functionality for container bookings 2026-07-09 18:10:58 +00:00
Hagernesh
7ab5e9edd5 feat(warehouses): handover-driven approve delivery, weigh-skip, 5-min sign reminders
Approve delivery now tracks the handover lifecycle exactly: the button appears
(detail page + portal dashboard) the moment a handover is generated and
disappears when the customer signs. The bookings list attaches the
handoverAwaitingSignature flag via one batched query per page; status
heuristics (COMPLETED / TRUCK_ASSIGNED+arrived) are gone.

- generate the arrival handover for ANY self-haul truck: portal-assigned OR
  walk-in registered at the gate (isSelfHaulBooking: assigned_at set, or no
  EDR last-mile leg). Same rule now guards the exit paper.
- remind every 5 minutes (in-app + SMS + email) until the handover is signed
  (@Cron in HandoverService; one reminder per booking per tick)
- Truck Leaving no longer opens blank: the import queue mapper now carries
  inv.notes, so the saved arrival renders read-only with only gate-out time
  and gross weight editable
- container bookings get "Weigh truck? Yes/No": No skips tare/gross and the
  container weight match (weighingSkipped on ReleaseOrderDto, decision made at
  arrival sticks for the exit via the Weighing: SKIPPED note). Bulk always
  weighs, unchanged.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-09 15:37:06 +00:00
Nathnael
e5d2bb2f63 fix: unused var 2026-07-09 12:51:12 +00:00
Nathnael
80ef15b9dc fix: onboarding back and contract blocking 2026-07-09 12:38:05 +00:00
Nathnael
3f7734fe16 fixes 2026-07-09 08:55:24 +00:00
Nathnael
e3baf27a3e Merge branch 'dev' into freight/feat/fixes-v1 2026-07-09 08:51:50 +00:00
Nathnael
e04b513b8f feat: password reset flow 2026-07-09 08:50:08 +00:00
Marshal
cd8fb2b321 enhance gate pass and freight payment handling in train scheduling
- Updated the logic in  to ensure that a booking only earns its gate pass once the freight charges are settled.
- Added logging for bookings that have not settled freight payment when securing gate passes.
- Modified seeders to ensure that bookings have associated company profiles to prevent data inconsistencies.
- Updated freight permissions to include new clearance actions for bookings.
- Enhanced the UI to reflect changes in the clearance process, including new shipment request pages and improved status handling in the clearance action panel.
- Adjusted the contract clearance list to accommodate both customs contracts and shipment bookings.
- Improved the handling of GENERAL contracts in various components to ensure proper booking flow and visibility.
2026-07-09 07:19:36 +00:00
Nathnael
aa656eed7e fix: profile id and licence to registration 2026-07-09 06:40:45 +00:00
Marshal
bedcdca78b Enforce non-negative values for numeric inputs across various components 2026-07-09 04:24:08 +00:00
Marshal
b98bc529da Add minDate handling for vessel and departure dates across components 2026-07-09 04:02:54 +00:00
Marshal
14a5861ba3 resolve merge conflict 2026-07-09 03:46:31 +00:00
Marshal
305d35b2de resolve merge conflict 2026-07-09 03:39:06 +00:00
Marshal
ddddcfb71f Refactor wagon type handling and container wagon calculations
- Removed maxWagonsPerTrain from WagonType entity and related DTOs.
- Updated containerWagonsForLines function to calculate required wagons based on container lines more accurately.
- Added unit tests for containerWagonsForLines to ensure correct calculations.
- Adjusted related services and scripts to reflect the removal of maxWagonsPerTrain.
- Enhanced booking and contract components to use new status labels for better user experience.
- Implemented validation for unique container numbers in shipment forms.
2026-07-09 03:36:35 +00:00
natib21
13adc02e13 add first /last mile summery on booking detail 2026-07-09 03:19:57 +00:00
natib21
3263cf4262 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-09 01:44:26 +00:00
Hagernesh
99a9bbc291 unload export 2026-07-08 19:56:34 +00:00
Hagernesh
246663641a feat(warehouses): approve-delivery opens handover doc for review and signing
Customer reviews the generated handover before signing:
- add booking-scoped handover-document endpoint (portal only has bookingId)
- ApproveDeliveryModal renders the handover PDF, then applies the customer's
  saved signature on approve and returns the signed PDF
- ApproveDeliveryButton opens the modal instead of one-click silent signing

Handover generation + sign notification (in-app + SMS + email) and the
"Approve delivery" visibility on an awaiting-signature handover were committed
earlier; this wires the review-and-sign step.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-08 13:56:56 +00:00
Hagernesh
73baf97045 delivery approve notification 2026-07-08 13:00:17 +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
Nathnael
38577cdd26 fix 2026-07-08 11:05:46 +00:00
Nathnael
9e98600a5f fix: add vat to the settings, and docs to the profile 2026-07-08 10:51:22 +00:00
Nathnael
8947ab8614 feat: fix the settings preview for the business licence and changes request to the approval 2026-07-08 10:42:00 +00:00
marshal
8de7754e35 Merge pull request #535 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-08 12:09:40 +03:00
Marshal
7bedfde6e7 add production DB drift check and fix for invoice payments 2026-07-08 08:19:35 +00:00
Nathnael
1dba962502 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-08 07:50:24 +00:00
Hagernesh
ba821b06ca Warehouse and customer truck edit and KG to Tons 2026-07-08 07:00:23 +00:00
Hagernesh Tadesse
7712340c51 Merge pull request #525 from Tria-plc/Truckdetantion
Container truck assignment on customer portal for import
2026-07-08 07:41:22 +03:00
Hagernesh
3f6b9ac974 Container truck assignment on customer portal for import 2026-07-08 04:36:03 +00:00
Marshal
70a917510e feat: add isGeneral flag to identify general contracts in NewContractPage 2026-07-07 21:58:06 +00:00
Marshal
b57840c907 add CUSTOMS type to priority configs and update related logic 2026-07-07 16:42:57 +00:00
natib21
3a1d73b725 fix last mile 2026-07-07 13:36:45 +00:00
Marshal
f300600bfa changes 2026-07-07 12:28:47 +00:00
Marshal
1c18fdbd52 Enhance contract management by adding booking windows section and updating invoice logic for offloaded cargo 2026-07-07 09:49:12 +00:00
Marshal
f4d28e77fa Implement reject step functionality for contract approval process and enhance contract editing experience 2026-07-07 08:56:44 +00:00
Nathnael
63f638d1bb fix: session expiry during usage and also login error message 2026-07-07 08:52:35 +00:00
Marshal
05d71eb6da implement self-healing for freight payment milestones and enhance contract change request visibility 2026-07-07 07:45:59 +00:00