Commit Graph

1137 Commits

Author SHA1 Message Date
hagiye
4efef9bab3 inspection status column fix 2026-06-26 13:20:26 +03:00
hagiye
0556ca7966 inspection status column fix 2026-06-26 12:33:22 +03:00
hagiye
7bcf7bf3e3 Autounload on train arrival and inspection status column fix 2026-06-26 12:24:46 +03:00
Eyob T.
411244ae28 Merge pull request #300 from Tria-plc/alpha
Throttling configuration from the passenger back office app
2026-06-26 12:23:46 +03:00
hagiye
fa4a4e2397 Autounload on train arrival and inspection status column fix 2026-06-26 12:19:38 +03:00
hagiye
75d4c9b7c1 Autounload on train arrival 2026-06-26 12:17:31 +03:00
Stephanos A
eefbe6e8ed Throttling configuration from the backoffice added 2026-06-26 12:17:01 +03:00
Marshal
f7428df664 Add Document Clearance pages and sidebar section with permissions 2026-06-26 08:29:34 +00:00
Stephanos A
84a14b7312 Build issues resolution 2026-06-26 06:42:19 +03:00
Stephanos A
533bbc0047 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 22:24:02 +03:00
Stephanos A
380ca4219e Build issues resolution 2026-06-25 22:23:44 +03:00
Roba Boru
48968c3685 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 20:37:21 +03:00
Roba Boru
b2111b3695 Update coachtype id for seat map 2026-06-25 20:36:51 +03:00
Stephanos A
5a1ae88397 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 20:10:54 +03:00
Stephanos A
cfbbd437e9 Backoffice UAT results addressed, packages and other updates 2026-06-25 20:10:36 +03:00
Roba Boru
4556509316 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 19:59:31 +03:00
Roba Boru
bd82e95f9f Fix test findings 2026-06-25 19:58:47 +03:00
Abubeker Yasin
b9fce9505b Merge branch 'passenger/feat/iam' into alpha 2026-06-25 16:29:18 +03:00
Abubeker Yasin
61f62be31d feat: ( fayda ) register user after fayda verification 2026-06-25 16:27:29 +03:00
Roba Boru
1a152b0e75 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 15:51:01 +03:00
Roba Boru
a51494d4f4 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 15:50:44 +03:00
Roba Boru
1af5d6d310 Update seatmap and add cron job for payment status 2026-06-25 15:50:27 +03:00
Abubeker Yasin
e983179519 Update bookings.controller.ts 2026-06-25 14:49:57 +03:00
Abubeker Yasin
29fd5cec34 refactor: ( d-money ) update trade_type and business_type 2026-06-25 14:46:07 +03:00
Abubeker Yasin
5b89c5852d Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-06-25 14:33:50 +03:00
Abubeker Yasin
a0a02b473d fix: ( my booking ) add get passenger id from the iamuserid 2026-06-25 14:20:17 +03:00
natib21
f85a6a2196 fix 2026-06-25 09:25:50 +00:00
yaschalew
a8f9fc0445 fix last mile 2026-06-25 12:02:27 +03:00
hagiye
2b7959fc82 fix conflict 2026-06-25 11:31:50 +03:00
hagiye
f4a90755c2 api 2026-06-25 11:00:40 +03:00
Nathnael Wondisha
6a84a6a2d6 Merge pull request #289 from Tria-plc/freight/fix/type-errors
chore: setup sms rabbit mq
2026-06-25 10:43:12 +03:00
Marshal
4b13894ef5 remove unused imports from MyBookings component 2026-06-25 07:41:42 +00:00
Nathnael
6fd9b6d519 chore: setup sms rabbit mq 2026-06-25 07:41:33 +00:00
marshal
99a29ada51 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 10:37:34 +03:00
marshal
f8036a617a merge 2026-06-25 10:37:21 +03:00
Marshal
859e16c2be enhance onNavigate prop to accept options for navigation state 2026-06-25 07:35:07 +00:00
Nathnael Wondisha
b201861f1f Merge pull request #285 from Tria-plc/freight/fix/type-errors
Freight/fix/type errors
2026-06-25 10:15:33 +03:00
Nathnael
ce5c69acb3 fix: rm email and phone on exteranl profile 2026-06-25 07:14:29 +00:00
Nathnael
0c461273c8 fix: merge issues 2026-06-25 07:12:33 +00:00
marshal
44c3e84182 update API_BASE_URL 2026-06-25 10:11:24 +03:00
marshal
f4b02501bb Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 10:09:45 +03:00
Marshal
861b8dc38a feat: Refactor general contract handling and introduce drawdown orders
- Updated ContractRouteLineView to clarify that routes carry no quantity and are pure origin-destination lanes.
- Modified GeneralContractService to reflect changes in route handling, removing quantity-related logic.
- Adjusted BookingsService to persist contracted routes without quantities, aligning with the new contract structure.
- Revised CreateBookingDto and CreateContractRouteDto to remove quantity fields, emphasizing shared pool usage.
- Added ContractOrdersPanel component to display drawdown orders and their associated pool.
- Implemented useContractOrders and useContractPool hooks for fetching order and pool data.
- Created booking-orders.service.ts to manage API interactions for drawdown orders and pool data.
- Updated BookingRequestDetailPage and PlaceOrderDialog to accommodate new order handling logic.
2026-06-25 07:06:48 +00:00
yaschalew
db667ccf80 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-25 09:46:34 +03:00
yaschalew
84675f953e health 2026-06-25 09:45:59 +03:00
yaschalew
de81ee1239 last mile 2026-06-25 09:41:49 +03:00
yaschalew
925754067b last mile 2026-06-25 09:40:52 +03:00
Marshal
dd352f0340 feat: synchronize order status with child booking and enhance contract status labels 2026-06-25 06:37:15 +00:00
marshal
104ffaef91 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 09:29:32 +03:00
Marshal
663bc96765 feat: enhance extra routes handling with dynamic yard options based on operation type 2026-06-25 06:29:01 +00:00
Nathnael Wondisha
d41013890b Merge branch 'dev' into freight/fix/type-errors 2026-06-25 09:27:14 +03:00