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

Merge branch 'fronkdev' into 'master'

Browse Source 
added nuance to product search in createOrderFromPreorderAction()

See merge request fronk/thetool!2040
This commit is contained in:
Frank Schubert
2026-01-21 13:43:44 +00:00
parent 27acacf854 225e14c74d
commit 437fb919ce
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
application/Preorder/PreorderController.php
View File

@@ -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
]);
}