Commit Graph

619 Commits

Author SHA1 Message Date
hagiye
3441ee4a0a interchange document generation and acknowledgement 2026-06-27 13:49:41 +03:00
hagiye
3decc9aeea interchange document generation and acknowledgement 2026-06-27 13:39:42 +03:00
yaschalew
421806e282 fix um 2026-06-27 12:54:57 +03:00
natib21
92df6c427c fix 2026-06-27 09:07:28 +00:00
natib21
cc0e6e7d87 :Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-27 08:30:29 +00:00
natib21
657e0bffc3 fix ui 2026-06-27 08:30:01 +00:00
Nathnael Wondisha
a652a0f2a1 Merge pull request #306 from Tria-plc/freight/fix/file-syncing
file syncing and some improvement to the onboarding
2026-06-27 09:29:19 +03:00
yaschalew
33469801b7 resolve conflict 2026-06-27 08:14:05 +03:00
yaschalew
2373e0b8a4 user module 2026-06-27 08:11:06 +03:00
natib21
a013fe1c48 add health check 2026-06-27 05:07:11 +00:00
hagiye
d726927453 Notification for demurrage and invoice fee 2026-06-27 05:33:58 +03:00
hagiye
11803763b0 Invoice and clearance seal approval 2026-06-27 05:11:44 +03:00
hagiye
108d91b5fa Invoice and clearance seal approval 2026-06-27 04:58:21 +03:00
hagiye
fafa64e4db Warehouse receiving for export and GRN generation 2026-06-27 04:20:23 +03:00
hagiye
15be978c42 Warehouse receiving for export and GRN generation 2026-06-27 04:19:32 +03:00
hagiye
6860b891f7 Interchange document 2026-06-27 02:27:40 +03:00
hagiye
29bdf68742 Invoice and clearance seal approval 2026-06-27 01:22:14 +03:00
hagiye
b2b668a392 Invoice and clearance seal approval 2026-06-27 01:13:25 +03:00
hagiye
8005282f9e Invoice and clearance seal approval 2026-06-27 00:39:48 +03:00
hagiye
0438dade75 Invoice and clearance seal approval 2026-06-27 00:32:17 +03:00
hagiye
1d84cad99d Invoice genaration and seal 2026-06-27 00:22:38 +03:00
Hagernesh Tadesse
2f06817e48 Merge pull request #307 from Tria-plc/Release_order
Release order
2026-06-26 23:53:32 +03:00
hagiye
9534950e09 get clearance fix 2026-06-26 23:49:12 +03:00
hagiye
d5e8abcf62 get clearance fix 2026-06-26 23:37:09 +03:00
Nathnael
9c9348d12d fix: unused imports 2026-06-26 13:07:29 +00:00
Nathnael
1c076e0694 fix: rm the global approve 2026-06-26 13:05:34 +00:00
Nathnael
723c403699 fix: finish cleaning up the file syncing 2026-06-26 13:00:11 +00:00
Nathnael
f51488e989 fix: the use person x button to checkbox 2026-06-26 12:42:15 +00:00
Nathnael
552e6bcd16 fix: make the file sync work on onboarding 2026-06-26 12:31:08 +00:00
hagiye
4efef9bab3 inspection status column fix 2026-06-26 13:20:26 +03:00
yaschalew
f21d7ec523 fix conflict 2026-06-26 12:48:21 +03:00
yaschalew
29af8d76f9 fix conflict 2026-06-26 12:47:20 +03:00
hagiye
7bcf7bf3e3 Autounload on train arrival and inspection status column fix 2026-06-26 12:24:46 +03:00
hagiye
75d4c9b7c1 Autounload on train arrival 2026-06-26 12:17:31 +03:00
Marshal
f7428df664 Add Document Clearance pages and sidebar section with permissions 2026-06-26 08:29:34 +00:00
yaschalew
671dc854f3 fix 2026-06-25 13:18:25 +03:00
hagiye
ee9f3fa394 Fix inventory status column 2026-06-25 13:07:50 +03:00
hagiye
e6c2735f9b Fix inventory status column 2026-06-25 13:06:11 +03:00
natib21
f85a6a2196 fix 2026-06-25 09:25:50 +00:00
hagiye
2b7959fc82 fix conflict 2026-06-25 11:31:50 +03:00
hagiye
f4a90755c2 api 2026-06-25 11:00:40 +03:00
Marshal
4b13894ef5 remove unused imports from MyBookings component 2026-06-25 07:41:42 +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
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