diff --git a/application/Contractqueue/ContractqueueController.php b/application/Contractqueue/ContractqueueController.php index 03946b702..597bac662 100644 --- a/application/Contractqueue/ContractqueueController.php +++ b/application/Contractqueue/ContractqueueController.php @@ -74,7 +74,10 @@ class ContractqueueController extends mfBaseController { protected function importFinishedOrdersAction() { $o = 0; $max_orders = 1500; - foreach(OrderModel::search(["finish_date<" => date("U")]) as $order) { + + $not_before = new DateTime("2024-07-10"); + + foreach(OrderModel::search(["finish_date" => true, "finish_date<" => date("U"), "finish_date>" => $not_before->getTimestamp()]) as $order) { if(!is_array($order->products) || !count($order->products)) { //echo "keine Produkte in Order ".$order->id."\n"; continue; diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php index 41c5036e5..a914d6ab7 100644 --- a/application/Order/OrderController.php +++ b/application/Order/OrderController.php @@ -1161,7 +1161,7 @@ class OrderController extends mfBaseController { // send order finish email if($send_to_bill_email) { - if($ext_products && !$int_products) { + if($ext_products) { if(!$order->sendExtBillinfoEmail(new Address($ext_product_owner_id))) { $this->layout()->setFlash("Beim Senden der externen Billing Benachrichtigung ist ein Fehler aufgetreten.", "warning"); } @@ -1173,12 +1173,12 @@ class OrderController extends mfBaseController { } } } - - if($int_products) { + + /*if($int_products) { if(!$order->sendIntBillinfoEmail()) { $this->layout()->setFlash("Beim Senden der Billing Benachrichtigung ist ein Fehler aufgetreten.", "warning"); } - } + }*/ if($int_products && $ext_products) { //$this->layout()->setFlash("Eigene und Fremdprodukte gefunden, nur interne Billing Benachrichtigung verschickt.", "warning");