Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 22:30:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,615 Commits 96 Branches 0 Tags
6e3d2bc0d2130baea2f17f5e917f94dfac2f2018
Commit Graph

408 Commits

Author SHA1 Message Date
hagiye
2a038c59db Import operation gate pass 2026-06-27 21:22:18 +03:00
hagiye
19e395abf6 Import operation gate pass 2026-06-27 21:13:53 +03:00
hagiye
9112e70400 Merge branch 'dev' of github.com:Tria-plc/edr-platform into Interchange 2026-06-27 21:05:20 +03:00
hagiye
fee4365b70 Import operation gate pass 2026-06-27 21:04:27 +03:00
yaschalew10
5c94a8648e Merge pull request #320 from Tria-plc/freight/feature/vehicle_2 
Freight/feature/vehicle 2
 2026-06-27 18:09:19 +03:00
natib21
f5eaa87564 fix ui 2026-06-27 14:15:14 +00:00
yaschalew10
0d6d394fca Merge pull request #319 from Tria-plc/freight/feature/vehicle_2 
Freight/feature/vehicle 2
 2026-06-27 16:21:05 +03:00
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
natib21
de0e9e8c9c fix status update 2026-06-27 10:29:16 +00:00
natib21
92df6c427c fix 2026-06-27 09:07:28 +00:00
yaschalew
f8aa3b3968 fix 2026-06-27 10:02:05 +03:00
yaschalew
9f85d45b17 add package 2026-06-27 09:29:48 +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
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
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
d5e8abcf62 get clearance fix 2026-06-26 23:37:09 +03:00
hagiye
f86bdb1c36 Merge branch 'dev' of github.com:Tria-plc/edr-platform into dev 2026-06-26 13:21:18 +03:00
hagiye
4efef9bab3 inspection status column fix 2026-06-26 13:20:26 +03:00
yaschalew
29af8d76f9 fix conflict 2026-06-26 12:47:20 +03:00
yaschalew
ed496b72ae add iam package 2026-06-26 12:38:31 +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
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
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
Nathnael
6fd9b6d519 chore: setup sms rabbit mq 2026-06-25 07:41:33 +00:00
marshal
f8036a617a merge 2026-06-25 10:37:21 +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
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
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
Nathnael Wondisha
d41013890b Merge branch 'dev' into freight/fix/type-errors 2026-06-25 09:27:14 +03:00