merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Bug Fixed #1640 and #1642: Customer delete issue resolved if any invoice is in pending.]

This commit is contained in:
Vivek 2019-10-17 15:17:02 +05:30
parent 8fe90bc0f6
commit ee5a63c4e4
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Webkul/Admin/src/Resources/lang/ar/app.php
View File

@ -844,7 +844,8 @@ return [
'create-root-failure' => 'الفئة مع الاسم الجذر موجود',
'cancel-success' => ':name canceled successfully.',
'cancel-error' => ':name can not be canceled.',
'already-taken' => 'The :name has already been taken.'
'already-taken' => 'The :name has already been taken.',
'order-pending' => 'لا يمكن حذف الحساب لأن بعض الطلبات (الطلبات) معلقة أو قيد المعالجة.'
],
'footer' => [

3
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -1132,7 +1132,8 @@ return [
'create-root-failure' => 'Category with name root already exists',
'cancel-success' => ':name canceled successfully.',
'cancel-error' => ':name can not be canceled.',
'already-taken' => 'The :name has already been taken.'
'already-taken' => 'The :name has already been taken.',
'order-pending' => 'Cannot delete account because some Order(s) are pending or processing state.'
],
'footer' => [

14
packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
View File

@ -135,14 +135,22 @@ class CustomerController extends Controller
{
$id = auth()->guard('customer')->user()->id;
$customer = $this->customer->findorFail($id);
$customerRepository = $this->customerRepository->findorFail($id);
$orders = $customerRepository->all_orders->whereIn('status', ['pending', 'processing'])->first();
if ( $orders ) {
session()->flash('error', trans('admin::app.response.order-pending'));
return redirect()->route($this->_config['redirect']);
}
try {
$this->customer->delete($id);
$this->customerRepository->delete($id);
session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer']));
return redirect()->route($this->_config['redirect']);
return redirect()->route('customer.session.index');
} catch(\Exception $e) {
session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Customer']));