From 2a139ad91a57ef5c8e97b39229afd4f60d934ef2 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Thu, 5 Aug 2021 19:33:22 +0530 Subject: [PATCH 1/6] Cache Filter Issue Fixed --- packages/Webkul/Product/src/CacheFilters/Large.php | 9 ++++++--- packages/Webkul/Product/src/CacheFilters/Medium.php | 9 ++++++--- packages/Webkul/Product/src/CacheFilters/Small.php | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/packages/Webkul/Product/src/CacheFilters/Large.php b/packages/Webkul/Product/src/CacheFilters/Large.php index a3798af26..c64a05f1d 100755 --- a/packages/Webkul/Product/src/CacheFilters/Large.php +++ b/packages/Webkul/Product/src/CacheFilters/Large.php @@ -8,16 +8,19 @@ use Intervention\Image\Filters\FilterInterface; class Large implements FilterInterface { /** + * Apply filter. + * * @param \Intervention\Image\Image $image * @return \Intervention\Image\Image */ public function applyFilter(Image $image) { - $width = core()->getConfigData('catalog.products.cache-large-image.width') ?? 480; - $height = core()->getConfigData('catalog.products.cache-large-image.height') ?? 480; + $width = core()->getConfigData('catalog.products.cache-large-image.width') != '' ? core()->getConfigData('catalog.products.cache-large-image.width') : 480; + + $height = core()->getConfigData('catalog.products.cache-large-image.height') != '' ? core()->getConfigData('catalog.products.cache-large-image.height') : 480; return $image->resize($width, $height, function ($constraint) { $constraint->aspectRatio(); }); } -} \ No newline at end of file +} diff --git a/packages/Webkul/Product/src/CacheFilters/Medium.php b/packages/Webkul/Product/src/CacheFilters/Medium.php index adcc2a40f..9531cc06c 100755 --- a/packages/Webkul/Product/src/CacheFilters/Medium.php +++ b/packages/Webkul/Product/src/CacheFilters/Medium.php @@ -8,13 +8,16 @@ use Intervention\Image\Filters\FilterInterface; class Medium implements FilterInterface { /** + * Apply filter. + * * @param \Intervention\Image\Image $image * @return \Intervention\Image\Image */ public function applyFilter(Image $image) { - $width = core()->getConfigData('catalog.products.cache-medium-image.width') ?? 280; - $height = core()->getConfigData('catalog.products.cache-medium-image.height') ?? 280; + $width = core()->getConfigData('catalog.products.cache-medium-image.width') != '' ? core()->getConfigData('catalog.products.cache-medium-image.width') : 280; + + $height = core()->getConfigData('catalog.products.cache-medium-image.height') != '' ? core()->getConfigData('catalog.products.cache-medium-image.height') : 280; $image->resize($width, $height, function ($constraint) { $constraint->aspectRatio(); @@ -22,4 +25,4 @@ class Medium implements FilterInterface return $image->resizeCanvas($width, $height, 'center', false, '#fff'); } -} \ No newline at end of file +} diff --git a/packages/Webkul/Product/src/CacheFilters/Small.php b/packages/Webkul/Product/src/CacheFilters/Small.php index 060fff42d..f4aafaf30 100755 --- a/packages/Webkul/Product/src/CacheFilters/Small.php +++ b/packages/Webkul/Product/src/CacheFilters/Small.php @@ -8,13 +8,16 @@ use Intervention\Image\Filters\FilterInterface; class Small implements FilterInterface { /** + * Apply filter. + * * @param \Intervention\Image\Image $image * @return \Intervention\Image\Image */ public function applyFilter(Image $image) { - $width = core()->getConfigData('catalog.products.cache-small-image.width') ?? 120; - $height = core()->getConfigData('catalog.products.cache-small-image.height') ?? 120; + $width = core()->getConfigData('catalog.products.cache-small-image.width') ? core()->getConfigData('catalog.products.cache-small-image.width') : 120; + + $height = core()->getConfigData('catalog.products.cache-small-image.height') ? core()->getConfigData('catalog.products.cache-small-image.height') : 120; $image->resize($width, $height, function ($constraint) { $constraint->aspectRatio(); @@ -22,4 +25,4 @@ class Small implements FilterInterface return $image->resizeCanvas($width, $height, 'center', false, '#fff'); } -} \ No newline at end of file +} From 83e8e4c66f1106f2b55d624a633068b5df79da07 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 6 Aug 2021 09:52:45 +0530 Subject: [PATCH 2/6] Add To Cart Button Issue Fixed On Compare Page --- .../views/products/add-to-cart.blade.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php index 6887730ee..4b66d029e 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php @@ -4,9 +4,17 @@ $width = (core()->getConfigData('catalog.products.storefront.buy_now_button_display') == 1) ? '49' : '95'; @endphp - +
+ @csrf + + + + + + +
{!! view_render_event('bagisto.shop.products.add_to_cart.after', ['product' => $product]) !!} \ No newline at end of file From c8173d61c8825a372d7f5274d3f6599ba40ae38c Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 6 Aug 2021 12:43:27 +0530 Subject: [PATCH 3/6] Only Added to Compare Page And Reverted Previous Code --- .../guest/compare/compare-products.blade.php | 10 +++++++++- .../views/products/add-to-cart.blade.php | 16 ++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php index 31eadd4f1..c01ddb76e 100644 --- a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php @@ -68,7 +68,15 @@ @case('addToCartHtml')
-
+
+ @csrf + + + + + +
+
diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php index 4b66d029e..6887730ee 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php @@ -4,17 +4,9 @@ $width = (core()->getConfigData('catalog.products.storefront.buy_now_button_display') == 1) ? '49' : '95'; @endphp -
- @csrf - - - - - - -
+ {!! view_render_event('bagisto.shop.products.add_to_cart.after', ['product' => $product]) !!} \ No newline at end of file From 1b4ffc447446150db497c3ccda5e67d5c007fe5a Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 6 Aug 2021 13:09:54 +0530 Subject: [PATCH 4/6] Latest Change Log --- CHANGELOG for v1.x.x.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md index 549a4606b..b82dff360 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG for v1.x.x.md @@ -34,6 +34,12 @@ This changelog consists of the bug & security fixes and new features being inclu * #3251 [enhancement] - Add orders list to the customers details view. +* #5046 [fixed] - Add to cart button is not working in compare page for default theme. + +* #5045 [fixed] - Not getting product images where cache is exist. + +* #5042 [fixed] - Update the alert message when edit and save customer address. + * #5033 [fixed] - Order status options after invoice generation on payment methods. * #5029 [fixed] - Header menu content list layout need to fix. From 7ca290438dfb8f1d77b1eb5c82f63f283068e293 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 6 Aug 2021 14:09:28 +0530 Subject: [PATCH 5/6] PHP 8 Support Added --- CHANGELOG for v1.x.x.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md index b82dff360..3529b7395 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG for v1.x.x.md @@ -28,6 +28,8 @@ This changelog consists of the bug & security fixes and new features being inclu * #4901 [enhancement] - Configurable product addition issue. +* #4767 [enhancement] - PHP 8 support + * #4449 [enhancement] - Laravel 8 Support * #3834 [enhancement] - Ability to use multiple datagrids on single page. From 9b933ca0e75cd915d6ece82a1362a50ac5aa4730 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 6 Aug 2021 14:10:27 +0530 Subject: [PATCH 6/6] Typo --- CHANGELOG for v1.x.x.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md index 3529b7395..e8603cbd6 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG for v1.x.x.md @@ -28,9 +28,9 @@ This changelog consists of the bug & security fixes and new features being inclu * #4901 [enhancement] - Configurable product addition issue. -* #4767 [enhancement] - PHP 8 support +* #4767 [enhancement] - PHP 8 Support. -* #4449 [enhancement] - Laravel 8 Support +* #4449 [enhancement] - Laravel 8 Support. * #3834 [enhancement] - Ability to use multiple datagrids on single page.