From 9b03696cbafceae8f3ace0e862aecea1d867ca72 Mon Sep 17 00:00:00 2001 From: Devansh Date: Wed, 4 May 2022 20:15:10 +0530 Subject: [PATCH 1/7] Updated Validation --- .../Webkul/Core/src/Contracts/Validations/AlphaNumericSpace.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Core/src/Contracts/Validations/AlphaNumericSpace.php b/packages/Webkul/Core/src/Contracts/Validations/AlphaNumericSpace.php index 8dbb3d778..4dc191d90 100755 --- a/packages/Webkul/Core/src/Contracts/Validations/AlphaNumericSpace.php +++ b/packages/Webkul/Core/src/Contracts/Validations/AlphaNumericSpace.php @@ -15,7 +15,7 @@ class AlphaNumericSpace implements Rule */ public function passes($attribute, $value) { - return preg_match('/^[a-zA-Z0-9\s]+$/', $value); + return preg_match('/[a-zA-Z0-9\s]+/', $value); } /** From c52bcb430c2e4b9bf623a4c87e37dfa93d4b65cb Mon Sep 17 00:00:00 2001 From: Devansh Date: Thu, 5 May 2022 16:52:45 +0530 Subject: [PATCH 2/7] Fixed Exception In Merged Cart --- packages/Webkul/Checkout/src/Cart.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index ff61d9925..3603fb67f 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -310,19 +310,9 @@ class Cart } foreach ($cart->items as $item) { - $this->cartItemRepository->delete($item->id); - - if ($cart->items->count() == 0) { - $this->cartRepository->delete($cart->id); - - if (session()->has('cart')) { - session()->forget('cart'); - } - } + $this->removeItem($item->id); } - $cart->save(); - Event::dispatch('checkout.cart.delete.all.after', $cart); return $cart; From 2c3faadeb308ae43ecc7411d934da91567e6a09d Mon Sep 17 00:00:00 2001 From: Devansh <68321766+devansh-webkul@users.noreply.github.com> Date: Thu, 5 May 2022 17:00:40 +0530 Subject: [PATCH 3/7] Update README.md --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 8bf80d91e..875174e1a 100755 --- a/README.md +++ b/README.md @@ -61,6 +61,18 @@ to the ever-demanding online world. Your business -- whether small or huge -- ca **We also have a forum for any concerns, feature requests, or discussions. Please visit: [Bagisto Forums](https://forums.bagisto.com/)** +# Headless Commerce + +The power of headless commerce now comes to Bagisto enabling you to experience seamless and easily scalable storefront performance. Backed by some of the hottest tech stack Vue and React, Bagisto commerce can now be used to build powerful headless commerce solution offering blazing fast speed and easy customisation powered by Vue Storefront and Next.js + +## Vue Storefront + +Vue Storefront 2 integration for Bagisto: [https://github.com/bagisto/vuestorefront](https://github.com/bagisto/vuestorefront) + +## Next.js Commerce + +Develop and deploy your next headless commerce storefronts with Next JS and Bagisto: [https://github.com/bagisto/nextjs-commerce](https://github.com/bagisto/nextjs-commerce) + # Visit our live [Demo](https://demo.bagisto.com) It packs in lots of features that will allow your E-Commerce business to scale in no time: From 4764c75305d5cd7c61b999914debfedf0c293ea3 Mon Sep 17 00:00:00 2001 From: Devansh Date: Fri, 6 May 2022 12:40:47 +0530 Subject: [PATCH 4/7] Wishlist And Compare Added --- .../views/layouts/header/index.blade.php | 48 +++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index dc18294ee..e16f6964d 100755 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -61,7 +61,7 @@ $showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false @endphp - @php + @php $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false; @endphp @@ -128,14 +128,28 @@ + +
+ + @if ($showWishlist) +
  • + + {{ __('shop::app.header.wishlist') }} + +
    • + @endif + + @if ($showCompare) +
  • + + {{ __('shop::app.customer.compare.text') }} + +
    • + @endif @endguest @auth('customer') - @php - $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false; - @endphp -