Commit Graph

  • e59b797477 Minor updates Stephanos A 2026-07-17 00:49:35 +03:00
  • 92aa0e9252 Merge pull request #750 from Tria-plc/alpha robiman 2026-07-16 23:24:25 +03:00
  • 1bba6dd9fc Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 23:22:55 +03:00
  • 969c524afe Added cron job that check duplicate seat and assign if free available Roba Boru 2026-07-16 23:22:20 +03:00
  • d8ec9b3436 Merge pull request #749 from Tria-plc/freight_feature/usermanagement marshal 2026-07-16 23:13:01 +03:00
  • 71507b27fd changes Marshal 2026-07-16 20:09:59 +00:00
  • 35c53e3f36 changes Marshal 2026-07-16 20:03:35 +00:00
  • 5f5e6f6b4b Merge pull request #748 from Tria-plc/alpha Stephanos A. 2026-07-16 21:53:01 +03:00
  • bf5f62a9ca Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 21:51:41 +03:00
  • 5bcc32cc79 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 21:51:22 +03:00
  • ef37ce4c31 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-16 21:31:13 +03:00
  • 718c384a06 Update tickets.controller.ts Abubeker Yasin 2026-07-16 21:15:10 +03:00
  • 17c0123161 Add unique constraint to JourneySegment for seat bookings per schedule Stephanos A 2026-07-16 21:10:02 +03:00
  • 49a51c4bcc Merge pull request #747 from Tria-plc/dev Abubeker Yasin 2026-07-16 20:46:01 +03:00
  • 19b5f366e2 Merge pull request #746 from Tria-plc/alpha Stephanos A. 2026-07-16 20:13:02 +03:00
  • 3726ac8390 Add seat block schedule id for consistency Stephanos A 2026-07-16 20:11:42 +03:00
  • 80652bb0dc Merge pull request #745 from Tria-plc/alpha Stephanos A. 2026-07-16 19:38:38 +03:00
  • 8ae327e779 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-16 19:28:12 +03:00
  • e3075d1486 Seats holding, booking, blocking inconsistencies resolution Stephanos A 2026-07-16 19:28:00 +03:00
  • 7fb5a58ab0 Merge pull request #744 from Tria-plc/alpha robiman 2026-07-16 17:28:42 +03:00
  • 08dae58fbe Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 17:27:50 +03:00
  • 6d524ce6be Fix payment fallback redirect Roba Boru 2026-07-16 17:27:32 +03:00
  • 51e85dc0eb Merge pull request #743 from Tria-plc/alpha robiman 2026-07-16 17:03:37 +03:00
  • 1df5099cb6 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 17:02:43 +03:00
  • fe5b258fca Fix confirmation page pending payment Roba Boru 2026-07-16 17:02:23 +03:00
  • 93645f1f76 Merge pull request #742 from Tria-plc/alpha robiman 2026-07-16 16:43:13 +03:00
  • bc8571cbd2 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 16:42:10 +03:00
  • e6d85f0ac4 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 16:42:00 +03:00
  • f9b87b9911 Fix waiting time loading Roba Boru 2026-07-16 16:41:36 +03:00
  • 8955139150 Merge pull request #741 from Tria-plc/dev marshal 2026-07-16 16:40:53 +03:00
  • e626e1db63 Merge branch 'dev' into freight/feat/fixes-v1 Nathnael 2026-07-16 13:23:40 +00:00
  • 65d1472600 Merge pull request #740 from Tria-plc/alpha robiman 2026-07-16 16:18:12 +03:00
  • 842dc92a5a Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 16:17:25 +03:00
  • e3e70707a3 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 16:17:15 +03:00
  • 8790e020ee Fix loading message Roba Boru 2026-07-16 16:16:51 +03:00
  • 615054bd66 Merge pull request #739 from Tria-plc/dev Abubeker Yasin 2026-07-16 16:03:41 +03:00
  • 1a3fa4bc5a Merge pull request #738 from Tria-plc/freight_feature/usermanagement marshal 2026-07-16 16:00:07 +03:00
  • b50adc4666 fix issue Marshal 2026-07-16 12:59:28 +00:00
  • 1ef5a589b6 Merge pull request #737 from Tria-plc/alpha robiman 2026-07-16 15:46:34 +03:00
  • 10968410b2 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 15:45:13 +03:00
  • 43c0f5b01e Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 15:45:01 +03:00
  • 0142c94bb0 Check payment before generating ticket Roba Boru 2026-07-16 15:44:47 +03:00
  • e2f42136a8 fix: add password form to account Nathnael 2026-07-16 12:37:52 +00:00
  • cc56ad7748 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-07-16 15:37:25 +03:00
  • e0abfddf10 Update payment-events.consumer.ts Abubeker Yasin 2026-07-16 15:36:02 +03:00
  • 211505a585 Merge pull request #736 from Tria-plc/alpha Stephanos A. 2026-07-16 15:19:07 +03:00
  • e28372306f Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-16 15:18:16 +03:00
  • 6b5a80b597 Supplementary payments client pages Stephanos A 2026-07-16 15:18:01 +03:00
  • 8ee3f13bdb Merge pull request #735 from Tria-plc/freight/feat/payment-revert Nathnael Wondisha 2026-07-16 15:13:30 +03:00
  • f71bbbf782 feat: setup account page for customer and centeralize the otps and phone usages to use the iam user Nathnael 2026-07-16 12:08:45 +00:00
  • c19e4260c1 fix: revert the testing Nathnael 2026-07-16 12:04:58 +00:00
  • 35a9d25aaa Merge pull request #734 from Tria-plc/freight_feature/usermanagement marshal 2026-07-16 15:02:40 +03:00
  • e8e12c1363 fix u=issue Marshal 2026-07-16 12:02:11 +00:00
  • 72a11901c7 Merge pull request #733 from Tria-plc/alpha Eyob T. 2026-07-16 14:38:54 +03:00
  • fa7a517410 Fallback cron job for ticketing if rabbitmq disconnected. Roba Boru 2026-07-16 14:34:53 +03:00
  • 767690236a Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 13:54:45 +03:00
  • 8a1c9bfeb7 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 13:54:33 +03:00
  • 9161b24f98 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-16 13:54:22 +03:00
  • 478d52a623 Merge pull request #732 from Tria-plc/alpha Stephanos A. 2026-07-16 13:40:51 +03:00
  • e316e59eda Update altenative dates Roba Boru 2026-07-16 13:39:44 +03:00
  • b2ab65245a totalMinor with displayTotalMinor updates Stephanos A 2026-07-16 13:38:34 +03:00
  • 5cedd43436 Merge pull request #731 from Tria-plc/wh-dashboard Hagernesh Tadesse 2026-07-16 12:28:08 +03:00
  • d5182c5d85 feat(last-mile): wire multi-container assignment, bulk drawdown + EDR exit papers Hagernesh 2026-07-16 09:03:04 +00:00
  • ff49554cc2 feat(last-mile): per-truck EDR arrival/exit, exit paper, bulk drawdown, departure notify Hagernesh 2026-07-16 08:30:18 +00:00
  • 8b7f4dc563 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-07-16 12:06:00 +03:00
  • c6ca5ed8e8 add provider detail on the Abubeker Yasin 2026-07-16 12:05:47 +03:00
  • a85bae1002 Merge pull request #729 from Tria-plc/alpha Stephanos A. 2026-07-16 12:04:32 +03:00
  • 2b4eeea8d7 Excess luggage tarif management issue resolution Stephanos A 2026-07-16 12:01:44 +03:00
  • 68f6a393a9 Merge pull request #730 from Tria-plc/freight/feat/fixes-v1 Nathnael Wondisha 2026-07-16 11:59:01 +03:00
  • 318af79962 feat: setup posthog Nathnael 2026-07-16 08:52:29 +00:00
  • 8a77f23701 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-16 11:43:14 +03:00
  • a852b4e619 Seats report, supplementary change for bookings added Stephanos A 2026-07-16 11:43:04 +03:00
  • 6dde17fa4d fix: premature payable invoice Nathnael 2026-07-16 08:38:49 +00:00
  • baa5a85a4a Merge pull request #726 from Tria-plc/dev Nathnael Wondisha 2026-07-16 11:30:28 +03:00
  • d34363c276 Merge pull request #728 from Tria-plc/dev Abubeker Yasin 2026-07-16 11:21:20 +03:00
  • 368d01ff34 Merge pull request #727 from Tria-plc/alpha Abubeker Yasin 2026-07-16 11:20:16 +03:00
  • 1186dd91b1 Merge pull request #725 from Tria-plc/freight/feature/user_management_UI yaschalew10 2026-07-16 11:14:32 +03:00
  • af57ffdda4 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-16 08:13:57 +00:00
  • 4a04aa7e97 fic natib21 2026-07-16 08:13:22 +00:00
  • edbef5ccf2 add permissions Abubeker Yasin 2026-07-16 11:01:31 +03:00
  • 2db321b37a Merge pull request #724 from Tria-plc/freight/feat/fixes-v1 Nathnael Wondisha 2026-07-16 10:59:36 +03:00
  • b6d71ccc57 Merge pull request #723 from Tria-plc/freight/feature/user_management_UI yaschalew10 2026-07-16 10:50:34 +03:00
  • 9d53552f95 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-16 07:48:27 +00:00
  • a4b3309412 add seed natib21 2026-07-16 07:43:54 +00:00
  • 5f6d8f9294 fix: cache invalidation Nathnael 2026-07-16 07:17:22 +00:00
  • 312014b678 fix first/last mile natib21 2026-07-16 07:13:24 +00:00
  • 08faf56c4f fix: payment autopay on the payment init added for testing Nathnael 2026-07-16 06:43:12 +00:00
  • bfc8477721 Merge pull request #722 from Tria-plc/alpha Stephanos A. 2026-07-16 08:47:56 +03:00
  • 3bc492ea83 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-16 08:41:53 +03:00
  • b2b31f30bb Generate ticket, dashboard, excess luggage rate updates Stephanos A 2026-07-16 08:41:35 +03:00
  • 50d5ce5ad9 Merge pull request #721 from Tria-plc/freight_feature/usermanagement marshal 2026-07-16 04:06:52 +03:00
  • fe29b38377 fix issue Marshal 2026-07-16 01:05:57 +00:00
  • ea22f38adf Merge pull request #720 from Tria-plc/freight_feature/usermanagement marshal 2026-07-16 03:34:14 +03:00
  • 41fe04652f fix issue Marshal 2026-07-16 00:33:31 +00:00
  • 67bc835458 Merge pull request #719 from Tria-plc/freight_feature/usermanagement marshal 2026-07-16 02:06:08 +03:00
  • 234a74e812 implement empty-container return service: add return quantity handling, update related DTOs, services, and UI components Marshal 2026-07-15 22:48:04 +00:00
  • 70724ac3df Merge pull request #718 from Tria-plc/alpha Abubeker Yasin 2026-07-15 23:26:28 +03:00
  • e3fccbd24d Merge pull request #717 from Tria-plc/freight_feature/usermanagement marshal 2026-07-15 23:18:55 +03:00
  • fc44eee25e implement update train details feature: add DTO, service method, and UI modal for editing train name and run numbers Marshal 2026-07-15 20:14:39 +00:00
  • d0a3fb3ca3 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-07-15 23:14:19 +03:00