Commit Graph

  • 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
  • a61130cd51 Update pnpm-lock.yaml to include '@nestjs/microservices' version 11.1.24 and its dependencies Stephanos A 2026-06-16 14:56:35 +03:00
  • e0e6020020 fixes ghost2023 2026-06-16 14:54:07 +03:00
  • 022da79387 Merge pull request #174 from Tria-plc/alpha Eyob T. 2026-06-16 14:49:50 +03:00
  • eb97c11ddb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Stephanos A 2026-06-16 14:41:33 +03:00
  • e03c11e7ee Build issues resolution Stephanos A 2026-06-16 14:41:27 +03:00
  • fc5f77c817 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Stephanos A 2026-06-16 14:40:09 +03:00
  • 7be5be9c54 Update deploy.yml Yonas Tewabe 2026-06-16 14:37:57 +03:00
  • 232c986cbb Merge pull request #173 from Tria-plc/alpha Eyob T. 2026-06-16 14:32:18 +03:00
  • 166067fbe7 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority marshal 2026-06-16 14:29:17 +03:00
  • c0b6869232 Merge pull request #172 from Tria-plc/freight/fix/fixes Nathnael Wondisha 2026-06-16 14:28:24 +03:00
  • e47340c2c8 fixes ghost2023 2026-06-16 14:26:47 +03:00
  • 3ca564f073 simplify build script and add tinymce dependency marshal 2026-06-16 14:26:47 +03:00
  • 06035a2b94 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-16 14:22:21 +03:00
  • 1a71f654b1 Update email and sms services Roba Boru 2026-06-16 14:21:56 +03:00
  • d6ad094d5a style: use mantine in settings page ghost2023 2026-06-16 14:16:55 +03:00
  • b883c2d878 feat(onboarding): Implement company profile creation on Settings page ghost2023 2026-06-16 14:10:31 +03:00
  • 811225c05d Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority marshal 2026-06-16 13:50:54 +03:00
  • 23272f972a Merge pull request #171 from Tria-plc/freight_feature/priority marshal 2026-06-16 13:34:18 +03:00
  • 75c8423f50 Round trip journeys, feedback items, backoffice documentation Stephanos A 2026-06-16 13:33:03 +03:00
  • 3afccbd660 fix priority ui Marshal 2026-06-16 10:24:22 +00:00
  • 63f177e6d0 Move within warehouses hagiye 2026-06-16 12:46:02 +03:00
  • b6ece994fc Merge branch 'freight/feat/booking-schedule' into freight/develop ghost2023 2026-06-16 12:39:56 +03:00
  • 0778021d86 implement priority Marshal 2026-06-16 09:26:57 +00:00
  • d5a536956f Loading queque changes Hagernesh 2026-06-16 09:25:47 +00:00
  • 22d28340cd Merge pull request #169 from Tria-plc/alpha Eyob T. 2026-06-16 12:23:35 +03:00
  • 7044dcfb43 payment ui for booking Nathnael 2026-06-16 09:20:31 +00:00
  • 00d1263f6d fix seed issue marshal 2026-06-16 12:15:48 +03:00
  • e9f06a52aa Merge remove changes Roba Boru 2026-06-16 12:14:35 +03:00
  • ed49470249 Update telebirr callback page query paramaters Roba Boru 2026-06-16 12:14:10 +03:00
  • d65ea24354 Merge pull request #168 from Tria-plc/feat/payment-microservice Abubeker Yasin 2026-06-16 12:09:13 +03:00
  • 38175cbdb7 Update seed.ts Abubeker Yasin 2026-06-16 12:07:38 +03:00
  • 314e9b79cc Faciklity add Hagernesh 2026-06-16 09:06:11 +00:00
  • 7151bce288 changes Marshal 2026-06-16 08:56:52 +00:00
  • 570c5ee125 feat: setted up the renewal contract Nathnael 2026-06-16 08:51:23 +00:00
  • f5d6d8e7da Batch 1 to 3 implementation hagiye 2026-06-16 11:36:24 +03:00
  • 05da2ce27a feat: ui status updates Nathnael 2026-06-16 08:29:40 +00:00
  • 0cac604510 Merge pull request #167 from Tria-plc/freight_feature/payments yaschalew10 2026-06-16 11:13:03 +03:00
  • db54a6870d Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-16 11:13:01 +03:00
  • dc5929e7ae changes marshal 2026-06-16 11:11:32 +03:00
  • a0dbb4ca6f backoffice cleen up marshal 2026-06-16 11:04:36 +03:00
  • 06c7fea330 Merge branch 'feat/payment-microservice' into alpha Abubeker Yasin 2026-06-16 11:02:41 +03:00
  • 8520c3add3 fix: ( payment ) remove /100 Abubeker Yasin 2026-06-16 11:02:07 +03:00
  • 36b9545be2 Merge pull request #166 from Tria-plc/freight/feature/user_management yaschalew10 2026-06-16 10:54:45 +03:00
  • e5877e5339 fix: ( telebirr ) fix query status Abubeker Yasin 2026-06-16 10:52:36 +03:00
  • 3fef810666 Update deploy.yml Yonas Tewabe 2026-06-16 10:27:24 +03:00
  • ae967b324c Update deploy.yml Yonas Tewabe 2026-06-16 10:26:01 +03:00
  • d0689dfe04 Update deploy.yml Yonas Tewabe 2026-06-16 10:23:51 +03:00
  • f52fc44ca1 Update deploy.yml Yonas Tewabe 2026-06-16 10:21:57 +03:00
  • adba481f23 feat: setted up the schedule in the booking Nathnael 2026-06-16 07:18:59 +00:00
  • c267d4f641 Enhance deployment workflow with change detection Yonas Tewabe 2026-06-16 10:18:32 +03:00
  • deae339887 fix natib21 2026-06-16 07:17:21 +00:00
  • 9157e144ad fix natib21 2026-06-16 07:03:10 +00:00
  • ab99c96d62 fix natib21 2026-06-16 07:01:25 +00:00
  • 03c4ec33c3 Added get ticketing info by reference number endpoint and update payment methods to dynamic Roba Boru 2026-06-16 09:47:05 +03:00
  • e7e3d61975 fix natib21 2026-06-16 06:45:14 +00:00
  • 8362bd94c5 fix natib21 2026-06-16 06:39:59 +00:00
  • 0198b545c9 fix natib21 2026-06-16 06:35:51 +00:00
  • 2b5db67bcd fix natib21 2026-06-16 06:33:43 +00:00
  • ba4ebee59d Merge pull request #165 from Tria-plc/freight/feature/user_management yaschalew10 2026-06-16 09:20:08 +03:00
  • a1244609ce auth natib21 2026-06-16 06:17:36 +00:00
  • d55cc78bd9 auth natib21 2026-06-16 06:08:32 +00:00
  • ca9a67837c feat: ( payment ) implement d-money payment Abubeker Yasin 2026-06-16 08:49:41 +03:00
  • 20b564e681 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-16 07:47:57 +03:00
  • f3d892f68e Merge pull request #164 from Tria-plc/feat/payment-microservice Abubeker Yasin 2026-06-15 22:06:28 +03:00
  • 1f0a642c03 Merge branch 'freight_feature/payments' of github.com:Tria-plc/edr-platform into freight_feature/payments marshal 2026-06-15 16:16:33 +03:00
  • 87c6e12fbd fix allocate bookigns Marshal 2026-06-15 13:15:22 +00:00
  • 9ee8262df8 Merge branch 'freight_feature/payments' of github.com:Tria-plc/edr-platform into freight_feature/payments marshal 2026-06-15 15:02:25 +03:00
  • 28ad9363d1 tracking ui Marshal 2026-06-15 12:01:44 +00:00
  • 0aed9824ae cac payemnt integration and cbe rate exchange webscrabing marshal 2026-06-15 14:54:20 +03:00
  • 96ec2923c2 fix: ( telebirr ) redirect_url Abubeker Yasin 2026-06-15 14:35:14 +03:00
  • 70f0f0394b Merge pull request #163 from Tria-plc/fix/security_patch Eyob T. 2026-06-15 14:12:39 +03:00
  • 20d6b1b6d8 Security patch Eyob T. 2026-06-15 14:11:39 +03:00
  • 3e3daba14d Update deploy.yml Yonas Tewabe 2026-06-15 13:43:48 +03:00
  • e4805824ce Merge pull request #162 from Tria-plc/feat/payment-microservice Abubeker Yasin 2026-06-15 11:28:05 +03:00
  • 73eeee175f Update payments.service.ts Abubeker Yasin 2026-06-15 11:26:51 +03:00
  • da7ab97782 Merge pull request #161 from Tria-plc/freight_feature/payments yaschalew10 2026-06-15 11:15:26 +03:00
  • e3c66bfa5e Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/payments marshal 2026-06-15 11:14:48 +03:00
  • fe1bed8c4b payment integration marshal 2026-06-15 11:09:58 +03:00
  • d1347892db feat(bookings): Implement unified hierarchical bulk cargo type selection via cargoTypePath ghost2023 2026-06-13 12:37:11 +03:00