From 28ed55d711c19cab498ffa084934bb89e74671c6 Mon Sep 17 00:00:00 2001
From: naresh verma <naresh.verma327@webkul.com>
Date: Thu, 17 Oct 2019 17:24:01 +0530
Subject: [PATCH] Bug Fixed #1645: No confirm password action when customer is
 deleting his profile

---
 .../Http/Controllers/CustomerController.php   | 17 ++++++++----
 .../Webkul/Shop/src/Resources/lang/en/app.php |  3 ++-
 .../customers/account/profile/index.blade.php | 27 ++++++++++++++++---
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
index b447a240c..eb7e4a42b 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
@@ -135,18 +135,25 @@ class CustomerController extends Controller
     {
         $id = auth()->guard('customer')->user()->id;
 
-        $customer = $this->customer->findorFail($id);
+        $data = request()->all();
+
+        $customer = $this->customerRepository->findorFail($id);
 
         try {
-            $this->customer->delete($id);
+            if (hash::check($data['password'], $customer->password)) {
 
-            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer']));
+                $this->customerRepository->delete($id);
+
+                session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer']));
+            } else {
+                session()->flash('error', trans('shop::app.customer.account.address.delete.wrong-password'));
+            }
 
             return redirect()->route($this->_config['redirect']);
         } catch(\Exception $e) {
-            session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Customer']));
+        session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Customer']));
 
-            return redirect()->route($this->_config['redirect']);
+        return redirect()->route($this->_config['redirect']);
         }
     }
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 5b4798e78..69513b280 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -240,7 +240,8 @@ return [
                 ],
                 'delete' => [
                     'success' => 'Address successfully deleted',
-                    'failure' => 'Address cannot be deleted'
+                    'failure' => 'Address cannot be deleted',
+                    'wrong-password' => 'Wrong Password !'
                 ]
             ],
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
index 8bf150254..6b4b1cecd 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
@@ -70,12 +70,31 @@
         <accordian :title="'{{ __('shop::app.customer.account.profile.index.title') }}'" :active="true">
             <div slot="body">
                 <div class="page-action">
-                    <form method="POST" action="{{ route('customer.profile.destroy') }}">
-                        @csrf
-                        <input type="submit" class="btn btn-lg btn-primary mt-10" value="Delete">
-                    </form>
+                    <button type="submit" @click="showModal('deleteProfile')" class="btn btn-lg btn-primary mt-10">
+                        {{ __('shop::app.customer.account.address.index.delete') }}
+                    </button>
                 </div>
 
+                <form method="POST" action="{{ route('customer.profile.destroy') }}">
+                    @csrf
+                    <modal id="deleteProfile" :is-open="modalIds.deleteProfile">
+                        <h3 slot="header">{{ __('shop::app.customer.account.address.index.enter-password') }}</h3>
+
+                        <div slot="body">
+                            <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
+                                <label for="password" class="required">{{ __('admin::app.users.users.password') }}</label>
+                                <input type="password" v-validate="'required|min:6|max:18'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.users.password') }}&quot;"/>
+                                <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
+                            </div>
+
+                            <div class="page-action">
+                                <button type="submit"  class="btn btn-lg btn-primary mt-10">
+                                {{ __('shop::app.customer.account.address.index.delete') }}
+                                </button>
+                            </div>
+                        </div>
+                    </modal>
+                </form>
             </div>
         </accordian>