Merge branch 'fronkdev' into 'master'

Fronkdev

See merge request fronk/thetool!2012

.claude/settings.local.json

@@ -1,12 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(docker-compose up:*)",
-      "Bash(python:*)",
-      "Bash(cat:*)",
-      "Bash(find:*)",
-      "Bash(docker-compose exec:*)",
-      "mcp__sequentialthinking__sequentialthinking"
-    ]
-  }
-}

.gitignore

@@ -3,6 +3,7 @@ composer.lock
 .project
 .settings
 .idea
+.claude/
 nbproject
 config/config.php
 scripts/addressdb/import

Layout/default/Order/Form.php

@@ -597,7 +597,7 @@
                       </div>
                       <div class="row">
                         <div class="col-md-12 delete-button-container">
-                          <i class="btn btn-outline-danger  fas fa-trash-can pointer" style="font-size: 1.5em" onclick="toggleDeletePos(<?=$i?>)"></i>
+                            <a href="#" class="btn btn-xl btn-outline-danger" onclick="toggleDeletePos(<?=$i?>); return false;"><i class="fas fa-fw fa-trash-can fa-xl pointer"></i></a>
                         </div>
                         
                       </div>
@@ -828,7 +828,7 @@
                       </div>
                       <div class="row">
                         <div class="col-md-12 delete-button-container">
-                          <i class="btn btn-outline-info  fas fa-trash-can pointer" title="Inhalte löschen" style="font-size: 1.5em" onclick="clearNewPos(<?=$i?>)"></i>
+                          <a href="#" class="btn btn-xl btn-outline-info" title="Inhalte löschen" onclick="clearNewPos(<?=$i?>); return false;"><i class="fas fa-fw fa-trash-can fa-xl pointer"></i></a>
                         </div>
                       </div>
                     </div>
@@ -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('<i class="btn btn-outline-danger fas fa-trash-can pointer" style="font-size: 1.5em" onclick="toggleDeletePos(' + id + ')"></i>');
+      $('#position-' + id + ' .delete-button-container').html('<a href="#" class="btn btn-xl btn-outline-info" title="Inhalte löschen" onclick="toggleDeletePos(' + id + '); return false;"><i class="fas fa-fw fa-trash-can fa-xl pointer"></i></a>');
       //$('#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 @@
           </div> \
           <div class="row"> \
             <div class="col-md-12 delete-button-container"> \
-              <i class="btn btn-outline-info  fas fa-trash-can pointer" title="Inhalte löschen" style="font-size: 1.5em" onclick="clearNewPos(' + i +')"></i> \
+              <a href="#" class="btn btn-xl btn-outline-info" title="Inhalte löschen" onclick="clearNewPos(' + i +'); return false;"><i class="fas fa-fw fa-trash-can fa-xl pointer"></i></a> \
             </div> \
           </div> \
         </div> \

Layout/default/Preorder/Index.php

@@ -1359,7 +1359,7 @@ $pagination_entity_name = "Vorbestellungen";
         * Globals for map display
         */
         var borderpolies = [];
-        <?php if($me->is("Admin")): ?>
+        <?php if($me->is("Admin") && !isset($campaign)): ?>
             <?php foreach(ADBNetzgebietModel::search(["borderpoly" => true]) as $bp_netz): ?>
             borderpolies.push([<?=$bp_netz->borderpoly?>]);
             <?php endforeach; ?>

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
+    // set status flag 200
-    if($preorder->status->code < 200) {
+    $preorder->setStatusFlag(200, 1);
-      $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();
-    }
     
     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
+    // set status flag 200
-    if($preorder->status->code < 200) {
+    $preorder->setStatusFlag(200, 1);
-      $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();
-    }
     
     return \mfResponse::Ok(["message" => "Status successfully updated."]);
     

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,

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