Added fibu_supplier_paymentblock to Address

Layout/default/Address/Form.php

@@ -254,7 +254,9 @@
                       <input type="text" class="form-control" name="fibu_account_number" id="fibu_account_number" value="<?=$address->fibu_account_number?>" />
                     </div>
                   </div>
-                                    
+                  
+                  <hr />
+                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="fibu_supplier_number">FIBU Lieferantennummer</label>
                     <div class="col-lg-10">
@@ -284,6 +286,13 @@
                     </div>
                   </div>
                   
+                  <div class="form-group row">
+                    <label class="col-lg-2">Lieferant Zahlsperre</label>
+                    <div class="col-lg-10">
+                      <label><input type="checkbox" name="fibu_supplier_paymentblock" id="fibu_supplier_paymentblock" value="1" <?=($address->fibu_supplier_paymentblock) ? "checked='checked'" : ""?> /> Zahlsperre akiviert</label>
+                    </div>
+                  </div>
+                  
                 </div>
               </div>
               <?php endif; ?>

Layout/default/Address/Index.php

@@ -39,10 +39,11 @@
             <div class="row">
               <div class="col">
                 <a href="https://thetool.xinon.at/xfarm/" class="btn btn-primary" target="_blank"><i class="far fa-arrows-to-circle fa-fw"></i> AR-Merge / Fibu Konten Import</a>
-                <a href="<?=self::getUrl("Address", "exportBmd")?>" class="ml-2 btn btn-outline-primary" onclick="if(!confirm('Wirklich inkrementellen BMD-Export starten?')) return false;"><i class="fas fa-down-from-dotted-line fa-fw"></i> Inkrementellen BMD-Export starten</a>
+                <a href="#" class="ml-2 btn btn-outline-primary" onclick="startBmdExport(event, 'inc')"><i class="fas fa-down-from-dotted-line fa-fw"></i> Inkrementellen BMD-Export starten</a>
                 <?php if($last_bmd_export): ?><small>Letzter Export: <?=date("d.m.Y H:i", $last_bmd_export)?></small><?php endif; ?>
                 
-                <a href="<?=self::getUrl("Address", "exportBmd", ["type" => "full"])?>" class="btn btn-outline-danger float-right"  onclick="if(!confirm('Wirklich vollständigen BMD-Export starten?')) return false;"><i class="fas fa-down-from-line fa-fw"></i> Vollen BMD-Export starten</a>
+                <a href="#" class="btn btn-outline-danger float-right" onclick="startBmdExport(event, 'full')"><i class="fas fa-down-from-line fa-fw"></i> Vollen BMD-Export starten</a>
+                <img src="img/ajax-loader.gif" class="float-right mr-2 hidden" id="bmd-export-loader" />
               </div>
             </div>
           </div>
@@ -259,6 +260,30 @@
 
     <script type="text/javascript">
       $("#filter_addresstype").select2({closeOnSelect: false});
+      
+      function startBmdExport(e, type) {
+        e.preventDefault();
+        
+        if(type == "inc") {
+          name = "inkrementellen";
+          url = "<?=self::getUrl("Address", "exportBmd")?>";
+        } else if(type == "full") {
+          name = "VOLLSTÄNDIGEN";
+          url = "<?=self::getUrl("Address", "exportBmd", ["type" => "full"])?>";
+        } else {
+          return false;
+        }
+        console.log(name);
+        if(!confirm("Wirklich " + name + " BMD-Export starten?")) {
+          return false;
+        }
+        
+        $('button, input').prop('disabled', true);
+        $('a').removeAttr("href");
+        $("#bmd-export-loader").show();
+        window.location.href = url;
+        return false;
+      }
     </script>
 
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Address/View.php

@@ -137,6 +137,9 @@
                   </tr><tr>
                     <th>Lieferant Skonto %</th>
                     <td><?=$address->fibu_supplier_skonto_rate?></td>
+                  </tr><tr>
+                    <th>Lieferant Zahlsperre</th>
+                    <td><?=($address->fibu_supplier_paymentblock) ? "<i class='fas fa-xmark text-danger'></i> Automatische Zahlungen gesperrt" : "Nicht gesperrt"?></td>
                   </tr><tr>
                     <td colspan="2"><h4>Zusatzdaten</h4></td>
                   </tr><tr>

Layout/default/Address/bmd_export.csv.php

@@ -1,10 +1,10 @@
 <?php
-$header = "FIBU Kontonummber;Zahlungsziel Lieferant;Skontotage;Skontoprozent;Vorname;Nachname;Straße Hausnummer;PLZ;Ort;Land;Telefon;Mail;UID;SEPA;Kontoinhaber;IBAN;BIC;customer_numbers\n";
+$header = "FIBU Kontonummber;Zahlungsziel Lieferant;Skontotage;Skontoprozent;Zahlsperre;Vorname;Nachname;Straße Hausnummer;PLZ;Ort;Land;Telefon;Mail;UID;SEPA;Kontoinhaber;IBAN;BIC;customer_numbers\n";
 $this->setReturnValue(["header" => $header]);
 
 foreach($addresses as $a):
 ?>
