From 4be8e9150840f946fc27dc3ca6f3c5dffc0a69fc Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Mon, 27 Feb 2023 19:02:23 +0100
Subject: [PATCH] Added product active flag, saving filter in Product/Index

---
 Layout/default/Product/Form.php               | 13 ++++++-
 Layout/default/Product/Index.php              | 15 +++++--
 application/Order/OrderController.php         |  3 +-
 application/Preorder/PreorderController.php   |  1 +
 .../Preordercampaign/Preordercampaign.php     |  6 +--
 application/Product/ProductController.php     | 39 +++++++++++++++----
 application/Product/ProductModel.php          | 24 ++++++++++++
 7 files changed, 86 insertions(+), 15 deletions(-)

diff --git a/Layout/default/Product/Form.php b/Layout/default/Product/Form.php
index 4c0f007e5..84f248611 100644
--- a/Layout/default/Product/Form.php
+++ b/Layout/default/Product/Form.php
@@ -37,6 +37,16 @@
                     </div>
                   </div>
                   
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="active">Aktiv *</label>
+                    <div class="col-lg-10">
+                      <select class="select2 form-control " name="active" id="active">
+                        <option value="1" <?=($product->active == 1) ? "selected='selected'" : ""?>>Aktiv</option>
+                        <option value="0" <?=($product->active != 1) ? "selected='selected'" : ""?>>Deaktiviert</option>
+                      </select>
+                    </div>
+                  </div>
+                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="description">Beschreibung</label>
                     <div class="col-lg-10">
@@ -237,7 +247,8 @@
               <div class="form-group row">
                 <label class="col-lg-2"></label>
                 <div class="col-lg-10">
-                  <button type="submit" class="btn btn-primary">Speichern</button>
+                  <button type="submit" name="return" value="form" class="btn btn-primary mr-1">Speichern</button>
+                  <button type="submit" name="return" value="index" class="btn btn-primary">Speichern und zur Übersicht</button>
                 </div>
               </div>
               
diff --git a/Layout/default/Product/Index.php b/Layout/default/Product/Index.php
index 1c6e080f1..86be922cf 100644
--- a/Layout/default/Product/Index.php
+++ b/Layout/default/Product/Index.php
@@ -66,7 +66,7 @@
                   <input type="text" class="form-control" name="filter[name]" id="filter_name" value="<?=$filter['name']?>" />
                 </div>
                 
-                <div class="col-2">
+                <div class="col-1">
                   <label class="form-label" for="filter_customer_type">Kundentyp</label>
                   <select name="filter[customer_type]" id="filter_customer_type" class="form-control">
                     <option></option>
@@ -75,7 +75,16 @@
                   </select>
                 </div>
                 
-                <div class="col-2">
+                <div class="col-1">
+                  <label class="form-label" for="filter_active">Status</label>
+                  <select name="filter[active]" id="filter_active" class="form-control">
+                    <option value="1" <?=(is_array($filter) && array_key_exists('active', $filter) && $filter['active']) ? "selected='selected'" : ""?>>Aktiviert</option>
+                    <option value="0" <?=(is_array($filter) && array_key_exists('active', $filter) && !$filter['active']) ? "selected='selected'" : ""?>>Deaktiviert</option>
+                    <option value="all" <?=(is_array($filter) && array_key_exists('active', $filter) && $filter['active'] == "all") ? "selected='selected'" : ""?>>Alle anzeigen</option>
+                  </select>
+                </div>
+                
+                <div class="col-1">
                   <label class="form-label" for="filter_external">Externe Produkte</label>
                   <select name="filter[external]" id="filter_external" class="form-control">
                     <option></option>
@@ -88,7 +97,7 @@
               <div class="row mt-2">
                 <div class="col">
                   <button type="submit" class="btn btn-primary">Filter anwenden</button>
