Commit Graph

1890 Commits

Author SHA1 Message Date
Abubeker Yasin
7ff31a87f5 Merge branch 'alpha' into passenger/feat/iam 2026-07-01 09:18:49 +03:00
Stephanos A
0db0d3af78 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-01 09:03:37 +03:00
Stephanos A
b50a386b25 UAT findings resolutions and enhancements 2026-07-01 09:03:09 +03:00
Roba Boru
6312e93686 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-01 08:01:19 +03:00
Roba Boru
ff27a82bc1 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-01 08:01:03 +03:00
Roba Boru
8a7799be0e Added callback url for fayda 2026-07-01 08:00:47 +03:00
Abubeker Yasin
aa07e22cb9 Merge pull request #385 from Tria-plc/alpha
Alpha
2026-06-30 20:09:01 +03:00
Abubeker Yasin
1c9efed103 fix: ( payment ) add ispublic to payment event consumer 2026-06-30 20:06:43 +03:00
Hagernesh Tadesse
8c11e6ed95 Merge pull request #384 from Tria-plc/importhandover
Importhandover
2026-06-30 17:08:08 +03:00
hagiye
38db9a4177 Delivery approval customer handover signature 2026-06-30 17:05:53 +03:00
hagiye
98d1065f11 Merge branch 'dev' of github.com:Tria-plc/edr-platform into importhandover 2026-06-30 16:53:54 +03:00
hagiye
156747f42f Approve delivery button for customer to sign or acknowlegde delivery 2026-06-30 16:48:08 +03:00
Roba Boru
be9c6c4adb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-30 16:46:09 +03:00
Roba Boru
6e81090f8c Added optimization for search result and fix sea map 2026-06-30 16:45:51 +03:00
Hagernesh Tadesse
8616f6dcdf Merge pull request #383 from Tria-plc/freight/feat/invoice
Freight/feat/invoice
2026-06-30 16:38:16 +03:00
Nathnael
0056dec924 style: clean up the invoice and setup event for warehouse. 2026-06-30 13:28:14 +00:00
Nathnael
fa3138f2ac refactor: migrate the warehouse invoice to use the central one 2026-06-30 12:54:04 +00:00
Abubeker Yasin
100fe2f083 Merge pull request #382 from Tria-plc/alpha
add test payment event
2026-06-30 15:53:32 +03:00
Abubeker Yasin
a667f5b2df add test payment event 2026-06-30 15:51:47 +03:00
Yonas Tewabe
9f2f1b5138 Update docker-compose.yaml 2026-06-30 15:28:39 +03:00
Yonas Tewabe
90f200fdc1 Update Dockerfile.passenger-web 2026-06-30 15:26:23 +03:00
Yonas Tewabe
18e18bd15e Update Dockerfile.web 2026-06-30 15:24:09 +03:00
Yonas Tewabe
1decdc85c7 Merge pull request #380 from Tria-plc/deployment-updates
feat: implement automated environment synchronization and conditional…
2026-06-30 15:18:46 +03:00
yonastewabe
2bbb37207e feat: implement automated environment synchronization and conditional CI/CD deployment workflows 2026-06-30 15:16:47 +03:00
Nathnael
5ad4efd7eb feat: add pdf to the central invoice system 2026-06-30 11:58:28 +00:00
Nathnael
7fa18b8ee7 fix: reference type in payment service 2026-06-30 11:54:43 +00:00
Nathnael
3eb4a24199 fix: terminal clearing int vite 2026-06-30 11:29:28 +00:00
Nathnael
228b840c26 Merge branch 'dev' into freight/feat/invoice 2026-06-30 11:26:32 +00:00
Nathnael Wondisha
eed827e61e Merge pull request #379 from Tria-plc/fix/apiconfig
fix: the hardcoded api url
2026-06-30 14:07:15 +03:00
ghost2023
48340f5e0a fix: the hardcoded api url 2026-06-30 14:05:28 +03:00
Nathnael Wondisha
317945b49a Merge pull request #378 from Tria-plc/fix/apiconfig
fix: the hardcoded api url
2026-06-30 14:02:59 +03:00
ghost2023
9619fbd9b0 fix: the hardcoded api url 2026-06-30 13:58:57 +03:00
Nathnael Wondisha
d112a7ed55 Merge pull request #377 from Tria-plc/fix/apiconfig
fix: testing the env
2026-06-30 13:51:33 +03:00
Nathnael
21cf24950d feat: add partial payment to match the warehouse invoice before migration 2026-06-30 10:50:43 +00:00
ghost2023
fdb77a7036 fix: testing the env 2026-06-30 13:49:52 +03:00
SennayT
3c5f5b5861 fix: add docker cache for pnpm installations 2026-06-30 09:54:59 +00:00
Abubeker Yasin
7b98f74445 Merge pull request #376 from Tria-plc/alpha
fix: ( migration ) clean up migrations
2026-06-30 11:53:12 +03:00
SennayT
e7e523b3b2 geerate prisma client after deploying 2026-06-30 08:39:38 +00:00
Abubeker Yasin
6cb070831b Merge branch 'alpha' into passenger/feat/iam 2026-06-30 11:16:11 +03:00
Abubeker Yasin
35a2a200d6 fix: ( migration ) clean up migrations 2026-06-30 11:11:50 +03:00
SennayT
5e43820efa revert changes to dockerfile 2026-06-30 10:38:53 +03:00
Nathnael Wondisha
1407c345b1 Merge pull request #375 from Tria-plc/fix/apiconfig
fix: api url backoffice
2026-06-30 09:22:09 +03:00
ghost2023
0f762172bf fix: api url backoffice 2026-06-30 09:19:32 +03:00
Nathnael Wondisha
d31b6f2d53 Merge pull request #374 from Tria-plc/fix/apiconfig
fix: api url
2026-06-30 09:15:36 +03:00
ghost2023
004c40059f fix: api url 2026-06-30 09:13:48 +03:00
Abubeker Yasin
813381af2d Merge pull request #373 from Tria-plc/alpha
Update webhooks.controller.ts
2026-06-30 09:13:46 +03:00
Abubeker Yasin
8d7ded1726 Update webhooks.controller.ts 2026-06-30 09:12:45 +03:00
Eyob T.
98da6033b5 Merge pull request #371 from Tria-plc/alpha
Routes management issue fix
2026-06-30 08:53:58 +03:00
Nathnael Wondisha
fec235c433 Merge pull request #372 from Tria-plc/freight/fix/migrate-undo
fix
2026-06-30 08:39:57 +03:00
ghost2023
c299973bb0 fix 2026-06-30 08:38:27 +03:00