From 837c5d44fab695cbee77f72bba8c6bcc8a91eca0 Mon Sep 17 00:00:00 2001
From: rahulshukla-home <rahulcs0082@gmail.com>
Date: Tue, 28 Apr 2020 08:14:53 +0530
Subject: [PATCH] fix category issue and change country,state order

---
 .../src/Repositories/ProductRepository.php    | 14 ++--
 .../checkout/onepage/customer-info.blade.php  | 76 +++++++++----------
 2 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index 4a9acacaf..a68aaa0a0 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -145,14 +145,16 @@ class ProductRepository extends Repository
             if (isset($params['sort'])) {
                 $attribute = $this->attributeRepository->findOneByField('code', $params['sort']);
 
-                if ($params['sort'] == 'price') {
-                    if ($attribute->code == 'price') {
-                        $qb->orderBy('min_price', $params['order']);
+                if ($attribute) {
+                    if ($params['sort'] == 'price') {
+                        if ($attribute->code == 'price') {
+                            $qb->orderBy('min_price', $params['order']);
+                        } else {
+                            $qb->orderBy($attribute->code, $params['order']);
+                        }
                     } else {
-                        $qb->orderBy($attribute->code, $params['order']);
+                        $qb->orderBy($params['sort'] == 'created_at' ? 'product_flat.created_at' : $attribute->code, $params['order']);
                     }
-                } else {
-                    $qb->orderBy($params['sort'] == 'created_at' ? 'product_flat.created_at' : $attribute->code, $params['order']);
                 }
             }
 
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
index 5214f57c0..90fa8652c 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
@@ -161,6 +161,26 @@
             </span>
         </div>
 
+        <div class="control-group" :class="[errors.has('address-form.billing[country]') ? 'has-error' : '']">
+            <label for="billing[country]" class="required">
+                {{ __('shop::app.checkout.onepage.country') }}
+            </label>
+
+            <select type="text" v-validate="'required'" class="control" id="billing[country]" name="billing[country]" v-model="address.billing.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
+                <option value=""></option>
+
+                @foreach (core()->countries() as $country)
+
+                    <option value="{{ $country->code }}">{{ $country->name }}</option>
+
+                @endforeach
+            </select>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[country]')">
+                @{{ errors.first('address-form.billing[country]') }}
+            </span>
+        </div>
+
         <div class="control-group" :class="[errors.has('address-form.billing[state]') ? 'has-error' : '']">
             <label for="billing[state]" class="required">
                 {{ __('shop::app.checkout.onepage.state') }}
@@ -195,26 +215,6 @@
             </span>
         </div>
 
-        <div class="control-group" :class="[errors.has('address-form.billing[country]') ? 'has-error' : '']">
-            <label for="billing[country]" class="required">
-                {{ __('shop::app.checkout.onepage.country') }}
-            </label>
-
-            <select type="text" v-validate="'required'" class="control" id="billing[country]" name="billing[country]" v-model="address.billing.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
-                <option value=""></option>
-
-                @foreach (core()->countries() as $country)
-
-                    <option value="{{ $country->code }}">{{ $country->name }}</option>
-
-                @endforeach
-            </select>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[country]')">
-                @{{ errors.first('address-form.billing[country]') }}
-            </span>
-        </div>
-
         <div class="control-group" :class="[errors.has('address-form.billing[phone]') ? 'has-error' : '']">
             <label for="billing[phone]" class="required">
                 {{ __('shop::app.checkout.onepage.phone') }}
@@ -386,6 +386,24 @@
                 </span>
             </div>
 
+            <div class="control-group" :class="[errors.has('address-form.shipping[country]') ? 'has-error' : '']">
+                <label for="shipping[country]" class="required">
+                    {{ __('shop::app.checkout.onepage.country') }}
+                </label>
+
+                <select type="text" v-validate="'required'" class="control" id="shipping[country]" name="shipping[country]" v-model="address.shipping.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
+                    <option value=""></option>
+
+                    @foreach (core()->countries() as $country)
+                        <option value="{{ $country->code }}">{{ $country->name }}</option>
+                    @endforeach
+                </select>
+
+                <span class="control-error" v-if="errors.has('address-form.shipping[country]')">
+                    @{{ errors.first('address-form.shipping[country]') }}
+                </span>
+            </div>
+
             <div class="control-group" :class="[errors.has('address-form.shipping[state]') ? 'has-error' : '']">
                 <label for="shipping[state]" class="required">
                     {{ __('shop::app.checkout.onepage.state') }}
@@ -421,24 +439,6 @@
                 </span>
             </div>
 
-            <div class="control-group" :class="[errors.has('address-form.shipping[country]') ? 'has-error' : '']">
-                <label for="shipping[country]" class="required">
-                    {{ __('shop::app.checkout.onepage.country') }}
-                </label>
-
-                <select type="text" v-validate="'required'" class="control" id="shipping[country]" name="shipping[country]" v-model="address.shipping.country" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
-                    <option value=""></option>
-
-                    @foreach (core()->countries() as $country)
-                        <option value="{{ $country->code }}">{{ $country->name }}</option>
-                    @endforeach
-                </select>
-
-                <span class="control-error" v-if="errors.has('address-form.shipping[country]')">
-                    @{{ errors.first('address-form.shipping[country]') }}
-                </span>
-            </div>
-
             <div class="control-group" :class="[errors.has('address-form.shipping[phone]') ? 'has-error' : '']">
                 <label for="shipping[phone]" class="required">
                     {{ __('shop::app.checkout.onepage.phone') }}