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

Merge pull request #1719 from jitendra-webkul/jitendra 

Issue #1644 fixed
This commit is contained in:
Jitendra Singh 2019-10-31 17:37:52 +05:30 committed by GitHub
parent fe6e405f35 00deebd3fd
commit 2ac7cb95cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Webkul/Product/src/Repositories/ProductRepository.php
View File

@ -182,6 +182,9 @@ class ProductRepository extends Repository
$query2 = $query2->where(function($query3) use($aliasTemp, $column, $temp) {
foreach($temp as $code => $filterValue) {
if (! is_numeric($filterValue))
continue;
$columns = $aliasTemp . '.' . $column;
$query3 = $query3->orwhereRaw("find_in_set($filterValue, $columns)");
}

60
packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
View File

@ -65,40 +65,36 @@
@endif --}}
</tbody>
</table>
<button type="submit" @click="showModal('deleteProfile')" class="btn btn-lg btn-primary mt-10">
{{ __('shop::app.customer.account.address.index.delete') }}
</button>
<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="&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 :title="'{{ __('shop::app.customer.account.profile.index.title') }}'" :active="true">
<div slot="body">
<div class="page-action">
<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="&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>
{!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
{!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
</div>
</div>
@endsection

2
packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php
View File

@ -39,7 +39,7 @@
@endforeach
@if ($enableActions)
<td class="actions" style="width: 100px;" data-value="{{ __('ui::app.datagrid.actions') }}">
<td class="actions" style="white-space: nowrap; width: 100px;" data-value="{{ __('ui::app.datagrid.actions') }}">
<div class="action">
@foreach ($actions as $action)
@php