natib21
f85a6a2196
fix
2026-06-25 09:25:50 +00:00
yaschalew10
a00a9281fd
Merge pull request #290 from Tria-plc/freight/feature/vehicle_2
...
fix last mile
2026-06-25 12:04:12 +03:00
yaschalew
a8f9fc0445
fix last mile
2026-06-25 12:02:27 +03:00
yaschalew10
a09961c36a
Merge pull request #274 from Tria-plc/Release_order
...
Release order
2026-06-25 11:42:23 +03:00
hagiye
2b7959fc82
fix conflict
2026-06-25 11:31:50 +03:00
Yonas Tewabe
c1aa7ed8d7
Update docker-compose.yaml
2026-06-25 11:25:57 +03:00
Yonas Tewabe
1c841f549f
Update docker-compose.yaml
2026-06-25 11:22:56 +03:00
Yonas Tewabe
1ff304611a
Update docker-compose.yaml
2026-06-25 11:17:03 +03:00
Yonas Tewabe
4e22c4372f
Update Dockerfile.web
2026-06-25 11:16:58 +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
1147f0553b
Merge pull request #288 from Tria-plc/freight_feature/profile
...
Freight feature/profile
2026-06-25 10:42:42 +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
e98624d56f
merge
2026-06-25 10:39:21 +03: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
yaschalew10
97060e78fb
Merge pull request #287 from Tria-plc/freight/feature/vehicle_2
...
fix
2026-06-25 10:36:16 +03:00
Marshal
859e16c2be
enhance onNavigate prop to accept options for navigation state
2026-06-25 07:35:07 +00:00
yaschalew
31fbca23d6
fix
2026-06-25 10:34:40 +03:00
yaschalew10
19c17e94b8
Merge pull request #286 from Tria-plc/freight/feature/vehicle_2
...
health
2026-06-25 10:31:33 +03:00
yaschalew
8d7517b6af
health
2026-06-25 10:29:51 +03: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
yaschalew10
33684b6489
Merge pull request #284 from Tria-plc/freight/feature/vehicle_2
...
Freight/feature/vehicle 2
2026-06-25 09:48:11 +03: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
yaschalew10
c33fe6a659
Merge pull request #283 from Tria-plc/freight/fix/type-errors
...
Onboarding Polish and update
2026-06-25 09:28:46 +03:00
Nathnael Wondisha
d41013890b
Merge branch 'dev' into freight/fix/type-errors
2026-06-25 09:27:14 +03:00
Nathnael
360f6885d5
feat: setup contact person verification
2026-06-25 06:17:57 +00:00
marshal
1a868cac30
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-25 09:12:55 +03:00
Marshal
8dff19eae1
refactor: optimize pool lines utilization calculation in ContractDetailPage
2026-06-25 06:12:31 +00:00
marshal
c82e925152
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-25 09:10:02 +03:00
Marshal
d31b4c668a
feat: update booking form to remove per-route quantity input for general contracts
2026-06-25 06:09:21 +00:00
marshal
cf850c1fcd
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-25 08:56:13 +03:00
Marshal
a5a2f99dc0
feat: enhance clearance document submission process and UI feedback
2026-06-25 05:55:28 +00:00
marshal
44005fa754
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-25 06:17:38 +03:00
Marshal
c249c25731
refactor: update clearance review colors and styles for consistency
...
- Changed status colors in ClearanceReviewSection from blue to green for approved and from accent to gray for pending.
- Updated Loader color in DocumentClearanceDetailPage to green.
- Adjusted Badge colors in DocumentClearanceDetailPage and DocumentClearanceListPage to reflect new color scheme.
- Introduced DirectionIcon component for better visual representation of trade direction with tooltips.
- Enhanced ResubmitDocuments component to improve document handling and display.
- Added validation error alerts in ChangesRequestedView and ResubmitBookingModal.
- Implemented ContractSignButton for bookings ready for signature.
- Created useBookingDocumentSetting hook to fetch document settings based on company nationality.
2026-06-25 03:16:21 +00:00
marshal
9a240be315
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-25 05:46:43 +03:00
Marshal
9353d57585
feat: implement resubmit flow for CHANGES_REQUESTED bookings with document updates
2026-06-25 02:46:06 +00:00
marshal
1f5a6be2ff
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-25 05:19:54 +03:00
