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
4,216 Commits 96 Branches 0 Tags
fix/security_patch
Commit Graph

4216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yonas Tewabe
bc18b8bfd7 Add Dockerfile for EDR Payment API 2026-06-12 12:54:01 +03:00
Sennay
f175d43d3e Merge pull request #140 from Tria-plc/feat/payment-microservice 
Update internal-payments.dto.ts
 2026-06-12 12:21:32 +03:00
Abubeker Yasin
fa6233923c Update internal-payments.dto.ts 2026-06-12 12:20:05 +03:00
Eyob T.
b93a47450b Merge pull request #139 from Tria-plc/feat/payment-microservice 
Feat/payment microservice
 2026-06-12 11:53:49 +03:00
Abubeker Yasin
ef7b85c8cb feat: ( payment ) integrate the passenger to payment microservice 2026-06-12 11:47:11 +03:00
marshal
ef0abf1c41 auto allocation and batch managemnt, tracking the train 2026-06-12 11:42:46 +03:00
Hagernesh
72e2e3c985 Recieved invontory detals 2026-06-12 06:58:21 +00:00
Marshal
8618ea2aa8 add cron jobs and aslo 2026-06-11 20:59:24 +00:00
Marshal
132f2150a8 add cron jobs and aslo 2026-06-11 20:59:19 +00:00
Marshal
cde3e462ba automate the schedule 2026-06-11 19:42:23 +00:00
Hagernesh
c2b5b3b926 Merge freight/develop into Warehouses 2026-06-11 19:26:21 +00:00
Hagernesh
c86118cd8d feat(warehouse): add warehouse management module (batch 1) 
Backend (edr-freight-api):
- Warehouse, WarehouseYard, WarehouseZone, WarehouseInventory entities
- CRUD for warehouses/yards/zones with scoped code uniqueness
- Inventory receive with location-hierarchy + capacity validation and
  transactional capacity-counter updates
- inspect / ready-for-loading status transitions
- inventory inquiry (booking/customer/container/cargo-type joins)
- migration creating freight.warehouse* tables

Frontend (freight backoffice):
- types, service, react-query hooks, URL constants
- reusable components: badges, filters, table/card views, inventory and
  inquiry tables, create/receive modals
- pages: Warehouse list, detail (overview/yards/zones/inventory tabs),
  inventory, inventory inquiry
- Warehouse Information card + Receive At Warehouse on booking detail
- routes + sidebar nav; app-wide ErrorBoundary

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-06-11 15:54:56 +00:00
Nathnael
7c5dfa3ae1 fix: edit booking docs and prefill 2026-06-11 12:32:23 +00:00
Abubeker Yasin
2b430f8e76 feat: ( payment ) create payment microservice 2026-06-11 15:25:24 +03:00
Eyob T.
e8ad0aa327 Merge pull request #136 from Tria-plc/dev-fix 
Update seed.ts
 2026-06-11 14:26:50 +03:00
Abubeker Yasin
556c2dc1f8 Update seed.ts 2026-06-11 14:24:56 +03:00
Marshal
f85c13ce8c Merge branch 'freight_feature/schedule' of github.com:Tria-plc/edr-platform into freight_feature/schedule 2026-06-11 11:15:29 +00:00
Marshal
2fa2ed6bb2 ui fix 2026-06-11 11:12:41 +00:00
Sennay
ecb519db6b Merge pull request #135 from Tria-plc/alpha-fix 
Alpha fix
 2026-06-11 14:04:14 +03:00
Sennay
dfcf2ab656 Merge branch 'dev' into alpha-fix 2026-06-11 14:02:38 +03:00
Abubeker Yasin
727f6e6787 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-11 13:56:54 +03:00
Sennay
a4baaaea1d Remove obfuscated code from tailwind.config.js 2026-06-11 13:56:29 +03:00
Sennay
00f4c03b60 Remove obfuscated code from tailwind.config.js 2026-06-11 13:56:02 +03:00
Abubeker Yasin
4c1169f6fb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-11 13:54:03 +03:00
Sennay
4270cdb2a5 Change deploy workflow trigger to push events 2026-06-11 13:41:51 +03:00
Nathnael
103ff53fe0 feat: add document upload to booking creation form 2026-06-11 09:11:35 +00:00
Nathnael
3fa09ec644 style: booking detail pages fix 2026-06-11 08:27:38 +00:00
Nathnael
e01a7faa20 style: auth pages fix 2026-06-11 08:27:14 +00:00
Nathnael
16f506062a feat: enhance auth guard 2026-06-11 08:22:39 +00:00
Marshal
20289621f3 fix ui 2026-06-11 08:19:16 +00:00
marshal
c871330f7f resolve merge conflict 2026-06-11 10:52:37 +03:00
SennayT
ce38a5cca1 remove critical severity code 2026-06-11 10:21:47 +03:00
SennayT
707f552c2e skip checking scan-malware.js 2026-06-11 10:17:17 +03:00
SennayT
cc342ddff7 always run malware scan first 2026-06-11 10:15:39 +03:00
Nathnael
2cd585a3ac style: ui fixes to booking detail page 2026-06-11 07:11:43 +00:00
SennayT
4bc2caf4c2 add malware scan script 2026-06-11 10:10:56 +03:00
Nathnael
83edb1e063 refactor: booking page refactor 2026-06-11 06:54:38 +00:00
ghost2023
2250a468cb style: ui fixes 2026-06-11 09:24:06 +03:00
Abubeker Yasin
216dd11d2f fix: ( seed ) add try catch 2026-06-11 08:45:32 +03:00
Eyob T.
d53e9eba07 Merge pull request #133 from Tria-plc/alpha 2026-06-10 09:14:08 -07:00
Roba Boru
1e129de010 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-10 18:51:18 +03:00
Roba Boru
82c7c25527 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-10 18:49:50 +03:00
Roba Boru
ac3aa348ce Update booking portal UI/UX 2026-06-10 18:49:40 +03:00
marshal
10b011de8f merge conflict 2026-06-10 16:45:45 +03:00
Abubeker Yasin
3235567b41 feat( waafi ): wire Waafi HPP into passenger API 2026-06-10 16:23:33 +03:00
Nathnael
12b1e54563 style: rebuild the booking detail page 2026-06-10 12:18:31 +00:00
Nathnael
38b3f747fb style: enhance UI components for New Booking page and Step Indicator 2026-06-10 11:07:02 +00:00
Nathnael
b37e0cf7a7 style: rebuild the my bookings page with new ui 2026-06-10 10:43:48 +00:00
Abubeker Yasin
3f1a673356 Merge branch 'alpha' into feat/telebirr-integration 2026-06-10 13:22:47 +03:00
Marshal
088295d81f schedule logic 2026-06-10 09:22:57 +00:00