Commit Graph

3793 Commits

Author SHA1 Message Date
Yonas Tewabe
4e7b7d9f4d Change restart policy and remove npmrc secrets
Updated restart policy for multiple services to 'always' and removed npmrc secrets.
2026-07-27 13:18:28 +03:00
Hagernesh Tadesse
1ae516c5f3 Merge pull request #974 from Tria-plc/warehouseselection
feat(warehouses): map GRN numbers to the goods owner

Each booking is keyed by its own bookingId and matched using its own freightType/cargoTypeCode — not the train's. So on one Indode train with, say, 3 bookings (Wheat, Steel Billet, a container), all 3 can auto-select simultaneously, each to its own correct yard:

Wheat → Dry Bulk (Yard 4)
Steel Billet → Break Bulk (Yard 2)
Container import → Yard 5
Only requirement per booking: warehouse already picked (auto-fills first, single-warehouse case) and exactly one yard candidate for that booking's own cargo type. Bookings with an ambiguous/unmapped cargo type just get a real dropdown instead, independently of the others.
2026-07-27 12:58:59 +03:00
Hagernesh
101bf69271 feat(warehouses): map GRN numbers to the goods owner
GRN-<DIR>-<DATE>-<REF8> carried no owner, so a note couldn't be
identified by who owns the cargo. Add an owner segment sourced from the
booking's company at every generation point (import, export, facility,
manual receive), keep REF8 for uniqueness, and label the GRN document
row Owner's Name.
2026-07-27 09:57:59 +00:00
Hagernesh Tadesse
2a97bd4235 Merge pull request #973 from Tria-plc/milesfixes
Truck detention was timed once per delivery, so every truck on a mult…
2026-07-27 12:37:37 +03:00
Abubeker Yasin
ba14a1b753 Merge pull request #971 from Tria-plc/alpha
Alpha
2026-07-27 11:28:35 +03:00
Abubeker Yasin
93615158ab fix: ( booking ) remove duplicated auditservice 2026-07-27 11:27:21 +03:00
Hagernesh
500668a415 Truck detention was timed once per delivery, so every truck on a multi-truck last mile was billed the same number of days regardless of when it actually arrived or was released. Each truck now carries its own detention clock (destination arrival → release) with its own rule match, chargeable days and amount; the modal records and displays the window per truck, and the summary shows the longest detention plus the combined total. Also corrected a false no detention rule matches warning that appeared whenever more than one truck was assigned. 2026-07-27 08:24:07 +00:00
Abubeker Yasin
1b666775a9 Merge pull request #970 from Tria-plc/dev
merg
2026-07-27 11:22:29 +03:00
Abubeker Yasin
3e2ae80e5a Merge pull request #969 from Tria-plc/alpha
Alpha
2026-07-27 11:08:44 +03:00
Abubeker Yasin
f5bdc6971d Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-27 11:07:44 +03:00
Abubeker Yasin
afcae037fc refactor: ( bookings ) unify authenticated booking flow with guest service 2026-07-27 11:07:33 +03:00
marshal
89a0bc6948 Merge pull request #968 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-27 09:00:59 +03:00
Marshal
15d78e1d67 fix issue 2026-07-27 05:59:49 +00:00
Marshal
773456c256 refactor DocReviewAlertButton and FreightDashboardHeader comments for clarity and accuracy 2026-07-27 05:07:09 +00:00
marshal
fe407d8d40 Merge pull request #967 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-26 22:20:01 +03:00
Marshal
bcf25538b6 add contract hazard declaration, DO collection dates, and booking request currency migrations; implement article body diff component and integrate into contract revision timeline 2026-07-26 19:14:39 +00:00
Marshal
5fa012cad3 add contract hazard declaration, DO collection dates, and booking request currency migrations; implement article body diff component and integrate into contract revision timeline 2026-07-26 19:09:01 +00:00
marshal
952078086e Merge pull request #966 from Tria-plc/freight_feature/usermanagement
add dispute functionality for contract duty and implement collection…
2026-07-26 21:24:17 +03:00
Marshal
af85f20789 add dispute functionality for contract duty and implement collection dates 2026-07-26 18:23:37 +00:00
marshal
2da27ef127 Merge pull request #965 from Tria-plc/freight_feature/usermanagement
add dispute functionality for contract duty and implement collection…
2026-07-26 20:59:16 +03:00
Marshal
225d2c8229 add dispute functionality for contract duty and implement collection dates 2026-07-26 17:58:37 +00:00
marshal
12bab14b06 Merge pull request #964 from Tria-plc/freight_feature/usermanagement
add dispute functionality for contract duty and implement collection…
2026-07-26 20:30:31 +03:00
Marshal
bfea9de660 add dispute functionality for contract duty and implement collection dates 2026-07-26 17:30:00 +00:00
marshal
e63ddec088 Merge pull request #963 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-26 19:59:39 +03:00
Marshal
5e10c97294 add dispute functionality for contract duty and implement collection dates 2026-07-26 16:58:51 +00:00
Marshal
9b13fa2ac6 feat: implement wagon transfer management modals and page
- Add TransferFulfillModal for fulfilling wagon transfer requests.
- Create TransferRequestFormModal for filing new wagon transfer requests.
- Introduce TransferCloseShortModal for closing requests that cannot be fully fulfilled.
- Develop WagonTransfersPage to manage and display wagon transfer requests.
- Implement utility functions for handling wagon transfer request data and UI components.
- Enhance UI with Mantine components for better user experience.
2026-07-26 15:11:50 +00:00
marshal
48873890a4 Merge pull request #962 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-26 11:12:23 +03:00
Marshal
9a1c8e5603 feat: add hazardous goods declaration feature
- Introduced HazardDeclarationPanel component to display dangerous goods declaration details.
- Updated URL constants to include CLEARANCE_PROCEED endpoint for re-requesting operations.
- Enhanced permissions to include hazardous approval roles for contract approvals.
- Integrated HazardDeclarationPanel into ContractRequestDetailPage and ContractClearanceDetailPage.
- Added proceedToOperation method in bookings service for handling operation re-requests.
- Updated contract forms and schemas to include hazard class and UN number fields.
- Implemented validation for hazardous contracts in the contract creation flow.
- Added expiry notice functionality for contracts nearing validity end.
- Created tests for expiry notice calculations and labels.
- Updated UI components to reflect hazardous cargo information and validation errors.
2026-07-25 21:10:09 +00:00
Marshal
fde5e6de4b add company stamp upload functionality for contract signing
- Introduced StampUpload component for uploading company stamp images.
- Integrated stamp upload in contract signing modal, supporting PNG and JPG formats.
- Implemented validation for file type and size (max 5 MB).
- Added visual feedback for drag-and-drop functionality.
- Updated contract-related pages to handle duplicate contract alerts and pricing notices.
- Enhanced contract expiry management with a nightly sweep service.
- Added unit tests for new features and updated existing tests for contract handling.
2026-07-25 17:14:58 +00:00
Hagernesh Tadesse
083899d912 Merge pull request #961 from Tria-plc/milesfixes
feat(warehouses): gate double-handling fee on a per-booking Yes/No
2026-07-25 13:47:27 +03:00
Hagernesh
6983645347 feat(warehouses): gate double-handling fee on a per-booking Yes/No
Double handling billed every import with a matching rule. Add
bookings.double_handling (+ set_at/by), charge only when Yes, expose a
PATCH endpoint (import-only, locked after invoicing, audited) and Yes/No
items in the inventory row menu.
2026-07-25 10:45:34 +00:00
Hagernesh Tadesse
43b053bf71 Merge pull request #960 from Tria-plc/milesfixes
fix(operations): last-mile assign until load fully trucked + 40ft cap

