Stephanos A
|
cc8e88d7eb
|
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
|
2026-06-29 16:03:12 +03:00 |
|
Stephanos A
|
98959c03cc
|
Fare engine issue resolution
|
2026-06-29 16:03:00 +03:00 |
|
Abubeker Yasin
|
079351f7c4
|
fix: migration problem
|
2026-06-29 15:05:46 +03:00 |
|
Abubeker Yasin
|
b3ec6e4235
|
refactor: ( iam ) user real uuid
|
2026-06-29 13:51:05 +03:00 |
|
Stephanos A
|
7de3ec45e1
|
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
|
2026-06-29 12:43:37 +03:00 |
|
Stephanos A
|
f8810253ff
|
Migration fix
|
2026-06-29 12:42:37 +03:00 |
|
Abubeker Yasin
|
b70e9ea2cd
|
feat: ( payments ) convert ETB to method currency before charging
|
2026-06-29 11:55:31 +03:00 |
|
Stephanos A
|
c6e56d1c4f
|
Boarding, payment methods, journey direction on seat hold, and more updates
|
2026-06-29 08:44:38 +03:00 |
|
Roba Boru
|
81ae99cee3
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-27 07:16:31 +03:00 |
|
Roba Boru
|
c50abbffaa
|
Update fare display based on currency and fix seat allocation
|
2026-06-27 07:16:08 +03:00 |
|
Hagernesh Tadesse
|
30e3a0b46b
|
Merge pull request #310 from Tria-plc/marshaling
Marshaling
|
2026-06-27 04:47:32 +03:00 |
|
Roba Boru
|
d86cfa43ea
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-27 04:28:48 +03:00 |
|
hagiye
|
fafa64e4db
|
Warehouse receiving for export and GRN generation
|
2026-06-27 04:20:23 +03:00 |
|
hagiye
|
e30f48d3bc
|
Merge branch 'dev' of github.com:Tria-plc/edr-platform into marshaling
|
2026-06-27 04:19:56 +03:00 |
|
hagiye
|
15be978c42
|
Warehouse receiving for export and GRN generation
|
2026-06-27 04:19:32 +03:00 |
|
Hagernesh Tadesse
|
503dd760ad
|
Merge pull request #309 from Tria-plc/marshaling
Interchange document automated
|
2026-06-27 02:31:08 +03:00 |
|
hagiye
|
2fecde7ebc
|
Merge branch 'dev' of github.com:Tria-plc/edr-platform into marshaling
|
2026-06-27 02:27:58 +03:00 |
|
hagiye
|
6860b891f7
|
Interchange document
|
2026-06-27 02:27:40 +03:00 |
|
Hagernesh Tadesse
|
7bfe828d03
|
Merge pull request #308 from Tria-plc/marshaling
Marshaling
|
2026-06-27 01:24:32 +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
|
3ca04ed630
|
Merge branch 'dev' of github.com:Tria-plc/edr-platform into dev
|
2026-06-26 23:48:28 +03:00 |
|
hagiye
|
d5e8abcf62
|
get clearance fix
|
2026-06-26 23:37:09 +03:00 |
|
Abubeker Yasin
|
8678258157
|
feat: ( permission ) add permission guard
|
2026-06-26 15:49:14 +03:00 |
|
Abubeker Yasin
|
0b013e91ef
|
Merge pull request #305 from Tria-plc/alpha
Update pnpm-lock.yaml
|
2026-06-26 14:42:37 +03:00 |
|
Abubeker Yasin
|
e2dbd27222
|
Update pnpm-lock.yaml
|
2026-06-26 14:41:31 +03:00 |
|
Abubeker Yasin
|
cdfe2617f6
|
Merge pull request #304 from Tria-plc/alpha
Alpha
|
2026-06-26 14:34:12 +03:00 |
|
Abubeker Yasin
|
b490e2581f
|
Merge branch 'dev' into alpha
|
2026-06-26 14:32:30 +03:00 |
|
Abubeker Yasin
|
e7b0b95a10
|
Merge branch 'passenger/feat/iam' into alpha
|
2026-06-26 14:31:40 +03:00 |
|
Abubeker Yasin
|
9c664ccce6
|
feat(auth): add post-Fayda password setup flow
|
2026-06-26 14:20:32 +03:00 |
|
Eyob T.
|
49b3adf31a
|
Merge pull request #303 from Tria-plc/alpha
Package inquiry, UAT related updates
|
2026-06-26 14:17:40 +03:00 |
|
Stephanos A
|
86c7b2e4eb
|
Package inquiry, UAT related update
|
2026-06-26 13:57:26 +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 |
|
yaschalew10
|
6f04aa1f3c
|
Merge pull request #302 from Tria-plc/freight/feature/vehicle_2
fix conflict
|
2026-06-26 12:49:24 +03:00 |
|
yaschalew
|
f21d7ec523
|
fix conflict
|
2026-06-26 12:48:21 +03:00 |
|
yaschalew10
|
1713a0a212
|
Merge pull request #301 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
|
2026-06-26 12:47:50 +03:00 |
|
yaschalew
|
29af8d76f9
|
fix conflict
|
2026-06-26 12:47:20 +03:00 |
|
yaschalew
|
d1c099c70b
|
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
|
2026-06-26 12:39:24 +03:00 |
|
yaschalew
|
ed496b72ae
|
add iam package
|
2026-06-26 12:38:31 +03:00 |
|
hagiye
|
0556ca7966
|
inspection status column fix
|
2026-06-26 12:33:22 +03:00 |
|
hagiye
|
7bcf7bf3e3
|
Autounload on train arrival and inspection status column fix
|
2026-06-26 12:24:46 +03:00 |
|
Eyob T.
|
411244ae28
|
Merge pull request #300 from Tria-plc/alpha
Throttling configuration from the passenger back office app
|
2026-06-26 12:23:46 +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 |
|