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 PreorderPrice exception for Kienach 9 on RML request

See merge request fronk/thetool!1150
This commit is contained in:
Frank Schubert
2025-03-27 09:38:03 +00:00
parent 300aeb2a12 b8db830214
commit ff765746fa
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/Api/v1/AddressdbApicontroller.php
View File

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

2
application/PreorderBilling/PreorderBilling.php
View File

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