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

fixed preorder issue

Browse Source
This commit is contained in:
Luca Haid
2025-06-12 13:25:19 +02:00
parent ec74c28866
commit 6faafc86f9
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/Preordercampaign/PreordercampaignController.php
View File

@@ -513,7 +513,7 @@ class PreordercampaignController extends mfBaseController {
"prevent_previous" => ($prevent_previous) ? 1 : 0, "prevent_previous" => ($prevent_previous) ? 1 : 0,
]; ];
$statusmailtemplate = PreordercampaignStatusnotificationMailtemplate::getFirst(["preordercampaign_id" => $campaign->id, "logical_config" => json_encode(["type" => $status_code])]); $statusmailtemplate = PreordercampaignStatusnotificationMailtemplate::getFirst(["preordercampaign_id" => $campaign->id, "logical_config" => $status_code]);
if($statusmailtemplate) { if($statusmailtemplate) {
$statusmailtemplate->update($mt_data); $statusmailtemplate->update($mt_data);
} else { } else {
@@ -529,7 +529,7 @@ class PreordercampaignController extends mfBaseController {
foreach($mailtemplates_delete as $mt_code) { foreach($mailtemplates_delete as $mt_code) {
$status_mt = null; $status_mt = null;
if(preg_match("/^\d+$/", $mt_code)) $status_mt = PreordercampaignStatusnotificationMailtemplate::getFirst(["preordercampaign_id" => $campaign->id, "status_code" => $mt_code]); if(preg_match("/^\d+$/", $mt_code)) $status_mt = PreordercampaignStatusnotificationMailtemplate::getFirst(["preordercampaign_id" => $campaign->id, "status_code" => $mt_code]);
else $status_mt = PreordercampaignStatusnotificationMailtemplate::getFirst(["preordercampaign_id" => $campaign->id, "logical_config" => json_encode(["type" => $mt_code])]); else $status_mt = PreordercampaignStatusnotificationMailtemplate::getFirst(["preordercampaign_id" => $campaign->id, "logical_config" => $mt_code]);
if($status_mt) $status_mt->delete(); if($status_mt) $status_mt->delete();
} }

7
application/PreordercampaignStatusnotificationMailtemplate/PreordercampaignStatusnotificationMailtemplate.php
View File

@@ -176,11 +176,8 @@ class PreordercampaignStatusnotificationMailtemplate extends mfBaseModel {
if(array_key_exists("logical_config", $filter)) { if(array_key_exists("logical_config", $filter)) {
$logical_config = $filter['logical_config']; $logical_config = $filter['logical_config'];
if(is_array($logical_config) && count($logical_config)) { $where .= " AND PreordercampaignStatusnotificationMailtemplate.notification_type='logical'
$where .= " AND PreordercampaignStatusnotificationMailtemplate.notification_type='logical' AND PreordercampaignStatusnotificationMailtemplate.logical_config = '" . json_encode($logical_config) . "'"; AND JSON_EXTRACT(PreordercampaignStatusnotificationMailtemplate.logical_config, '$.type') = '$logical_config'";
} elseif(is_string($logical_config)) {
$where .= " AND PreordercampaignStatusnotificationMailtemplate.notification_type='logical' AND PreordercampaignStatusnotificationMailtemplate.logical_config LIKE '%" . $logical_config . "%'";
}
} }
if(array_key_exists("mailtemplate_id", $filter)) { if(array_key_exists("mailtemplate_id", $filter)) {