Commit Graph

1738 Commits

Author SHA1 Message Date
natib21
b1d9045d0b fix: remove isPostPaymentCompleted filter check
Property removed from entities until migration creates column.
Temporarily skip this filter until feature is fully implemented.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 03:15:58 +00:00
Yonas Tewabe
2d4608aded Update deploy.yml 2026-06-29 16:21:46 +03:00
Yonas Tewabe
999753b842 Update deploy.yml 2026-06-29 16:07:44 +03:00
Abubeker Yasin
86bea9dc8d Merge pull request #342 from Tria-plc/alpha
Alpha
2026-06-29 15:29:00 +03:00
yaschalew10
a9274a0bad Merge pull request #341 from Tria-plc/freight/feature/last_mile_invoice
fix
2026-06-29 15:28:39 +03:00
yaschalew
0d4587cf52 Merge branch 'freight/feature/last_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 15:26:54 +03:00
natib21
fc95d48d28 fix 2026-06-29 12:25:36 +00:00
marshal
4e632123c0 Merge pull request #340 from Tria-plc/freight_feature/contrat
payemnt
2026-06-29 15:21:01 +03:00
marshal
6685a3ba76 payemnt 2026-06-29 15:17:51 +03:00
yaschalew10
cb4f2c8933 Merge pull request #339 from Tria-plc/freight/feature/last_mile_invoice
Freight/feature/last mile invoice
2026-06-29 15:17:34 +03:00
natib21
aac790292b Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 12:15:53 +00:00
natib21
a64e531324 fix 2026-06-29 12:15:30 +00:00
marshal
d22fb6bb22 Merge pull request #338 from Tria-plc/freight_feature/contrat
payemnt
2026-06-29 15:10:57 +03:00
yaschalew10
87edba6c12 Merge pull request #337 from Tria-plc/freight/feature/last_mile_invoice
Freight/feature/last mile invoice
2026-06-29 15:10:00 +03:00
yaschalew
75ff175538 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 15:09:20 +03:00
marshal
a83a686f37 payemnt 2026-06-29 15:09:19 +03:00
marshal
f958a7639a Merge pull request #336 from Tria-plc/freight_feature/contrat
payemnt
2026-06-29 15:08:50 +03:00
natib21
b22ab739db fix 2026-06-29 12:08:16 +00:00
marshal
09e1429c38 payemnt 2026-06-29 15:08:12 +03:00
marshal
1795bb8830 Merge pull request #335 from Tria-plc/freight_feature/contrat
Freight feature/contrat
2026-06-29 15:07:25 +03:00
marshal
211301b7ce Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 15:06:23 +03:00
marshal
b688a76550 payemnt 2026-06-29 15:05:50 +03:00
Abubeker Yasin
079351f7c4 fix: migration problem 2026-06-29 15:05:46 +03:00
marshal
1491db304b payemnt 2026-06-29 15:04:01 +03:00
yaschalew10
db7f0cb601 Merge pull request #334 from Tria-plc/freight/feature/last_mile_invoice
Freight/feature/last mile invoice
2026-06-29 15:03:00 +03:00
natib21
5c36c09dae fix 2026-06-29 12:01:19 +00:00
natib21
835facc65a fix 2026-06-29 11:12:51 +00:00
Hagernesh Tadesse
eab71f2348 Merge pull request #333 from Tria-plc/importhandover
Importhandover
2026-06-29 13:55:36 +03:00
Abubeker Yasin
b3ec6e4235 refactor: ( iam ) user real uuid 2026-06-29 13:51:05 +03:00
hagiye
64cab3ecd0 Merge branch 'dev' of github.com:Tria-plc/edr-platform into handover 2026-06-29 13:49:25 +03:00
hagiye
9176df5e4b Marshaling document Receive Export and import handover to customer 2026-06-29 13:48:58 +03:00
Eyob T.
580b484882 Merge pull request #329 from Tria-plc/alpha
Migration fix
2026-06-29 13:37:21 +03:00
marshal
943a986b05 Merge pull request #332 from Tria-plc/freight_feature/contrat
Freight feature/contrat
2026-06-29 13:36:14 +03:00
Marshal
1c170ec790 remove unused import for PackageCheck in step2-service-type.tsx 2026-06-29 10:34:40 +00:00
Marshal
15a19053d9 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 10:27:16 +00:00
Marshal
6be461bb2f add profile creation flow with license upload in NewContractPage 2026-06-29 10:25:06 +00:00
marshal
bdca3a1e8d Merge pull request #331 from Tria-plc/freight_feature/contrat
merge conflict
2026-06-29 12:52:50 +03:00
marshal
9fe90c8ef7 merge conflict 2026-06-29 12:50:47 +03:00
marshal
7f63d4bd2b Merge pull request #330 from Tria-plc/freight_feature/contrat
Freight feature/contrat
2026-06-29 12:49:33 +03:00
marshal
160840a22f merge conflict 2026-06-29 12:46:56 +03:00
yaschalew10
750577d72b Merge pull request #328 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-29 12:46:13 +03:00
marshal
1c01c792fc merge conflict 2026-06-29 12:45:40 +03:00
natib21
69e5359783 :wqMerge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 09:43:56 +00:00
Stephanos A
7de3ec45e1 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-06-29 12:43:37 +03:00
natib21
fc03e27bdc fix 2026-06-29 09:43:31 +00:00
Stephanos A
f8810253ff Migration fix 2026-06-29 12:42:37 +03:00
yaschalew10
1225990a69 Merge pull request #327 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-29 12:38:16 +03:00
yaschalew
b95bd76774 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 12:37:28 +03:00
yaschalew
0ad399cdc5 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 12:34:15 +03:00
natib21
9f0d16886d fix 2026-06-29 09:33:56 +00:00