From a72010234a0070cdfcf22c2c442142a57ac289e8 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 25 Jul 2024 22:19:32 +0200
Subject: [PATCH] Fixed creating new Contracts

---
 Layout/default/Contract/Form.php            | 13 +++++++++++++
 Layout/default/Contract/Index.php           |  2 +-
 application/Contract/ContractController.php |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Layout/default/Contract/Form.php b/Layout/default/Contract/Form.php
index ef86b0999..3c969f224 100644
--- a/Layout/default/Contract/Form.php
+++ b/Layout/default/Contract/Form.php
@@ -118,6 +118,18 @@
                         </div>
                       </div>
 
+                        <div class="form-group row">
+                            <label class="col-lg-2 col-form-label" for="vatgroup_id">Umsatzsteuergruppe</label>
+                            <div class="col-lg-10">
+                                <select class="form-control" name="vatgroup_id" id="vatgroup_id">
+                                    <?php foreach(VatgroupModel::getAll() as $vatgroup): ?>
+                                        <option value="<?=$vatgroup->id?>"><?=$vatgroup->name?></option>
+                                    <?php endforeach; ?>
+
+                                </select>
+                            </div>
+                        </div>
+
                       <div class="form-group row">
                         <label class="col-lg-2 col-form-label" for="price">Preis</label>
                         <div class="col-lg-10">
@@ -408,6 +420,7 @@
           if(success.status != "OK") return;
           
           p = success.result.product;
+          $("#vatgroup_id").val(p.vatgroup_id);
           $("#price").val(p.price);
           $("#price_setup").val(p.price_setup);
           $("#price_nne").val(p.price_nne);
diff --git a/Layout/default/Contract/Index.php b/Layout/default/Contract/Index.php
index eb78419aa..663849167 100644
--- a/Layout/default/Contract/Index.php
+++ b/Layout/default/Contract/Index.php
@@ -92,7 +92,7 @@
               <h4 class="header-title">Liste aller aktiven Produkte</h4>
             </div>
             <div class="float-right">
-              <a class="btn btn-primary mb-2" href="<?=self::getUrl("Contract", "add")?>"><i class="fas fa-plus"></i> Neues Produkt anlegen</a>
+              <a class="btn btn-primary mb-2" href="<?=self::getUrl("Contract", "add")?>"><i class="fas fa-plus"></i> Neuen Contract anlegen</a>
             </div>
             
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
diff --git a/application/Contract/ContractController.php b/application/Contract/ContractController.php
index 07c3373d4..f5b33fd58 100644
--- a/application/Contract/ContractController.php
+++ b/application/Contract/ContractController.php
@@ -748,6 +748,7 @@ class ContractController extends mfBaseController
         $contract_data["product_name"] = $r->product_name;
         $contract_data["product_info"] = $r->product_info;
         $contract_data['amount'] = ($r->amount) ? (float)$r->amount : 1;
+        $contract_data['vatgroup_id'] = $r->vatgroup_id;
         $contract_data['price'] = (float)$r->price;
         $contract_data['price_setup'] = (float)$r->price_setup;
         $contract_data['price_nne'] = (float)$r->price_nne;