From 6db1055c6b61e8fc2874308a6682363c99481fc7 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 27 Feb 2024 14:35:25 +0100
Subject: [PATCH] Added taxcode to Vatrate

---
 Layout/default/Vatgroup/Index.php                | 16 +++++++++++-----
 application/Vatgroup/VatgroupController.php      |  5 +++++
 application/Vatrate/VatrateModel.php             |  1 +
 .../20240220192901_create_vat_tables.php         |  1 +
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Layout/default/Vatgroup/Index.php b/Layout/default/Vatgroup/Index.php
index 6db6e6ce4..3e2fdb458 100644
--- a/Layout/default/Vatgroup/Index.php
+++ b/Layout/default/Vatgroup/Index.php
@@ -43,26 +43,29 @@
                       <input type="hidden" name="id" value="<?=$vatgroup->id?>" />
                       
                       <div class="row">
-                        <div class="col-2 font-weight-medium">
+                        <div class="col-1 font-weight-medium">
                           Zielland *
                         </div>
                         <div class="col-2 font-weight-medium">
                           Erlöskonto *
                         </div>
                         <div class="col-2 font-weight-medium">
-                          Legacy Erlöskonto
+                          Legacy Erlöskonto *
                         </div>
                         <div class="col-2 font-weight-medium">
                           Steuersatz % *
                         </div>
-                        <div class="col-4 font-weight-medium">
+                        <div class="col-2 font-weight-medium">
+                          Steuercode *
+                        </div>
+                        <div class="col-3 font-weight-medium">
                           Rechnungstext
                         </div>
                       </div>
 
                       <?php foreach(TT_VATRATE_AREAS as $area_key => $area_name): ?>
                       <div class="row mb-2">
-                        <div class="col-2">
+                        <div class="col-1">
                           <input type="text" class="form-control" value="<?=$area_name?>" disabled="disabled" />
                         </div>
                         <div class="col-2">
@@ -74,7 +77,10 @@
                         <div class="col-2">
                           <input type="text" class="form-control" name="rates[<?=$area_key?>][rate]" value="<?=str_replace(".",",", round($vatgroup->rates[$area_key]->rate, 2))?>" placeholder="Steuersatz %" />
                         </div>
-                        <div class="col-4">
+                        <div class="col-2">
+                          <input type="text" class="form-control" name="rates[<?=$area_key?>][taxcode]" value="<?=str_replace(".",",", $vatgroup->rates[$area_key]->taxcode)?>" placeholder="Steuercode" />
+                        </div>
+                        <div class="col-3">
                           <input type="text" class="form-control" name="rates[<?=$area_key?>][invoice_text]" value="<?=htmlentities($vatgroup->rates[$area_key]->invoice_text)?>" placeholder="Optionaler Rechnungstext" />
                         </div>
                       </div>
diff --git a/application/Vatgroup/VatgroupController.php b/application/Vatgroup/VatgroupController.php
index 5f1052c5c..b5e8ccfb5 100644
--- a/application/Vatgroup/VatgroupController.php
+++ b/application/Vatgroup/VatgroupController.php
@@ -72,6 +72,7 @@ class VatgroupController extends mfBaseController {
       $data["account"] = trim($rate["account"]);
       $data["legacy_account"] = (trim($rate["legacy_account"])) ? trim($rate["legacy_account"]) : null;
       $data["rate"] = str_replace(",",".", trim($rate["rate"]));
+      $data["taxcode"] = ($rate["taxcode"]) ? trim($rate["taxcode"]) : null;
       $data["invoice_text"] = (trim($rate["invoice_text"])) ? trim($rate["invoice_text"]) : null;
       
       if(!$data["account"] || !is_numeric($data["account"])) {
@@ -86,6 +87,10 @@ class VatgroupController extends mfBaseController {
         $this->layout()->setFlash("Ungültiger Steuersatz", "error");
         $this->redirect("Vatgroup");
       }
+      if($data["taxcode"] && !is_numeric($data["taxcode"])) {
+        $this->layout()->setFlash("Ungültiger Steuercode", "error");
+        $this->redirect("Vatgroup");
+      }
       
       $vatrate = VatrateModel::getFirst(["vatgroup_id" => $group->id, "area" => $area]);
       if($vatrate) {
diff --git a/application/Vatrate/VatrateModel.php b/application/Vatrate/VatrateModel.php
index 00f987614..199b3bd07 100644
--- a/application/Vatrate/VatrateModel.php
+++ b/application/Vatrate/VatrateModel.php
@@ -6,6 +6,7 @@ class VatrateModel {
   public $account;
   public $legacy_account;
   public $rate;
+  public $taxcode;
   public $invoice_text;
   
   public $create_by = null;
diff --git a/db/migrations/20240220192901_create_vat_tables.php b/db/migrations/20240220192901_create_vat_tables.php
index 1054880b4..d2ba9480a 100644
--- a/db/migrations/20240220192901_create_vat_tables.php
+++ b/db/migrations/20240220192901_create_vat_tables.php
@@ -24,6 +24,7 @@ final class CreateVatTables extends AbstractMigration
           $table->addColumn("account", "integer", ["null" => false]);
           $table->addColumn("legacy_account", "integer", ["null" => true, "default" => null]);
           $table->addColumn("rate", "decimal", ["null" => false, "precision" => 6, "scale" => 2]);
+          $table->addColumn("taxcode", "integer", ["null" => true, "default" => null]);
           $table->addColumn("invoice_text", "text", ["null" => true, "default" => null]);
           $table->addColumn("create_by", "integer", ["null" => false]);
           $table->addColumn("edit_by", "integer", ["null" => false]);