marshal
3affef65d4
Merge pull request #582 from Tria-plc/freight_feature/usermanagement
...
fix ui issue
2026-07-09 17:12:03 +03:00
Marshal
3259bd7667
fix ui issue
2026-07-09 14:10:46 +00:00
Nathnael
632951268f
Merge branch 'dev' into freight/feat/fixes-v1
2026-07-09 12:38:55 +00:00
Marshal
db35b90b45
freight_feature/usermanagement
2026-07-09 09:02:44 +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
6c54493bbc
changes
2026-07-09 08:41:15 +00:00
Marshal
f736523afd
Implement client-side validation for container and bul
2026-07-09 08:13:20 +00:00
Marshal
c6198a4c62
Implement client-side validation for container and bulk cargo fields in booking form
2026-07-09 07:49:53 +00:00
Marshal
61ec67cc2e
Refactor wagon specifications to rely on wagon type; remove tare weight and max payload from wagon entity and related components
2026-07-09 07:42:02 +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
d1652c1b96
fix: sidebar scrollbar
2026-07-09 07:04:31 +00:00
Marshal
1b2b3f68f8
Add tareWeightTons property to CreateWagonTypeDto and update related components
2026-07-09 06:05:34 +00:00
Marshal
bedcdca78b
Enforce non-negative values for numeric inputs across various components
2026-07-09 04:24:08 +00:00
Marshal
df7d796741
Add minDate handling for vessel and departure dates across components
2026-07-09 04:06:40 +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
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
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
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
Hagernesh
80904eeeb2
Handover SIGN notification, resending until signed no exit before sign
2026-07-08 09:33:19 +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
44023efb12
solve priorty issue
2026-07-08 09:08:53 +00:00
Nathnael
3bc4514b04
feat: implemented the changes request to the company profile to backoffice
2026-07-08 08:07:10 +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
9dd9ace313
add reference field to train schedules and implement unique sequence generation
2026-07-07 23:06:44 +00:00
Marshal
88b1e548a2
resolve conflict
2026-07-07 22:24:42 +00:00
Marshal
94904ea6d0
resolve conflict
2026-07-07 21:46:25 +00:00
Marshal
518eec6286
enhance train scheduling and booking management
2026-07-07 21:42:59 +00:00
Marshal
8addfdf3e2
changes
2026-07-07 18:40:32 +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
Hagernesh Tadesse
ec23faa5db
Merge pull request #507 from Tria-plc/Truckdetantion
...
Truckdetantion
2026-07-07 14:49:41 +03:00
Hagernesh
25c9bdeecd
Export Load on train
2026-07-07 10:21:17 +00:00
Hagernesh
35ccf1bc95
truck type detantion
2026-07-07 10:02:43 +00:00
natib21
b300fd1de5
user permition
2026-07-07 10:00:48 +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
2a8d514b98
Merge pull request #503 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-07-07 12:05:49 +03:00
Nathnael
63f638d1bb
fix: session expiry during usage and also login error message
2026-07-07 08:52:35 +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
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
