From 9a92eadfa24fdfbecbbd01eb99d64e646da07d2a Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Tue, 8 Apr 2025 15:19:50 +0200 Subject: [PATCH] Fixed querying prices in AddressdbAPI for netowner --- application/Api/v1/AddressdbApicontroller.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/application/Api/v1/AddressdbApicontroller.php b/application/Api/v1/AddressdbApicontroller.php index 43a86d6b4..950fdf973 100644 --- a/application/Api/v1/AddressdbApicontroller.php +++ b/application/Api/v1/AddressdbApicontroller.php @@ -916,6 +916,9 @@ class AddressdbApicontroller extends mfBaseApicontroller { if($campaign->network->owner_id != $this->me->address_id) { return mfResponse::Unauthorized(); } + + $netop = PreordercampaignOperatorModel::getFirst(["preordercampaign_id" => $campaign->id]); + } $netoperator = $netop->operator; @@ -927,7 +930,9 @@ class AddressdbApicontroller extends mfBaseApicontroller { $enduser_setup_product_id = $product->id; } $product->setNetownerId($netowner_id); - $product->setNetoperatorId($netoperator->id); + if($netoperator) { + $product->setNetoperatorId($netoperator->id); + } $prices[$product->type] = $product->getCampaignPrice($campaign->id); } @@ -943,8 +948,7 @@ class AddressdbApicontroller extends mfBaseApicontroller { ]; - //$paid = $unit->enduser_setup_paid; - if($unit->enduser_setup_invoice_date || PreorderBilling::getFirst(["adb_wohneinheit_id" => $unit->id, "product_id" => $enduser_setup_product_id, "invoice_id" => false])) { + if($unit->enduser_setup_invoice_date || PreorderBilling::getFirst(["adb_wohneinheit_id" => $unit->id, "product_id" => $enduser_setup_product_id, "invoice_id" => true])) { $prices_return["enduser_setup_price_net"] = 0; $prices_return["enduser_setup_price_gross"] = 0; $prices_return["enduser_setup_info"] = "paid";