From cd594fae5480fca87974eb5baadd0bfeb0770776 Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 30 Aug 2022 11:03:45 +0530 Subject: [PATCH 1/2] Fixed typo --- .../src/Repositories/ProductFlatRepository.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php index a085559ff..c3a5a4cc5 100644 --- a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php @@ -39,7 +39,7 @@ class ProductFlatRepository extends Repository * @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') @@ -74,7 +74,7 @@ class ProductFlatRepository extends Repository */ public function getCategoryProductAttribute($categoryId) { - $qb = $this->categoryProductQuerybuilder($categoryId); + $qb = $this->categoryProductQueryBuilder($categoryId); $childQuery = $this->model->distinct()->whereIn('parent_id', $qb->distinct()->select(['id'])); @@ -144,18 +144,18 @@ class ProductFlatRepository extends Repository 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(); From d6e8aa435aa9f701837b2e522e9895efa0339e13 Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 30 Aug 2022 11:10:14 +0530 Subject: [PATCH 2/2] Updated readme and version in env files --- .env.example | 2 +- CHANGELOG for v1.x.x.md | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index a0eb5f16c..b225aed84 100644 --- a/.env.example +++ b/.env.example @@ -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 diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md index 0dbe22fcd..a1820ae5a 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG for v1.x.x.md @@ -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.