From b8db8302141af096feb072e75bdd945b5259c721 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Thu, 27 Mar 2025 10:37:06 +0100 Subject: [PATCH] Added PreorderPrice exception for Kienach 9 on RML request --- application/Api/v1/AddressdbApicontroller.php | 13 ++++++++++++- application/PreorderBilling/PreorderBilling.php | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/application/Api/v1/AddressdbApicontroller.php b/application/Api/v1/AddressdbApicontroller.php index 89f1ece78..ac934de98 100644 --- a/application/Api/v1/AddressdbApicontroller.php +++ b/application/Api/v1/AddressdbApicontroller.php @@ -891,6 +891,7 @@ class AddressdbApicontroller extends mfBaseApicontroller { } $unit = ADBWohneinheitModel::getFirst(["oaid" => $oaid]); + if($unit) { $hausnummer = $unit->hausnummer; } else { @@ -938,14 +939,24 @@ class AddressdbApicontroller extends mfBaseApicontroller { "vatrate" => 20, ]; + //$paid = $unit->enduser_setup_paid; - if(PreorderBillingInvoice::getFirst(["adb_wohneinheit_id" => $unit->id, "product_id" => $enduser_setup_product_id, "invoice_id" => false])) { + if(PreorderBilling::getFirst(["adb_wohneinheit_id" => $unit->id, "product_id" => $enduser_setup_product_id, "invoice_id" => false])) { $prices_return["enduser_setup_price_net"] = 0; $prices_return["enduser_setup_price_gross"] = 0; $prices_return["enduser_setup_info"] = "paid"; $prices_return["enduser_setup_valid_until"] = null; } + if($hausnummer->oaid == "AT-8952-67570191" || $hausnummer->oaid == "AT-8952-622a69bb") { + //var_dump(PreorderBilling::getFirst(["adb_wohneinheit_id" => $unit->id, "product_id" => $enduser_setup_product_id, "invoice_id" => true]));exit; + $prices_return["enduser_setup_price_net"] = 600; + $prices_return["enduser_setup_price_gross"] = 720; + $prices_return["enduser_setup_info"] = "Aktion Kienach 9"; + $prices_return["enduser_setup_valid_until"] = "2025-04-30"; + + } + return mfResponse::Ok($prices_return); } diff --git a/application/PreorderBilling/PreorderBilling.php b/application/PreorderBilling/PreorderBilling.php index 120f812b9..98f487403 100644 --- a/application/PreorderBilling/PreorderBilling.php +++ b/application/PreorderBilling/PreorderBilling.php @@ -161,7 +161,7 @@ class PreorderBilling extends mfBaseModel { WHERE $where ORDER BY preorder_id LIMIT 1"; //var_dump($sql);exit; - //mfLoghandler::singleton()->debug($sql); + mfLoghandler::singleton()->debug($sql); $res = $db->query($sql); if($db->num_rows($res)) { $data = $db->fetch_object($res);