From d3602100a07ef390901ba77e28adb88e4ef42421 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Mon, 7 Jul 2025 14:23:00 +0200 Subject: [PATCH 1/3] PreorderBilling: activation_billing now also works for operator_setup --- application/PreorderBilling/PreorderBillingController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/PreorderBilling/PreorderBillingController.php b/application/PreorderBilling/PreorderBillingController.php index adeb7e264..ce4cf2b60 100644 --- a/application/PreorderBilling/PreorderBillingController.php +++ b/application/PreorderBilling/PreorderBillingController.php @@ -450,8 +450,8 @@ class PreorderBillingController extends mfBaseController { if(!$change_to_active) { $status_change_date = $status_244_change_date; } - - if($status_change_date < $earliest_bill_date) { + + if($status_change_date < $earliest_bill_date && !$preorder->activation_billing) { $this->log->debug(__METHOD__.": Not billing operator_setup for preorder ".$preorder->id." because status change date ".$status_change_date->format("Y-m-d")." is before earliest_bill_date ".$earliest_bill_date->format("Y-m-d")); return true; } From f166f746c508d020b78af9bd3f029f31b094f035 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Mon, 7 Jul 2025 14:23:53 +0200 Subject: [PATCH 2/3] RimoWorkorder: now setting dynamic properties to null in afterSave() --- application/RimoWorkorder/RimoWorkorder.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/RimoWorkorder/RimoWorkorder.php b/application/RimoWorkorder/RimoWorkorder.php index 7f18b4713..31dcb8994 100644 --- a/application/RimoWorkorder/RimoWorkorder.php +++ b/application/RimoWorkorder/RimoWorkorder.php @@ -15,6 +15,9 @@ class RimoWorkorder extends mfBaseModel { } public function afterSave() { + $this->adb_wohneinheit = null; + $this->termination = null; + // prevent potential infinite loop $nesting_level = mfValuecache::singleton()->get("rimoworkorder-save-nesting-level-".$this->id); if(!$nesting_level) { From 086f1b5969d2a91a7d61d61ef3bb25c1f28c48ba Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Mon, 7 Jul 2025 14:25:01 +0200 Subject: [PATCH 3/3] Removed debugging in VodiaApi --- lib/Vodia/Api.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Vodia/Api.php b/lib/Vodia/Api.php index 7119463bd..ab894dd8b 100644 --- a/lib/Vodia/Api.php +++ b/lib/Vodia/Api.php @@ -45,13 +45,13 @@ class Vodia_Api { //"header" => $headers, ]]; - $this->log->debug(__METHOD__.": authenticating to $url for domain $domain, user $this->admin_user"); - $this->log->debug(__METHOD__.": ".print_r($ctx_options, true)); + //$this->log->debug(__METHOD__.": authenticating to $url for domain $domain, user $this->admin_user"); + //$this->log->debug(__METHOD__.": ".print_r($ctx_options, true)); $ctx = stream_context_create($ctx_options); $output = file_get_contents($url, false, $ctx); - $this->log->debug(__METHOD__.": auth output: $output"); + //$this->log->debug(__METHOD__.": auth output: $output"); $m = []; if(preg_match('/^"([^"]+)"$/', $output, $m)) { @@ -93,7 +93,7 @@ class Vodia_Api { $ctx = stream_context_create($ctx_options); $output = file_get_contents($url, false, $ctx); - $this->log->debug(__METHOD__.": output: $output"); + //$this->log->debug(__METHOD__.": output: $output"); return true; } @@ -130,7 +130,7 @@ class Vodia_Api { $ctx = stream_context_create($ctx_options); $output = file_get_contents($url, false, $ctx); - $this->log->debug(__METHOD__.": output: $output"); + //$this->log->debug(__METHOD__.": output: $output"); $user_settings = json_decode($output, true);