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

Merge branch 'fronkdev' into 'master'

Browse Source 
PreorderBilling: activation_billing now also works for operator_setup

See merge request fronk/thetool!1523
This commit is contained in:
Frank Schubert
2025-07-07 12:25:30 +00:00
parent 45b0ef3e47 086f1b5969
commit 0637125b86
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/PreorderBilling/PreorderBillingController.php
View File

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

3
application/RimoWorkorder/RimoWorkorder.php
View File

@@ -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) {

10
lib/Vodia/Api.php
View File

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