Skip to content

Commit

Permalink
Merge pull request PrestaShop#35773 from tleon/Issue-35687-command-on…
Browse files Browse the repository at this point in the history
…-single-shops-that-expects-shopids

chore(api) allow customer group endpoint to be created without shopid…
  • Loading branch information
jolelievre authored Apr 9, 2024
2 parents 3387bf3 + 881b406 commit 5566b47
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"prestashop/gsitemap": "^4",
"prestashop/pagesnotfound": "^2",
"prestashop/productcomments": "^6.0",
"prestashop/ps_apiresources": "dev-admin-api-renaming",
"prestashop/ps_apiresources": "dev-Issue-35687-command-on-single-shops-that-expects-shopids",
"prestashop/ps_banner": "^2",
"prestashop/ps_bestsellers": "^1.0",
"prestashop/ps_brandlist": "^1.0",
Expand Down Expand Up @@ -254,7 +254,7 @@
"repositories": {
"ps_apiresources": {
"type": "vcs",
"url": "https://github.com/jolelievre/ps_apiresources.git"
"url": "https://github.com/tleon/ps_apiresources.git"
}
},
"minimum-stability": "dev",
Expand Down
18 changes: 9 additions & 9 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ protected function getContextParameters(): array
'isStrict' => $shopConstraint->isStrict(),
],
'shopId' => $this->shopContext->getId(),
'shopIds' => $this->shopContext->getAssociatedShopIds(),
'langId' => $this->languageContext->getId(),
'apiClientId' => $this->apiClientContext->getApiClient()?->getId(),
],
Expand Down

0 comments on commit 5566b47

Please sign in to comment.