added construction consent owner import

application/WarehouseEShop/WarehouseEShopController.php

@@ -42,11 +42,11 @@ class WarehouseEShopController extends TTCrud {
         $warehouseArticleFilter['isEShop'] = 1;
         $warehouseArticleFilter['isEShopHide'] = 0;
 
-        $warehouseArticles = WarehouseArticleModel::getAll($warehouseArticleFilter, $perPage, ($page - 1) * $perPage, $order);
+        $warehouseArticles = WarehouseArticleModel::getAll($warehouseArticleFilter, null, 0, $order);
         $warehouseArticlesTotal = WarehouseArticleModel::count(['isEShop' => 1, 'isEShopHide' => 0]);
         $warehouseArticlesAvailable = WarehouseArticleModel::count($warehouseArticleFilter);
 
-        $warehousePackets = WarehouseArticlePacketModel::getAll();
+        $warehousePackets = WarehouseArticlePacketModel::getAll($filter, null, 0, $order);
         $warehousePacketsTotal = WarehouseArticlePacketModel::count();
         $warehousePacketsAvailable = WarehouseArticlePacketModel::count($filter);
 
@@ -54,6 +54,8 @@ class WarehouseEShopController extends TTCrud {
         $totalRows = $warehouseArticlesTotal + $warehousePacketsTotal;
         $rows = [...$warehouseArticles, ...$warehousePackets];
 
+        $rows = array_slice($rows, ($page - 1) * $perPage, $perPage);
+
         self::returnJson(["rows" => $rows,
                           "pagination" => ["page" => $page,
                                            "total_pages" => ceil($filteredAvailable / $perPage),