Commit Graph

  • 58af6ee2db fix:( payment ) fix date and add waafi demo callback Abubeker Yasin 2026-06-17 12:31:20 +03:00
  • b2f1cec37e Remove concurrency settings from deploy.yml Yonas Tewabe 2026-06-17 12:25:33 +03:00
  • 4ba91400d6 Merge pull request #196 from Tria-plc/feat/payment-microservice Abubeker Yasin 2026-06-17 12:12:34 +03:00
  • 1b6bc47026 fix: ( telebirr ) fix webhook return types Abubeker Yasin 2026-06-17 12:04:00 +03:00
  • cae2848db7 Merge pull request #195 from Tria-plc/freight/feat/portal-fixes Nathnael Wondisha 2026-06-17 11:02:33 +03:00
  • 8b7dcdb897 fixes Nathnael 2026-06-17 08:00:00 +00:00
  • 24f314150c fix Nathnael 2026-06-17 07:43:46 +00:00
  • c59e100e5e style: ui fix in scheduling Nathnael 2026-06-17 07:40:52 +00:00
  • 585d86b8af Merge pull request #194 from Tria-plc/freight/develop Nathnael Wondisha 2026-06-17 10:19:59 +03:00
  • 815c3f4548 Merge branch 'dev' into freight/develop Nathnael Wondisha 2026-06-17 10:19:43 +03:00
  • fc514bb6be Merge pull request #193 from Tria-plc/freight/feat/portal-fixes Nathnael Wondisha 2026-06-17 10:18:24 +03:00
  • c96c863070 fix ghost2023 2026-06-17 09:57:46 +03:00
  • 3919464acb fix: the route direction Nathnael 2026-06-17 07:14:21 +00:00
  • 4f20b07d81 refactor: the portal dashboard Nathnael 2026-06-17 07:02:15 +00:00
  • e9de1e8f0f Merge pull request #192 from Tria-plc/freight_feature/priority marshal 2026-06-17 09:33:53 +03:00
  • 2be9b948ba Switch payment API URL from localhost to production domain in payment client service marshal 2026-06-17 09:31:18 +03:00
  • 1ca98f32ea style: improved the review ui Nathnael 2026-06-17 06:24:03 +00:00
  • 5ba052fda9 Merge pull request #191 from Tria-plc/alpha Eyob T. 2026-06-17 08:12:26 +03:00
  • 81a9c614b7 Update pnpm-lock.yaml Stephanos A 2026-06-17 08:10:59 +03:00
  • 7cada1a0af Merge pull request #190 from Tria-plc/freight_feature/priority marshal 2026-06-17 07:49:05 +03:00
  • 0b7492c502 Switch API configuration from localhost to production URL in portal and add localhost comment in backoffice marshal 2026-06-17 07:47:09 +03:00
  • b2cd30c773 Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority marshal 2026-06-17 07:37:38 +03:00
  • 2de3f78fb0 Add payments management features including summary and listing, and integrate with the dashboard Marshal 2026-06-17 04:35:43 +00:00
  • f59dbdc033 Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority marshal 2026-06-17 04:57:33 +03:00
  • 648f4f2ee4 Add fleet management and admin permissions, and update controllers to enforce new permissions Marshal 2026-06-17 01:56:56 +00:00
  • fe679d23d4 Refactor payment method handling and simplify provider options in PaymentMethodModal Marshal 2026-06-17 01:19:04 +00:00
  • a1b58d0068 Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority marshal 2026-06-17 04:02:48 +03:00
  • c76f8648a9 Updated signature handling, added booking detail components, introduced a signature management page, updated routing, enabled document downloads, and simplified the profile page. Marshal 2026-06-17 01:02:09 +00:00
  • 828f1ac1cd Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority marshal 2026-06-17 03:19:08 +03:00
  • 152dbf8e62 Remove PolinRider malware scan workflow and centralize API configuration marshal 2026-06-17 03:18:34 +03:00
  • e65addc619 Add signature menu item and wrap MySignatureCard in a div on ProfilePage Marshal 2026-06-17 00:09:28 +00:00
  • 7106a549ab Add signature management features for booking contracts Marshal 2026-06-16 23:06:41 +00:00
  • 853c2b2765 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority Marshal 2026-06-16 22:50:01 +00:00
  • dbe4983b75 Pin Mantine dependencies to portal's node_modules and optimize dependency pre-bundling to prevent React version conflicts marshal 2026-06-17 01:29:48 +03:00
  • b191fe2335 Update Vite configuration to use Vitest for testing, add TypeScript source resolution for types, and deduplicate Mantine dependencies to ensure shared context. marshal 2026-06-17 00:44:39 +03:00
  • 57b9029daf Merge branch 'dev' of github.com:Tria-plc/edr-platform into dev marshal 2026-06-16 23:28:47 +03:00
  • 9ad78bffc1 remove virus scanner SennayT 2026-06-16 23:27:25 +03:00
  • 6d8eb65a36 Add TypeScript type annotations to Vite config and dedupe Mantine dependencies marshal 2026-06-16 23:26:03 +03:00
  • fd49d904a8 remove PolinRider malware scan workflow Sennay 2026-06-16 23:25:21 +03:00
  • 9329e6ca57 Refactor payment type exports to separate types from enums in index marshal 2026-06-16 23:08:27 +03:00
  • e815b4d976 Refactor API base URL configuration to use centralized constant across applications marshal 2026-06-16 23:06:46 +03:00
  • 67ab9b5f82 changes marshal 2026-06-16 22:59:48 +03:00
  • 699f7466e2 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority marshal 2026-06-16 22:45:31 +03:00
  • b512e77ce1 Update VITE_API_URL to production endpoint Sennay 2026-06-16 22:35:27 +03:00
  • d110391c05 Merge pull request #189 from Tria-plc/alpha Eyob T. 2026-06-16 22:33:41 +03:00
  • ad2a175ff5 Merge remove changes Roba Boru 2026-06-16 22:29:50 +03:00
  • 57c2549738 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-16 22:29:31 +03:00
  • 001a1a7d98 Update roundtrip booking result Roba Boru 2026-06-16 22:29:10 +03:00
  • 865105eb6a Revert "fix: add lockfile corruption handling to CI/CD and Dockertfiles" Stephanos A 2026-06-16 22:25:26 +03:00
  • 2d513b78a3 Update VITE_API_URL for production deployment Sennay 2026-06-16 22:15:57 +03:00
  • c1d96f1daf Merge pull request #188 from Tria-plc/revert-187-alpha Eyob T. 2026-06-16 22:02:54 +03:00
  • 7a00955588 Revert "fix: add lockfile corruption handling to CI/CD and Dockerfiles" Stephanos A. 2026-06-16 21:58:26 +03:00
  • eb7db6db21 Merge pull request #187 from Tria-plc/alpha Eyob T. 2026-06-16 21:48:40 +03:00
  • 560aff222b fix: add lockfile corruption handling to CI/CD and Dockerfiles Stephanos A 2026-06-16 21:40:01 +03:00
  • 1861d45f1e feat: add the payment to booking page ghost2023 2026-06-16 20:38:48 +03:00
  • c73780712d fixes ghost2023 2026-06-16 20:37:28 +03:00
  • f3284a13d0 refactor(workflow): Revamp booking progress stages and status mapping ghost2023 2026-06-16 17:25:29 +03:00
  • fc57c66d0a Merge pull request #185 from Tria-plc/alpha Eyob T. 2026-06-16 20:20:41 +03:00
  • 38f18d1fde Merge pull request #186 from Tria-plc/freight/hotfix_1 yaschalew10 2026-06-16 19:40:27 +03:00
  • 018ae5e059 fix prod issue natib21 2026-06-16 16:39:29 +00:00
  • ad83c87e2f Enhance deletion logic in Fleet and Schedules services to prevent deletion of records with active dependencies; update Seats and Stations pages to improve UI and remove unused fields. Stephanos A 2026-06-16 19:30:09 +03:00
  • eb60fc340d Refactor booking creation to support one-way and round-trip bookings with enhanced DTOs and service methods Stephanos A 2026-06-16 18:44:09 +03:00
  • e8c6a2bbd2 Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority Marshal 2026-06-16 15:28:38 +00:00
  • 052829c7e6 Add freight demo data seeder and permissions management Marshal 2026-06-16 15:28:10 +00:00
  • 7e1c2dcbd8 Merge pull request #184 from Tria-plc/freight/develop marshal 2026-06-16 18:26:01 +03:00
  • 8098adedaa Merge pull request #183 from Tria-plc/freight_feature/priority marshal 2026-06-16 18:25:12 +03:00
  • 369f2892fb Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority marshal 2026-06-16 18:13:25 +03:00
  • 2e9e69275a Merge pull request #180 from Tria-plc/alpha Eyob T. 2026-06-16 17:40:01 +03:00
  • 82954b1ec1 Merge pull request #182 from Tria-plc/freight_feature/priority marshal 2026-06-16 17:31:28 +03:00
  • 10364fe924 ass signature on the profile marshal 2026-06-16 17:30:22 +03:00
  • 43a822a2ac Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority Marshal 2026-06-16 14:27:00 +00:00
  • f6c28635bc add 'My signature' menu item to user menu Marshal 2026-06-16 14:26:17 +00:00
  • ea9b9c7346 Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority marshal 2026-06-16 17:20:31 +03:00
  • 2d0f5ce6ee changes Marshal 2026-06-16 14:17:40 +00:00
  • fef2239d39 Merge pull request #181 from Tria-plc/freight_feature/priority yaschalew10 2026-06-16 17:02:49 +03:00
  • 2592e604fb changes marshal 2026-06-16 16:57:15 +03:00
  • 524d3b6418 add reusable per-user contract signatures with profile prefill and approval Marshal 2026-06-16 13:34:04 +00:00
  • 62ce2dc64f Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority Marshal 2026-06-16 13:27:29 +00:00
  • 366a335f85 add reusable per-user contract signatures with profile prefill and approval Marshal 2026-06-16 13:26:45 +00:00
  • 421e30dc6c Enhance DTOs and services to support sequence and operational status for coaches and stations Stephanos A 2026-06-16 16:25:33 +03:00
  • c5b8a97a25 Merge pull request #179 from Tria-plc/freight/develop Nathnael Wondisha 2026-06-16 16:23:01 +03:00
  • b82e4ac46e Merge branch 'dev' into freight/develop Nathnael Wondisha 2026-06-16 16:22:38 +03:00
  • 8777c5e26f Merge pull request #176 from Tria-plc/freight_feature/priority Nathnael Wondisha 2026-06-16 16:19:55 +03:00
  • ab3583d9ee Merge pull request #178 from Tria-plc/freight/fix/fixes Nathnael Wondisha 2026-06-16 16:19:14 +03:00
  • edc63379bc fix: type error Nathnael 2026-06-16 13:16:42 +00:00
  • 9afa23cc47 feat: add dashboard summary endpoint and related DTOs for company KPIs Nathnael 2026-06-16 13:06:14 +00:00
  • 16f16e7d7e fix: booking payment Nathnael 2026-06-16 12:14:30 +00:00
  • 1d4edfc98c fix: type error to booking and edit booking ghost2023 2026-06-16 16:08:48 +03:00
  • 4484ed60e6 Update deploy.yml Yonas Tewabe 2026-06-16 16:05:20 +03:00
  • 797d643ec6 Merge pull request #177 from Tria-plc/feat/payment-microservice Eyob T. 2026-06-16 16:00:03 +03:00
  • 17dfce0d18 fixes ghost2023 2026-06-16 15:45:58 +03:00
  • 30fecc3627 fix ( telebirr ) remove booking ref from title Abubeker Yasin 2026-06-16 15:33:03 +03:00
  • c56e0e794c Update payments.module.ts Abubeker Yasin 2026-06-16 15:25:14 +03:00
  • 1ed2c4d2f0 Merge branch 'dev' into feat/payment-microservice Abubeker Yasin 2026-06-16 15:24:33 +03:00
  • f682adc5be feat(bookings): add endpoint to list customer's payable bookings marshal 2026-06-16 15:24:16 +03:00
  • e5850fbc63 feat: ( payment ) return url based on payment method Abubeker Yasin 2026-06-16 15:23:32 +03:00
  • 64fad99bdc Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority Marshal 2026-06-16 12:21:16 +00:00
  • 52a9462228 add booking endpoint for featch payable bookings Marshal 2026-06-16 12:20:49 +00:00
  • cf3db76bb1 type fixes ghost2023 2026-06-16 15:13:11 +03:00
  • 90f86262c0 Merge pull request #175 from Tria-plc/alpha Eyob T. 2026-06-16 14:59:03 +03:00