Merge branch 'fronkdev' into 'master'

Added product_name filter in Order/Index

See merge request fronk/thetool!1973

Layout/default/Order/Index.php

@@ -111,6 +111,9 @@
                   <label class="form-label" for="filter_partner_number">Partnernummer</label>
                   <input type="text" class="form-control" name="filter[partner_number]" id="filter_partner_number" value="<?=$filter['partner_number'] ?? ''?>" />
                 </div>
+
+              </div>
+                <div class="row mt-1">
                 
                 <div class="col-2">
                   <label class="form-label" for="filter_finish_date">Bestellstatus</label>
@@ -130,6 +133,11 @@
                     <option value="business" <?=(($filter['customer_type'] ?? null) == "business") ? 'selected="selected"' : ""?>>Business</option>
                   </select>
                 </div>
+
+                  <div class="col-1">
+                      <label class="form-label" for="filter_product_name">Produktname</label>
+                      <input type="text" class="form-control" name="filter[product_name]" id="filter_product_name" value="<?=$filter['product_name'] ?? ''?>" />
+                  </div>
                 
               </div>
               <div class="row mt-2">

application/Order/OrderModel.php

@@ -358,6 +358,13 @@ class OrderModel {
         $where .= " AND `Order`.name='$name'";
       }
     }
+
+      if(array_key_exists("product_name", $filter)) {
+          $product_name = FronkDB::singleton()->escape($filter['product_name']);
+          if($product_name) {
+              $where .= " AND `Product`.name LIKE '%$product_name%'";
+          }
+      }
     
     if(array_key_exists("product_id", $filter)) {
       $product_id = $filter['product_id'];