Commit Graph

  • 6bd3fffa49 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-20 16:55:37 +03:00
  • 26f73cbe5f chnages Marshal 2026-07-20 13:55:26 +00:00
  • c71f4df6a1 Fix payment discrepancy column Roba Boru 2026-07-20 16:55:09 +03:00
  • 7002d42879 Merge pull request #842 from Tria-plc/alpha robiman 2026-07-20 16:45:38 +03:00
  • 8f0eb0c48b Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-20 16:44:40 +03:00
  • be7d6b2092 Fix paid minor calculation Roba Boru 2026-07-20 16:44:25 +03:00
  • 810aba563f Merge remote-tracking branch 'origin/dev' into tests Muluhabt 2026-07-20 16:34:59 +03:00
  • c4f54a666b test: add EDR passenger pricing/config E2E bug-hunt harness Muluhabt 2026-07-20 16:22:40 +03:00
  • bb03dfdccb Merge pull request #841 from Tria-plc/alpha robiman 2026-07-20 16:11:43 +03:00
  • 8054cefd45 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-20 16:10:47 +03:00
  • ef2fb2e05c Expand to show multiple passengers in payment discrepancy Roba Boru 2026-07-20 16:10:28 +03:00
  • 2c16c50701 Merge pull request #840 from Tria-plc/intercity-load-unload Hagernesh Tadesse 2026-07-20 15:57:10 +03:00
  • 7b777792e3 feat(warehouse): expand an inventory row to see which containers ride which truck Hagernesh 2026-07-20 12:52:31 +00:00
  • 0c0de284b0 feat(warehouse): show the trucks in the yard, not just a count of them Hagernesh 2026-07-20 12:35:51 +00:00
  • cd80a29602 Merge pull request #839 from Tria-plc/alpha robiman 2026-07-20 15:52:59 +03:00
  • 6ea2216aeb Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-20 15:50:42 +03:00
  • bc4c085d95 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-20 15:50:29 +03:00
  • 1e7324d276 Added payment discrepancy report Roba Boru 2026-07-20 15:50:03 +03:00
  • fd55b5c253 Merge pull request #838 from Tria-plc/alpha Abubeker Yasin 2026-07-20 15:49:22 +03:00
  • 800e1e21ed fix: (payment ) store fractional payment intent amounts Abubeker Yasin 2026-07-20 15:47:37 +03:00
  • b9b2075207 Merge pull request #837 from Tria-plc/freight_feature/usermanagement marshal 2026-07-20 15:25:51 +03:00
  • b90afadfba contrat nad booking modification Marshal 2026-07-20 12:24:58 +00:00
  • 0adaba9ca1 Merge pull request #836 from Tria-plc/freight/feat/fixes-v1 Nathnael Wondisha 2026-07-20 15:13:49 +03:00
  • 804c72f14a Merge branch 'dev' into freight/feat/fixes-v1 Nathnael 2026-07-20 12:12:30 +00:00
  • 0549a88d57 feat: otp double sending Nathnael 2026-07-20 12:10:49 +00:00
  • aa02700e4c fix: disable global errors Nathnael 2026-07-20 11:52:08 +00:00
  • 5e9feab869 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-20 14:45:37 +03:00
  • 1570c8e4bf Merge pull request #835 from Tria-plc/intercity-load-unload Hagernesh Tadesse 2026-07-20 14:44:10 +03:00
  • d60f354e9f fix: reuse the locaiton too Nathnael 2026-07-20 11:44:07 +00:00
  • c8a70593cf fix(mile): apply one truck-load rule to customer and EDR haulage alike Hagernesh 2026-07-20 11:28:31 +00:00
  • 540f4a1ff6 changes Marshal 2026-07-20 10:52:20 +00:00
  • 0727de0f4d Refactor clearance terminology to document approval across services and UI components Marshal 2026-07-20 07:46:38 +00:00
  • b67aa813f9 fix: type error in portal Nathnael 2026-07-20 08:25:54 +00:00
  • 38bccaccf9 fix: normalized the region and logged the otp properly Nathnael 2026-07-20 08:19:59 +00:00
  • 6cb921e617 fix: 194 and 183 plane takss Nathnael 2026-07-20 07:41:25 +00:00
  • ccd9afacb1 feat: setup forget password to the backoffice Nathnael 2026-07-20 06:19:12 +00:00
  • 149548a9b1 chore: packages Nathnael 2026-07-18 09:44:44 +00:00
  • 4b4a4ce788 feat: setup the attachment to the passenger clients Nathnael 2026-07-18 09:44:33 +00:00
  • 779af4c348 feat: setup the attachment to the passenger api Nathnael 2026-07-18 09:44:14 +00:00
  • 59cecd44e7 chore: chat types update Nathnael 2026-07-18 09:36:35 +00:00
  • 9fbe1c5236 feat: setup attachment to the freight chat Nathnael 2026-07-18 08:52:06 +00:00
  • 5bf82bf531 fix: notify the backoffice of new booking Nathnael 2026-07-20 11:28:18 +00:00
  • 6420c72e89 feat(auth): implement staff-triggered password-reset links Nathnael 2026-07-20 11:20:50 +00:00
  • bb068d38d1 Merge pull request #834 from Tria-plc/freight_feature/usermanagement marshal 2026-07-20 13:52:55 +03:00
  • eb532399d9 changes Marshal 2026-07-20 10:52:20 +00:00
  • bed1208dee Merge pull request #833 from Tria-plc/freight/feat/fixes-v1 Nathnael Wondisha 2026-07-20 11:26:30 +03:00
  • 03e21d104c fix: type error in portal Nathnael 2026-07-20 08:25:54 +00:00
  • f41463748d Merge pull request #788 from Tria-plc/freight/feat/chat-app Nathnael Wondisha 2026-07-20 11:23:16 +03:00
  • 2c7a4b7112 Merge branch 'dev' into freight/feat/fixes-v1 Nathnael 2026-07-20 08:20:34 +00:00
  • a45e1008fa fix: normalized the region and logged the otp properly Nathnael 2026-07-20 08:19:59 +00:00
  • c1c362ab9d fix(mile): only send bookings that bought EDR haulage to the mile queues Hagernesh 2026-07-20 08:03:16 +00:00
  • e22b336e8c Refactor clearance terminology to document approval across services and UI components Marshal 2026-07-20 07:46:38 +00:00
  • c7195f077a fix: 194 and 183 plane takss Nathnael 2026-07-20 07:41:25 +00:00
  • d51e2e4042 Merge pull request #832 from Tria-plc/intercity-load-unload Hagernesh Tadesse 2026-07-20 10:18:03 +03:00
  • 2906c6bb45 test(train-scheduling): cover the checkpoint backdating guard on the DTO Hagernesh 2026-07-20 07:06:19 +00:00
  • 536d6043c2 fix(clearance): allow customs risk to be corrected and keep the trail Hagernesh 2026-07-20 07:04:18 +00:00
  • 21df861979 back date validator Hagernesh 2026-07-17 14:51:34 +00:00
  • c0fdffa7ef Marshalling document empty wagon rendering Hagernesh 2026-07-17 14:20:34 +00:00
  • eb998bfddd Facility Hagernesh 2026-07-17 12:20:12 +00:00
  • ee6ad7da8b Auto arrival train Hagernesh 2026-07-17 12:07:27 +00:00
  • a5973de6e1 feat(intercity): a facility only handles the cargo its equipment can lift Hagernesh 2026-07-17 11:57:27 +00:00
  • 096e69ba43 Merge pull request #831 from Tria-plc/freight_feature/usermanagement marshal 2026-07-20 10:06:21 +03:00
  • 771aa2a605 Add train deactivation feature and import train number management Marshal 2026-07-20 07:04:23 +00:00
  • 3d4996e4df feat: setup forget password to the backoffice Nathnael 2026-07-20 06:19:12 +00:00
  • 2e52bb6fc8 Merge pull request #830 from Tria-plc/freight_feature/usermanagement marshal 2026-07-20 09:11:45 +03:00
  • ab355d0e16 Enhance cargo description handling in contract forms Marshal 2026-07-20 06:10:50 +00:00
  • a263cade24 Merge pull request #829 from Tria-plc/freight_feature/usermanagement marshal 2026-07-20 08:54:09 +03:00
  • bac0fa7f48 changes Marshal 2026-07-20 05:51:21 +00:00
  • 5d94e8acf2 Merge pull request #828 from Tria-plc/dev marshal 2026-07-20 06:09:16 +03:00
  • 721245cdc0 Merge pull request #827 from Tria-plc/freight_feature/usermanagement marshal 2026-07-20 06:08:31 +03:00
  • 8354804505 Merge branch 'main' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement Marshal 2026-07-20 03:07:42 +00:00
  • f672d66a92 Merge pull request #826 from Tria-plc/freight_feature/usermanagement marshal 2026-07-20 06:06:06 +03:00
  • 4969f62896 changes Marshal 2026-07-20 03:05:28 +00:00
  • 13e9b1622b Merge pull request #825 from Tria-plc/quick-fix-main Stephanos A. 2026-07-20 00:42:46 +03:00
  • 8d7a914ab7 Merge branch 'dev' into quick-fix-main Stephanos A. 2026-07-20 00:42:25 +03:00
  • e683ed50b9 Merge pull request #824 from Tria-plc/quick-fix-main Stephanos A. 2026-07-20 00:39:59 +03:00
  • c62491b236 Reports (overall, seats report, passenger export) updates Stephanos A 2026-07-20 00:37:10 +03:00
  • efa3c218fe Merge pull request #823 from Tria-plc/alpha robiman 2026-07-20 00:22:00 +03:00
  • 3293040438 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-20 00:19:31 +03:00
  • f5cbf512ea Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-20 00:17:32 +03:00
  • 594e56b042 Merge pull request #822 from Tria-plc/quick-fix-main Stephanos A. 2026-07-19 23:58:35 +03:00
  • c31a337a98 Include coach number to voucher Roba Boru 2026-07-19 23:58:14 +03:00
  • 57390647d8 Search schedule update Stephanos A 2026-07-19 23:57:16 +03:00
  • 225f5df10e Merge pull request #821 from Tria-plc/quick-fix-main Stephanos A. 2026-07-19 22:53:18 +03:00
  • 8e84fcebd5 Passenger list report filter updates Stephanos A 2026-07-19 22:52:23 +03:00
  • 903219eec1 Merge pull request #820 from Tria-plc/alpha robiman 2026-07-19 22:50:41 +03:00
  • a6e4f0538c Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-19 22:48:46 +03:00
  • 68cf5dbbd7 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-19 22:47:24 +03:00
  • bb78c1880e Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-19 22:47:11 +03:00
  • d43229528e Fix price inconsistency Roba Boru 2026-07-19 22:46:36 +03:00
  • 2efd105a2d Merge pull request #819 from Tria-plc/alpha Abubeker Yasin 2026-07-19 22:37:39 +03:00
  • f48a4735c8 fix: ( telebirr ) read transId from webhook for provider_txn_id Abubeker Yasin 2026-07-19 22:16:20 +03:00
  • c7af33028e Merge pull request #818 from Tria-plc/main mulish77 2026-07-19 21:58:28 +03:00
  • d099222f4f Merge pull request #817 from Tria-plc/quick-fix-main Stephanos A. 2026-07-19 21:09:03 +03:00
  • eb41f4bb5f Merge branch 'quick-fix-main' of github.com:Tria-plc/edr-platform into quick-fix-main Stephanos A 2026-07-19 21:03:27 +03:00
  • 264206b57a Passenger report updates Stephanos A 2026-07-19 20:58:00 +03:00
  • 2eef2da5bc Merge pull request #816 from Tria-plc/user_seed Abubeker Yasin 2026-07-19 18:58:10 +03:00
  • 5317ca0d19 feat: ( users ) seed ticket officer and director users Abubeker Yasin 2026-07-19 18:57:31 +03:00
  • 38fc628df2 Merge pull request #815 from Tria-plc/alpha robiman 2026-07-19 18:52:52 +03:00
  • 996c0d8896 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-19 18:51:41 +03:00