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

Merge pull request #6667 from jitendra-webkul/master 

Updated changelog and version in env files
This commit is contained in:
Jitendra Singh 2022-08-30 11:21:32 +05:30 committed by GitHub
parent 61c39e6dce d6e8aa435a
commit 521eb9b2d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -1,6 +1,6 @@
APP_NAME=Bagisto APP_NAME=Bagisto
APP_ENV=local APP_ENV=local
APP_VERSION=1.4.3 APP_VERSION=1.4.4
APP_KEY= APP_KEY=
APP_DEBUG=true APP_DEBUG=true
APP_URL=http://localhost APP_URL=http://localhost

8
CHANGELOG for v1.x.x.md
View File

@ -2,12 +2,18 @@
This changelog consists of the bug & security fixes and new features being included in the releases listed below. This changelog consists of the bug & security fixes and new features being included in the releases listed below.
## **v1.4.4 (29th of August 2022)** - *Release* ## **v1.4.4 (30th of August 2022)** - *Release*
* #5584 [feature] - there should be an feature so that when we click on mark as read , notification box should close. * #5584 [feature] - there should be an feature so that when we click on mark as read , notification box should close.
* #5463 [feature] - there should be a button so that we should clear all filters. * #5463 [feature] - there should be a button so that we should clear all filters.
* [enhancement] - Optimized product
* [enhancement] - Optimized cart
* [enhancement] - Refactored code
* #6556 [enhancement] - Cart Rule -. Validation should be applied in Coupon Code uses per customer and used per coupon section. * #6556 [enhancement] - Cart Rule -. Validation should be applied in Coupon Code uses per customer and used per coupon section.
* #6555 [enhancement] - Cart Rule - Auto Generate Coupon Code details at bottom must not visible when we switch to Manual Coupon Code. * #6555 [enhancement] - Cart Rule - Auto Generate Coupon Code details at bottom must not visible when we switch to Manual Coupon Code.

14
packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
View File

@ -39,7 +39,7 @@ class ProductFlatRepository extends Repository
* @param int $categoryId * @param int $categoryId
* @return \Illuminate\Support\Querybuilder * @return \Illuminate\Support\Querybuilder
*/ */
public function categoryProductQuerybuilder($categoryId) public function categoryProductQueryBuilder($categoryId)
{ {
return $this->model return $this->model
->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id') ->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id')
@ -74,7 +74,7 @@ class ProductFlatRepository extends Repository
*/ */
public function getCategoryProductAttribute($categoryId) public function getCategoryProductAttribute($categoryId)
{ {
$qb = $this->categoryProductQuerybuilder($categoryId); $qb = $this->categoryProductQueryBuilder($categoryId);
$childQuery = $this->model->distinct()->whereIn('parent_id', $qb->distinct()->select(['id'])); $childQuery = $this->model->distinct()->whereIn('parent_id', $qb->distinct()->select(['id']));
@ -144,18 +144,18 @@ class ProductFlatRepository extends Repository
return $loadedCategoryAttributes[$category->id]; return $loadedCategoryAttributes[$category->id];
} }
$productsCount = $this->categoryProductQuerybuilder($category->id)->count(); $productsCount = $this->categoryProductQueryBuilder($category->id)->count();
if ($productsCount > 0) { if ($productsCount > 0) {
$categoryFilterableAttributes = $category->filterableAttributes->pluck('id')->toArray(); $categoryFilterableAttributes = $category->filterableAttributes->pluck('id')->toArray();
$productCategoryArrributes = $this->getCategoryProductAttribute($category->id); $productCategoryAttributes = $this->getCategoryProductAttribute($category->id);
$allFilterableAttributes = array_filter(array_unique(array_intersect($categoryFilterableAttributes, $productCategoryArrributes['attributes']))); $allFilterableAttributes = array_filter(array_unique(array_intersect($categoryFilterableAttributes, $productCategoryAttributes['attributes'])));
$attributes = $this->attributeRepository->getModel()::with([ $attributes = $this->attributeRepository->getModel()::with([
'options' => function ($query) use ($productCategoryArrributes) { 'options' => function ($query) use ($productCategoryAttributes) {
return $query->whereIn('id', $productCategoryArrributes['attributeOptions']) return $query->whereIn('id', $productCategoryAttributes['attributeOptions'])
->orderBy('sort_order'); ->orderBy('sort_order');
} }
])->whereIn('id', $allFilterableAttributes)->get(); ])->whereIn('id', $allFilterableAttributes)->get();