Commit Graph

1186 Commits

Author SHA1 Message Date
natib21
df34a91e61 fix 2026-06-27 13:32:09 +00:00
natib21
2d962d79d8 fix 2026-06-27 11:00:28 +00:00
natib21
de0e9e8c9c fix status update 2026-06-27 10:29:16 +00:00
yaschalew
421806e282 fix um 2026-06-27 12:54:57 +03:00
natib21
92df6c427c fix 2026-06-27 09:07:28 +00:00
natib21
cc0e6e7d87 :Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-27 08:30:29 +00:00
natib21
657e0bffc3 fix ui 2026-06-27 08:30:01 +00:00
yaschalew
f8aa3b3968 fix 2026-06-27 10:02:05 +03:00
yaschalew
9ba520b6d8 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-27 09:30:09 +03:00
yaschalew
9f85d45b17 add package 2026-06-27 09:29:48 +03:00
Nathnael Wondisha
a652a0f2a1 Merge pull request #306 from Tria-plc/freight/fix/file-syncing
file syncing and some improvement to the onboarding
2026-06-27 09:29:19 +03:00
yaschalew10
7e3332156b Merge pull request #313 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-27 08:20:13 +03:00
yaschalew
33469801b7 resolve conflict 2026-06-27 08:14:05 +03:00
Eyob T.
3ecbc88fbb Merge pull request #311 from Tria-plc/alpha
Update fare display, notification for guest user and fix seat allocation
2026-06-27 08:11:58 +03:00
yaschalew
2373e0b8a4 user module 2026-06-27 08:11:06 +03:00
natib21
a013fe1c48 add health check 2026-06-27 05:07:11 +00: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
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
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
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
Nathnael
9c9348d12d fix: unused imports 2026-06-26 13:07:29 +00:00
Nathnael
1c076e0694 fix: rm the global approve 2026-06-26 13:05:34 +00:00
Nathnael
723c403699 fix: finish cleaning up the file syncing 2026-06-26 13:00:11 +00:00
Abubeker Yasin
8678258157 feat: ( permission ) add permission guard 2026-06-26 15:49:14 +03:00
Nathnael
f51488e989 fix: the use person x button to checkbox 2026-06-26 12:42:15 +00:00
Nathnael
552e6bcd16 fix: make the file sync work on onboarding 2026-06-26 12:31:08 +00: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
yaschalew
f21d7ec523 fix conflict 2026-06-26 12:48:21 +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
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