From 225e14c74d9f2097e60ab04c532f22f79f048cdd Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 21 Jan 2026 14:42:54 +0100
Subject: [PATCH] added nuance to product search in
 createOrderFromPreorderAction()

---
 application/Preorder/PreorderController.php | 28 +++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 822ad3617..52623f44a 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -1101,7 +1101,6 @@ class PreorderController extends mfBaseController {
             $order_data["owner_id"] = $owner->id;
             $order_data["owner"] = $owner;
         } else {
-            // ... otherwise add owner data to order
             foreach($owner_data as $field => $value) {
                 if(!$preorder->$field) continue;
                 $order_data["owner_".$field] = $value;
@@ -1128,10 +1127,29 @@ class PreorderController extends mfBaseController {
         }
 
         // try product with correct network id
-        $product = ProductModel::getFirst(["external_id" => $operator->id, "network_id" => $campaign->network_id]);
+        $product = ProductModel::getFirst([
+            "external_id" => $operator->id,
+            "network_id" => $campaign->network_id,
+            "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
+            "name" => "%OAN%",
+            "active" => true
+        ]);
         if(!$product) {
             // else use any product from operator
-            $product = ProductModel::getFirst(["external_id" => $operator->id, "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI, "active" => true]);
+            $product = ProductModel::getFirst([
+                "external_id" => $operator->id,
+                "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
+                "name" => "%OAN%",
+                "active" => true
+            ]);
+        }
+        if(!$product) {
+            // else use any product from operator
+            $product = ProductModel::getFirst([
+                "external_id" => $operator->id,
+                "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
+                "active" => true
+            ]);
         }
         if($operator->id == 1) {
             if(!$product) {
@@ -1139,8 +1157,6 @@ class PreorderController extends mfBaseController {
                     "external" => 0,
                     "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
                     "network_id" => $campaign->network_id,
-                    "attributename" => "termination_required",
-                    "attributevalue" => 0,
                     "active" => true
                 ]);
             }
@@ -1149,8 +1165,6 @@ class PreorderController extends mfBaseController {
                     "external" => 0,
                     "productgroup_id" => TT_PRODUCTGROUP_ID_INTERNET_ACCESS_RESI,
                     "name" => "%OAN%",
-                    "attributename" => "termination_required",
-                    "attributevalue" => 0,
                     "active" => true
                 ]);
             }