Skip to content

Commit

Permalink
Merge pull request #6667 from jitendra-webkul/master
Browse files Browse the repository at this point in the history
Updated changelog and version in env files
  • Loading branch information
jitendra-webkul committed Aug 30, 2022
2 parents 61c39e6 + d6e8aa4 commit 521eb9b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_NAME=Bagisto
APP_ENV=local
APP_VERSION=1.4.3
APP_VERSION=1.4.4
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG for v1.x.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,18 @@

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.

* #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.

* #6555 [enhancement] - Cart Rule - Auto Generate Coupon Code details at bottom must not visible when we switch to Manual Coupon Code.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function model(): string
* @param int $categoryId
* @return \Illuminate\Support\Querybuilder
*/
public function categoryProductQuerybuilder($categoryId)
public function categoryProductQueryBuilder($categoryId)
{
return $this->model
->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id')
Expand Down Expand Up @@ -74,7 +74,7 @@ public function updateAttributeColumn(
*/
public function getCategoryProductAttribute($categoryId)
{
$qb = $this->categoryProductQuerybuilder($categoryId);
$qb = $this->categoryProductQueryBuilder($categoryId);

$childQuery = $this->model->distinct()->whereIn('parent_id', $qb->distinct()->select(['id']));

Expand Down Expand Up @@ -144,18 +144,18 @@ public function getProductsRelatedFilterableAttributes($category)
return $loadedCategoryAttributes[$category->id];
}

$productsCount = $this->categoryProductQuerybuilder($category->id)->count();
$productsCount = $this->categoryProductQueryBuilder($category->id)->count();

if ($productsCount > 0) {
$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([
'options' => function ($query) use ($productCategoryArrributes) {
return $query->whereIn('id', $productCategoryArrributes['attributeOptions'])
'options' => function ($query) use ($productCategoryAttributes) {
return $query->whereIn('id', $productCategoryAttributes['attributeOptions'])
->orderBy('sort_order');
}
])->whereIn('id', $allFilterableAttributes)->get();
Expand Down

0 comments on commit 521eb9b

Please sign in to comment.