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

Merge pull request #1921 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-12-19 16:49:47 +05:30 committed by GitHub
parent 8ef4c64d01 2f0338bda3
commit 3c0de30400
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
View File

@ -52,7 +52,7 @@
<div class="control-group {!! $errors->has('image.*') ? 'has-error' : '' !!}">
<label class="required">{{ __('admin::app.catalog.categories.image') }}</label>
<image-wrapper :button-label="'{{ __('admin::app.settings.sliders.image') }}'" input-name="image" :multiple="false" :images='"{{ url('storage/'.$slider->path) }}"' ></image-wrapper>
<image-wrapper :button-label="'{{ __('admin::app.settings.sliders.image') }}'" input-name="image" :multiple="false" :images='"{{ Storage::url($slider->path) }}"'></image-wrapper>
<span class="control-error" v-if="{!! $errors->has('image.*') !!}">
@foreach ($errors->get('image.*') as $key => $message)

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

@ -93,8 +93,9 @@ class CustomerController extends Controller
'gender' => 'required',
'date_of_birth' => 'date|before:today',
'email' => 'email|unique:customers,email,'.$id,
'password' => 'confirmed|min:6|required_with:oldpassword',
'oldpassword' => 'required_with:password',
'password' => 'confirmed|min:6'
'password_confirmation' => 'required_with:password',
]);
$data = collect(request()->input())->except('_token')->toArray();
@ -139,27 +140,26 @@ class CustomerController extends Controller
$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'], $customerRepository->password) ) {
if (Hash::check($data['password'], $customerRepository->password)) {
$orders = $customerRepository->all_orders->whereIn('status', ['pending', 'processing'])->first();
$this->customerRepository->delete($id);
if ($orders) {
session()->flash('error', trans('admin::app.response.order-pending'));
session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer']));
return redirect()->route($this->_config['redirect']);
} else {
$this->customerRepository->delete($id);
return redirect()->route('customer.session.index');
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');
return redirect()->back();
}
} catch(\Exception $e) {
session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Customer']));