merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert the parameter rename, but keep new functionality

This commit is contained in:
nikolayandreev 2021-02-23 13:23:22 +02:00
parent a352370394
commit 93a5ec7d56
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/API/Http/Controllers/Shop/ProductController.php
View File

@ -34,7 +34,7 @@ class ProductController extends Controller
*/
public function index()
{
return ProductResource::collection($this->productRepository->getAll(request()->input('categories')));
return ProductResource::collection($this->productRepository->getAll(request()->input('category_id')));
}
/**

10
packages/Webkul/Product/src/Repositories/ProductRepository.php
View File

@ -129,11 +129,11 @@ class ProductRepository extends Repository
}
/**
* @param string $categories
* @param string $categoryId
*
* @return \Illuminate\Support\Collection
*/
public function getAll($categories = null)
public function getAll($categoryId = null)
{
$params = request()->input();
@ -147,7 +147,7 @@ class ProductRepository extends Repository
$page = Paginator::resolveCurrentPage('page');
$repository = app(ProductFlatRepository::class)->scopeQuery(function ($query) use ($params, $categories) {
$repository = app(ProductFlatRepository::class)->scopeQuery(function ($query) use ($params, $categoryId) {
$channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
$locale = request()->get('locale') ?: app()->getLocale();
@ -161,8 +161,8 @@ class ProductRepository extends Repository
->where('product_flat.locale', $locale)
->whereNotNull('product_flat.url_key');
if ($categories) {
$qb->whereIn('product_categories.category_id', explode(',', $categories));
if ($categoryId) {
$qb->whereIn('product_categories.category_id', explode(',', $categoryId));
}
if (! core()->getConfigData('catalog.products.homepage.out_of_stock_items')) {