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

Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev

Browse Source
This commit is contained in:
Frank Schubert
2025-09-10 17:39:52 +02:00
parent 6dfc4a31c6 b622f66903
commit aab08b5d65
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/Preorder/Preorder.php
View File

@@ -1134,7 +1134,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;
}

22
application/Preorderlogistics/PreorderlogisticsController.php
View File

@@ -207,16 +207,18 @@ class PreorderlogisticsController extends mfBaseController {
/*
* generate QR code
*/
if(!$preorder->ciftoken) {
$preorder->createCiftoken();
$preorder->cifurl = "https://pro.ichwillglasfaser.at/ClientSubmit/finishedInstallationWork?c=".$preorder->ciftoken;
$preorder->save();
}
if(!$preorder->cifcableurl) {
$preorder->cifcableurl = "https://www.deineglasfaser.at/kundinnen/leerrohr-nachbestellung/";
$preorder->save();
}
if(!$preorder->ciftoken) {
$preorder->createCiftoken();
$preorder->save();
}
if(!$preorder->cifurl) {
$preorder->cifurl = $preorder->generateCifUrl();
$preorder->save();
}
if(!$preorder->cifcableurl) {
$preorder->cifcableurl = $preorder->generateCifCableUrl();
$preorder->save();
}
$plog = PreorderlogisticsModel::getFirst(["preorder_id" => $preorder->id]);