-<?=$a["fibu_account_number"]?>;<?=$a["fibu_supplier_due"]?>;<?=$a["fibu_supplier_skonto"]?>;<?=$a["fibu_supplier_skonto_rate"]?>;<?=$this->nl2ws($a["firstname"])?>;<?=$this->nl2ws($a["lastname"])?>;<?=$this->nl2ws($a["street"])?>;<?=$this->nl2ws($a["zip"])?>;<?=$this->nl2ws($a["city"])?>;<?=$this->nl2ws($a["countrycode"])?>;<?=$this->nl2ws($a["phone"])?>;<?=$this->nl2ws($a["email"])?>;<?=$this->nl2ws($a["uid"])?>;<?=$a["billing_type"]?>;<?=$a["bank_owner"]?>;<?=$a["iban"]?>;<?=$a["bic"]?>;<?=implode(" ",$a["customer_numbers"])?>
+<?=$a["fibu_account_number"]?>;<?=$a["fibu_supplier_due"]?>;<?=$a["fibu_supplier_skonto"]?>;<?=$a["fibu_supplier_skonto_rate"]?>;<?=$a["fibu_supplier_paymentblock"]?>;<?=$this->nl2ws($a["firstname"])?>;<?=$this->nl2ws($a["lastname"])?>;<?=$this->nl2ws($a["street"])?>;<?=$this->nl2ws($a["zip"])?>;<?=$this->nl2ws($a["city"])?>;<?=$this->nl2ws($a["countrycode"])?>;<?=$this->nl2ws($a["phone"])?>;<?=$this->nl2ws($a["email"])?>;<?=$this->nl2ws($a["uid"])?>;<?=$a["billing_type"]?>;<?=$a["bank_owner"]?>;<?=$a["iban"]?>;<?=$a["bic"]?>;<?=implode(" ",$a["customer_numbers"])?>
 
 <?php
 endforeach;

application/Address/AddressController.php

@@ -295,9 +295,17 @@ class AddressController extends mfBaseController {
       //$a["customer_number"] = $address->customer_number;
       $a["fibu_account_number"] = $fibu_num;
       //$a["fibu_supplier_number"] = $address->fibu_supplier_number;
-      $a["fibu_supplier_due"] = (is_numeric($address->fibu_supplier_due)) ? $address->fibu_supplier_due : TT_ADDRESS_DEFAULT_SUPPLIER_DUE;
+      if($fibu_num >= 300000  && $fibu_num < 400000) {
-      $a["fibu_supplier_skonto"] = $address->fibu_supplier_skonto;
+        $a["fibu_supplier_due"] = (is_numeric($address->fibu_supplier_due)) ? $address->fibu_supplier_due : TT_ADDRESS_DEFAULT_SUPPLIER_DUE;
-      $a["fibu_supplier_skonto_rate"] = $address->fibu_supplier_skonto_rate;
+        $a["fibu_supplier_skonto"] = $address->fibu_supplier_skonto;
+        $a["fibu_supplier_skonto_rate"] = $address->fibu_supplier_skonto_rate;
+        $a["fibu_supplier_paymentblock"] = $address->fibu_supplier_paymentblock;
+      } else {
+        $a["fibu_supplier_due"] = "";
+        $a["fibu_supplier_skonto"] = "";
+        $a["fibu_supplier_skonto_rate"] = "";
+        $a["fibu_supplier_paymentblock"] = "";
+      }
       $a["street"] = $address->street;
       $a["zip"] = $address->zip;
       $a["city"] = $address->city;
@@ -455,6 +463,13 @@ class AddressController extends mfBaseController {
       } else {
         $data['fibu_primary_account'] = 0;
       }
+      
+      if($r->fibu_supplier_paymentblock) {
+        $data['fibu_supplier_paymentblock'] = 1;
+      } else {
+        $data['fibu_supplier_paymentblock'] = 0;
+      }
+      
       $data['fibu_supplier_due'] = ($r->fibu_supplier_due) ? trim($r->fibu_supplier_due) : null;
       $data['fibu_supplier_skonto'] = ($r->fibu_supplier_skonto) ? trim($r->fibu_supplier_skonto) : null;
       $data['fibu_supplier_skonto_rate'] = ($r->fibu_supplier_skonto_rate) ? trim($r->fibu_supplier_skonto_rate) : null;

db/migrations/20240123132303_address_add_fibu_supplier_paymentblock.php

@@ -0,0 +1,31 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddressAddFibuSupplierPaymentblock extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+          $table = $this->table("Address");
+          $table->addColumn("fibu_supplier_paymentblock", "integer", ["null" => false, "default" => 0, "limit" => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY, "after" => "fibu_supplier_skonto_rate"]);
+          $table->update();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+          $this->table("Address")->removeColumn("fibu_supplier_paymentblock")->save();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+}