Merge pull request #1651 from naresh-webkul/development
Bug Fixed #1645: No confirm password action when customer is deleting…
This commit is contained in:
Jitendra Singh
GitHub
commit
02f0d004b0
|
|
@ -135,6 +135,8 @@ class CustomerController extends Controller
|
|||
{
|
||||
$id = auth()->guard('customer')->user()->id;
|
||||
|
||||
$data = request()->all();
|
||||
|
||||
$customerRepository = $this->customerRepository->findorFail($id);
|
||||
|
||||
$orders = $customerRepository->all_orders->whereIn('status', ['pending', 'processing'])->first();
|
||||
|
|
@ -146,9 +148,16 @@ class CustomerController extends Controller
|
|||
}
|
||||
|
||||
try {
|
||||
$this->customerRepository->delete($id);
|
||||
if ( Hash::check($data['password'], $customerRepository->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']));
|
||||
|
||||
return redirect()->route('customer.session.index');
|
||||
} else {
|
||||
session()->flash('error', trans('shop::app.customer.account.address.delete.wrong-password'));
|
||||
}
|
||||
|
||||
return redirect()->route('customer.session.index');
|
||||
} catch(\Exception $e) {
|
||||
|
|
@ -158,7 +167,6 @@ class CustomerController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Load the view for the customer account panel, showing approved reviews.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -193,7 +193,8 @@ return [
|
|||
'default' => 'افتراضي',
|
||||
'contact' => 'معلومات الإتصال',
|
||||
'confirm-delete' => 'هل تريد حقا حذف هذا العنوان؟',
|
||||
'default-delete' => 'لا يمكن تغيير العنوان الافتراضي'
|
||||
'default-delete' => 'لا يمكن تغيير العنوان الافتراضي',
|
||||
'enter-password' => 'Enter Your Password.',
|
||||
],
|
||||
|
||||
'create' => [
|
||||
|
|
@ -219,7 +220,8 @@ return [
|
|||
],
|
||||
'delete' => [
|
||||
'success' => 'تم حذف العنوان بنجاح.',
|
||||
'failure' => 'لا يمكن حذف العنوان'
|
||||
'failure' => 'لا يمكن حذف العنوان',
|
||||
'wrong-password' => 'Wrong Password !'
|
||||
]
|
||||
],
|
||||
|
||||
|
|
@ -499,7 +501,7 @@ return [
|
|||
'adjustment-refund' => 'تعديلات عملية الإسترجاع',
|
||||
'adjustment-fee' => 'تكلفة تعديلات عملية الإسترجاع'
|
||||
],
|
||||
|
||||
|
||||
'forget-password' => [
|
||||
'dear' => 'عزيزي :name',
|
||||
'info' => 'أنت تستلم هذا البريد الإلكتروني لأننا تلقينا طلب إعادة ضبط كلمة الدخول لحسابك',
|
||||
|
|
|
|||
|
|
@ -213,7 +213,8 @@ return [
|
|||
'default' => 'Default',
|
||||
'contact' => 'Contact',
|
||||
'confirm-delete' => 'Do you really want to delete this address?',
|
||||
'default-delete' => 'Default address cannot be changed.'
|
||||
'default-delete' => 'Default address cannot be changed.',
|
||||
'enter-password' => 'Enter Your Password.',
|
||||
],
|
||||
|
||||
'create' => [
|
||||
|
|
@ -240,7 +241,8 @@ return [
|
|||
],
|
||||
'delete' => [
|
||||
'success' => 'Address successfully deleted',
|
||||
'failure' => 'Address cannot be deleted'
|
||||
'failure' => 'Address cannot be deleted',
|
||||
'wrong-password' => 'Wrong Password !'
|
||||
]
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -200,7 +200,8 @@ return [
|
|||
'default' => 'Por defecto',
|
||||
'contact' => 'Contacto',
|
||||
'confirm-delete' => '¿Quieres eleminar esta dirección?',
|
||||
'default-delete' => 'La dirección por defecto no puede ser cambiada'
|
||||
'default-delete' => 'La dirección por defecto no puede ser cambiada',
|
||||
'enter-password' => 'Enter Your Password.',
|
||||
],
|
||||
|
||||
'create' => [
|
||||
|
|
@ -227,7 +228,8 @@ return [
|
|||
],
|
||||
'delete' => [
|
||||
'success' => 'Dirección eliminada correctamente',
|
||||
'failure' => 'La dirección no puede ser eliminada'
|
||||
'failure' => 'La dirección no puede ser eliminada',
|
||||
'wrong-password' => 'Wrong Password !'
|
||||
]
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -201,7 +201,8 @@ return [
|
|||
'default' => 'پیش فرض',
|
||||
'contact' => 'تماس',
|
||||
'confirm-delete' => 'آیا واقعاً می خواهید این آدرس را حذف کنید؟',
|
||||
'default-delete' => 'آدرس پیش فرض تغییر نمی کند'
|
||||
'default-delete' => 'آدرس پیش فرض تغییر نمی کند',
|
||||
'enter-password' => 'Enter Your Password.',
|
||||
],
|
||||
|
||||
'create' => [
|
||||
|
|
@ -228,7 +229,8 @@ return [
|
|||
],
|
||||
'delete' => [
|
||||
'success' => 'آدرس با موفقیت حذف شد',
|
||||
'failure' => 'آدرس حذف نمی شود'
|
||||
'failure' => 'آدرس حذف نمی شود',
|
||||
'wrong-password' => 'Wrong Password !'
|
||||
]
|
||||
],
|
||||
|
||||
|
|
@ -535,7 +537,7 @@ return [
|
|||
'adjustment-refund' => 'Adjustment Refund',
|
||||
'adjustment-fee' => 'Adjustment Fee'
|
||||
],
|
||||
|
||||
|
||||
'forget-password' => [
|
||||
'dear' => 'عزیز :name',
|
||||
'info' => 'شما این ایمیل را دریافت می کنید زیرا ما درخواست بازنشانی رمزعبور را برای حساب شما دریافت کردیم',
|
||||
|
|
|
|||
|
|
@ -196,7 +196,8 @@ return [
|
|||
'default' => 'Padrão',
|
||||
'contact' => 'Contato',
|
||||
'confirm-delete' => 'Você realmente deseja excluir este endereço?',
|
||||
'default-delete' => 'O endereço padrão não pode ser alterado'
|
||||
'default-delete' => 'O endereço padrão não pode ser alterado',
|
||||
'enter-password' => 'Enter Your Password.',
|
||||
],
|
||||
|
||||
'create' => [
|
||||
|
|
@ -223,7 +224,8 @@ return [
|
|||
],
|
||||
'delete' => [
|
||||
'success' => 'Endereço Excluído com sucesso',
|
||||
'failure' => 'Endereço não pode ser adicionado'
|
||||
'failure' => 'Endereço não pode ser adicionado',
|
||||
'wrong-password' => 'Wrong Password !'
|
||||
]
|
||||
],
|
||||
|
||||
|
|
@ -513,7 +515,7 @@ return [
|
|||
'carrier' => 'Transportadora',
|
||||
'tracking-number' => 'Código de Rastreio'
|
||||
],
|
||||
|
||||
|
||||
'forget-password' => [
|
||||
'dear' => 'Caro :name',
|
||||
'info' => 'Você está recebendo este e-mail porque recebemos uma solicitação de redefinição de senha para sua conta',
|
||||
|
|
|
|||
|
|
@ -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') }}" @submit.prevent="onSubmit">
|
||||
@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=""{{ __('admin::app.users.users.password') }}""/>
|
||||
<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>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue