Commit Graph

2612 Commits

Author SHA1 Message Date
Hagernesh
f7ceca944a Freight OperationsQA Test Plan 2026-07-09 09:21:15 +00:00
Hagernesh
fa5fde6b6b Fix slow GRN button and sms timeout 2026-07-09 09:03:35 +00:00
marshal
a811dbe0ce Merge pull request #573 from Tria-plc/freight_feature/usermanagement
Implement client-side validation for container and bul
2026-07-09 11:41:44 +03:00
Marshal
6c54493bbc changes 2026-07-09 08:41:15 +00:00
Stephanos A.
434fc0d314 Merge pull request #572 from Tria-plc/alpha
Alternative schedules notification updates
2026-07-09 11:25:31 +03:00
Stephanos A
5a8db998e5 Alternative schedules notification updates 2026-07-09 11:23:14 +03:00
marshal
a16570280d Merge pull request #571 from Tria-plc/freight_feature/usermanagement
Implement client-side validation for container and bul
2026-07-09 11:17:43 +03:00
Stephanos A.
4b6b462155 Merge pull request #570 from Tria-plc/alpha
Passenger portal build issue resolution
2026-07-09 11:17:12 +03:00
Marshal
15707d9070 Implement client-side validation for container and bul 2026-07-09 08:16:59 +00:00
Stephanos A
758c6082f3 Passenger portal build issue resolution 2026-07-09 11:15:42 +03:00
marshal
ee797668d2 Merge pull request #569 from Tria-plc/freight_feature/usermanagement
Implement client-side validation for container and bul
2026-07-09 11:14:55 +03:00
Marshal
f736523afd Implement client-side validation for container and bul 2026-07-09 08:13:20 +00:00
Stephanos A.
d3a07a61a3 Merge pull request #568 from Tria-plc/alpha
Alpha
2026-07-09 11:05:55 +03:00
Stephanos A
9afe82c422 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-09 11:02:37 +03:00
Stephanos A
554756a116 Luggage processing,, schedule times and tariff related updates 2026-07-09 11:00:56 +03:00
marshal
1c80457a62 Merge pull request #567 from Tria-plc/freight_feature/usermanagement
Implement client-side validation for container and bulk cargo fields …
2026-07-09 10:50:37 +03: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
c35c72edc2 Merge pull request #566 from Tria-plc/freight_feature/usermanagement
Refactor wagon specifications to rely on wagon type; remove tare weig…
2026-07-09 10:43:13 +03: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
Abubeker Yasin
cd4df2f810 Update webhooks.controller.ts 2026-07-09 10:32:19 +03:00
marshal
7ca672eb6b Merge pull request #564 from Tria-plc/freight_feature/usermanagement
enhance gate pass and freight payment handling in train scheduling
2026-07-09 10:20:34 +03: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 Wondisha
172c633f85 Merge pull request #563 from Tria-plc/freight/feat/chat-app
style: update the chat widget
2026-07-09 10:05:15 +03:00
Nathnael
66edeb84bf style: update the chat widget 2026-07-09 07:02:02 +00:00
Abubeker Yasin
ba77f9b447 Merge pull request #562 from Tria-plc/alpha
feat: ( forget password ) add  phone number
2026-07-09 09:39:40 +03:00
Abubeker Yasin
f1452ba67e feat: ( forget password ) add phone number 2026-07-09 09:38:34 +03:00
marshal
1e0cd82f6f Merge pull request #561 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-09 09:06:23 +03: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
acfa5795cf Merge pull request #560 from Tria-plc/freight_feature/usermanagement
Add minDate handling for vessel and departure dates across components
2026-07-09 07:08:32 +03:00
Marshal
df7d796741 Add minDate handling for vessel and departure dates across components 2026-07-09 04:06:40 +00:00
marshal
fc97146fe9 Merge pull request #559 from Tria-plc/freight_feature/usermanagement
Add minDate handling for vessel and departure dates across components
2026-07-09 07:04:31 +03:00
Marshal
b98bc529da Add minDate handling for vessel and departure dates across components 2026-07-09 04:02:54 +00:00
marshal
7282b19417 Merge pull request #558 from Tria-plc/freight_feature/usermanagement
resolve merge conflict
2026-07-09 06:59:00 +03:00
Marshal
14a5861ba3 resolve merge conflict 2026-07-09 03:46:31 +00:00
marshal
edfb2ac978 Merge pull request #557 from Tria-plc/freight_feature/usermanagement
Refactor wagon type handling and container wagon calculations
2026-07-09 06:39:26 +03: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
yaschalew10
1b9ac42ed3 Merge pull request #556 from Tria-plc/freight/feature/first_mile_invoice
Freight/feature/first mile invoice
2026-07-09 06:22:08 +03: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
Abubeker Yasin
a7706cf206 Merge pull request #555 from Tria-plc/alpha
Update cac-bank.provider.ts
2026-07-08 23:36:21 +03:00
Abubeker Yasin
d71ee6ed1b Update cac-bank.provider.ts 2026-07-08 23:33:31 +03:00
Abubeker Yasin
a2e0e94cff Merge pull request #553 from Tria-plc/alpha
Alpha
2026-07-08 23:20:45 +03:00
Abubeker Yasin
0f580e40f3 Update cac-bank.provider.ts 2026-07-08 23:11:28 +03:00
Abubeker Yasin
69625eceb1 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-08 23:05:55 +03:00
Abubeker Yasin
01e24e1aae feat: ( payment ) add changing payment for booking 2026-07-08 23:05:42 +03:00
Hagernesh Tadesse
082682ec02 Merge pull request #552 from Tria-plc/Truckdetantion
Truckdetantion
2026-07-08 22:58:12 +03:00
Hagernesh
99a9bbc291 unload export 2026-07-08 19:56:34 +00:00
Abubeker Yasin
46e95415f8 Merge pull request #550 from Tria-plc/alpha
Fix no train section alignment
2026-07-08 22:41:51 +03:00