From f8b5bee942b11ab3ce5020436d7f84a8065686db Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Fri, 8 Jan 2021 16:43:42 +0530 Subject: [PATCH] Issue #4457 fixed --- packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php | 4 ++-- .../Webkul/Shop/src/Resources/views/search/search.blade.php | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php index 5abaa1544..fd19c8aef 100644 --- a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php @@ -120,9 +120,9 @@ class CartRuleDataGrid extends DataGrid 'sortable' => true, 'filterable' => true, 'wrapper' => function ($value) { - if ($value->status == 'active') { + if ($value->status == 1) { return trans('admin::app.datagrid.active'); - } else if ($value->status == 'inactive') { + } else if ($value->status == 0) { return trans('admin::app.datagrid.inactive'); } else { return trans('admin::app.datagrid.draft'); diff --git a/packages/Webkul/Shop/src/Resources/views/search/search.blade.php b/packages/Webkul/Shop/src/Resources/views/search/search.blade.php index 597be9f0a..1f6543788 100755 --- a/packages/Webkul/Shop/src/Resources/views/search/search.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/search/search.blade.php @@ -25,11 +25,7 @@ {{ $results->total() }} - @if ($results->total() == 1) - {{ __('shop::app.search.found-result') }} - @else - {{ __('shop::app.search.found-results') }} - @endif + {{ ($results->total() == 1) ? __('shop::app.search.found-result') : __('shop::app.search.found-results') }}