From ef3af99ae476d3e39ccf006771746e8ee6b4b599 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 1 Aug 2024 21:26:03 +0200
Subject: [PATCH] Added cancel_date filter in Contract/Index

---
 Layout/default/Contract/Form.php            |  3 +--
 Layout/default/Contract/Index.php           | 10 +++++++++-
 application/Contract/ContractController.php |  6 ++++++
 application/Contract/ContractModel.php      | 10 ++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Layout/default/Contract/Form.php b/Layout/default/Contract/Form.php
index e89790c25..2eca067d1 100644
--- a/Layout/default/Contract/Form.php
+++ b/Layout/default/Contract/Form.php
@@ -439,9 +439,8 @@
         function(success) {
           if(success.status != "OK") return;
 
-
           p = success.result.product;
-          
+
           var sla_id;
           if(p.sla_id) {
               sla_id = p.sla_id;
diff --git a/Layout/default/Contract/Index.php b/Layout/default/Contract/Index.php
index d2f26c52e..9d3f2a194 100644
--- a/Layout/default/Contract/Index.php
+++ b/Layout/default/Contract/Index.php
@@ -60,7 +60,15 @@
                       <label class="form-label" for="filter_matchcode">Matchcode</label>
                       <input type="text" class="form-control" name="filter[matchcode]" id="filter_matchcode" value="<?=$filter['matchcode']?>" />
                   </div>
-                
+
+                  <div class="col-2">
+                      <label class="form-label" for="filter_show_canceled">Kündigungsdatum</label>
+                      <select class="form-control" name="filter[cancel_date]" id="filter_cancel_date">
+                          <option></option>
+                          <option value="1" <?=(array_key_exists("cancel_date", $filter) && $filter['cancel_date'] == 1) ? "selected='selected'" : ""?>>Mit Kündigungsdatum</option>
+                      </select>
+                  </div>
+
                 <div class="col-2">
                   <label class="form-label" for="filter_show_canceled">Gekündigte Produkte</label>
                   <select class="form-control" name="filter[show_canceled]" id="filter_show_canceled">
diff --git a/application/Contract/ContractController.php b/application/Contract/ContractController.php
index 221ef2126..08953ff24 100644
--- a/application/Contract/ContractController.php
+++ b/application/Contract/ContractController.php
@@ -71,6 +71,12 @@ class ContractController extends mfBaseController
             $new_filter['add-where'] = " AND (cancel_date IS NULL OR cancel_date > UNIX_TIMESTAMP())";
         }
 
+        if(array_key_exists("cancel_date", $filter)) {
+            if($filter["cancel_date"]) {
+                $new_filter["cancel_date"] = true;
+            }
+        }
+
         if (array_key_exists("show_credit", $filter)) {
             if ($filter["show_credit"] == 0) {
                 $new_filter["price>="] = 0;
diff --git a/application/Contract/ContractModel.php b/application/Contract/ContractModel.php
index d712b70fc..8b1385be6 100644
--- a/application/Contract/ContractModel.php
+++ b/application/Contract/ContractModel.php
@@ -597,6 +597,16 @@ class ContractModel {
           }
       }
 
+      if(array_key_exists("cancel_date", $filter)) {
+          $cancel_date = $filter['cancel_date'];
+          if($cancel_date == true) {
+              $where .= " AND Contract.cancel_date > 0";
+          } elseif($cancel_date === false || $cancel_date === null) {
+              $where .= " AND (Contract.cancel_date = 0 OR Contract.cancel_date IS NULL)";
+          }
+      }
+
+
       if(array_key_exists("cancel_date>", $filter)) {
           $cancel_date = $filter['cancel_date>'];
           if(is_numeric($cancel_date)) {