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

changed filter in Contractqueue Import

Browse Source
This commit is contained in:
Frank Schubert
2024-08-01 19:22:27 +02:00
parent 7f3075dae6
commit 489d081d35
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/Contractqueue/ContractqueueController.php
View File

@@ -121,8 +121,9 @@ class ContractqueueController extends mfBaseController {
//$max_orders = 1500;
$not_before = new DateTime("2024-07-01");
$not_before->setTimezone(new DateTimeZone("Europe/Vienna"));
foreach(OrderModel::search(["finish_date" => true, "finish_date<" => date("U"), "finish_date>" => $not_before->getTimestamp()]) as $order) {
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;

18
application/Order/OrderModel.php
View File

@@ -301,14 +301,28 @@ class OrderModel {
$where .= " AND `Order`.finish_date > $finish_date";
}
}
if(array_key_exists("finish_date>=", $filter)) {
$finish_date = $filter['finish_date>='];
if($finish_date) {
$where .= " AND `Order`.finish_date >= $finish_date";
}
}
if(array_key_exists("finish_date<", $filter)) {
$finish_date = $filter['finish_date<'];
if($finish_date) {
$where .= " AND `Order`.finish_date < $finish_date";
}
}
if(array_key_exists("finish_date<=", $filter)) {
$finish_date = $filter['finish_date<='];
if($finish_date) {
$where .= " AND `Order`.finish_date <= $finish_date";
}
}
if(array_key_exists("upgrade", $filter)) {
if($filter['upgrade'] == 1) {
$where .= " AND `Order`.upgrade = 1";