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

Merge pull request #726 from prashant-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-03-20 15:32:58 +05:30 committed by GitHub
parent 3dfc63fe46 c84e76646e
commit 74c4230b97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Shop/src/Http/Controllers/HomeController.php
View File

@ -13,7 +13,7 @@ use Webkul\Core\Repositories\SliderRepository as Sliders;
* @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class HomeController extends controller
class HomeController extends Controller
{
protected $_config;
protected $sliders;

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

@ -43,7 +43,7 @@
<div>
@foreach ($actions as $action)
<a href="{{ route($action['route'], $record->{$index}) }}">
<span class="{{ $action['icon'] }}" onclick="return confirm('{{ __('ui::app.datagrid.click_on_action') }}')"></span>
<span class="{{ $action['icon'] }}" @if(strtolower($action['type']) == "delete") onclick="return confirm('{{ __('ui::app.datagrid.click_on_action') }}')" @endif></span>
</a>
@endforeach
</div>

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

@ -114,7 +114,7 @@
<option value="gt">{{ __('ui::app.datagrid.greater') }}</option>
<option value="lt">{{ __('ui::app.datagrid.less') }}</option>
<option value="gte">{{ __('ui::app.datagrid.greatere') }}</option>
<option value="lte">{{ __('ui::app.datagrid.equalse') }}</option>
<option value="lte">{{ __('ui::app.datagrid.lesse') }}</option>
{{-- <option value="btw">{{ __('ui::app.datagrid.between') }}</option> --}}
</select>
</div>