From 2f8e319fb032e41a6c62bce9bcc069e8e18acb47 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Mon, 16 Dec 2019 18:56:02 +0530
Subject: [PATCH] Issue #1232, default item in perpage and label of perpage

---
 packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php         | 2 +-
 .../Shop/src/Resources/views/checkout/cart/index.blade.php      | 2 +-
 packages/Webkul/Ui/src/DataGrid/DataGrid.php                    | 2 +-
 packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
index 52f7318d4..d254106fb 100644
--- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
@@ -17,7 +17,7 @@ class ProductDataGrid extends DataGrid
 
     protected $index = 'product_id';
 
-    protected $itemsPerPage = 20;
+    protected $itemsPerPage = 10;
 
     public function prepareQueryBuilder()
     {
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
index 0cab52989..269fc5ca4 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
@@ -54,7 +54,7 @@
 
                                         @if (isset($item->additional['attributes']))
                                             <div class="item-options">
-                                                
+
                                                 @foreach ($item->additional['attributes'] as $attribute)
                                                     <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
                                                 @endforeach
diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
index db843c5f5..7688aac0b 100644
--- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php
+++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
@@ -91,7 +91,7 @@ abstract class DataGrid
     /**
      * If paginated then value of pagination.
      */
-    protected $itemsPerPage = 15;
+    protected $itemsPerPage = 10;
 
     protected $operators = [
         'eq' => "=",
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
index fd2f3d776..cfec25965 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
@@ -152,6 +152,7 @@
                     <span class="filter-tag" v-if="filters.length > 0" v-for="filter in filters" style="text-transform: capitalize;">
                         <span v-if="filter.column == 'sort'">@{{ filter.label }}</span>
                         <span v-else-if="filter.column == 'search'">Search</span>
+                        <span v-else-if="filter.column == 'perPage'">perPage</span>
                         <span v-else>@{{ filter.label }}</span>
 
                         <span class="wrapper">