Commit Graph

2026 Commits

Author SHA1 Message Date
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
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
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
Abubeker Yasin
a2e0e94cff Merge pull request #553 from Tria-plc/alpha
Alpha
2026-07-08 23:20:45 +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
Roba Boru
6e7eb460b0 Fixed voucher qr value 2026-07-08 22:37:31 +03:00
Roba Boru
6d4761a4c6 Fix no train section alignment 2026-07-08 21:57:17 +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
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
0c3050b6fe feat: ( notification ) add notification management 2026-07-08 15:40:31 +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
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
Marshal
7bedfde6e7 add production DB drift check and fix for invoice payments 2026-07-08 08:19:35 +00:00
Nathnael
3bc4514b04 feat: implemented the changes request to the company profile to backoffice 2026-07-08 08:07:10 +00:00
Nathnael
2cae451edc feat: implemented the changes request to the company profile 2026-07-08 08:06:50 +00:00
Nathnael
1dba962502 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-08 07:50:24 +00:00
Nathnael Wondisha
01cd8fcc3a Merge pull request #534 from Tria-plc/freight/feat/chat-app
fix: backoffice socket
2026-07-08 10:26:49 +03:00
Nathnael
32aaa77d50 fix: backoffice socket 2026-07-08 07:25:34 +00:00
Hagernesh
9ffc8bfb0b Notify customer on Sign handover, truck assignment, arrival and dispatch of train 2026-07-08 07:07:33 +00:00
Hagernesh
ba821b06ca Warehouse and customer truck edit and KG to Tons 2026-07-08 07:00:23 +00:00
Nathnael Wondisha
22a2a770d2 Merge pull request #531 from Tria-plc/freight/feat/chat-app
chore: enable polling to the socket.io on the passenger clients
2026-07-08 09:52:27 +03:00
Nathnael
15b8068b9e chore: enable polling to the socket.io on the passenger clients 2026-07-08 06:50:44 +00:00