Commit Graph

  • e5c7280bd5 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-18 15:49:25 +03:00
  • f3be5e3d84 feat(company): introduce CompanyProfile entity for detailed company roles ghost2023 2026-06-18 15:32:44 +03:00
  • 526096b101 Merge pull request #216 from Tria-plc/freight_feature/priority marshal 2026-06-18 15:10:08 +03:00
  • 8258429c28 fix: hardcode payment API URL to production endpoint marshal 2026-06-18 15:09:09 +03:00
  • cd1fa385a3 refactor: rm the unused ff client stuff ghost2023 2026-06-18 14:46:11 +03:00
  • 81a495ec61 refactor: cut off the old customre entity ghost2023 2026-06-18 14:41:16 +03:00
  • 7bdcee04bc Merge pull request #215 from Tria-plc/alpha Eyob T. 2026-06-18 14:06:29 +03:00
  • b491f39d42 Booking and pricing related updates Stephanos A 2026-06-18 14:02:11 +03:00
  • f1c2943854 driver natib21 2026-06-18 09:51:31 +00:00
  • 3352333bef fix yaschalew 2026-06-18 12:49:47 +03:00
  • fc702f0fbe driver natib21 2026-06-18 09:46:35 +00:00
  • 96ad7bd152 save yaschalew 2026-06-18 12:38:15 +03:00
  • 4b46c44147 fix yaschalew 2026-06-18 12:33:45 +03:00
  • 5c070d239e fix save yaschalew 2026-06-17 11:09:38 +03:00
  • a9aa4876af Merge pull request #214 from Tria-plc/Demurrage_invoices yaschalew10 2026-06-18 12:25:46 +03:00
  • 398bc9330e fix migration natib21 2026-06-18 09:11:10 +00:00
  • b069f95596 Merge pull request #213 from Tria-plc/freight_feature/priority marshal 2026-06-18 10:30:32 +03:00
  • aef1214d1e Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority marshal 2026-06-18 10:29:42 +03:00
  • 62038458f8 refactor: disable demo data seeders while retaining for easy re-enabling Marshal 2026-06-18 07:27:57 +00:00
  • 9cc40514c4 Merge pull request #212 from Tria-plc/freight_hotfix_2 yaschalew10 2026-06-18 10:14:21 +03:00
  • 58fcf9ce3f fix data integrity issue natib21 2026-06-18 07:13:08 +00:00
  • 16bb0b5246 changes Marshal 2026-06-18 06:58:01 +00:00
  • b9c43e9214 Update service paths in deploy workflow Yonas Tewabe 2026-06-18 09:18:37 +03:00
  • ad11f8c220 Merge pull request #211 from Tria-plc/alpha Eyob T. 2026-06-18 08:27:52 +03:00
  • aefee5027a Fix missing booking columns Stephanos A 2026-06-18 08:26:05 +03:00
  • 0c6cf97a59 Merge pull request #210 from Tria-plc/Demurrage_invoices Hagernesh Tadesse 2026-06-18 03:15:19 +03:00
  • be12a9d496 fee invoice frontend Hagernesh 2026-06-18 00:12:59 +00:00
  • 3860d17304 demurrage invoices Hagernesh 2026-06-18 00:05:50 +00:00
  • 33b74a5da9 demurrage invoices Hagernesh 2026-06-18 00:04:07 +00:00
  • 01aec12ee9 feat(warehouse): Batch 5 — config-driven allocation + storage/demurrage fee rules Hagernesh 2026-06-17 23:53:04 +00:00
  • 270e39edd6 fix: post-merge cleanup after freight/develop merge Hagernesh 2026-06-17 23:04:48 +00:00
  • 8db8bb1808 automation of loading and unloading Hagernesh 2026-06-17 22:33:51 +00:00
  • 89d651693b automation of loading and unloading Hagernesh 2026-06-17 22:33:06 +00:00
  • ff79657018 automation Hagernesh 2026-06-17 22:16:01 +00:00
  • 5a6e1ef363 automation Hagernesh 2026-06-17 22:01:47 +00:00
  • 5b8cb16c1a automation Hagernesh 2026-06-17 22:00:53 +00:00
  • 1db1467ea1 automated loading and unloading Hagernesh 2026-06-17 21:45:22 +00:00
  • d062a74e27 Merge pull request #208 from Tria-plc/freight_feature/priority marshal 2026-06-17 23:05:03 +03:00
  • 1d9e0f2108 add payment currency field to booking forms with ETB/USD selection support marshal 2026-06-17 23:01:08 +03:00
  • 1f37803454 Merge pull request #207 from Tria-plc/alpha Eyob T. 2026-06-17 22:31:22 +03:00
  • 48b33f86f6 Merge pull request #206 from Tria-plc/freight_feature/priority marshal 2026-06-17 22:25:19 +03:00
  • 8396b83f46 add price change confirmation modal and support document replacement for change-requested bookings marshal 2026-06-17 22:23:48 +03:00
  • a25ee13339 Updated to address requests and UAT feedback Stephanos A 2026-06-17 22:23:24 +03:00
  • 507758ea39 fix: update booking data structure to use meta.total and add null coalescing for checkbox states marshal 2026-06-17 21:14:00 +03:00
  • 800c9fcb7c Merge pull request #205 from Tria-plc/freight_feature/priority marshal 2026-06-17 21:03:04 +03:00
  • ca7d5cb92b switch API base URL from localhost to production endpoint marshal 2026-06-17 20:57:42 +03:00
  • 1141370767 update signup phone validation to enforce Ethiopian mobile format and fix invoice default balance marshal 2026-06-17 20:56:40 +03:00
  • 51e0d4897a update authentication pages with new layout and functionality Marshal 2026-06-17 17:49:16 +00:00
  • 58e6e05458 add login image marshal 2026-06-17 20:30:20 +03:00
  • b3904caacb Refactor expireHolds to optimize expired seat hold deletion Stephanos A 2026-06-17 20:23:32 +03:00
  • b85bd954f1 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-17 20:22:28 +03:00
  • 6d73359b8e update booking request object Roba Boru 2026-06-17 20:22:09 +03:00
  • 5a5e9b55ed Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Stephanos A 2026-06-17 20:20:53 +03:00
  • 46d332e153 Seat hold updates Stephanos A 2026-06-17 20:20:40 +03:00
  • a6fb5e1b74 Merge pull request #204 from Tria-plc/feat/payment-microservice Abubeker Yasin 2026-06-17 20:15:06 +03:00
  • 5b9fed57fe add payment success and failure pages with environment variable support Marshal 2026-06-17 17:13:19 +00:00
  • be64352bf1 refactor: ( waafi ) use USD for demo Abubeker Yasin 2026-06-17 20:12:44 +03:00
  • 3798b28bcd implement auto-consolidation for freight bookings at submission time Marshal 2026-06-17 16:46:44 +00:00
  • 31fc93a9d5 Merge pull request #203 from Tria-plc/alpha Eyob T. 2026-06-17 19:37:11 +03:00
  • 1dc7766078 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-17 19:33:27 +03:00
  • e550c6ed36 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-17 19:33:10 +03:00
  • bd0d90eddd Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority Marshal 2026-06-17 16:33:07 +00:00
  • bc61578f80 Update email/sms service config Roba Boru 2026-06-17 19:32:40 +03:00
  • ddf42f3a34 Merge pull request #202 from Tria-plc/alpha Eyob T. 2026-06-17 18:47:31 +03:00
  • 4601ee0e60 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Stephanos A 2026-06-17 18:12:58 +03:00
  • a82538d9db feat: enhance search and ticketing for multi-leg (round trip + transit) journeys Stephanos A 2026-06-17 18:12:49 +03:00
  • 9dc3bc0765 enhance booking form UI with new components and improved layouts Marshal 2026-06-17 14:12:14 +00:00
  • 978893f8e5 Merge pull request #200 from Tria-plc/alpha Eyob T. 2026-06-17 17:02:27 +03:00
  • 2c33ce44bf Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-17 16:54:37 +03:00
  • a74a9232f2 Fix build error Roba Boru 2026-06-17 16:54:16 +03:00
  • 276c229cd4 Fix missing newline at end of tailwind.config.js Yonas Tewabe 2026-06-17 16:51:13 +03:00
  • c89f7dcc11 implement PayNowButton component and integrate payment functionality in booking rows Marshal 2026-06-17 13:50:57 +00:00
  • 8c691ae33f Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-17 16:50:56 +03:00
  • 9d59ecb29a Update tailwind.config.js Yonas Tewabe 2026-06-17 16:50:44 +03:00
  • b5abe79294 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-17 16:50:41 +03:00
  • 2bfce8beb1 Update booking summary page layout and update notification service Roba Boru 2026-06-17 16:49:05 +03:00
  • 7eb6228d31 feat: add shipment tracking feature with live updates Marshal 2026-06-17 13:23:40 +00:00
  • 5d0812ade1 Merge pull request #201 from Tria-plc/feat/payment-microservice Abubeker Yasin 2026-06-17 16:00:52 +03:00
  • 6ecc19c69c Update waafi.provider.ts Abubeker Yasin 2026-06-17 15:59:46 +03:00
  • a6fc8e3eb6 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Stephanos A 2026-06-17 15:52:29 +03:00
  • 25668e7916 Enhance guest booking functionality with round trip support and fare engine integration Stephanos A 2026-06-17 15:52:18 +03:00
  • f528b75737 Warehouse Hagernesh 2026-06-17 12:44:57 +00:00
  • cd31f3612c Implement user-based booking access control and enhance booking filtering options Marshal 2026-06-17 12:35:29 +00:00
  • d67f4a8358 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-17 15:18:26 +03:00
  • a304ed2f03 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-17 15:07:38 +03:00
  • 1d34354e66 Update booking result page for round trip Roba Boru 2026-06-17 15:07:05 +03:00
  • c256784b17 Merge pull request #199 from Tria-plc/dev Nathnael Wondisha 2026-06-17 15:03:12 +03:00
  • 2a9729304f Update .gitignore Yonas Tewabe 2026-06-17 14:54:11 +03:00
  • 1ad1999b2f Update tailwind.config.js Yonas Tewabe 2026-06-17 14:53:45 +03:00
  • 31710494d4 add telebirr and waafi icon marshal 2026-06-17 14:53:30 +03:00
  • 3e618c8f71 Update tailwind.config.js Yonas Tewabe 2026-06-17 14:52:59 +03:00
  • 611c8201da Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority marshal 2026-06-17 14:33:07 +03:00
  • d7476a51c1 Removed console.log statements and corrected the amount calculation by removing the multiplication by 100. marshal 2026-06-17 14:21:33 +03:00
  • 999a58011c Update deploy.yml Yonas Tewabe 2026-06-17 14:00:10 +03:00
  • 52f0fd7e62 Merge pull request #198 from Tria-plc/freight/fix/hot-fixes Nathnael Wondisha 2026-06-17 13:43:58 +03:00
  • a4a58d264a fix ghost2023 2026-06-17 13:43:35 +03:00
  • 24ee3b88f5 Round trip booking and additional enhancements Stephanos A 2026-06-17 13:42:20 +03:00
  • dcb2de7631 fix: settings page ghost2023 2026-06-17 13:34:23 +03:00
  • 2a0f16241b fix: improve the setting onboarding flow ghost2023 2026-06-17 13:17:09 +03:00
  • e007b28285 fix: type errors ghost2023 2026-06-17 11:48:41 +03:00