fix(operations): last-mile assign until load fully trucked + 40ft cap

Assign was gated on "any truck assigned", blocking multi-truck
deliveries. Gate on remaining containers (or bulk tonnage) instead, show
covered/total in the modal, cap a 40ft container to one truck with no
size mixing (mirrors assertTruckLoad), and lock arrived/departed rows.
2026-07-25 13:30:43 +03:00
Hagernesh
a544bebc51 fix(operations): last-mile assign until load fully trucked + 40ft cap
Assign was gated on any truck assigned, blocking multi-truck
deliveries. Gate on remaining containers (or bulk tonnage) instead, show
covered/total in the modal, cap a 40ft container to one truck with no
size mixing (mirrors assertTruckLoad), and lock arrived/departed rows.
2026-07-25 10:29:44 +00:00
mulish77
d4695ba9eb Merge pull request #959 from Tria-plc/tests
Adding exact reason why train is not available to users search results
2026-07-25 12:29:41 +03:00
Muluhabt
d175514f85 Adding exact reason why train is not available to users search results 2026-07-25 12:28:07 +03:00
Nathnael Wondisha
5d5cfe8b96 Merge pull request #957 from Tria-plc/freight/fix/iam-seeder
fix
2026-07-25 12:12:02 +03:00
ghost2023
6fb9107e43 fix 2026-07-25 12:11:04 +03:00
mulish77
f24c7015e0 Merge pull request #956 from Tria-plc/tests
Adding ticket generation and booking for staff employees logic
2026-07-25 11:22:59 +03:00
Muluhabt
2a0fd9bda5 Adding ticket generation and booking for staff employees logic 2026-07-25 11:20:47 +03:00
marshal
ae6751a7d0 Merge pull request #955 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-25 09:06:58 +03:00
Marshal
54b5882355 changes 2026-07-25 06:05:20 +00:00
Stephanos A.
ed5de9a214 Merge pull request #954 from Tria-plc/alpha
Set boardedAt in addition to validatedAt on ticket boarding action
2026-07-24 19:59:32 +03:00
Stephanos A
fa7fb6b7ea Set boardedAt in addition to validatedAt on ticket boarding action 2026-07-24 19:57:29 +03:00
Stephanos A.
06787aeaaf Merge pull request #953 from Tria-plc/alpha
Alpha
2026-07-24 17:00:06 +03:00
Stephanos A
e4b60f28b5 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-24 16:49:50 +03:00
Marshal
286390a3cf change contrat creation 2026-07-24 13:26:19 +00:00
Stephanos A
050a08f330 Boarding report added 2026-07-24 16:09:27 +03:00
Hagernesh Tadesse
3da6ce4824 Merge pull request #952 from Tria-plc/intercity
Intercity
2026-07-24 15:12:01 +03:00
Hagernesh
2f124bc666 Intercity load unload with grn ,Warehouse , fleet , and allocation endpoints permission 2026-07-24 11:55:05 +00:00
Hagernesh
cf8a2e928d fix(warehouses): detention groups by canonical truck type
Join truck_types via vehicles.truck_type_id (normalized legacy
vehicle_type only as fallback) so type renames can't unmatch detention
rules and FK-less vehicles keep billing.
2026-07-24 11:55:05 +00:00