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
Roba Boru
6e7eb460b0
Fixed voucher qr value
2026-07-08 22:37:31 +03:00
Roba Boru
d8b29a2cff
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-08 21:58:12 +03:00
Roba Boru
6d4761a4c6
Fix no train section alignment
2026-07-08 21:57:17 +03:00
Eyob T.
9f6a47197f
Merge pull request #549 from Tria-plc/alpha
...
added dmoney redirect
2026-07-08 21:42:42 +03:00
Roba Boru
4d20169616
added dmoney redirect
2026-07-08 21:29:57 +03:00
Roba Boru
8897e49972
Fix auto assign seat
2026-07-08 21:11:26 +03:00
Stephanos A.
843b41c652
Merge pull request #548 from Tria-plc/alpha
...
Alpha
2026-07-08 19:11:58 +03:00
Stephanos A
9825d37e66
Search widget updates
2026-07-08 19:04:21 +03:00
Stephanos A
65004dd2af
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-08 18:24:19 +03:00
Stephanos A
3760bcdb66
Fare engine updates, seat class amount updates
2026-07-08 18:16:57 +03:00
Hagernesh
33956d07dc
Fix customer_truck_containers status
2026-07-08 13:56:56 +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 Tadesse
3772db2c72
Merge pull request #546 from Tria-plc/Truckdetantion
...
delivery approve notification
Handover generated — on truck arrival, or when the operator hits Exit Paper on an unsigned booking (requestSignature).
Sent to the customer — in-app + SMS + email.
Customer opens the booking → Approve delivery button is there → approves → handover signed + signed PDF downloaded.
Exit Paper unblocks in the backoffice.
2026-07-08 16:01:42 +03:00
Hagernesh
73baf97045
delivery approve notification
2026-07-08 13:00:17 +00:00
Abubeker Yasin
93aa40569e
Merge pull request #544 from Tria-plc/alpha
...
feat: ( notification ) add notification management
2026-07-08 15:58:46 +03:00
Abubeker Yasin
78bee6dbe3
Update cac-bank.provider.ts
2026-07-08 15:57:16 +03:00
Abubeker Yasin
0c3050b6fe
feat: ( notification ) add notification management
2026-07-08 15:40:31 +03:00
Abubeker Yasin
43b3e49ffc
Merge pull request #542 from Tria-plc/alpha
...
Update waafi.provider.ts
2026-07-08 15:08:09 +03:00
Abubeker Yasin
8b957e956e
Update waafi.provider.ts
2026-07-08 15:06:54 +03: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
866186564d
Merge pull request #539 from Tria-plc/freight_feature/usermanagement
...
fix seed data
2026-07-08 13:37:04 +03:00
Marshal
addee34d5d
fix seed data
2026-07-08 10:35:32 +00:00
marshal
66a42e63ba
Merge pull request #537 from Tria-plc/freight_feature/usermanagement
...
ensure pessimistic-lock writes run in a transaction for invoice proce…
2026-07-08 13:14:09 +03:00
Marshal
3349d256b8
ensure pessimistic-lock writes run in a transaction for invoice processing
2026-07-08 10:13:22 +00:00
Hagernesh Tadesse
cee24c625e
Merge pull request #536 from Tria-plc/Truckdetantion
...
Handover SIGN notification, resending until signed no exit before sign
2026-07-08 12:34:54 +03:00
Hagernesh
80904eeeb2
Handover SIGN notification, resending until signed no exit before sign
2026-07-08 09:33:19 +00:00
