Commit Graph

2645 Commits

Author SHA1 Message Date
Hagernesh
c53c186896 Approve delivery and notification fix 2026-07-09 15:37:06 +00:00
marshal
3ff84d687a Merge pull request #584 from Tria-plc/freight_feature/usermanagement
Enhance bulk booking handling and wagon capacity calculations across …
2026-07-09 18:31:00 +03:00
Marshal
1690f9e498 Enhance bulk booking handling and wagon capacity calculations across services 2026-07-09 15:30:00 +00:00
Eyob T.
3d80f2d040 Merge pull request #583 from Tria-plc/alpha
design revamp
2026-07-09 17:24:46 +03:00
Roba Boru
f201b6e1fb Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-09 17:20:22 +03:00
Roba Boru
a856a763fe Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-09 17:20:12 +03:00
Roba Boru
fc065b50aa design revamp 2026-07-09 17:20:00 +03:00
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
yaschalew10
17d95f47e5 Merge pull request #581 from Tria-plc/freight/feature/first_mile_invoice
Freight/feature/first mile invoice
2026-07-09 17:07:37 +03:00
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
Roba Boru
188c818251 Fix chat bot alignment 2026-07-09 16:18:52 +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 Wondisha
41af519afb Merge pull request #574 from Tria-plc/freight/feat/fixes-v1
Forget password and fixes
2026-07-09 15:39:39 +03: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
41fc1e8df1 Merge pull request #577 from Tria-plc/Testplan
Freight OperationsQA Test Plan
2026-07-09 12:25:15 +03:00
Hagernesh
f7ceca944a Freight OperationsQA Test Plan 2026-07-09 09:21:15 +00: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