Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1

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:

packages/Webkul/Checkout/src/Cart.php

@@ -310,19 +310,9 @@ class Cart
         }
 
         foreach ($cart->items as $item) {
-            $this->cartItemRepository->delete($item->id);
+            $this->removeItem($item->id);
-
-            if ($cart->items->count() == 0) {
-                $this->cartRepository->delete($cart->id);
-
-                if (session()->has('cart')) {
-                    session()->forget('cart');
-                }
-            }
         }
 
-        $cart->save();
-
         Event::dispatch('checkout.cart.delete.all.after', $cart);
 
         return $cart;

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);
     }
 
     /**

packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php

@@ -90,7 +90,7 @@
 
                     onError: function (error) {
                         if (! options.authorizationFailed) {
-                            options.alertBox(error);
+                            options.alertBox(messages.universalError);
                         }
                     }
                 };

packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php

@@ -85,13 +85,13 @@
                                     </span>
 
                                     <span>
-                                        <a href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
+                                        <a href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}', '{{ $address->id }}')">
                                             {{ __('shop::app.customer.account.address.index.delete') }}
                                         </a>
 
-                                        <form id="deleteAddressForm" action="{{ route('address.delete', $address->id) }}" method="post">
+                                        <form id="deleteAddressForm{{ $address->id }}" action="{{ route('address.delete', $address->id) }}" method="post">
                                             @method('delete')
-                                            
+
                                             @csrf
                                         </form>
                                     </span>
@@ -109,12 +109,12 @@
 
 @push('scripts')
     <script>
-        function deleteAddress(message) {
+        function deleteAddress(message, addressId) {
             if (! confirm(message)) {
                 return;
             }
 
-            $('#deleteAddressForm').submit();
+            $(`#deleteAddressForm${addressId}`).submit();
         }
     </script>
 @endpush

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 @@
                                     </a>
                                 </div>
                             </li>
+
+                            <hr>
+
+                            @if ($showWishlist)
+                                <li>
+                                    <a href="{{ route('customer.wishlist.index') }}">
+                                        {{ __('shop::app.header.wishlist') }}
+                                    </a>
+                                </li>
+                            @endif
+
+                            @if ($showCompare)
+                                <li>
+                                    <a href="{{ route('velocity.product.compare') }}">
+                                        {{ __('shop::app.customer.compare.text') }}
+                                    </a>
+                                </li>
+                            @endif
                         </ul>
                     @endguest
 
                     @auth('customer')
-                        @php
-                           $showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
-                        @endphp
-
                         <ul class="dropdown-list account customer">
                             <li>
                                 <div>
@@ -151,24 +165,18 @@
 
                                     @if ($showWishlist)
                                         <li>
-                                            <a href="{{ route('customer.wishlist.index') }}">{{ __('shop::app.header.wishlist') }}</a>
+                                            <a href="{{ route('customer.wishlist.index') }}">
+                                                {{ __('shop::app.header.wishlist') }}
+                                            </a>
                                         </li>
                                     @endif
 
-                                    @if ($showCompare)                                     
+                                    @if ($showCompare)
-                                    <li>
+                                        <li>
-                                        <a
+                                            <a href="{{ route('velocity.customer.product.compare') }}">
-                                            @auth('customer')
+                                                {{ __('shop::app.customer.compare.text') }}
-                                                href="{{ route('velocity.customer.product.compare') }}"
+                                            </a>
-                                            @endauth
+                                        </li>
-
-                                            @guest('customer')
-                                                href="{{ route('velocity.product.compare') }}"
-                                            @endguest
-                                            
-                                            > {{ __('shop::app.customer.compare.text') }}
-                                        </a>
-                                    </li>
                                     @endif
 
                                     <li>

packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php

@@ -52,11 +52,11 @@
                                         {{ __('shop::app.customer.account.address.index.edit') }}
                                     </a>
 
-                                    <a class="card-link" href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
+                                    <a class="card-link" href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}', '{{ $address->id }}')">
                                         {{ __('shop::app.customer.account.address.index.delete') }}
                                     </a>
 
-                                    <form id="deleteAddressForm" action="{{ route('address.delete', $address->id) }}" method="post">
+                                    <form id="deleteAddressForm{{ $address->id }}" action="{{ route('address.delete', $address->id) }}" method="post">
                                         @method('delete')
 
                                         @csrf
@@ -74,12 +74,12 @@
 
 @push('scripts')
     <script>
-        function deleteAddress(message) {
+        function deleteAddress(message, addressId) {
             if (! confirm(message)) {
                 return;
             }
 
-            $('#deleteAddressForm').submit();
+            $(`#deleteAddressForm${addressId}`).submit();
         }
     </script>
 @endpush