Commit Graph

  • 4aadf588d4 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-02 16:23:25 +03:00
  • 9494d57343 Boarding, ticketing, class fare edit updates Stephanos A 2026-07-02 16:20:15 +03:00
  • 79c3293a72 fix: booking paid trigger ghost2023 2026-07-02 16:18:46 +03:00
  • 1869790eab fix natib21 2026-07-02 13:18:34 +00:00
  • e429a2cebf fix natib21 2026-07-02 13:15:44 +00:00
  • 64e346324b fix issue natib21 2026-07-02 13:11:12 +00:00
  • 83eafacee1 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-02 16:08:20 +03:00
  • 93f2d12d3c Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-02 16:07:46 +03:00
  • f2ee62b95f Refine booking flow Roba Boru 2026-07-02 16:03:57 +03:00
  • a5d7384f59 Merge pull request #404 from Tria-plc/truckassign Hagernesh Tadesse 2026-07-02 16:00:00 +03:00
  • 5af45c2643 Customer Truck Assignment and Portal Delivary Approval hagiye 2026-07-02 15:54:16 +03:00
  • c8b7d76073 fix natib21 2026-07-02 12:50:49 +00:00
  • 43a32f192f fix natib21 2026-07-02 12:47:10 +00:00
  • 58b3805d0b fix natib21 2026-07-02 12:43:03 +00:00
  • 657f3bd2ab fix natib21 2026-07-02 12:39:47 +00:00
  • 4098b5476f fix(temp): invoice no for the telebirr ghost2023 2026-07-02 15:37:49 +03:00
  • a0f4de05f8 log full error natib21 2026-07-02 12:37:02 +00:00
  • 787da1ccc0 chore: fix the invoice event Nathnael 2026-07-02 12:35:43 +00:00
  • adde596289 fix natib21 2026-07-02 11:32:16 +00:00
  • ff7e20d2ee fix natib21 2026-07-02 11:22:35 +00:00
  • 03740ee719 fix: types isses Nathnael 2026-07-02 11:09:25 +00:00
  • bab329e8e5 fix natib21 2026-07-02 10:57:35 +00:00
  • e59a8f9802 fix delete api natib21 2026-07-02 10:54:43 +00:00
  • f4f98575f1 fix error natib21 2026-07-02 10:48:31 +00:00
  • 79490d5979 fix ghost2023 2026-07-02 13:44:07 +03:00
  • a1109c6623 Merge pull request #402 from Tria-plc/contrat-backup2 marshal 2026-07-02 13:42:17 +03:00
  • 7d3eb39625 fix error Marshal 2026-07-02 10:40:31 +00:00
  • 4519a1d75d fix natib21 2026-07-02 10:33:32 +00:00
  • cdc2592bc7 fix: script fial ghost2023 2026-07-02 13:30:09 +03:00
  • 4e4d81479b Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice natib21 2026-07-02 10:27:33 +00:00
  • 1c88bd8d68 fix natib21 2026-07-02 10:27:01 +00:00
  • d169b45c04 Merge pull request #401 from Tria-plc/contrat-backup2 marshal 2026-07-02 13:25:31 +03:00
  • a0edf3cd7f merg conflict Marshal 2026-07-02 10:24:29 +00:00
  • 10e442deb1 fix yaschalew 2026-07-02 13:18:49 +03:00
  • be56f43d59 Merge pull request #399 from Tria-plc/contrat-backup2 marshal 2026-07-02 13:17:33 +03:00
  • adddb24033 add public to InternalPaymentController Marshal 2026-07-02 10:16:58 +00:00
  • 7b3f9094ed changes marshal 2026-07-02 13:02:33 +03:00
  • e874de25fe Merge pull request #397 from Tria-plc/feight/fix/ui-ux-issues Nathnael Wondisha 2026-07-02 12:49:07 +03:00
  • 41fc0cabdf fix: duplicate invoice Nathnael 2026-07-02 09:44:56 +00:00
  • e0010695be fix natib21 2026-07-02 09:41:52 +00:00
  • 5aafa436c1 fixes Nathnael 2026-07-02 09:38:14 +00:00
  • ad9f9de7a8 Truck Assign by customer plus Handover signature on portal hagiye 2026-07-02 12:32:18 +03:00
  • 63937db32b fix: update the updateStatus iss Nathnael 2026-07-02 09:22:25 +00:00
  • 56bb75c9a8 fix transi permit file upload marshal 2026-07-02 12:22:07 +03:00
  • 602453ff7a fix: invoice based payment on the client Nathnael 2026-07-02 09:22:07 +00:00
  • 4fefe4f827 finilize gl marshal 2026-07-02 12:06:17 +03:00
  • d324516693 Merge pull request #396 from Tria-plc/freight/feature/first_mile_invoice yaschalew10 2026-07-02 12:01:26 +03:00
  • 07abe9b679 fix natib21 2026-07-02 08:51:21 +00:00
  • 1c012ce1e2 refactor(payment): centralize invoice processing with detailed tracking and configurable logging ghost2023 2026-07-02 11:47:35 +03:00
  • db8ead322c Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/hot_fix yaschalew 2026-07-02 11:29:27 +03:00
  • 54b2114e7f fix issue yaschalew 2026-07-02 11:28:56 +03:00
  • c349f9e08d Merge pull request #395 from Tria-plc/alpha Abubeker Yasin 2026-07-02 10:31:21 +03:00
  • d6938df66c feat: ( iam ) add forgot and change password to passenger backoffice Abubeker Yasin 2026-07-02 10:27:08 +03:00
  • 448e64da02 feat: ( iam ) add Station Master and Ticket Officer roles with positions Abubeker Yasin 2026-07-02 09:38:30 +03:00
  • 8b8a993953 fix conflict yaschalew 2026-07-02 09:28:02 +03:00
  • 8f2919f4be Merge branch 'alpha' into passenger/feat/iam Abubeker Yasin 2026-07-02 09:10:37 +03:00
  • 129448e437 frist mile receive to warehouse and last mile truck arrival integration hagiye 2026-07-02 01:08:37 +03:00
  • 9c18d086d7 changes marshal 2026-07-01 20:55:17 +03:00
  • 118ba46930 Merge pull request #394 from Tria-plc/alpha Eyob T. 2026-07-01 20:48:38 +03:00
  • 305e850073 Added tour package booking option Roba Boru 2026-07-01 20:45:40 +03:00
  • 5bfcde0c40 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-01 19:26:49 +03:00
  • 14a00af341 train gate pass, Telebirr and Wafi hagiye 2026-07-01 16:23:52 +03:00
  • 0d41d4bd20 Merge pull request #393 from Tria-plc/freight/feat/invoice Nathnael Wondisha 2026-07-01 16:18:09 +03:00
  • 2f79178496 fix: booking invoice issue ghost2023 2026-07-01 16:11:47 +03:00
  • 43d1634823 feat: add payment modal to the invoice detail page ghost2023 2026-07-01 16:11:32 +03:00
  • 174df0b7aa chore: fix script and add seed company ghost2023 2026-07-01 15:46:25 +03:00
  • aef868bc40 fix: the invoice status syncing with booking payment window ghost2023 2026-07-01 15:46:13 +03:00
  • b511da2821 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-01 15:40:33 +03:00
  • a1d6d09056 Merge pull request #392 from Tria-plc/alpha Abubeker Yasin 2026-07-01 15:30:56 +03:00
  • 33d90df5a9 feat: ( dmoney ) create redirect page to dmoney Abubeker Yasin 2026-07-01 15:29:49 +03:00
  • 924cce5716 More production clearances Stephanos A 2026-07-01 15:20:39 +03:00
  • 7e96fa65b9 feat: rm the hardcoded invoice types ghost2023 2026-07-01 15:10:04 +03:00
  • 103117d88b Production checklists, issue fixes Stephanos A 2026-07-01 15:04:38 +03:00
  • 1754c18ede fix: apiconfig ghost2023 2026-07-01 14:46:24 +03:00
  • fbda15bac8 Merge branch 'dev' into freight/feat/invoice ghost2023 2026-07-01 14:40:58 +03:00
  • a4b9cf68b5 Merge pull request #391 from Tria-plc/freight/feat/script Nathnael Wondisha 2026-07-01 14:39:03 +03:00
  • b7be6d6229 feat: add the seed schedules ghost2023 2026-07-01 14:37:47 +03:00
  • abdf459289 feat: add the seed contracts ghost2023 2026-07-01 14:26:32 +03:00
  • 0015f645cf Coach edit related fixes Stephanos A 2026-07-01 13:38:08 +03:00
  • a6eb8966e9 Merge pull request #390 from Tria-plc/alpha Eyob T. 2026-07-01 13:37:32 +03:00
  • 74bdbecefd Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-01 13:32:09 +03:00
  • 4f1fc6c439 Route stops distance and other fixes Stephanos A 2026-07-01 13:31:31 +03:00
  • c88c5ee450 chore: setup script ghost2023 2026-07-01 12:26:37 +03:00
  • 6a4604ddcd Merge pull request #389 from Tria-plc/alpha Abubeker Yasin 2026-07-01 12:20:10 +03:00
  • f831c164e7 Update dmoney.provider.ts Abubeker Yasin 2026-07-01 12:18:43 +03:00
  • 61c08eb0dc Merge pull request #388 from Tria-plc/alpha Abubeker Yasin 2026-07-01 12:09:27 +03:00
  • 8705b98407 Update dmoney-webhook.service.ts Abubeker Yasin 2026-07-01 12:08:05 +03:00
  • 46f5207054 Merge branch 'alpha' into passenger/feat/iam Abubeker Yasin 2026-07-01 11:09:43 +03:00
  • 50b6b7c3ee Merge pull request #387 from Tria-plc/alpha Abubeker Yasin 2026-07-01 10:29:56 +03:00
  • 3308c775e6 feat: ( fayda ) use platform-specific Fayda redirect_uri Abubeker Yasin 2026-07-01 10:24:42 +03:00
  • 612df8daff Enhance clearance milestone management and introduce new contract actions marshal 2026-07-01 10:20:16 +03:00
  • e5aab84f51 feat: ui changes and pdf setup on the clients Nathnael 2026-07-01 06:56:58 +00:00
  • 94982d3c5a feat: setup pdf on the central billing Nathnael 2026-07-01 06:25:24 +00:00
  • 8ab27a6721 feat: add expiration to invoice Nathnael 2026-07-01 06:19:07 +00:00
  • 7ff31a87f5 Merge branch 'alpha' into passenger/feat/iam Abubeker Yasin 2026-07-01 09:18:49 +03:00
  • a13323f6b1 Merge pull request #386 from Tria-plc/alpha Abubeker Yasin 2026-07-01 09:08:42 +03:00
  • 0db0d3af78 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-01 09:03:37 +03:00
  • b50a386b25 UAT findings resolutions and enhancements Stephanos A 2026-07-01 09:03:09 +03:00
  • 6312e93686 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-01 08:01:19 +03:00
  • ff27a82bc1 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-01 08:01:03 +03:00