Commit Graph

  • 4e632123c0 Merge pull request #340 from Tria-plc/freight_feature/contrat marshal 2026-06-29 15:21:01 +03:00
  • 6685a3ba76 payemnt marshal 2026-06-29 15:17:51 +03:00
  • cb4f2c8933 Merge pull request #339 from Tria-plc/freight/feature/last_mile_invoice yaschalew10 2026-06-29 15:17:34 +03:00
  • aac790292b Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice natib21 2026-06-29 12:15:53 +00:00
  • a64e531324 fix natib21 2026-06-29 12:15:30 +00:00
  • d22fb6bb22 Merge pull request #338 from Tria-plc/freight_feature/contrat marshal 2026-06-29 15:10:57 +03:00
  • 87edba6c12 Merge pull request #337 from Tria-plc/freight/feature/last_mile_invoice yaschalew10 2026-06-29 15:10:00 +03:00
  • 75ff175538 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice yaschalew 2026-06-29 15:09:20 +03:00
  • a83a686f37 payemnt marshal 2026-06-29 15:09:19 +03:00
  • f958a7639a Merge pull request #336 from Tria-plc/freight_feature/contrat marshal 2026-06-29 15:08:50 +03:00
  • b22ab739db fix natib21 2026-06-29 12:08:16 +00:00
  • 09e1429c38 payemnt marshal 2026-06-29 15:08:12 +03:00
  • 1795bb8830 Merge pull request #335 from Tria-plc/freight_feature/contrat marshal 2026-06-29 15:07:25 +03:00
  • 211301b7ce Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat marshal 2026-06-29 15:06:23 +03:00
  • b688a76550 payemnt marshal 2026-06-29 15:05:50 +03:00
  • 079351f7c4 fix: migration problem Abubeker Yasin 2026-06-29 15:05:46 +03:00
  • 1491db304b payemnt marshal 2026-06-29 15:04:01 +03:00
  • db7f0cb601 Merge pull request #334 from Tria-plc/freight/feature/last_mile_invoice yaschalew10 2026-06-29 15:03:00 +03:00
  • 5c36c09dae fix natib21 2026-06-29 12:01:19 +00:00
  • 72ec31d4ea Merge branch 'dev' into passenger/feat/iam Abubeker Yasin 2026-06-29 14:24:38 +03:00
  • 662d96571e fix Nathnael 2026-06-29 11:14:42 +00:00
  • 835facc65a fix natib21 2026-06-29 11:12:51 +00:00
  • 9d6558553b Merge branch 'alpha' into passenger/feat/iam Abubeker Yasin 2026-06-29 14:02:53 +03:00
  • c37e8acfdc Merge branch 'dev' into freight/feat/invoice Nathnael 2026-06-29 10:58:12 +00:00
  • eab71f2348 Merge pull request #333 from Tria-plc/importhandover Hagernesh Tadesse 2026-06-29 13:55:36 +03:00
  • b3ec6e4235 refactor: ( iam ) user real uuid Abubeker Yasin 2026-06-29 13:51:05 +03:00
  • 64cab3ecd0 Merge branch 'dev' of github.com:Tria-plc/edr-platform into handover hagiye 2026-06-29 13:49:25 +03:00
  • 9176df5e4b Marshaling document Receive Export and import handover to customer hagiye 2026-06-29 13:48:58 +03:00
  • 580b484882 Merge pull request #329 from Tria-plc/alpha Eyob T. 2026-06-29 13:37:21 +03:00
  • 943a986b05 Merge pull request #332 from Tria-plc/freight_feature/contrat marshal 2026-06-29 13:36:14 +03:00
  • 1c170ec790 remove unused import for PackageCheck in step2-service-type.tsx Marshal 2026-06-29 10:34:40 +00:00
  • 15a19053d9 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat Marshal 2026-06-29 10:27:16 +00:00
  • 6be461bb2f add profile creation flow with license upload in NewContractPage Marshal 2026-06-29 10:25:06 +00:00
  • bdca3a1e8d Merge pull request #331 from Tria-plc/freight_feature/contrat marshal 2026-06-29 12:52:50 +03:00
  • 9fe90c8ef7 merge conflict marshal 2026-06-29 12:50:47 +03:00
  • 2551f76f8a fix: reference type in payment and billing Nathnael 2026-06-29 09:50:29 +00:00
  • 7f63d4bd2b Merge pull request #330 from Tria-plc/freight_feature/contrat marshal 2026-06-29 12:49:33 +03:00
  • 160840a22f merge conflict marshal 2026-06-29 12:46:56 +03:00
  • 750577d72b Merge pull request #328 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-29 12:46:13 +03:00
  • 1c01c792fc merge conflict marshal 2026-06-29 12:45:40 +03:00
  • 69e5359783 :wqMerge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 natib21 2026-06-29 09:43:56 +00:00
  • 7de3ec45e1 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-06-29 12:43:37 +03:00
  • fc03e27bdc fix natib21 2026-06-29 09:43:31 +00:00
  • f8810253ff Migration fix Stephanos A 2026-06-29 12:42:37 +03:00
  • 1225990a69 Merge pull request #327 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-29 12:38:16 +03:00
  • b95bd76774 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 12:37:28 +03:00
  • 0ad399cdc5 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 12:34:15 +03:00
  • 9f0d16886d fix natib21 2026-06-29 09:33:56 +00:00
  • 2ad384e63b Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat marshal 2026-06-29 12:31:21 +03:00
  • be2f59beff Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 12:31:05 +03:00
  • 0f7cac2b68 add booking request functionality for GENERAL customs contracts Marshal 2026-06-29 09:30:44 +00:00
  • 31b38311ff fix natib21 2026-06-29 09:30:44 +00:00
  • b23066006f Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 12:28:07 +03:00
  • 4a7503a667 fix natib21 2026-06-29 09:27:43 +00:00
  • 4be4286fbf feat: rewired up the billing and payment with the booking Nathnael 2026-06-29 09:25:46 +00:00
  • ef0b4d389c Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 12:25:23 +03:00
  • 9d7d08cf5d fix natib21 2026-06-29 09:24:45 +00:00
  • d55f9312bf Marshaling document Receive Export and import handover to customer hagiye 2026-06-29 12:24:14 +03:00
  • f3ad44bf11 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 12:20:59 +03:00
  • 6aad868fb2 fix natib21 2026-06-29 09:20:37 +00:00
  • 09e4501708 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 12:16:24 +03:00
  • 8728347642 fix natib21 2026-06-29 09:16:03 +00:00
  • 7841c5c2b5 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 12:12:07 +03:00
  • 8a8a1b7316 fix natib21 2026-06-29 09:11:48 +00:00
  • 4309b9ae96 Merge branch 'dev' into passenger/feat/iam Abubeker Yasin 2026-06-29 11:59:31 +03:00
  • d970cfb08f Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 11:57:54 +03:00
  • 6607fda5fd fix natib21 2026-06-29 08:57:34 +00:00
  • 397a36cd8d Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 11:56:03 +03:00
  • 8bb1cb18b5 fix natib21 2026-06-29 08:55:40 +00:00
  • b70e9ea2cd feat: ( payments ) convert ETB to method currency before charging Abubeker Yasin 2026-06-29 11:55:31 +03:00
  • f3e27fb607 Merge pull request #326 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-29 11:53:31 +03:00
  • cdba937a9f Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 11:49:56 +03:00
  • 17ee6ea292 fix natib21 2026-06-29 08:49:36 +00:00
  • bee842bac5 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 11:47:04 +03:00
  • 0d922a132f fix natib21 2026-06-29 08:46:03 +00:00
  • fcad1b7fac Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 11:40:42 +03:00
  • 18fb16f741 fix yaschalew 2026-06-29 11:40:14 +03:00
  • 40320d247a fix natib21 2026-06-29 08:37:48 +00:00
  • 9cd24d9b51 feat(WIP): Wire up the invoice with the booking. Nathnael 2026-06-29 08:29:07 +00:00
  • 36711eace4 chore: type updates on the billing service Nathnael 2026-06-29 08:28:12 +00:00
  • 95af66f547 changes marshal 2026-06-29 11:11:44 +03:00
  • 8b80415d8c Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat marshal 2026-06-29 11:08:43 +03:00
  • aeb5e0046e implement Global Logistics booking process for customs contracts and enhance contract document handling Marshal 2026-06-29 08:08:10 +00:00
  • 86c51574b9 Update deploy.yml Yonas Tewabe 2026-06-29 10:36:33 +03:00
  • 0f33076b4c Update Dockerfile Yonas Tewabe 2026-06-29 10:35:28 +03:00
  • 6e3d2bc0d2 Refactor Dockerfile for separate migration and seed process Yonas Tewabe 2026-06-29 10:34:47 +03:00
  • 1da5af94ab feat: scoped the payables by type Nathnael 2026-06-29 07:32:42 +00:00
  • 5bad245ce8 feat: setup billing services Nathnael 2026-06-29 07:11:52 +00:00
  • 3a0b34d3b6 Merge pull request #325 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-29 10:11:21 +03:00
  • fadc98056d Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 10:10:43 +03:00
  • a64e335be6 fix ui yaschalew 2026-06-29 10:09:26 +03:00
  • 3b380a5bb3 fix um yaschalew 2026-06-29 10:08:33 +03:00
  • 82a249e582 Merge pull request #324 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-29 09:50:49 +03:00
  • 48a3dbb12c Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-29 09:49:08 +03:00
  • 382c9c4b80 fix yaschalew 2026-06-29 09:48:41 +03:00
  • 334755432d Merge pull request #323 from Tria-plc/alpha Eyob T. 2026-06-29 08:52:28 +03:00
  • c6e56d1c4f Boarding, payment methods, journey direction on seat hold, and more updates Stephanos A 2026-06-29 08:44:38 +03:00
  • 418ba10858 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat marshal 2026-06-29 02:55:27 +03:00
  • 4be4cc9054 feat: implement first and last mile trucking pricing logic in booking and contract services Marshal 2026-06-28 23:54:51 +00:00
  • 1b8a765ee4 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat marshal 2026-06-29 02:40:02 +03:00