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

fixes as per comment

This commit is contained in:
rahul shukla 2021-02-15 15:38:08 +05:30
parent f37d157461
commit db30a2e442
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/Webkul/Customer/src/Repositories/WishlistRepository.php
View File

@ -61,7 +61,20 @@ class WishlistRepository extends Repository
*/
public function getCustomerWhishlist()
{
return $this->model->where([
$query = $this->model;
if (! core()->getConfigData('catalog.products.homepage.out_of_stock_items')) {
$query =$this->model
->leftJoin('products as ps', 'wishlist.product_id', '=', 'ps.id')
->leftJoin('product_inventories as pv', 'ps.id', '=', 'pv.product_id')
->where(function ($qb) {
$qb
->WhereIn('ps.type', ['configurable', 'grouped', 'downloadable', 'bundle', 'booking'])
->orwhereIn('ps.type', ['simple', 'virtual'])->where('pv.qty' , '>' , 0);
});
}
return $query->where([
'channel_id' => core()->getCurrentChannel()->id,
'customer_id' => auth()->guard('customer')->user()->id,
])->paginate(5);

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

@ -812,12 +812,12 @@ class ProductRepository extends Repository
* @return Model
*/
public function checkOutOfStockItem($query) {
return $query->leftJoin('products', 'product_flat.product_id', '=', 'products.id')
->leftJoin('product_inventories', 'product_flat.product_id', '=', 'product_inventories.product_id')
return $query->leftJoin('products as ps', 'product_flat.product_id', '=', 'ps.id')
->leftJoin('product_inventories as pv', 'product_flat.product_id', '=', 'pv.product_id')
->where(function ($qb) {
$qb
->WhereIn('products.type', ['configurable', 'grouped', 'downloadable', 'bundle', 'booking'])
->orwhereIn('products.type', ['simple', 'virtual'])->where('product_inventories.qty' , '>' , 0);
->WhereIn('ps.type', ['configurable', 'grouped', 'downloadable', 'bundle', 'booking'])
->orwhereIn('ps.type', ['simple', 'virtual'])->where('pv.qty' , '>' , 0);
});
}
}

4
packages/Webkul/Velocity/src/Helpers/Helper.php
View File

@ -380,6 +380,10 @@ class Helper extends Review
// @TODO:- query only once insted of 2
$productFlat = $this->productFlatRepository->findOneWhere(['id' => $productId]);
if (! core()->getConfigData('catalog.products.homepage.out_of_stock_items') && ! $productFlat->isSaleable()) {
continue;
}
if ($productFlat) {
$product = $this->productRepository->findOneWhere(['id' => $productFlat->product_id]);

4
packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php
View File

@ -116,6 +116,10 @@ class ProductRepository extends Repository
$locale = request()->get('locale') ?: app()->getLocale();
if (! core()->getConfigData('catalog.products.homepage.out_of_stock_items')) {
$query = app('Webkul\Product\Repositories\ProductRepository')->checkOutOfStockItem($query);
}
$query = $query->distinct()
->addSelect('product_flat.*')
->leftJoin('products', 'product_flat.product_id', '=', 'products.id')