natib21
151c82373b
:Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-09 14:06:30 +00:00
natib21
70a9742631
add gps readme
2026-07-09 14:01:59 +00:00
marshal
0fc7ed9041
Merge pull request #580 from Tria-plc/freight_feature/usermanagement
...
small fix
2026-07-09 16:37:53 +03:00
Marshal
3afadcd9f2
small fix
2026-07-09 13:36:36 +00:00
marshal
b1a1099532
Merge pull request #579 from Tria-plc/freight_feature/usermanagement
...
Enhance wagon capacity handling and validation in booking service
2026-07-09 16:20:55 +03:00
Marshal
eb819d66a1
Enhance wagon capacity handling and validation in booking service
...
- Added default capacities for container and bulk wagons.
- Updated wagonsFor method to consider weight and length for wagon calculations.
- Improved handling of overweight bookings with appropriate warnings.
- Adjusted tests to reflect changes in wagon capacity and validation logic.
2026-07-09 13:10:32 +00:00
Nathnael
632951268f
Merge branch 'dev' into freight/feat/fixes-v1
2026-07-09 12:38:55 +00:00
Nathnael
80ef15b9dc
fix: onboarding back and contract blocking
2026-07-09 12:38:05 +00:00
Nathnael
3f9dca5244
fix: notification mark as read
2026-07-09 12:38:04 +00:00
Nathnael
a5bc9d8435
fix: the company rejection on the approved ones
2026-07-09 12:38:04 +00:00
Stephanos A.
ed4de712ff
Merge pull request #578 from Tria-plc/alpha
...
Coach type price change on seat selection updates
2026-07-09 15:29:55 +03:00
Stephanos A
cec544fc12
Coach type price change on seat selection updates
2026-07-09 15:28:20 +03:00
Hagernesh Tadesse
de404fc94e
Merge pull request #576 from Tria-plc/Truckdetantion
...
Fix slow GRN button and sms timeout
2026-07-09 12:12:06 +03:00
marshal
0cea4e8dbc
Merge pull request #575 from Tria-plc/freight_feature/usermanagement
...
freight_feature/usermanagement
2026-07-09 12:03:37 +03:00
Hagernesh
fa5fde6b6b
Fix slow GRN button and sms timeout
2026-07-09 09:03:35 +00:00
Marshal
db35b90b45
freight_feature/usermanagement
2026-07-09 09:02:44 +00:00
Nathnael
3f7734fe16
fixes
2026-07-09 08:55:24 +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
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
d1652c1b96
fix: sidebar scrollbar
2026-07-09 07:04:31 +00:00
Nathnael
66edeb84bf
style: update the chat widget
2026-07-09 07:02:02 +00:00
Nathnael
aa656eed7e
fix: profile id and licence to registration
2026-07-09 06:40:45 +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
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
