From ce2094d34c856898397bae670bbefdc0e574d61a Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 11 Jan 2019 20:03:40 +0530 Subject: [PATCH 1/2] Asset compiled for production --- packages/Webkul/Ui/webpack.mix.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/Webkul/Ui/webpack.mix.js b/packages/Webkul/Ui/webpack.mix.js index a460ad735..62c9ba3ef 100755 --- a/packages/Webkul/Ui/webpack.mix.js +++ b/packages/Webkul/Ui/webpack.mix.js @@ -4,7 +4,6 @@ require("laravel-mix-merge-manifest"); var publicPath = 'publishable/assets'; // var publicPath = "../../../public/vendor/webkul/ui/assets"; - mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications(); From 6040e464fdf54b641e1b715307feb82d92ec913e Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 11 Jan 2019 20:07:53 +0530 Subject: [PATCH 2/2] Pagination count changed in all grids --- packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php | 2 +- .../Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/UserDataGrid.php | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index 6386c47c3..f45534b51 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -17,7 +17,7 @@ class AttributeDataGrid extends DataGrid public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php index a00ae77c7..8900b684d 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php @@ -16,7 +16,7 @@ class AttributeFamilyDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index 2c89e327a..1b26ceed5 100755 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -16,7 +16,7 @@ class CategoryDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index c85bcae9c..b73b3f8fe 100755 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -16,7 +16,7 @@ class ChannelDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php index 3ee28fd74..24303783b 100755 --- a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php @@ -16,7 +16,7 @@ class CurrencyDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index c3035a24c..0d2311f76 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -16,7 +16,7 @@ class CustomerDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index 0d5c1a0c7..f1e4b7621 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -16,7 +16,7 @@ class CustomerGroupDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index edbdea5ed..0428ac953 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -16,7 +16,7 @@ class CustomerReviewDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php index 36eeff15c..4d76ed7a3 100755 --- a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php @@ -16,7 +16,7 @@ class ExchangeRatesDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php index 5ebc39d7a..8cac66ece 100755 --- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php @@ -16,7 +16,7 @@ class InventorySourcesDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php index 6e88189f4..a185b5e73 100755 --- a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php @@ -16,7 +16,7 @@ class LocalesDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php index 8fd3b64f2..21c0dc18d 100755 --- a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php @@ -16,7 +16,7 @@ class NewsLetterDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php index 4204c9029..3e488cfbe 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -16,7 +16,7 @@ class OrderDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php index be79faa11..8470ae8cb 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php @@ -16,7 +16,7 @@ class OrderInvoicesDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php index 5ded9d48b..55d0b4fbc 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php @@ -16,7 +16,7 @@ class OrderShipmentsDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index eaa6182e3..a9e7028e5 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -16,7 +16,7 @@ class ProductDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php index 9bbf0a1bc..8d672fa6c 100755 --- a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php @@ -16,7 +16,7 @@ class RolesDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index 2068badf0..0b5b7b93c 100755 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -16,7 +16,7 @@ class SliderDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php index f22dda005..b3243341c 100755 --- a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php @@ -16,7 +16,7 @@ class TaxCategoryDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php index da1c16c1a..b6035b400 100755 --- a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php @@ -16,7 +16,7 @@ class TaxRateDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder() diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index 49c69bd24..14b09cd6e 100755 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -16,7 +16,7 @@ class UserDataGrid extends DataGrid public $allColumns = []; public function __construct() { - $this->itemsPerPage = 5; + $this->itemsPerPage = 10; } public function prepareQueryBuilder()