-                  <a class="btn btn-secondary" href="<?=self::getUrl("Product")?>">Filter zurücksetzen</a>
+                  <a class="btn btn-secondary" href="<?=self::getUrl("Product", "", ["resetFilter" => 1])?>">Filter zurücksetzen</a>
                 </div>
                 <!--<div class="col">
                   <button class="btn btn-info" type="button" onclick="refreshMap()"><i class="far fa-map"></i> Auf Karte anzeigen</button>
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index d9b800bc3..79fe4abbb 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -366,7 +366,7 @@ class OrderController extends mfBaseController {
     $this->layout()->setTemplate("Order/Form");
     if($this->me->is("Admin")) {
       //$this->layout()->set("addresses", AddressModel::search(['parents_only' => 1]));
-      $this->layout()->set("products", ProductModel::getAll());
+      $this->layout()->set("products", ProductModel::getActive());
       $this->layout()->set("terminations", TerminationModel::getAll());
     } else {
       // get all salespartner addresses of my networks
@@ -396,6 +396,7 @@ class OrderController extends mfBaseController {
       // get products assigned to my networks
       $products = [];
       foreach(ProductNetworkModel::search(["network_id" => $network_ids]) as $pn) {
+        if(!$pn->product->active) continue;
         if(!array_key_exists($pn->product_id, $products))
           $products[$pn->product_id] = $pn->product;
       }
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index b7ea7249c..a68a8af94 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -155,6 +155,7 @@ class PreorderController extends mfBaseController {
     
     $products = [];
     foreach(ProductNetworkModel::search(["network_id" => $campaign->network_id]) as $pn) {
+      if(!$pn->product->active) continue;
       if(!array_key_exists($pn->product_id, $products)) {
         if(is_array($pn->product->attributes) && !array_key_exists("presales", $pn->product->attributes)) {
           $products[$pn->product_id] = $pn->product;
diff --git a/application/Preordercampaign/Preordercampaign.php b/application/Preordercampaign/Preordercampaign.php
index af3dbc792..a58223dff 100644
--- a/application/Preordercampaign/Preordercampaign.php
+++ b/application/Preordercampaign/Preordercampaign.php
@@ -54,9 +54,9 @@ class Preordercampaign extends mfBaseModel {
     $activation_products = [];
     $reorder_products = [];
     
-    $provisions = ProductModel::search(["attributename" => "presales", "attributevalue" => "provision"]);
-    $activations = ProductModel::search(["attributename" => "presales", "attributevalue" => "activation"]);
-    $reorders = ProductModel::search(["attributename" => "presales", "attributevalue" => "reorder"]);
+    $provisions = ProductModel::search(["active" => 1, "attributename" => "presales", "attributevalue" => "provision"]);
+    $activations = ProductModel::search(["active" => 1, "attributename" => "presales", "attributevalue" => "activation"]);
+    $reorders = ProductModel::search(["active" => 1, "attributename" => "presales", "attributevalue" => "reorder"]);
     
     foreach($provisions as $p) {
       if(ProductNetworkModel::search(['product_id' => $p->id, "network_id" => $this->network_id])) {
diff --git a/application/Product/ProductController.php b/application/Product/ProductController.php
index 937c115f6..5f8d385ea 100644
--- a/application/Product/ProductController.php
+++ b/application/Product/ProductController.php
@@ -19,16 +19,23 @@ class ProductController extends mfBaseController {
       $this->redirect("Dashboard");
     }
     
+    if($this->request->resetFilter) {
+      unset($_SESSION[MFAPPNAME.'-Product-filter']);
+    }
+    
     $filter = [];
     if(is_array($this->request->filter)) {
       $filter = $this->request->filter;
+      $_SESSION[MFAPPNAME.'-Product-filter'] = $filter;
+    } else {
+      if(array_key_exists(MFAPPNAME.'-Product-filter', $_SESSION) && count($_SESSION[MFAPPNAME.'-Product-filter'])) {
+        $filter = $_SESSION[MFAPPNAME.'-Product-filter'];
+      }
     }
     
     $this->layout->set("filter", $filter);
+    $filter = $this->getPreparedFilter($filter);
     
-    if($filter) {
-      $filter = $this->getPreparedFilter($filter);
-    }
     
     // pagination defaults
     $pagination = [];
@@ -55,6 +62,15 @@ class ProductController extends mfBaseController {
       unset($filter['name']);
     }
     
+    if(array_key_exists("active", $filter)) {
+      if($filter['active'] != "all") {
+        $new_filter['active'] = $filter['active'];
+      }
+      unset($filter['active']);
+    } else {
+      $new_filter['active'] = 1;
+    }
+    
     foreach($filter as $name => $value) {
       $new_filter[$name] = $value;
     }
@@ -128,7 +144,11 @@ class ProductController extends mfBaseController {
       }
       $data['external_id'] = $r->external_id;
     }
-    //var_dump($data);exit;
+    
+    $data['active'] = 1;
+    if(!$r->active) {
+      $data['active'] = 0;
+    }
     
     $data['price_nne'] = ($r->price_nne) ? Layout::commaToDot($r->price_nne) : 0;
     $data['price_nbe'] = ($r->price_nbe) ? Layout::commaToDot($r->price_nbe) : 0;
@@ -229,7 +249,12 @@ class ProductController extends mfBaseController {
     }
     
     $this->layout()->setFlash("Produkt erfolgreich gespeichert.", "success");
-    $this->redirect("Product", "Edit", ['id' => $new_id]);
+    if($r->return == "index") {
+      $this->redirect("Product");
+    } else {
+      $this->redirect("Product", "Edit", ['id' => $new_id]);
+    }
+    
   }
   
   protected function deleteAction() {
@@ -310,14 +335,14 @@ class ProductController extends mfBaseController {
     $products = [];
     
     if(is_numeric($search)) {
-      $pnumbers = ProductModel::search(["id" => $search]);
+      $pnumbers = ProductModel::search(["active" => 1, "id" => $search]);
       if($pnumbers) {
         $products = array_merge($products, $pnumbers);
       }
     }
     
     
-    $products = array_merge($products, ProductModel::search(["name%" => $search]));
+    $products = array_merge($products, ProductModel::search(["active" => 1, "name%" => $search]));
     
     if(!is_array($products) && !count($products)) {
       return false;
diff --git a/application/Product/ProductModel.php b/application/Product/ProductModel.php
index 4def0073a..873aa3192 100644
--- a/application/Product/ProductModel.php
+++ b/application/Product/ProductModel.php
@@ -75,6 +75,21 @@ class ProductModel {
     
   }
   
+  public static function getActive() {
+    $items = [];
+    
+    $db = FronkDB::singleton();
+    
+    $res = $db->select("Product", "*", "active = 1 ORDER BY name,producttech_id");
+    if($db->num_rows($res)) {
+      while($data = $db->fetch_object($res)) {
+        $items[] = new Product($data);
+      }
+    }
+    return $items;
+    
+  }
+  
   public static function getFirst() {
     $db = FronkDB::singleton();
     
@@ -162,6 +177,15 @@ class ProductModel {
       }
     }
     
+    if(array_key_exists("active", $filter)) {
+      $active = $filter['active'];
+      if($active) {
+        $where .= " AND Product.`active` = 1";
+      } else {
+        $where .= " AND Product.`active` = 0";
+      }
+    }
+    
     if(array_key_exists("productgroup_id", $filter)) {
       $productgroup_id = $filter['productgroup_id'];
       if(is_numeric($productgroup_id)) {