Commit Graph

  • 254d2a171c refactor( iam ): remove local auth service delegate OTP and password reset to IAM Abubeker Yasin 2026-06-06 10:23:53 +03:00
  • 3e3841cf6f changes marshal 2026-06-06 10:08:55 +03:00
  • 0794a77678 changes marshal 2026-06-06 10:01:40 +03:00
  • 5a4f5969d4 fix port mapping SennayT 2026-06-06 09:56:57 +03:00
  • c8768ba70b Merge remote-tracking branch 'origin/freight/develop' into freight/develop Michael Abebe 2026-06-06 09:45:10 +03:00
  • c31d87fc35 dep(freight): updated iam imports Michael Abebe 2026-06-06 09:45:00 +03:00
  • 4b223fc02b remove paths in github actions SennayT 2026-06-06 09:40:39 +03:00
  • 347774b7f6 change shadcn to mantine marshal 2026-06-06 09:39:52 +03:00
  • ae8fb3f639 Merge pull request #106 from Tria-plc/feat/nextjs-fixes Sennay 2026-06-06 09:37:35 +03:00
  • 2ea87fff64 fix passenger frontend bug SennayT 2026-06-06 06:36:50 +00:00
  • 053b4f35c5 changes Marshal 2026-06-06 06:32:04 +00:00
  • bf36e55040 Merge pull request #105 from Tria-plc/freight/feat/contract-signuture Nathnael Wondisha 2026-06-06 09:12:46 +03:00
  • da0f1e4cc9 feat(bookings): enhance contract viewer and backoffice UI consistency ghost2023 2026-06-06 09:11:13 +03:00
  • 7a19a161e1 fix: redirects ghost2023 2026-06-06 09:04:11 +03:00
  • f356c00ba2 fix: booking api url s ghost2023 2026-06-06 09:04:02 +03:00
  • 023522c3fb refactor( iam ): migrate session, logout, and guards to IAM Abubeker Yasin 2026-06-06 08:58:42 +03:00
  • d06debf1ca feat( iam ): integrate IAM for auth — register, login, lazy provisioning Abubeker Yasin 2026-06-06 08:29:26 +03:00
  • 06276764e0 Merge pull request #104 from Tria-plc/freight/feature/payment Eyosiyas Girma 2026-06-06 08:17:29 +03:00
  • 10f3c517f3 Merge branch 'freight/develop' into freight/feature/payment Eyosiyas Girma 2026-06-06 08:17:17 +03:00
  • 828f93d160 minor update Tria 2026-06-06 08:13:38 +03:00
  • 08fc53899a Merge pull request #103 from Tria-plc/feature/trains-management Hagernesh Tadesse 2026-06-06 05:56:22 +03:00
  • 788de5381e feat: complete train scheduling integration hagiye 2026-06-06 05:52:47 +03:00
  • 052676b934 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-05 22:01:29 +03:00
  • 1d11cbda4d feat: ( payment ) create payment microservice Abubeker Yasin 2026-06-05 21:29:55 +03:00
  • 29247d4140 Merge pull request #102 from Tria-plc/feature/trains-management Hagernesh Tadesse 2026-06-05 21:15:15 +03:00
  • 55e6ca4a3f Merge branch 'freight/develop' of https://github.com/Tria-plc/edr-platform into feature/trains-management hagiye 2026-06-05 21:07:36 +03:00
  • dc42838a43 Trains management CRUD issues solved hagiye 2026-06-05 21:07:04 +03:00
  • f8270175a2 fix the seed for rules Marshal 2026-06-05 17:25:44 +00:00
  • 67037ba748 fix the seed for rules Marshal 2026-06-05 17:25:16 +00:00
  • 04d79cd568 Merge pull request #101 from Tria-plc/freight/feature/payment Eyosiyas Girma 2026-06-05 17:36:19 +03:00
  • ebe59f491a payment | webhook Tria 2026-06-05 17:34:33 +03:00
  • 6786bdd210 receipt template Tria 2026-06-05 17:23:21 +03:00
  • 620607e50c add fan number Tria 2026-06-05 15:59:12 +03:00
  • 21bc6948e8 receipt Tria 2026-06-05 15:56:29 +03:00
  • 4a0dee9b7b Merge pull request #97 from Tria-plc/freight/feat/booking-pricing Nathnael Wondisha 2026-06-05 15:02:24 +03:00
  • c4348986d1 Merge pull request #100 from Tria-plc/feat/nextjs-fixes Sennay 2026-06-05 14:51:54 +03:00
  • aa7d655a2d use next start for deployment SennayT 2026-06-05 11:41:11 +00:00
  • b233fc42a6 add a pnpm deploy step SennayT 2026-06-05 11:33:18 +00:00
  • b6136b0a65 modify nextjs deployment SennayT 2026-06-05 11:28:33 +00:00
  • 9676a6bb56 resolve conflict hagiye 2026-06-05 14:17:48 +03:00
  • c3e92dbe70 resolve conflict hagiye 2026-06-05 14:13:35 +03:00
  • 55a1d45f58 Merge pull request #99 from Tria-plc/freight_feature/booking_flow marshal 2026-06-05 14:08:03 +03:00
  • 35c9bdfce4 resolve confilict marshal 2026-06-05 14:07:26 +03:00
  • 04765bdd78 fix: ( migration ) Create migration.sql Abubeker Yasin 2026-06-05 14:01:56 +03:00
  • d59c192137 resolve confilict marshal 2026-06-05 13:06:16 +03:00
  • 21d443db15 Merge pull request #98 from Tria-plc/freight/feature/payment Eyosiyas Girma 2026-06-05 13:02:06 +03:00
  • 03a997fad2 Merge branch 'freight/develop' into freight/feature/payment Eyosiyas Girma 2026-06-05 13:01:42 +03:00
  • 02018c339d payment Tria 2026-06-05 12:57:44 +03:00
  • c0dc9f5fc5 payment Tria 2026-06-05 12:54:35 +03:00
  • 2760e715c7 feat: add more statuses to the booking deailt page and added handling of request approval ghost2023 2026-06-05 11:40:44 +03:00
  • f77dd54390 feat: setup the recent booking endpoint and ui fixes ghost2023 2026-06-05 11:36:13 +03:00
  • 6e4b70be34 chore: install date-fns ghost2023 2026-06-05 11:28:43 +03:00
  • 7c124d9845 telebirr configured Tria 2026-06-05 11:01:01 +03:00
  • ba65a3f4cc booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions marshal 2026-06-05 11:01:00 +03:00
  • ec3f83c9fb Merge pull request #95 from Tria-plc/feature/trains-management Hagernesh Tadesse 2026-06-05 11:00:38 +03:00
  • b33517f47d resolve conflict hagiye 2026-06-05 10:59:52 +03:00
  • 1ce41cddde Fix train scheduling and booking seeder hagiye 2026-06-05 10:46:08 +03:00
  • bd6ad54eea Merge pull request #96 from Tria-plc/freight/feat/booking-pricing Nathnael Wondisha 2026-06-05 10:43:12 +03:00
  • d226d7ef22 booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions marshal 2026-06-05 10:38:31 +03:00
  • a991139cc2 feat(bookings): Integrate auto-pricing into DRAFT booking UI, and refactor customer-company relationships across services. ghost2023 2026-06-05 10:23:08 +03:00
  • ed9ef2b8e1 Merge freight/develop into feature/trains-management hagiye 2026-06-05 10:25:05 +03:00
  • c66b57d599 Merge freight/develop into feature/trains-management hagiye 2026-06-05 10:21:39 +03:00
  • 0184db9040 feat(bookings): Introduce DRAFT booking workflow with comprehensive features for pricing, document management, submission, and cancellation. ghost2023 2026-06-05 09:50:09 +03:00
  • c5859dba6c feat(bookings): Implement document upload API for DRAFT bookings ghost2023 2026-06-05 09:47:46 +03:00
  • c7617b1b6e chore: deps ghost2023 2026-06-05 09:46:00 +03:00
  • 523d7e5842 Merge pull request #94 from Tria-plc/freight/feature/add_train_scheduling Hagernesh Tadesse 2026-06-05 09:38:30 +03:00
  • 993d96d1b2 fix(freight:api): ton number conversion Michael Abebe 2026-06-04 17:14:55 +03:00
  • cd907eb263 feat(freight:api): added additional booking entry Michael Abebe 2026-06-04 17:08:41 +03:00
  • ac0076e84e fix(freight:api): migration fix on companies FAN number Michael Abebe 2026-06-04 17:08:05 +03:00
  • bdcb316685 Merge pull request #93 from Tria-plc/freight_feature/booking_flow marshal 2026-06-04 16:58:50 +03:00
  • 810bbc1168 dynamic contract templates and companyId on bookings marshal 2026-06-04 16:57:07 +03:00
  • 8fea963ddb dynamic contract templates and companyId on bookings marshal 2026-06-04 16:53:14 +03:00
  • 8b3aaad5fd feat(freight): basics of train scheduling Michael Abebe 2026-06-04 16:50:38 +03:00
  • 474c87a8ec Merge pull request #91 from Tria-plc/alpha Stephanos A. 2026-06-04 16:41:02 +03:00
  • af14535e08 Add device management to user profile and enhance seat hold expiration handling Stephanos A 2026-06-04 16:38:58 +03:00
  • 18c61dfe2e Merge pull request #90 from Tria-plc/alpha Stephanos A. 2026-06-04 16:22:39 +03:00
  • bc4d6d079b Booking and ticketing related updates Stephanos A 2026-06-04 16:21:22 +03:00
  • 93020b3153 working on payment Tria 2026-06-04 16:18:14 +03:00
  • 71ac89edc7 trains, wagons,containers and cargoes schema and API hagiye 2026-06-04 15:56:29 +03:00
  • ec0d789502 Merge pull request #89 from Tria-plc/freight/feat/onboarding-docs Nathnael Wondisha 2026-06-04 15:42:56 +03:00
  • ac964bace8 feat(WIP): setting and upload logic ghost2023 2026-06-04 15:39:36 +03:00
  • ad895d695e feat(companies): Introduce API endpoint and UI for company registration document uploads ghost2023 2026-06-04 14:41:37 +03:00
  • 8045415113 refactor: clean up ghost2023 2026-06-04 14:33:28 +03:00
  • 8ddd166dca feat: setup the ui for document uploading in accounts onboarding ghost2023 2026-06-04 14:30:49 +03:00
  • d61c3813cb feat(seed): Add file upload settings seeder for company onboarding ghost2023 2026-06-04 14:17:33 +03:00
  • 9d12d334d4 fix: key ghost2023 2026-06-04 14:16:48 +03:00
  • 30d2c123a5 Merge pull request #88 from Tria-plc/freight_feature/booking_flow marshal 2026-06-04 15:27:09 +03:00
  • 324935a334 implement booking flow marshal 2026-06-04 15:24:18 +03:00
  • 125ee18308 implement booking flow marshal 2026-06-04 15:16:27 +03:00
  • e44e80c200 Merge pull request #87 from Tria-plc/alpha Stephanos A. 2026-06-04 14:35:27 +03:00
  • 681825f36c Add endpoint to retrieve bookings by device ID and update related API methods Stephanos A 2026-06-04 14:28:49 +03:00
  • 3922d813b1 fix: ( telebirr ): fix payment status Abubeker Yasin 2026-06-04 14:24:38 +03:00
  • ef940a61bd Merge pull request #85 from Tria-plc/alpha Stephanos A. 2026-06-04 13:46:33 +03:00
  • 87a27677d9 Passenger portal UI and UX updates: landing mini site added Stephanos A 2026-06-04 13:45:23 +03:00
  • ffdb095a28 Update telebirr-webhook.service.ts Abubeker Yasin 2026-06-04 11:26:01 +03:00
  • 1784f05d31 Update webhooks.controller.ts Abubeker Yasin 2026-06-04 10:38:11 +03:00
  • 26cec36685 refactor: ( telebirr ) update the webhook to accept any request Abubeker Yasin 2026-06-04 10:15:20 +03:00
  • 6b82b11757 Merge pull request #84 from Tria-plc/freight/fix/user-signup Michael Abebe 2026-06-04 09:51:06 +03:00
  • 1fbedff810 Update payments.types.ts Abubeker Yasin 2026-06-04 09:01:19 +03:00
  • 848cb530ee fix: ( telebirr ) : change the payer id to appid Abubeker Yasin 2026-06-04 08:46:37 +03:00