Commit Graph

  • d71ee6ed1b Update cac-bank.provider.ts Abubeker Yasin 2026-07-08 23:33:31 +03:00
  • a2e0e94cff Merge pull request #553 from Tria-plc/alpha Abubeker Yasin 2026-07-08 23:20:45 +03:00
  • 0f580e40f3 Update cac-bank.provider.ts Abubeker Yasin 2026-07-08 23:11:28 +03:00
  • 69625eceb1 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-07-08 23:05:55 +03:00
  • 01e24e1aae feat: ( payment ) add changing payment for booking Abubeker Yasin 2026-07-08 23:05:42 +03:00
  • 082682ec02 Merge pull request #552 from Tria-plc/Truckdetantion Hagernesh Tadesse 2026-07-08 22:58:12 +03:00
  • 99a9bbc291 unload export Hagernesh 2026-07-08 19:56:34 +00:00
  • d01c385489 Merge pull request #551 from Tria-plc/dev Abubeker Yasin 2026-07-08 22:42:37 +03:00
  • 46e95415f8 Merge pull request #550 from Tria-plc/alpha Abubeker Yasin 2026-07-08 22:41:51 +03:00
  • 6e7eb460b0 Fixed voucher qr value Roba Boru 2026-07-08 22:37:31 +03:00
  • d8b29a2cff Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-08 21:58:12 +03:00
  • 6d4761a4c6 Fix no train section alignment Roba Boru 2026-07-08 21:57:17 +03:00
  • 9f6a47197f Merge pull request #549 from Tria-plc/alpha Eyob T. 2026-07-08 21:42:42 +03:00
  • 4d20169616 added dmoney redirect Roba Boru 2026-07-08 21:29:57 +03:00
  • 8897e49972 Fix auto assign seat Roba Boru 2026-07-08 21:11:26 +03:00
  • 843b41c652 Merge pull request #548 from Tria-plc/alpha Stephanos A. 2026-07-08 19:11:58 +03:00
  • 9825d37e66 Search widget updates Stephanos A 2026-07-08 19:04:21 +03:00
  • 65004dd2af Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-08 18:24:19 +03:00
  • 3760bcdb66 Fare engine updates, seat class amount updates Stephanos A 2026-07-08 18:16:57 +03:00
  • 33956d07dc Fix customer_truck_containers status Hagernesh 2026-07-08 13:54:02 +00:00
  • 246663641a feat(warehouses): approve-delivery opens handover doc for review and signing Hagernesh 2026-07-08 13:15:39 +00:00
  • 160f15414a Merge pull request #547 from Tria-plc/staging Abubeker Yasin 2026-07-08 16:41:42 +03:00
  • 3772db2c72 Merge pull request #546 from Tria-plc/Truckdetantion Hagernesh Tadesse 2026-07-08 16:01:42 +03:00
  • 73baf97045 delivery approve notification Hagernesh 2026-07-08 12:58:24 +00:00
  • b51e5ca8d3 Merge pull request #545 from Tria-plc/dev Abubeker Yasin 2026-07-08 15:59:47 +03:00
  • 93aa40569e Merge pull request #544 from Tria-plc/alpha Abubeker Yasin 2026-07-08 15:58:46 +03:00
  • 78bee6dbe3 Update cac-bank.provider.ts Abubeker Yasin 2026-07-08 15:57:16 +03:00
  • 0c3050b6fe feat: ( notification ) add notification management Abubeker Yasin 2026-07-08 15:40:31 +03:00
  • c8e94bcccf Merge pull request #543 from Tria-plc/dev Abubeker Yasin 2026-07-08 15:17:05 +03:00
  • 43b3e49ffc Merge pull request #542 from Tria-plc/alpha Abubeker Yasin 2026-07-08 15:08:09 +03:00
  • 8b957e956e Update waafi.provider.ts Abubeker Yasin 2026-07-08 15:06:54 +03:00
  • 84baa0f009 Merge pull request #541 from Tria-plc/staging Abubeker Yasin 2026-07-08 14:44:08 +03:00
  • 90a2416dcf Merge pull request #540 from Tria-plc/freight/feat/fixes-v1 Nathnael Wondisha 2026-07-08 14:09:15 +03:00
  • 38577cdd26 fix Nathnael 2026-07-08 11:05:46 +00:00
  • 9e98600a5f fix: add vat to the settings, and docs to the profile Nathnael 2026-07-08 10:51:22 +00:00
  • 8947ab8614 feat: fix the settings preview for the business licence and changes request to the approval Nathnael 2026-07-08 10:42:00 +00:00
  • 866186564d Merge pull request #539 from Tria-plc/freight_feature/usermanagement marshal 2026-07-08 13:37:04 +03:00
  • addee34d5d fix seed data Marshal 2026-07-08 10:35:32 +00:00
  • 10701659e2 Merge pull request #538 from Tria-plc/dev marshal 2026-07-08 13:15:04 +03:00
  • 66a42e63ba Merge pull request #537 from Tria-plc/freight_feature/usermanagement marshal 2026-07-08 13:14:09 +03:00
  • 3349d256b8 ensure pessimistic-lock writes run in a transaction for invoice processing Marshal 2026-07-08 10:13:22 +00:00
  • cee24c625e Merge pull request #536 from Tria-plc/Truckdetantion Hagernesh Tadesse 2026-07-08 12:34:54 +03:00
  • 80904eeeb2 Handover SIGN notification, resending until signed no exit before sign Hagernesh 2026-07-08 09:32:24 +00:00
  • 8de7754e35 Merge pull request #535 from Tria-plc/freight_feature/usermanagement marshal 2026-07-08 12:09:40 +03:00
  • 44023efb12 solve priorty issue Marshal 2026-07-08 09:08:53 +00:00
  • 7bedfde6e7 add production DB drift check and fix for invoice payments Marshal 2026-07-08 08:19:35 +00:00
  • 3bc4514b04 feat: implemented the changes request to the company profile to backoffice Nathnael 2026-07-08 08:07:10 +00:00
  • 2cae451edc feat: implemented the changes request to the company profile Nathnael 2026-07-08 08:06:50 +00:00
  • 1dba962502 Merge branch 'dev' into freight/feat/fixes-v1 Nathnael 2026-07-08 07:50:24 +00:00
  • 01cd8fcc3a Merge pull request #534 from Tria-plc/freight/feat/chat-app Nathnael Wondisha 2026-07-08 10:26:49 +03:00
  • 32aaa77d50 fix: backoffice socket Nathnael 2026-07-08 07:25:34 +00:00
  • c32f34085a Merge pull request #533 from Tria-plc/Truckdetantion Hagernesh Tadesse 2026-07-08 10:19:09 +03:00
  • 9ffc8bfb0b Notify customer on Sign handover, truck assignment, arrival and dispatch of train Hagernesh 2026-07-08 05:46:33 +00:00
  • ba821b06ca Warehouse and customer truck edit and KG to Tons Hagernesh 2026-07-08 05:19:25 +00:00
  • 5090df42a0 Merge pull request #532 from Tria-plc/dev Abubeker Yasin 2026-07-08 09:58:11 +03:00
  • 22a2a770d2 Merge pull request #531 from Tria-plc/freight/feat/chat-app Nathnael Wondisha 2026-07-08 09:52:27 +03:00
  • 15b8068b9e chore: enable polling to the socket.io on the passenger clients Nathnael 2026-07-08 06:50:44 +00:00
  • 59b6f8d07a Merge pull request #530 from Tria-plc/freight/feat/chat-app Nathnael Wondisha 2026-07-08 09:39:30 +03:00
  • 5ca01c546f Merge pull request #529 from Tria-plc/alpha Abubeker Yasin 2026-07-08 09:38:24 +03:00
  • 972b1e973a fix: websocket fix attempt Nathnael 2026-07-08 06:38:24 +00:00
  • 9e208861c7 refactor: ( iam ) revert deleted EDR-branded OTP SMS messages Abubeker Yasin 2026-07-08 09:33:24 +03:00
  • 3adaeeb9a3 Merge pull request #528 from Tria-plc/dev Abubeker Yasin 2026-07-08 09:22:10 +03:00
  • 32c9518821 Merge pull request #527 from Tria-plc/alpha Stephanos A. 2026-07-08 09:02:00 +03:00
  • c7403e1a1e Production cleanups Stephanos A 2026-07-08 09:01:07 +03:00
  • 2c12f02862 Merge pull request #526 from Tria-plc/freight/feat/chat-app Nathnael Wondisha 2026-07-08 08:41:08 +03:00
  • a817976db8 feat: make the support require nothing Nathnael 2026-07-08 05:33:02 +00:00
  • 7712340c51 Merge pull request #525 from Tria-plc/Truckdetantion Hagernesh Tadesse 2026-07-08 07:41:22 +03:00
  • 3f6b9ac974 Container truck assignment on customer portal for import Hagernesh 2026-07-08 04:36:03 +00:00
  • d1ef079705 Merge pull request #524 from Tria-plc/freight_feature/usermanagement marshal 2026-07-08 02:07:40 +03:00
  • 9dd9ace313 add reference field to train schedules and implement unique sequence generation Marshal 2026-07-07 23:06:44 +00:00
  • 1d946a2fdc Merge pull request #523 from Tria-plc/freight_feature/usermanagement marshal 2026-07-08 01:25:17 +03:00
  • 88b1e548a2 resolve conflict Marshal 2026-07-07 22:24:42 +00:00
  • 719f017a82 Merge pull request #522 from Tria-plc/freight_feature/usermanagement marshal 2026-07-08 00:58:53 +03:00
  • 70a917510e feat: add isGeneral flag to identify general contracts in NewContractPage Marshal 2026-07-07 21:58:06 +00:00
  • 8128ae6164 Merge pull request #521 from Tria-plc/freight_feature/usermanagement marshal 2026-07-08 00:47:23 +03:00
  • 4693d0f17c Merge pull request #520 from Tria-plc/alpha Stephanos A. 2026-07-08 00:46:38 +03:00
  • 94904ea6d0 resolve conflict Marshal 2026-07-07 21:46:25 +00:00
  • 63fa6996b1 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-08 00:43:24 +03:00
  • 73e8dc19b3 Fare engine formula updates Stephanos A 2026-07-08 00:43:05 +03:00
  • 518eec6286 enhance train scheduling and booking management Marshal 2026-07-07 21:42:59 +00:00
  • 87a95b37bf enhance train scheduling and booking management Marshal 2026-07-07 21:38:45 +00:00
  • ac33ca230b Merge pull request #519 from Tria-plc/dev Abubeker Yasin 2026-07-07 23:58:39 +03:00
  • 324c2c9360 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-07 23:57:04 +03:00
  • 88fca8a78e Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-07 23:56:51 +03:00
  • 8f23f85e63 Set nationality required on booking widget Roba Boru 2026-07-07 23:55:35 +03:00
  • d10f0c800b Merge pull request #518 from Tria-plc/alpha Abubeker Yasin 2026-07-07 23:43:12 +03:00
  • 08fe2bfac6 fix: ( telebirr ) remove hard coded private key Abubeker Yasin 2026-07-07 23:38:40 +03:00
  • 4aafa6e08d Merge pull request #517 from Tria-plc/alpha Abubeker Yasin 2026-07-07 23:34:58 +03:00
  • 15d96ab2b4 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-07 23:06:58 +03:00
  • 18043de7a2 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-07 23:06:40 +03:00
  • 1970eb7b9c Fix duplicate hold seat Roba Boru 2026-07-07 23:05:45 +03:00
  • 8af7e66133 Merge pull request #516 from Tria-plc/alpha Stephanos A. 2026-07-07 22:59:33 +03:00
  • 46d0d63611 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-07 22:58:11 +03:00
  • 8cc2d9445d Manuel ticket generation, seat management by route added Stephanos A 2026-07-07 22:58:01 +03:00
  • 2abf418630 Merge pull request #515 from Tria-plc/alpha Eyob T. 2026-07-07 21:50:12 +03:00
  • 8addfdf3e2 changes Marshal 2026-07-07 18:40:32 +00:00
  • b2218f383e Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-07 21:20:55 +03:00
  • 84169776b3 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-07 21:19:56 +03:00
  • bf3fa746eb Update manage booking Roba Boru 2026-07-07 21:19:04 +03:00
  • bf48f06489 Merge pull request #514 from Tria-plc/alpha Stephanos A. 2026-07-07 20:22:05 +03:00