From 6897e803006aeb9b2b72dfa1d9117bc55e305c9e Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Thu, 15 Jan 2026 15:40:22 +0100 Subject: [PATCH 1/6] Invoice: Implicitly rounding price totals --- application/Invoice/InvoiceController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/Invoice/InvoiceController.php b/application/Invoice/InvoiceController.php index 6d44febed..f96dd6615 100644 --- a/application/Invoice/InvoiceController.php +++ b/application/Invoice/InvoiceController.php @@ -681,6 +681,8 @@ class InvoiceController extends mfBaseController { } // save Invoiceposition + // first round price + $position->price_gross = round($position->price_gross, 4); if (!$position->save()) { $invoice->rollbackTransaction(); die("Error saving Invoiceposition"); @@ -703,7 +705,7 @@ class InvoiceController extends mfBaseController { } $invoice->total = $total_net; - $invoice->total_gross = $total_gross; + $invoice->total_gross = round($total_gross, 4); //$invoice->total_vat = $total_vat; if (!$invoice->save()) { From 217aa1faa01092edd861f1e4d3062c0bd23eedaf Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Thu, 15 Jan 2026 15:50:30 +0100 Subject: [PATCH 2/6] fixed trash-can icon buttons in Order/Form --- Layout/default/Order/Form.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php index a513c694e..f09c3a82c 100644 --- a/Layout/default/Order/Form.php +++ b/Layout/default/Order/Form.php @@ -597,7 +597,7 @@
- +
@@ -828,7 +828,7 @@
- +
@@ -1893,7 +1893,7 @@ } else { $('#products-' + id + '-delete').val(0); //$('#position-' + id + ' .delete-button-container i').removeClass("fa-trash-can-slash").addClass("fa-trash-can"); - $('#position-' + id + ' .delete-button-container').html(''); + $('#position-' + id + ' .delete-button-container').html(''); //$('#position-' + id + ' .delete-button-container i').removeClass("btn-outline-white fa-trash-can-slash").addClass("text-danger fa-trash-can"); $('#position-' + id).removeClass('text-white deleted'); @@ -1932,7 +1932,7 @@ \
\
\ - \ + \
\
\ \ From 450545695aefa4074b4eedc9371a91b0bc9acf36 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Thu, 15 Jan 2026 15:52:09 +0100 Subject: [PATCH 3/6] Preorder Map network outlines tweak --- Layout/default/Preorder/Index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php index 6a1a44cbb..ce132a676 100644 --- a/Layout/default/Preorder/Index.php +++ b/Layout/default/Preorder/Index.php @@ -1359,7 +1359,7 @@ $pagination_entity_name = "Vorbestellungen"; * Globals for map display */ var borderpolies = []; - is("Admin")): ?> + is("Admin") && !isset($campaign)): ?> true]) as $bp_netz): ?> borderpolies.push([borderpoly?>]); From 603bfa0f157ac072df669ef48fc8bd82eda90164 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Thu, 15 Jan 2026 15:53:46 +0100 Subject: [PATCH 4/6] Changed status change to single call in Preorder/Cif api --- application/Api/v1/Modules/Preorder/Cif.php | 36 +++------------------ 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/application/Api/v1/Modules/Preorder/Cif.php b/application/Api/v1/Modules/Preorder/Cif.php index 8e60be040..6a34e818f 100644 --- a/application/Api/v1/Modules/Preorder/Cif.php +++ b/application/Api/v1/Modules/Preorder/Cif.php @@ -43,22 +43,8 @@ class Cif extends Modules\ApiControllerModule { return \mfResponse::NotFound(["message" => "Preorder not found"]); } - // set status to 200 - if($preorder->status->code < 200) { - $new_status = \PreorderstatusModel::getFirst(["code" => 200]); - if(!$new_status) { - return \mfResponse::InternalServerError(); - } - $preorder->status_id = $new_status->id; - $preorder->save(); - } - - $sflag = \PreorderStatusflagModel::getFirst(["code" => 200]); - $sflag->preorder_id = $preorder->id; - if(!$sflag->value->value) { - $sflag->value->value = 1; - $sflag->value->save(); - } + // set status flag 200 + $preorder->setStatusFlag(200, 1); return \mfResponse::Ok(["message" => "Status successfully updated."]); @@ -134,22 +120,8 @@ class Cif extends Modules\ApiControllerModule { return \mfResponse::NotFound(["message" => "Invalid ciftoken"]); } - // set status to 200 - if($preorder->status->code < 200) { - $new_status = \PreorderstatusModel::getFirst(["code" => 200]); - if(!$new_status) { - return \mfResponse::InternalServerError(); - } - $preorder->status_id = $new_status->id; - $preorder->save(); - } - - $sflag = \PreorderStatusflagModel::getFirst(["code" => 200]); - $sflag->preorder_id = $preorder->id; - if(!$sflag->value->value) { - $sflag->value->value = 1; - $sflag->value->save(); - } + // set status flag 200 + $preorder->setStatusFlag(200, 1); return \mfResponse::Ok(["message" => "Status successfully updated."]); From d30f40c7e692d2fc562864fa43228bcc7570dc23 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Thu, 15 Jan 2026 15:54:12 +0100 Subject: [PATCH 5/6] formatting fix --- application/Emailnotification/Emailnotification.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Emailnotification/Emailnotification.php b/application/Emailnotification/Emailnotification.php index a686a9067..4906b0ca6 100644 --- a/application/Emailnotification/Emailnotification.php +++ b/application/Emailnotification/Emailnotification.php @@ -32,7 +32,7 @@ class Emailnotification { if($object_data !== false) $this->object_data = $object_data; } - public function addAttachment($filepath = null, $content = null, $name = false, $c_type = "application/octet-stream", $disposition = "attachment", $encoding = "base64" , $charset = "utf-8") { + public function addAttachment($filepath = null, $content = null, $name = false, $c_type = "application/octet-stream", $disposition = "attachment", $encoding = "base64", $charset = "utf-8") { $attachment = [ "file" => $filepath, "content" => $content, From 0e4c0e1220c08c6c0664104fa96856ee34704b65 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Thu, 15 Jan 2026 16:09:38 +0100 Subject: [PATCH 6/6] removed claude settings --- .claude/settings.local.json | 12 ------------ .gitignore | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .claude/settings.local.json diff --git a/.claude/settings.local.json b/.claude/settings.local.json deleted file mode 100644 index 64b936302..000000000 --- a/.claude/settings.local.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "permissions": { - "allow": [ - "Bash(docker-compose up:*)", - "Bash(python:*)", - "Bash(cat:*)", - "Bash(find:*)", - "Bash(docker-compose exec:*)", - "mcp__sequentialthinking__sequentialthinking" - ] - } -} diff --git a/.gitignore b/.gitignore index 7940ae3c2..81ebe75ee 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ composer.lock .project .settings .idea +.claude/ nbproject config/config.php scripts/addressdb/import