Commit Graph

  • c977deb460 modify booking request page Marshal 2026-07-03 14:01:50 +00:00
  • 7eb62a0ba2 Merge pull request #423 from Tria-plc/freight_feature/usermanagement marshal 2026-07-03 16:55:26 +03:00
  • 57d3752ea5 fix issues Marshal 2026-07-03 13:53:17 +00:00
  • b53c088eff Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice natib21 2026-07-03 13:50:18 +00:00
  • 782f4184ef fix natib21 2026-07-03 13:49:55 +00:00
  • e2867e3086 import loading backend Hagernesh 2026-07-03 13:47:45 +00:00
  • 52f48b688d fix issues Marshal 2026-07-03 13:40:10 +00:00
  • a63a16a0b7 fix yaschalew 2026-07-03 16:36:08 +03:00
  • 6570268d91 Merge pull request #422 from Tria-plc/freight_feature/usermanagement marshal 2026-07-03 16:28:49 +03:00
  • e14df58a47 fix issues Marshal 2026-07-03 13:26:40 +00:00
  • 04902f0dd5 Merge pull request #421 from Tria-plc/dev Abubeker Yasin 2026-07-03 15:33:22 +03:00
  • cd9a38b0fc Merge pull request #420 from Tria-plc/alpha Abubeker Yasin 2026-07-03 15:24:27 +03:00
  • 209701aa34 fix: passenger dob error Abubeker Yasin 2026-07-03 15:23:32 +03:00
  • 39d63be84c Merge pull request #419 from Tria-plc/freight/feat/fixes-v1 Nathnael Wondisha 2026-07-03 15:23:28 +03:00
  • f938107245 chore: add logger to mark-paid Nathnael 2026-07-03 12:22:46 +00:00
  • 64fa2862eb Merge branch 'dev' into freight/feat/fixes-v1 Nathnael 2026-07-03 12:19:45 +00:00
  • 79731e58ec feat: add otp to contract Nathnael 2026-07-03 12:19:07 +00:00
  • d3707fe704 feat: merge the role and nationality step Nathnael 2026-07-03 12:09:35 +00:00
  • 414c9610dc chore: migrate to otp table Nathnael 2026-07-03 11:57:40 +00:00
  • 37ec1c40ab chore: add loger Nathnael 2026-07-03 11:48:39 +00:00
  • c0d0b87c71 Merge pull request #418 from Tria-plc/freight_feature/usermanagement marshal 2026-07-03 14:12:28 +03:00
  • 2d71f24937 chore: rm the verify step in onboarding Nathnael 2026-07-03 11:08:57 +00:00
  • a4c6848233 user managemnt and wight limit rule marshal 2026-07-03 14:06:18 +03:00
  • 4e6e614b48 feat: add email to notification and otp Nathnael 2026-07-03 10:59:06 +00:00
  • 3d8e130f47 Merge pull request #417 from Tria-plc/freight_feature/usermanagement marshal 2026-07-03 13:58:09 +03:00
  • 07e524eea4 user managemnt and wight limit rule marshal 2026-07-03 13:56:34 +03:00
  • 02ee4cc743 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement marshal 2026-07-03 13:54:29 +03:00
  • 130625df54 user managemnt and wight limit rule marshal 2026-07-03 13:54:12 +03:00
  • 48db0b240b fix fayda natib21 2026-07-03 09:32:41 +00:00
  • 39d8a98e22 Merge pull request #416 from Tria-plc/alpha Abubeker Yasin 2026-07-03 12:26:39 +03:00
  • 35cb20da0b feat: implement 20ft container weight-pairing validation Marshal 2026-07-03 09:26:27 +00:00
  • 91e59abf0e fix: passenger id Abubeker Yasin 2026-07-03 12:21:41 +03:00
  • b218179d72 :wqMerge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice natib21 2026-07-03 09:10:31 +00:00
  • e4b0c73c63 fix fayda natib21 2026-07-03 09:10:05 +00:00
  • 20abc0288d Merge pull request #415 from Tria-plc/freight/feat/fixes-v1 Nathnael Wondisha 2026-07-03 11:39:47 +03:00
  • 515d59fb53 fix: file preview Nathnael 2026-07-03 08:35:57 +00:00
  • 4d17787dbd Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement marshal 2026-07-03 11:28:55 +03:00
  • d832e83b4a update Marshal 2026-07-03 08:13:51 +00:00
  • 46971fd5c5 Export Djbouti unloading queue Hagernesh 2026-07-03 07:30:12 +00:00
  • 3925a11dd4 feat: add invoice to customer detail on backoffice Nathnael 2026-07-03 07:21:19 +00:00
  • 43f7a039ad fix: payment api crash Nathnael 2026-07-03 07:20:31 +00:00
  • 300afb4c77 feat: add existing files to customer documet tab on portal Nathnael 2026-07-03 06:57:56 +00:00
  • 33ca30461e feat: extended the smartfileinput and add a global useFileViewer Nathnael 2026-07-03 06:57:22 +00:00
  • 1611c6be22 Merge branch 'dev' into freight/feat/fixes-v1 Nathnael 2026-07-03 06:28:38 +00:00
  • 633c7c52c5 feat: add viewing existingFiles to smartfileinput Nathnael 2026-07-03 06:22:32 +00:00
  • 1e408536aa feat: add invoice pages and api to the backoffice Nathnael 2026-07-03 06:21:25 +00:00
  • 53fed882be feat: setup pagination to find all invoice api Nathnael 2026-07-03 06:20:05 +00:00
  • 613d56fb17 Merge pull request #414 from Tria-plc/dev Abubeker Yasin 2026-07-03 09:06:21 +03:00
  • 75cda22a48 Implement consolidated booking handling and UI updates for shared wagons Marshal 2026-07-03 05:07:23 +00:00
  • bb2cedc87f Add allocation management features and update permissions for container allocation Marshal 2026-07-03 04:15:16 +00:00
  • 1735c4fdac Merge pull request #413 from Tria-plc/contrat-backup2 marshal 2026-07-03 06:50:43 +03:00
  • c71849c487 chnage the base url marshal 2026-07-03 06:49:43 +03:00
  • 01acd071cf Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 marshal 2026-07-03 06:39:02 +03:00
  • 56de90892d Add booking window management and locomotive scheduling features Marshal 2026-07-03 03:36:06 +00:00
  • 868639084c Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-02 22:42:30 +03:00
  • 200476dfd6 Fare and route-coach, production checklist updates Stephanos A 2026-07-02 22:42:15 +03:00
  • 4c6920d297 Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 marshal 2026-07-02 22:08:17 +03:00
  • e2e72075c9 merge conflickt marshal 2026-07-02 22:08:02 +03:00
  • 18c158fb61 changes Marshal 2026-07-02 19:06:22 +00:00
  • 0bf81490fe Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 marshal 2026-07-02 21:49:18 +03:00
  • 488a135054 changes Marshal 2026-07-02 18:49:00 +00:00
  • fc5d49f34c Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 marshal 2026-07-02 21:15:45 +03:00
  • 8d056c5014 finalize gl flow for import Marshal 2026-07-02 18:15:16 +00:00
  • d4561b948a Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2 marshal 2026-07-02 21:02:22 +03:00
  • dd47068a4b finilize gl flow for export Marshal 2026-07-02 17:55:59 +00:00
  • 1f0af964ff Merge pull request #412 from Tria-plc/freight/feature/first_mile_invoice yaschalew10 2026-07-02 18:09:08 +03:00
  • c449e73337 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice yaschalew 2026-07-02 18:08:35 +03:00
  • 49036abf7f fix yaschalew 2026-07-02 18:07:21 +03:00
  • 0a3b4fb225 Merge pull request #411 from Tria-plc/freight/feature/first_mile_invoice yaschalew10 2026-07-02 18:03:14 +03:00
  • 26e2974d87 fix yaschalew 2026-07-02 18:02:23 +03:00
  • 7df24673a8 Merge pull request #403 from Tria-plc/freight/feature/first_mile_invoice yaschalew10 2026-07-02 17:57:45 +03:00
  • 2b7e67b227 fix yaschalew 2026-07-02 17:56:17 +03:00
  • 8f24544f78 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice yaschalew 2026-07-02 17:42:21 +03:00
  • eb5d8a7411 fix natib21 2026-07-02 14:42:04 +00:00
  • 71e1ab98f4 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice yaschalew 2026-07-02 17:37:54 +03:00
  • b7da024968 fix natib21 2026-07-02 14:37:38 +00:00
  • 9198fcd3e7 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice yaschalew 2026-07-02 17:34:40 +03:00
  • 2424e96e74 fix natib21 2026-07-02 14:34:22 +00:00
  • 60eba409ae Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice yaschalew 2026-07-02 17:27:25 +03:00
  • e5fed081fc fix natib21 2026-07-02 14:27:09 +00:00
  • 86090d5c37 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice yaschalew 2026-07-02 17:19:09 +03:00
  • 7d85f5dc2e fix natib21 2026-07-02 14:18:53 +00:00
  • 9d14414bf1 Merge pull request #410 from Tria-plc/freight/feat/fixes-v1 Nathnael Wondisha 2026-07-02 17:14:40 +03:00
  • 8f152466e8 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice yaschalew 2026-07-02 17:14:31 +03:00
  • c2c29f0735 fix natib21 2026-07-02 14:14:13 +00:00
  • 635d674bbe fix: merge marker in invoice detial page Nathnael 2026-07-02 14:11:34 +00:00
  • 245dd2da88 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice yaschalew 2026-07-02 17:07:04 +03:00
  • 34b87bbcee fix natib21 2026-07-02 14:06:45 +00:00
  • 86b1534ed4 Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice yaschalew 2026-07-02 16:56:04 +03:00
  • d32b9502b0 Merge pull request #409 from Tria-plc/passenger/feat/iam Abubeker Yasin 2026-07-02 16:56:02 +03:00
  • fb8dcb0217 fix yaschalew 2026-07-02 16:55:51 +03:00
  • 7f6c9c6313 fix natib21 2026-07-02 13:55:08 +00:00
  • 193294d464 Merge pull request #408 from Tria-plc/contrat-backup2 marshal 2026-07-02 16:49:33 +03:00
  • f77e4d150b Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2 Marshal 2026-07-02 13:44:50 +00:00
  • 17f2ef9c85 Merge pull request #406 from Tria-plc/freight/feat/fixes-v1 Nathnael Wondisha 2026-07-02 16:44:43 +03:00
  • d8f1ed8899 fix issue natib21 2026-07-02 13:44:19 +00:00
  • 2c5e553d7c Merge branch 'dev' into freight/feat/fixes-v1 ghost2023 2026-07-02 16:43:16 +03:00
  • 71894ae2d3 merge conflict Marshal 2026-07-02 13:43:07 +00:00
  • 8e19089e89 Merge pull request #407 from Tria-plc/passenger/feat/iam Abubeker Yasin 2026-07-02 16:39:13 +03:00
  • 60e0c26943 feat: ( iam ) add portal auth registration, forgot/change password, Fayda setup Abubeker Yasin 2026-07-02 16:35:54 +03:00