Commit Graph

  • 7725b0d5d4 Update payments.service.ts Abubeker Yasin 2026-07-15 23:14:05 +03:00
  • f4ae970fc9 Merge pull request #716 from Tria-plc/alpha Eyob T. 2026-07-15 22:05:56 +03:00
  • 916b41d541 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 22:03:58 +03:00
  • 230fdfb852 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 22:03:48 +03:00
  • 63accc8bd3 Fix booking detail for roundtrip Roba Boru 2026-07-15 22:03:29 +03:00
  • 5360075a74 Merge pull request #715 from Tria-plc/alpha Abubeker Yasin 2026-07-15 21:47:32 +03:00
  • 458f27c1b1 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-07-15 21:33:17 +03:00
  • fa40dc787b Merge pull request #714 from Tria-plc/alpha Eyob T. 2026-07-15 21:32:35 +03:00
  • 4452ec2410 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 21:29:51 +03:00
  • be7b829845 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 21:29:35 +03:00
  • f185da2163 Update seatmap for blocked seats Roba Boru 2026-07-15 21:28:35 +03:00
  • 9cf71e7e7a feat: ( payment ) add waafi webhook log Abubeker Yasin 2026-07-15 21:23:10 +03:00
  • 9a8c42d0b3 Merge pull request #713 from Tria-plc/alpha Stephanos A. 2026-07-15 21:13:50 +03:00
  • 2d2fcfbda9 Seat block issue resolution Stephanos A 2026-07-15 21:11:23 +03:00
  • 2ffb2f9f60 remove auth Abubeker Yasin 2026-07-15 20:05:55 +03:00
  • ffa5a114b5 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 19:57:18 +03:00
  • 0d117362d6 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 19:56:58 +03:00
  • be46744417 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 19:56:22 +03:00
  • b12df90e59 Merge pull request #712 from Tria-plc/alpha Stephanos A. 2026-07-15 19:53:38 +03:00
  • 8bda06b226 Currency issue resolution Stephanos A 2026-07-15 19:50:32 +03:00
  • d45b4e78d4 Merge pull request #711 from Tria-plc/alpha Stephanos A. 2026-07-15 19:21:35 +03:00
  • 4343ead1fe Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-15 19:18:49 +03:00
  • 7bbd34f159 Currency issue resolution Stephanos A 2026-07-15 19:18:35 +03:00
  • a8690a60d8 Merge pull request #710 from Tria-plc/dev mulish77 2026-07-15 19:09:12 +03:00
  • 6518ba799a Merge pull request #709 from Tria-plc/wh-dashboard Hagernesh Tadesse 2026-07-15 18:35:32 +03:00
  • 2647776d19 feat(warehouse): stamp actor as display name instead of UUID Hagernesh 2026-07-15 15:24:05 +00:00
  • 2044312d93 feat(warehouse): stamp authenticated user as action actor (performedBy) Hagernesh 2026-07-15 14:51:21 +00:00
  • d7d9db9c3a changes Marshal 2026-07-15 14:27:00 +00:00
  • ac90b04be0 feat(warehouse): P2 dashboard — gate/dock throughput + live auto-refresh Hagernesh 2026-07-15 14:19:40 +00:00
  • 7be432436b Merge pull request #708 from Tria-plc/wh-dashboard Hagernesh Tadesse 2026-07-15 16:57:23 +03:00
  • fc4aadbc57 feat(warehouse): P1 dashboard analytics — dwell/aging, cycle-time + on-time, live deltas Hagernesh 2026-07-15 13:51:23 +00:00
  • 6391ba837a Merge pull request #707 from Tria-plc/freight_feature/usermanagement marshal 2026-07-15 16:30:28 +03:00
  • 19c9da28ae changes Marshal 2026-07-15 13:29:01 +00:00
  • f5423e19b5 Merge pull request #705 from Tria-plc/alpha Eyob T. 2026-07-15 15:34:16 +03:00
  • 05ebbed1fc Merge pull request #704 from Tria-plc/accrualdashboard Hagernesh Tadesse 2026-07-15 15:32:41 +03:00
  • 18ad65acc4 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 15:31:41 +03:00
  • 2e22b72e27 feat(warehouse): assemble dashboard cockpit + server-side throughput series Hagernesh 2026-07-15 11:07:45 +00:00
  • 7c9594a581 Fix seat reservation Roba Boru 2026-07-15 15:25:32 +03:00
  • ea2d912773 Merge pull request #703 from Tria-plc/alpha Abubeker Yasin 2026-07-15 15:04:26 +03:00
  • 6f8dcaaf4a Comment out altenative schedules Roba Boru 2026-07-15 14:58:25 +03:00
  • 8c1f2a21c6 Merge pull request #702 from Tria-plc/dev Abubeker Yasin 2026-07-15 14:20:45 +03:00
  • f13b1d176c remove no cache when building SennayT 2026-07-15 13:57:28 +03:00
  • f9706c9fb0 refactor: separate base image configuration into Dockerfile.base for improved build management SennayT 2026-07-15 10:51:35 +00:00
  • 3416585a01 add puppeteer support SennayT 2026-07-15 13:42:28 +03:00
  • 7700aa6358 Merge pull request #701 from Tria-plc/freight_feature/usermanagement marshal 2026-07-15 13:32:37 +03:00
  • c71a0043d6 implement wagon maintenance feature: add functionality to detach wagons and move them to maintenance status Marshal 2026-07-15 10:32:09 +00:00
  • 2c56928c6f Merge pull request #700 from Tria-plc/alpha Eyob T. 2026-07-15 12:52:32 +03:00
  • 30a91691c8 Update seat availability Roba Boru 2026-07-15 12:50:19 +03:00
  • 11771e5f92 remove reopen delay minutes from global rules and update related types Marshal 2026-07-15 09:13:02 +00:00
  • 6a0e333ff5 Merge pull request #699 from Tria-plc/dev Abubeker Yasin 2026-07-15 11:08:39 +03:00
  • 1d143cf17f Merge pull request #698 from Tria-plc/accrualdashboard Hagernesh Tadesse 2026-07-15 10:59:11 +03:00
  • fd4c4d630f fix(warehouse): disable Receive-At-Warehouse once booking is received Hagernesh 2026-07-15 07:49:28 +00:00
  • b71a53c4a9 fix(warehouse): show booking reference instead of UUID in inventory table Hagernesh 2026-07-14 15:04:03 +00:00
  • 9c864a3121 Merge pull request #697 from Tria-plc/alpha Stephanos A. 2026-07-15 10:53:05 +03:00
  • 6b84f22a91 Fix seat class name assignment to ensure consistency with fare engine resolution Stephanos A 2026-07-15 10:48:36 +03:00
  • c7e1ed5586 Merge pull request #696 from Tria-plc/alpha Stephanos A. 2026-07-15 10:44:17 +03:00
  • b4992546d1 Build issue resolution Stephanos A 2026-07-15 10:43:19 +03:00
  • 5f8266035b Merge pull request #695 from Tria-plc/alpha mulish77 2026-07-15 10:35:04 +03:00
  • 9347f932a1 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-15 10:28:14 +03:00
  • e2529b9317 Payment amount for non ETB and exchange fixes Stephanos A 2026-07-15 10:27:17 +03:00
  • 9be7f356f0 enhance train scheduling logic to exclude cancelled trains and refine window filtering Marshal 2026-07-15 07:07:10 +00:00
  • 9331f85d77 Update docker-compose.yaml Yonas Tewabe 2026-07-15 09:44:12 +03:00
  • 07ca838504 Merge pull request #694 from Tria-plc/alpha mulish77 2026-07-15 09:17:26 +03:00
  • d2f82fd097 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 09:16:09 +03:00
  • 6a9227b0f6 Extend seat hold time if booking created Roba Boru 2026-07-15 09:15:49 +03:00
  • bf4b685748 Merge pull request #693 from Tria-plc/alpha Eyob T. 2026-07-15 08:16:21 +03:00
  • 7cca901913 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 08:14:06 +03:00
  • 85f221065f Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 08:13:54 +03:00
  • 658b8d0077 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-15 08:13:39 +03:00
  • 64b362ff51 Fix expired seat Roba Boru 2026-07-15 08:13:23 +03:00
  • 28ddc7b1c5 Merge pull request #692 from Tria-plc/dev Abubeker Yasin 2026-07-15 01:03:47 +03:00
  • 1faf936869 Merge pull request #691 from Tria-plc/alpha Abubeker Yasin 2026-07-15 01:02:07 +03:00
  • 89ae06a5a8 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-07-15 00:45:39 +03:00
  • f8658d63b8 feat: ( currency ) add multiple from currency Abubeker Yasin 2026-07-15 00:45:24 +03:00
  • ad737d861b Merge pull request #690 from Tria-plc/alpha Abubeker Yasin 2026-07-15 00:42:29 +03:00
  • c0b99b50a9 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-15 00:40:08 +03:00
  • 25fdf88a77 Booking currency updates, audit logging updates Stephanos A 2026-07-15 00:39:53 +03:00
  • 7e1e600702 Merge pull request #689 from Tria-plc/alpha Abubeker Yasin 2026-07-14 23:03:21 +03:00
  • ae2db7feb4 remove fare from seat selection summary Roba Boru 2026-07-14 22:59:46 +03:00
  • 0aed560296 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-14 22:51:59 +03:00
  • effc9cefe2 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-14 22:51:43 +03:00
  • 7dc130d0ad Show seat left on booking result Roba Boru 2026-07-14 22:51:26 +03:00
  • 761d28f994 Merge pull request #688 from Tria-plc/alpha Abubeker Yasin 2026-07-14 22:46:48 +03:00
  • 5aa1892e19 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-14 22:44:07 +03:00
  • d92d1cdaa4 Segment price override enabled Stephanos A 2026-07-14 22:43:57 +03:00
  • 2300fc5e3b Merge pull request #687 from Tria-plc/alpha robiman 2026-07-14 22:00:36 +03:00
  • 93133ed0a1 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-14 21:58:17 +03:00
  • 36ecbbe6d0 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-14 21:58:02 +03:00
  • 89b99b0a08 Fix seat label Roba Boru 2026-07-14 21:57:34 +03:00
  • ef7ce03318 Merge pull request #686 from Tria-plc/alpha Abubeker Yasin 2026-07-14 21:30:57 +03:00
  • 0d29a940a6 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-07-14 21:26:36 +03:00
  • 43aecf8376 Update page.tsx Abubeker Yasin 2026-07-14 21:25:27 +03:00
  • 4521d7b496 Merge pull request #685 from Tria-plc/alpha robiman 2026-07-14 21:24:02 +03:00
  • a934313dda Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-14 21:22:35 +03:00
  • 18d38891a4 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-14 21:22:23 +03:00
  • 660c611a1c Fix route datetime on lookup page Roba Boru 2026-07-14 21:22:04 +03:00
  • dc57be8f49 Merge pull request #684 from Tria-plc/alpha Abubeker Yasin 2026-07-14 21:16:41 +03:00
  • c2a7d99480 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-14 21:10:16 +03:00
  • 9d93e5c300 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-07-14 21:10:02 +03:00
  • 7d64c91915 feat: ( auth ) restore sign in/register UI in nav bar, sidebar, and auth-check Abubeker Yasin 2026-07-14 21:09:49 +03:00