Commit Graph

  • 3509afbcf8 Merge pull request #367 from Tria-plc/alpha Stephanos A. 2026-06-30 07:20:52 +03:00
  • 831ac59a8e Merge branch 'dev' of github.com:Tria-plc/edr-platform into importhandover hagiye 2026-06-30 07:20:10 +03:00
  • 936bf5843e fix(passenger-api): allow gender column migration to run Stephanos A 2026-06-30 07:19:18 +03:00
  • 9f5c22c1ee Goods recieved notes and Booking delivery hagiye 2026-06-30 07:19:12 +03:00
  • fc82c5c636 Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix yaschalew 2026-06-30 07:05:53 +03:00
  • 360e61ac15 fix: use byId() instead of detail() in QUERY_KEYS natib21 2026-06-30 04:04:56 +00:00
  • 0bc9534172 fix: replace apiClient with api in FirstMilePage natib21 2026-06-30 04:03:29 +00:00
  • a3741c45bf fix yaschalew 2026-06-30 07:01:32 +03:00
  • 14dde418f7 fix(migrations): check if tables exist before CREATE TABLE natib21 2026-06-30 03:55:57 +00:00
  • dc4d1c2ac0 Merge pull request #366 from Tria-plc/freight/hot_fix yaschalew10 2026-06-30 06:48:41 +03:00
  • b142552f17 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/hot_fix natib21 2026-06-30 03:46:26 +00:00
  • 25e91c6d93 fix: comment out isPostPaymentCompleted column decorator natib21 2026-06-30 03:33:54 +00:00
  • b1d9045d0b fix: remove isPostPaymentCompleted filter check natib21 2026-06-30 03:15:58 +00:00
  • dd9a7e639a console marshal 2026-06-30 06:15:57 +03:00
  • f51c015814 Enhance payment module Marshal 2026-06-30 03:13:18 +00:00
  • c501effc32 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat marshal 2026-06-30 05:52:59 +03:00
  • 9674c9394d Update logging configuration to use TYPEORM_LOGGING environment variable Marshal 2026-06-30 02:52:19 +00:00
  • 524d10d004 Merge pull request #365 from Tria-plc/freight/feature/vehicle yaschalew10 2026-06-30 05:47:53 +03:00
  • 15cec02e00 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle natib21 2026-06-30 02:46:30 +00:00
  • f9ef473cff fix(migrations): check pg_type before CREATE TYPE enum natib21 2026-06-30 02:45:37 +00:00
  • cd528dc4d6 Merge pull request #364 from Tria-plc/freight/feature/vehicle yaschalew10 2026-06-30 05:35:01 +03:00
  • 76b25bd214 fix natib21 2026-06-30 02:33:29 +00:00
  • c5e9794a35 Merge pull request #363 from Tria-plc/freight/feature/vehicle yaschalew10 2026-06-30 05:26:12 +03:00
  • 1c1e98960e fix natib21 2026-06-30 02:24:52 +00:00
  • d05f634948 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat marshal 2026-06-30 05:22:10 +03:00
  • ec82f8eb9f fix(migrations): use CREATE TYPE IF NOT EXISTS for invoices enum natib21 2026-06-30 02:03:20 +00:00
  • a072f04450 Enhance contract and booking request handling Marshal 2026-06-30 02:20:32 +00:00
  • abce3da6ce merge conflict marshal 2026-06-30 05:17:56 +03:00
  • 3c8d9ad1ae Merge pull request #362 from Tria-plc/freight/feature/vehicle yaschalew10 2026-06-30 05:04:54 +03:00
  • 3ceacbe9a9 fix(migrations): use CREATE TYPE IF NOT EXISTS for invoices enum natib21 2026-06-30 02:03:20 +00:00
  • 9bd7edbd03 Update Dockerfile Stephanos A. 2026-06-30 00:42:39 +03:00
  • 592efd0bf9 Merge pull request #361 from Tria-plc/alpha Stephanos A. 2026-06-30 00:31:52 +03:00
  • bd372cce32 fix(passenger-api): remove trailing backslash in Dockerfile Stephanos A 2026-06-30 00:30:42 +03:00
  • aa974b940c Merge pull request #360 from Tria-plc/alpha Stephanos A. 2026-06-30 00:17:57 +03:00
  • 0cefd9ffb2 fix(passenger-api): ensure Prisma client is properly copied to runtime container Stephanos A 2026-06-30 00:16:31 +03:00
  • 8da6f5c1e1 Merge pull request #359 from Tria-plc/alpha Stephanos A. 2026-06-30 00:06:27 +03:00
  • 44930b5eab fix(passenger-api): resolve all pre-init legacy migrations Stephanos A 2026-06-30 00:03:38 +03:00
  • 538b433afb Merge pull request #358 from Tria-plc/alpha Stephanos A. 2026-06-29 23:56:49 +03:00
  • 140a989d34 Skip different schema version migrations Stephanos A 2026-06-29 23:55:24 +03:00
  • 944bf544c8 Merge pull request #357 from Tria-plc/alpha Stephanos A. 2026-06-29 23:49:44 +03:00
  • f069ee985d Resolve migrations Stephanos A 2026-06-29 23:45:59 +03:00
  • 0433285c1c Merge pull request #356 from Tria-plc/alpha Stephanos A. 2026-06-29 23:29:19 +03:00
  • c52b02ef72 Move the fix before the failing migration Stephanos A 2026-06-29 23:27:36 +03:00
  • 43f15426d8 Merge pull request #355 from Tria-plc/alpha Stephanos A. 2026-06-29 23:21:00 +03:00
  • 7d8e19b37d Fix failed migration state Stephanos A 2026-06-29 23:19:10 +03:00
  • 8a5b1891ae Merge pull request #354 from Tria-plc/alpha Stephanos A. 2026-06-29 23:09:45 +03:00
  • 8c2a2e34bf Migration issue resolution - individual ticket no timezone Stephanos A 2026-06-29 23:08:27 +03:00
  • a43dcb40d3 Merge pull request #353 from Tria-plc/freight/fix/dockerfile Nathnael Wondisha 2026-06-29 22:46:01 +03:00
  • 10cde2b2e3 fix Nathnael 2026-06-29 19:44:40 +00:00
  • d9020aa3c6 Merge pull request #352 from Tria-plc/alpha Stephanos A. 2026-06-29 21:23:08 +03:00
  • 2539fe8bba Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-06-29 21:13:32 +03:00
  • 32ca68f68c TypeError issue resolution Stephanos A 2026-06-29 21:12:20 +03:00
  • 97992da1b5 Merge pull request #351 from Tria-plc/freight_feature/contrat marshal 2026-06-29 18:49:16 +03:00
  • d91389daac cfix payment Marshal 2026-06-29 15:46:17 +00:00
  • ce3584cd4a cfix payment Marshal 2026-06-29 15:41:00 +00:00
  • 965c91e3f1 Merge pull request #350 from Tria-plc/freight/feature/last_mile_invoice yaschalew10 2026-06-29 18:38:32 +03:00
  • 1193e2bfa9 fix commit yaschalew 2026-06-29 18:35:51 +03:00
  • ddc3e723d7 Merge pull request #349 from Tria-plc/freight/feature/last_mile_invoice yaschalew10 2026-06-29 18:30:41 +03:00
  • a564338eeb Merge branch 'freight/feature/last_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice yaschalew 2026-06-29 18:29:41 +03:00
  • 690753154f fix yaschalew 2026-06-29 18:29:24 +03:00
  • 04bc9eded6 fix natib21 2026-06-29 15:28:04 +00:00
  • c6979a97c2 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/contrat Marshal 2026-06-29 15:25:53 +00:00
  • d94b73fe02 fix natib21 2026-06-29 15:09:34 +00:00
  • d4fb34c572 Merge pull request #345 from Tria-plc/alpha Eyob T. 2026-06-29 18:06:08 +03:00
  • 9b11eeb623 fix natib21 2026-06-29 14:54:34 +00:00
  • c728b249c2 fix natib21 2026-06-29 14:48:47 +00:00
  • 296b4ed399 Merge pull request #348 from Tria-plc/freight/feat/invoice Nathnael Wondisha 2026-06-29 17:47:24 +03:00
  • fed21de634 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice natib21 2026-06-29 14:45:37 +00:00
  • 6fa315db0f fix natib21 2026-06-29 14:45:22 +00:00
  • 31a2e93c49 fix: rm the hardcode false for general contract Nathnael 2026-06-29 14:42:53 +00:00
  • feae27d0c3 feat: improve the invoices in the portal Nathnael 2026-06-29 14:16:31 +00:00
  • 4cf8e89780 Merge branch 'dev' into freight/feat/invoice Nathnael Wondisha 2026-06-29 17:24:29 +03:00
  • e9f9450b0f fix: types Nathnael 2026-06-29 14:10:10 +00:00
  • eb1db022a7 Merge pull request #347 from Tria-plc/freight/feature/last_mile_invoice yaschalew10 2026-06-29 17:03:03 +03:00
  • 7dba546254 fix natib21 2026-06-29 13:59:51 +00:00
  • c9951bf0dd Merge pull request #346 from Tria-plc/freight/feature/last_mile_invoice yaschalew10 2026-06-29 16:56:09 +03:00
  • 6d40d185d6 feat: setup the invoice page in the portal Nathnael 2026-06-29 13:54:14 +00:00
  • 69955bc0e6 feat: setup the invoice backend Nathnael 2026-06-29 13:53:32 +00:00
  • 8b6b6ec737 fix natib21 2026-06-29 13:52:54 +00:00
  • f2826f2b9b fix natib21 2026-06-29 13:49:01 +00:00
  • f7f0f6aef3 fix: update the invoice generation to the new booking creation Nathnael 2026-06-29 13:45:35 +00:00
  • 0d5691051f Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-29 16:38:00 +03:00
  • 0b4e3d7817 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-29 16:37:37 +03:00
  • 4c153b0e3b Update payment methods and cron job for payment cancellation Roba Boru 2026-06-29 16:37:01 +03:00
  • d6f3ed5cd4 Merge pull request #343 from Tria-plc/alpha Abubeker Yasin 2026-06-29 16:30:16 +03:00
  • 4c393c33c8 Merge pull request #344 from Tria-plc/freight/feature/last_mile_invoice yaschalew10 2026-06-29 16:26:48 +03:00
  • 93ca1485c8 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice natib21 2026-06-29 13:24:32 +00:00
  • 0d8ed45256 fix natib21 2026-06-29 13:24:01 +00:00
  • 2d4608aded Update deploy.yml Yonas Tewabe 2026-06-29 16:21:46 +03:00
  • 999753b842 Update deploy.yml Yonas Tewabe 2026-06-29 16:07:44 +03:00
  • 7179f75a70 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat marshal 2026-06-29 16:05:46 +03:00
  • 69df391f90 Update payment service and API base URL for local development marshal 2026-06-29 16:03:53 +03:00
  • cc8e88d7eb Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-06-29 16:03:12 +03:00
  • 98959c03cc Fare engine issue resolution Stephanos A 2026-06-29 16:03:00 +03:00
  • 0783ee1635 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat Marshal 2026-06-29 13:01:48 +00:00
  • 0b1e330459 add payemnt test Marshal 2026-06-29 13:00:55 +00:00
  • 86bea9dc8d Merge pull request #342 from Tria-plc/alpha Abubeker Yasin 2026-06-29 15:29:00 +03:00
  • a9274a0bad Merge pull request #341 from Tria-plc/freight/feature/last_mile_invoice yaschalew10 2026-06-29 15:28:39 +03:00
  • 0d4587cf52 Merge branch 'freight/feature/last_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice yaschalew 2026-06-29 15:26:54 +03:00
  • fc95d48d28 fix natib21 2026-06-29 12:25:36 +00:00