Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Billing: Fixed always having billingaddress

Browse Source
This commit is contained in:
Frank Schubert
2025-07-04 13:51:51 +02:00
parent 4da5e4180c
commit 113f1820d5
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/Billing/BillingController.php
View File

@@ -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;