From bcd656e364d37b17a663589201b4abdecc9470de Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Wed, 9 Oct 2019 18:30:18 +0530
Subject: [PATCH 1/2] Issue #1563

---
 .../src/Http/Controllers/CustomerController.php   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
index 6fee5f52d..b447a240c 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
@@ -4,6 +4,7 @@ namespace Webkul\Customer\Http\Controllers;
 
 use Hash;
 use Webkul\Customer\Repositories\CustomerRepository;
+use Webkul\Product\Repositories\ProductReviewRepository;
 
 /**
  * Customer controlller for the customer basically for the tasks of customers which will be
@@ -28,19 +29,29 @@ class CustomerController extends Controller
     */
     protected $customerRepository;
 
+    /**
+     * ProductReviewRepository object
+     *
+     * @var array
+    */
+    protected $productReviewRepository;
+
     /**
      * Create a new controller instance.
      *
      * @param  \Webkul\Customer\Repositories\CustomerRepository $customer
+     * @param  \Webkul\Product\Repositories\ProductReviewRepository $productReview
      * @return void
     */
-    public function __construct(CustomerRepository $customerRepository)
+    public function __construct(CustomerRepository $customerRepository, ProductReviewRepository $productReviewRepository)
     {
         $this->middleware('customer');
 
         $this->_config = request('_config');
 
         $this->customerRepository = $customerRepository;
+
+        $this->productReviewRepository = $productReviewRepository;
     }
 
     /**
@@ -147,7 +158,7 @@ class CustomerController extends Controller
      */
     public function reviews()
     {
-        $reviews = $this->productReview->getCustomerReview();
+        $reviews = $this->productReviewRepository->getCustomerReview();
 
         return view($this->_config['view'], compact('reviews'));
     }

From 28c65329d7d4f53429f5099b38dd188326cce0b7 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Wed, 9 Oct 2019 18:45:39 +0530
Subject: [PATCH 2/2] Checkout conflict resolve

---
 .../src/Resources/views/checkout/onepage.blade.php   | 12 ++----------
 .../views/checkout/onepage/customer-info.blade.php   | 11 +++++------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
index 7fdcaf002..d71bf58d4 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
@@ -155,7 +155,7 @@
                     new_shipping_address: false,
 
                     new_billing_address: false,
-                    
+
                     allAddress: {},
 
                     countryStates: @json(core()->groupedStatesByCountries()),
@@ -251,7 +251,7 @@
                         .then(function(response) {
                             this_this.disable_button = false;
 
-                            if (this_this.step_numbers[response.data.jump_to_section] == 2) 
+                            if (this_this.step_numbers[response.data.jump_to_section] == 2)
                                 shippingHtml = Vue.compile(response.data.html)
                             else
                                 paymentHtml = Vue.compile(response.data.html)
@@ -277,17 +277,9 @@
                         .then(function(response) {
                             this_this.disable_button = false;
 
-<<<<<<< HEAD
                             paymentHtml = Vue.compile(response.data.html)
                             this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] + 1;
                             this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
-=======
-                            if (response.data.jump_to_section == 'payment') {
-                                paymentHtml = Vue.compile(response.data.html)
-                                paymentMethods = response.data.paymentMethods;
-                                this_this.completedStep = 2;
-                                this_this.currentStep = 3;
->>>>>>> fc920e14c53a3398cf3baf28ecf83bcb6e410d67
 
                             this_this.getOrderSummary();
                         })
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 b8014c32e..f296e059d 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
@@ -307,12 +307,11 @@
                 @endauth
             </div>
 
-                @auth('customer')
-                    <a class="btn btn-lg btn-primary" @click = backToSavedShippingAddress()>
-                        {{ __('shop::app.checkout.onepage.back') }}
-                    </a>
-                @endauth
-            </div>
+            @auth('customer')
+                <a class="btn btn-lg btn-primary" @click = backToSavedShippingAddress()>
+                    {{ __('shop::app.checkout.onepage.back') }}
+                </a>
+            @endauth
 
             <div class="control-group" :class="[errors.has('address-form.shipping[first_name]') ? 'has-error' : '']">
                 <label for="shipping[first_name]" class="required">