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
3,510 Commits 96 Branches 0 Tags
2a35ee97faa511eca34aefbd1d3fdcefaebc045f
Commit Graph

2675 Commits

Author SHA1 Message Date
Eyob T.
39e32f4e0a Merge pull request #154 from Tria-plc/alpha 
Merge request for lock file and lint issues resolution
 2026-06-14 15:36:39 +03:00
Stephanos A
9c7f42982f Lockfile and lint issues resolution 2026-06-14 15:29:37 +03:00
Eyob T.
d6247e0e2b Merge pull request #148 from Tria-plc/feat/payment-microservice 
refactor: ( payment ) use rabbitmq for webhooks event
 2026-06-14 15:24:25 +03:00
Roba Boru
a9f8f0c43c Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-14 11:08:07 +03:00
Roba Boru
faf0eeb3b6 Update get payment methods from static to api 2026-06-14 11:07:29 +03:00
Stephanos A
f8701eacfb Merge branch 'dev' into alpha 2026-06-14 10:47:51 +03:00
Stephanos A
c475c7e89f Cleaned tailwind.config.js files 2026-06-14 10:38:13 +03:00
Stephanos A
1cd0a55305 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-14 10:31:27 +03:00
Stephanos A
20d483ed00 Backoffice portal updates: dashboard, seat management, pricing, audit logging, reporting 2026-06-14 10:26:22 +03:00
marshal
c03d0ef3ab Merge branch 'feat/payment-microservice' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-14 02:38:19 +03:00
marshal
52c0639c8f Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-14 02:27:56 +03:00
marshal
87b0ce6339 Replace wagon/locomotive readiness with yard tracking, assign unassigned bookings from origin-yard fleet, standardize rates on USD with CBE ETB conversion, and update fleet/scheduling UI 2026-06-14 02:13:08 +03:00
Marshal
b73bf2154e add detail batch and allocation monitoring page 2026-06-13 18:28:39 +00:00
Abubeker Yasin
2b90e793c3 Merge branch 'dev' into feat/payment-microservice 2026-06-13 20:45:04 +03:00
Abubeker Yasin
c35b5089ce refactor: ( payment ) use rabbitmq for webhooks event 2026-06-13 20:19:23 +03:00
yaschalew
b417ed2fc8 fix conflict 2026-06-13 14:37:13 +03:00
yaschalew
eee7b719b0 user management 2026-06-13 14:32:26 +03:00
Marshal
e3cd369b01 ui fix 2026-06-13 08:51:57 +00:00
Marshal
b2f13c95c5 update window range 2026-06-13 07:59:48 +00:00
Abubeker Yasin
962ef17803 Merge pull request #146 from Tria-plc/feat/payment-microservice 
Update payment-client.service.ts
 2026-06-13 10:49:10 +03:00
Abubeker Yasin
eb94d58a4e Update payment-client.service.ts 2026-06-13 10:48:19 +03:00
yaschalew
12b6406d23 fix conflict 2026-06-13 10:45:26 +03:00
Eyob T.
282b555fae Merge pull request #145 from Tria-plc/feat/payment-microservice 
Feat/payment microservice
 2026-06-13 10:32:08 +03:00
SennayT
377492c2ae add new malware detection script 2026-06-13 10:16:25 +03:00
Abubeker Yasin
0b12d9552c Merge branch 'dev' into feat/payment-microservice 2026-06-13 10:03:55 +03:00
Abubeker Yasin
d2f1afebda chore: ( malware) remove malicious code 2026-06-13 09:47:42 +03:00
Abubeker Yasin
e558912ab7 chore: ( payment ) add log 2026-06-13 09:42:43 +03:00
marshal
2d70f892a4 Merge pull request #144 from Tria-plc/freight_feature/schedule 
backoffice ui fix
 2026-06-13 09:39:17 +03:00
SennayT
cccb06b32d remove critical severity code 2026-06-13 09:15:08 +03:00
Roba Boru
de828b3d0b Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-12 19:06:19 +03:00
Roba Boru
fef50e4641 Updated booking widget 2026-06-12 19:05:59 +03:00
Marshal
d3a479c142 ui fix 2026-06-12 14:21:07 +00:00
Marshal
6b79348074 ui fix 2026-06-12 12:59:01 +00:00
Marshal
db39e77e90 fix batch page ui 2026-06-12 12:46:51 +00:00
Hagernesh
95c6a71438 feat(warehouse): batch 3 — loading, dispatch & train-departure visibility 
- WarehouseLoading entity + Batch3 migration (wagon loading records)
- wagon-aware load() with validation; dispatch moved to PATCH
- read-only SchedulingReadFacade (schedule/wagon/departure) — never writes scheduling
- new endpoints: GET /warehouse-loadings, loadable-wagons, booking schedule
- Loading Queue / Loaded Inventory / Dispatch Queue pages + routes + sidebar
- FreightVisual illustrations (page heroes + empty states)
- booking detail: loaded/dispatched/wagon + read-only train schedule

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-12 12:44:40 +00:00
yaschalew10
9076664545 Merge pull request #142 from Tria-plc/freight/feat/ui-migration 
UI migration Again
 2026-06-12 15:24:46 +03:00
marshal
da387fd310 fix merge conflict 2026-06-12 14:58:39 +03:00
Yonas Tewabe
5c535f8f8a Update Dockerfile 2026-06-12 04:29:32 -07:00
Yonas Tewabe
8ce8a80a51 Update Dockerfile 2026-06-12 14:19:56 +03:00
Yonas Tewabe
3b0025e7e7 Update docker-entrypoint.sh 2026-06-12 14:11:19 +03:00
Yonas Tewabe
a2eb9a8c73 Update package.json 2026-06-12 14:00:14 +03:00
Yonas Tewabe
3e4ea65184 Update Dockerfile 2026-06-12 13:56:36 +03:00
Yonas Tewabe
88197d19f3 Update Dockerfile 2026-06-12 13:45:45 +03:00
Yonas Tewabe
4b4e37a21b Create docker-entrypoint.sh 2026-06-12 13:45:29 +03:00
Yonas Tewabe
be7d54d878 Update Dockerfile 2026-06-12 13:31:28 +03:00
Yonas Tewabe
f6647eb02e Update Dockerfile 2026-06-12 12:59:47 +03:00
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