Feature/warehouse improvements

application/WarehouseArticle/WarehouseArticleController.php

@@ -18,6 +18,7 @@ class WarehouseArticleController extends TTCrud {
         ['key' => 'criticalAmount', 'text' => 'Kritische Menge', 'required' => true,'modal' => ['type' => 'number'], 'table' => ['class' => 'text-center']], // Stock/inventory related
         ['key' => 'isSerialDocumentation', 'text' => 'Seriennummern', 'required' => true,'modal' => ['type' => 'checkbox'], 'table' => false], // Boolean value
         ['key' => 'isEShop', 'text' => 'Ist E-Shop', 'required' => true,'modal' => ['type' => 'checkbox'], 'table' => false], // Boolean value
+        ['key' => 'isEShopHide', 'text' => 'E-Shop Versteckt', 'required' => true,'modal' => ['type' => 'checkbox'], 'table' => false], // Boolean value
         ['key' => 'actions', 'text' => 'Aktionen', 'required' => false, 'modal' => false, 'table' => ['filter' => false, 'sortable' => false, 'class' => 'text-center', 'priority' => 8]]
     ];
 

application/WarehouseArticle/WarehouseArticleModel.php

@@ -10,6 +10,7 @@ class WarehouseArticleModel extends TTCrudBaseModel {
     public int $warningAmount;
     public int $criticalAmount;
     public int $isEShop;
+    public int $isEShopHide;
     public float $defaultSellMultiplier;
     public string $unit;
     public int $isSerialDocumentation;

application/WarehouseEShop/WarehouseEShopController.php

@@ -1,4 +1,9 @@
 <?php
+// Warrenkorb löschen
+// File Upload ermöglichen
+// Hide Articles
+
+
 
 class WarehouseEShopController extends TTCrud {
     protected string $headerTitle = 'Energie Steiermark Shop';
@@ -29,22 +34,26 @@ class WarehouseEShopController extends TTCrud {
         $page = $this->postData['pagination']['page'] ?? 1;
         $perPage = $this->postData['pagination']['per_page'] ?? 10;
 
-        $filter['isEShop'] = 1;
+        $warehouseArticleFilter = $filter;
+        $warehouseArticleFilter['isEShop'] = 1;
+        $warehouseArticleFilter['isEShopHide'] = 0;
 
-        $rows = WarehouseArticleModel::getAll($filter, $perPage, ($page - 1) * $perPage, $order);
-        $filteredAvailable = WarehouseArticleModel::count($filter);
-        $totalRows = WarehouseArticleModel::count(['isEShop' => 1]);
+        $warehouseArticles = WarehouseArticleModel::getAll($warehouseArticleFilter, $perPage, ($page - 1) * $perPage, $order);
+        $warehouseArticlesTotal = WarehouseArticleModel::count(['isEShop' => 1, 'isEShopHide' => 0]);
+        $warehouseArticlesAvailable = WarehouseArticleModel::count($warehouseArticleFilter);
 
-        $packetRows = WarehouseArticlePacketModel::getAll();
+        $warehousePackets = WarehouseArticlePacketModel::getAll();
+        $warehousePacketsTotal = WarehouseArticlePacketModel::count();
+        $warehousePacketsAvailable = WarehouseArticlePacketModel::count($filter);
 
-        $rows = [...$rows, ...$packetRows];
+        $filteredAvailable = $warehouseArticlesAvailable + $warehousePacketsAvailable;
+        $totalRows = $warehouseArticlesTotal + $warehousePacketsTotal;
+        $rows = [...$warehouseArticles, ...$warehousePackets];
 
         self::returnJson(["rows" => $rows,
                           "pagination" => ["page" => $page,
                                            "total_pages" => ceil($filteredAvailable / $perPage),
                                            "per_page" => $perPage,
-                                           "filtered_available" => intval($filteredAvailable),
-                                           "total_rows" => intval($totalRows)]]);    }
-
-
+                                           "filtered_available" => $filteredAvailable,
+                                           "total_rows" => $totalRows]]);    }
 }