From 6faafc86f94e2dbfd9d131b2aefac7a073392a18 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 12 Jun 2025 13:25:19 +0200
Subject: [PATCH] fixed preorder issue

---
 .../Preordercampaign/PreordercampaignController.php        | 4 ++--
 .../PreordercampaignStatusnotificationMailtemplate.php     | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/application/Preordercampaign/PreordercampaignController.php b/application/Preordercampaign/PreordercampaignController.php
index d81672df0..04d7b0016 100644
--- a/application/Preordercampaign/PreordercampaignController.php
+++ b/application/Preordercampaign/PreordercampaignController.php
@@ -513,7 +513,7 @@ class PreordercampaignController extends mfBaseController {
                 "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) {
                 $statusmailtemplate->update($mt_data);
             } else {
@@ -529,7 +529,7 @@ class PreordercampaignController extends mfBaseController {
     foreach($mailtemplates_delete as $mt_code) {
         $status_mt = null;
         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();
     }
diff --git a/application/PreordercampaignStatusnotificationMailtemplate/PreordercampaignStatusnotificationMailtemplate.php b/application/PreordercampaignStatusnotificationMailtemplate/PreordercampaignStatusnotificationMailtemplate.php
index 1fadfecbc..01c9421f6 100644
--- a/application/PreordercampaignStatusnotificationMailtemplate/PreordercampaignStatusnotificationMailtemplate.php
+++ b/application/PreordercampaignStatusnotificationMailtemplate/PreordercampaignStatusnotificationMailtemplate.php
@@ -176,11 +176,8 @@ class PreordercampaignStatusnotificationMailtemplate extends mfBaseModel {
 
         if(array_key_exists("logical_config", $filter)) {
             $logical_config = $filter['logical_config'];
-            if(is_array($logical_config) && count($logical_config)) {
-                $where .= " AND PreordercampaignStatusnotificationMailtemplate.notification_type='logical' AND PreordercampaignStatusnotificationMailtemplate.logical_config = '" . json_encode($logical_config) . "'";
-            } elseif(is_string($logical_config)) {
-                $where .= " AND PreordercampaignStatusnotificationMailtemplate.notification_type='logical' AND PreordercampaignStatusnotificationMailtemplate.logical_config LIKE '%" . $logical_config . "%'";
-            }
+            $where .= " AND PreordercampaignStatusnotificationMailtemplate.notification_type='logical' 
+            AND JSON_EXTRACT(PreordercampaignStatusnotificationMailtemplate.logical_config, '$.type') = '$logical_config'";
         }
 
         if(array_key_exists("mailtemplate_id", $filter)) {