From 113f1820d5b6572c6f0973f1bb489fbbbdde0a13 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Fri, 4 Jul 2025 13:51:51 +0200
Subject: [PATCH] Billing: Fixed always having billingaddress

---
 application/Billing/BillingController.php | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/application/Billing/BillingController.php b/application/Billing/BillingController.php
index f32f8fecb..eee5bb9bf 100644
--- a/application/Billing/BillingController.php
+++ b/application/Billing/BillingController.php
@@ -417,9 +417,16 @@ class BillingController extends mfBaseController {
 
                 $billing_type = "invoice";
                 $billing_delivery = "paper";
+                $billing_bank = $billing_owner = $billing_iban = $billing_bic = null;
 
                 if ($owner->billing_type) {
                     $billing_type = $owner->billing_type;
+                    if($billing_type == "sepa") {
+                        $billing_bank = $owner->bank_account_bank;
+                        $billing_owner = $owner->bank_account_owner;
+                        $billing_iban = str_replace(" ", "", $owner->bank_account_iban);
+                        $billing_bic = str_replace(" ", "", $owner->bank_account_bic);
+                    }
                 }
                 if ($owner->billing_delivery) {
                     $billing_delivery = $owner->billing_delivery;
@@ -427,11 +434,19 @@ class BillingController extends mfBaseController {
 
                 if ($billingaddress->billing_type) {
                     $billing_type = $billingaddress->billing_type;
+                    if($billing_type == "sepa") {
+                        $billing_bank = $billingaddress->bank_account_bank;
+                        $billing_owner = $billingaddress->bank_account_owner;
+                        $billing_iban = str_replace(" ", "", $billingaddress->bank_account_iban);
+                        $billing_bic = str_replace(" ", "", $billingaddress->bank_account_bic);
+                    }
                 }
                 if ($billingaddress->billing_delivery) {
                     $billing_delivery = $billingaddress->billing_delivery;
                 }
 
+
+
                 if($contract->vatgroup_id == TT_VATGROUP_CREDIT) {
                     $fibu_account_num = $billingaddress->fibu_supplier_number;
                     if(!$fibu_account_num) {
@@ -462,10 +477,10 @@ class BillingController extends mfBaseController {
                 $data["uid"] = $billingaddress->uid;
                 $data["billing_type"] = $billing_type;
                 $data["billing_delivery"] = $billing_delivery;
-                $data["bank_account_bank"] = $billingaddress->bank_account_bank;
-                $data["bank_account_owner"] = $billingaddress->bank_account_owner;
-                $data["bank_account_iban"] = str_replace(" ", "", $billingaddress->bank_account_iban);
-                $data["bank_account_bic"] = $billingaddress->bank_account_bic;
+                $data["bank_account_bank"] = $billing_bank;
+                $data["bank_account_owner"] = $billing_owner;
+                $data["bank_account_iban"] = $billing_iban;
+                $data["bank_account_bic"] = $billing_bic;
                 $data["product_id"] = $contract->product_id;
                 $data["product_name"] = $contract->product_name;
                 $data["product_info"] = $contract->product_info;