Commit Graph

2026 Commits

Author SHA1 Message Date
yaschalew10
c5e9794a35 Merge pull request #363 from Tria-plc/freight/feature/vehicle
Freight/feature/vehicle
2026-06-30 05:26:12 +03:00
natib21
1c1e98960e fix 2026-06-30 02:24:52 +00:00
marshal
d05f634948 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-30 05:22:10 +03:00
natib21
ec82f8eb9f fix(migrations): use CREATE TYPE IF NOT EXISTS for invoices enum
Allows migration to run when enum already exists in prod DB. Prevents
'type already exists' error on redeployment.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 02:22:09 +00:00
Marshal
a072f04450 Enhance contract and booking request handling 2026-06-30 02:20:32 +00:00
marshal
abce3da6ce merge conflict 2026-06-30 05:17:56 +03:00
yaschalew10
3c8d9ad1ae Merge pull request #362 from Tria-plc/freight/feature/vehicle
fix(migrations): use CREATE TYPE IF NOT EXISTS for invoices enum
2026-06-30 05:04:54 +03:00
natib21
3ceacbe9a9 fix(migrations): use CREATE TYPE IF NOT EXISTS for invoices enum
Allows migration to run when enum already exists in prod DB. Prevents
'type already exists' error on redeployment.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 02:03:20 +00:00
Stephanos A.
9bd7edbd03 Update Dockerfile 2026-06-30 00:42:39 +03:00
Stephanos A.
592efd0bf9 Merge pull request #361 from Tria-plc/alpha
fix(passenger-api): remove trailing backslash in Dockerfile
2026-06-30 00:31:52 +03:00
Stephanos A
bd372cce32 fix(passenger-api): remove trailing backslash in Dockerfile 2026-06-30 00:30:42 +03:00
Stephanos A.
aa974b940c Merge pull request #360 from Tria-plc/alpha
fix(passenger-api): ensure Prisma client is properly copied to runtim…
2026-06-30 00:17:57 +03:00
Stephanos A
0cefd9ffb2 fix(passenger-api): ensure Prisma client is properly copied to runtime container 2026-06-30 00:16:31 +03:00
Stephanos A.
8da6f5c1e1 Merge pull request #359 from Tria-plc/alpha
fix(passenger-api): resolve all pre-init legacy migrations
2026-06-30 00:06:27 +03:00
Stephanos A
44930b5eab fix(passenger-api): resolve all pre-init legacy migrations 2026-06-30 00:03:38 +03:00
Stephanos A.
538b433afb Merge pull request #358 from Tria-plc/alpha
Skip different schema version migrations
2026-06-29 23:56:49 +03:00
Stephanos A
140a989d34 Skip different schema version migrations 2026-06-29 23:55:24 +03:00
Stephanos A.
944bf544c8 Merge pull request #357 from Tria-plc/alpha
Resolve migrations
2026-06-29 23:49:44 +03:00
Stephanos A
f069ee985d Resolve migrations 2026-06-29 23:45:59 +03:00
Stephanos A.
0433285c1c Merge pull request #356 from Tria-plc/alpha
Move the fix before the failing migration
2026-06-29 23:29:19 +03:00
Stephanos A
c52b02ef72 Move the fix before the failing migration 2026-06-29 23:27:36 +03:00
Stephanos A.
43f15426d8 Merge pull request #355 from Tria-plc/alpha
Fix failed migration state
2026-06-29 23:21:00 +03:00
Stephanos A
7d8e19b37d Fix failed migration state 2026-06-29 23:19:10 +03:00
Stephanos A.
8a5b1891ae Merge pull request #354 from Tria-plc/alpha
Migration issue resolution - individual ticket no timezone
2026-06-29 23:09:45 +03:00
Stephanos A
8c2a2e34bf Migration issue resolution - individual ticket no timezone 2026-06-29 23:08:27 +03:00
Nathnael Wondisha
a43dcb40d3 Merge pull request #353 from Tria-plc/freight/fix/dockerfile
fix
2026-06-29 22:46:01 +03:00
Nathnael
10cde2b2e3 fix 2026-06-29 19:44:40 +00:00
Stephanos A.
d9020aa3c6 Merge pull request #352 from Tria-plc/alpha
Alpha
2026-06-29 21:23:08 +03:00
Stephanos A
2539fe8bba Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-06-29 21:13:32 +03:00
Stephanos A
32ca68f68c TypeError issue resolution 2026-06-29 21:12:20 +03:00
marshal
97992da1b5 Merge pull request #351 from Tria-plc/freight_feature/contrat
Freight feature/contrat
2026-06-29 18:49:16 +03:00
Marshal
d91389daac cfix payment 2026-06-29 15:46:17 +00:00
Marshal
ce3584cd4a cfix payment 2026-06-29 15:41:00 +00:00
yaschalew10
965c91e3f1 Merge pull request #350 from Tria-plc/freight/feature/last_mile_invoice
Freight/feature/last mile invoice
2026-06-29 18:38:32 +03:00
yaschalew
1193e2bfa9 fix commit 2026-06-29 18:35:51 +03:00
yaschalew10
ddc3e723d7 Merge pull request #349 from Tria-plc/freight/feature/last_mile_invoice
Freight/feature/last mile invoice
2026-06-29 18:30:41 +03:00
yaschalew
a564338eeb Merge branch 'freight/feature/last_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 18:29:41 +03:00
yaschalew
690753154f fix 2026-06-29 18:29:24 +03:00
natib21
04bc9eded6 fix 2026-06-29 15:28:04 +00:00
Marshal
c6979a97c2 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 15:25:53 +00:00
natib21
d94b73fe02 fix 2026-06-29 15:09:34 +00:00
Eyob T.
d4fb34c572 Merge pull request #345 from Tria-plc/alpha
Update payment methods and cron job for payment cancellation
2026-06-29 18:06:08 +03:00
natib21
9b11eeb623 fix 2026-06-29 14:54:34 +00:00
natib21
c728b249c2 fix 2026-06-29 14:48:47 +00:00
Nathnael Wondisha
296b4ed399 Merge pull request #348 from Tria-plc/freight/feat/invoice
Migration to central invoice
2026-06-29 17:47:24 +03:00
natib21
fed21de634 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 14:45:37 +00:00
natib21
6fa315db0f fix 2026-06-29 14:45:22 +00:00
Nathnael
31a2e93c49 fix: rm the hardcode false for general contract 2026-06-29 14:42:53 +00:00
Nathnael
feae27d0c3 feat: improve the invoices in the portal 2026-06-29 14:26:25 +00:00
Nathnael Wondisha
4cf8e89780 Merge branch 'dev' into freight/feat/invoice 2026-06-29 17:24:29 +03:00