Merge branch 'master' into google-captcha

This commit is contained in:
devansh bawari 2021-06-30 11:32:36 +05:30
commit e4eaefd199
1 changed files with 7 additions and 7 deletions

View File

@ -840,13 +840,14 @@ class ProductRepository extends Repository
} }
/** /**
* Check out of stock items. * Check out of stock items. This method needed `variants` alias in
* the `product_flat` query.
* *
* @param Webkul\Product\Models\ProductFlat * @param Webkul\Product\Models\ProductFlat $query
* * @return Illuminate\Database\Eloquent\Builder
* @return Model */
*/ public function checkOutOfStockItem($query)
public function checkOutOfStockItem($query) { {
return $query return $query
->leftJoin('products as ps', 'product_flat.product_id', '=', 'ps.id') ->leftJoin('products as ps', 'product_flat.product_id', '=', 'ps.id')
->leftJoin('product_inventories as pv', 'product_flat.product_id', '=', 'pv.product_id') ->leftJoin('product_inventories as pv', 'product_flat.product_id', '=', 'pv.product_id')
@ -865,7 +866,6 @@ class ProductRepository extends Repository
->selectRaw('SUM(' . DB::getTablePrefix() . 'product_inventories.qty)') ->selectRaw('SUM(' . DB::getTablePrefix() . 'product_inventories.qty)')
->from('product_flat') ->from('product_flat')
->leftJoin('product_inventories', 'product_inventories.product_id', '=', 'product_flat.product_id') ->leftJoin('product_inventories', 'product_inventories.product_id', '=', 'product_flat.product_id')
->join('product_flat as variants', 'product_flat.id', '=', DB::raw('COALESCE(' . DB::getTablePrefix() . 'variants.parent_id, ' . DB::getTablePrefix() . 'variants.id)'))
->whereRaw(DB::getTablePrefix() . 'product_flat.parent_id = variants.id'); ->whereRaw(DB::getTablePrefix() . 'product_flat.parent_id = variants.id');
}, '>', 0); }, '>', 0);
}); });