From 758024f4906c6091315ad6b7b58a38df6fb19120 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Fri, 5 Sep 2025 11:49:33 +0200
Subject: [PATCH 1/3] Fixed cifurl generation in Preorerlogistics

---
 application/Preorder/Preorder.php                           | 2 +-
 .../Preorderlogistics/PreorderlogisticsController.php       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/Preorder/Preorder.php b/application/Preorder/Preorder.php
index 87942b1be..8406b36c4 100644
--- a/application/Preorder/Preorder.php
+++ b/application/Preorder/Preorder.php
@@ -1125,7 +1125,7 @@ class Preorder extends mfBaseModel {
         $campaign = $this->getProperty("campaign");
 
         $cifcableurl = $campaign->cifcableurl;
-        str_replace("{{}}", $this->ciftoken, $cifcableurl);
+        str_replace("{{CIFTOKEN}}", $this->ciftoken, $cifcableurl);
 
         return $cifcableurl;
     }
diff --git a/application/Preorderlogistics/PreorderlogisticsController.php b/application/Preorderlogistics/PreorderlogisticsController.php
index b53c2d262..767e019eb 100644
--- a/application/Preorderlogistics/PreorderlogisticsController.php
+++ b/application/Preorderlogistics/PreorderlogisticsController.php
@@ -209,12 +209,12 @@ class PreorderlogisticsController extends mfBaseController {
      */
     if(!$preorder->ciftoken) {
       $preorder->createCiftoken();
-      $preorder->cifurl = "https://pro.ichwillglasfaser.at/ClientSubmit/finishedInstallationWork?c=".$preorder->ciftoken;
+      $preorder->generateCifUrl();
       $preorder->save();
     }
-    
+
     if(!$preorder->cifcableurl) {
-      $preorder->cifcableurl = "https://www.deineglasfaser.at/kundinnen/leerrohr-nachbestellung/";
+      $preorder->generateCifCableUrl();
       $preorder->save();
     }
     

From aa04f49837c223cffb58a8c06f1f83313156e580 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Fri, 5 Sep 2025 14:04:48 +0200
Subject: [PATCH 2/3] Fixed cifurl creation in PreorderLogistics

---
 .../PreorderlogisticsController.php           | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/application/Preorderlogistics/PreorderlogisticsController.php b/application/Preorderlogistics/PreorderlogisticsController.php
index 767e019eb..28ff20e89 100644
--- a/application/Preorderlogistics/PreorderlogisticsController.php
+++ b/application/Preorderlogistics/PreorderlogisticsController.php
@@ -207,16 +207,21 @@ class PreorderlogisticsController extends mfBaseController {
     /*
      * generate QR code
      */
-    if(!$preorder->ciftoken) {
-      $preorder->createCiftoken();
-      $preorder->generateCifUrl();
-      $preorder->save();
-    }
-
-    if(!$preorder->cifcableurl) {
-      $preorder->generateCifCableUrl();
-      $preorder->save();
-    }
+      if(!$preorder->ciftoken) {
+          echo "Generating ciftoken\n";
+          $preorder->createCiftoken();
+          $preorder->save();
+      }
+      if(!$preorder->cifurl) {
+          echo "Generating cifurl\n";
+          $preorder->cifurl = $preorder->generateCifUrl();
+          $preorder->save();
+      }
+      if(!$preorder->cifcableurl) {
+          echo "Generating cifcableurl\n";
+          $preorder->cifcableurl = $preorder->generateCifCableUrl();
+          $preorder->save();
+      }
     
     
     $plog = PreorderlogisticsModel::getFirst(["preorder_id" => $preorder->id]);

From b622f669031606c9a65d7b2a33eeb0e12eb5e340 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Fri, 5 Sep 2025 14:05:13 +0200
Subject: [PATCH 3/3] Fixed cifurl creation in PreorderLogistics

---
 application/Preorderlogistics/PreorderlogisticsController.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/application/Preorderlogistics/PreorderlogisticsController.php b/application/Preorderlogistics/PreorderlogisticsController.php
index 28ff20e89..eee34b7f3 100644
--- a/application/Preorderlogistics/PreorderlogisticsController.php
+++ b/application/Preorderlogistics/PreorderlogisticsController.php
@@ -208,17 +208,14 @@ class PreorderlogisticsController extends mfBaseController {
      * generate QR code
      */
       if(!$preorder->ciftoken) {
-          echo "Generating ciftoken\n";
           $preorder->createCiftoken();
           $preorder->save();
       }
       if(!$preorder->cifurl) {
-          echo "Generating cifurl\n";
           $preorder->cifurl = $preorder->generateCifUrl();
           $preorder->save();
       }
       if(!$preorder->cifcableurl) {
-          echo "Generating cifcableurl\n";
           $preorder->cifcableurl = $preorder->generateCifCableUrl();
           $preorder->save();
       }