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

resolved conflicts [issue #1645]

This commit is contained in:
naresh verma 2019-10-18 19:43:03 +05:30
parent 205cb21aa8
commit bfddda8ce2
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,10 +137,19 @@ class CustomerController extends Controller
$data = request()->all();
$customer = $this->customerRepository->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 {
if (Hash::check($data['password'], $customer->password)) {
if ( Hash::check($data['password'], $customerRepository->password) ) {
$this->customerRepository->delete($id);
@ -153,13 +162,12 @@ class CustomerController extends Controller
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']);
}
}
/**
* Load the view for the customer account panel, showing approved reviews.
*