diff --git a/Layout/default/Patching/Index.php b/Layout/default/Patching/Index.php
index 16a0cb420..892d9633e 100644
--- a/Layout/default/Patching/Index.php
+++ b/Layout/default/Patching/Index.php
@@ -59,6 +59,14 @@
+
+
+
+
+
diff --git a/application/Patching/PatchingController.php b/application/Patching/PatchingController.php
index 3f9baf06e..63cea82eb 100644
--- a/application/Patching/PatchingController.php
+++ b/application/Patching/PatchingController.php
@@ -100,21 +100,37 @@ class PatchingController extends mfBaseController {
private function getPreparedFilter($filter) {
$new_filter = [];
- //var_dump($filter);exit;
+ //var_dump($filter);
+
+ if(array_key_exists("hide_delayed_finish", $filter)) {
+ if($filter["hide_delayed_finish"] == "1") {
+ $new_filter["hide_delayed_finish"] = true;
+ } else {
+ $new_filter["hide_delayed_finish"] = false;
+ }
+ unset($filter["hide_delayed_finish"]);
+ } else {
+ $new_filter["hide_delayed_finish"] = true;
+ }
+
if(array_key_exists("patched", $filter)) {
if($filter["patched"] == "1") {
$new_filter["patched"] = true;
+ $new_filter["hide_delayed_finish"] = false;
} else {
$new_filter["patched"] = false;
}
+ unset($filter["patched"]);
} else {
$new_filter["patched"] = false;
}
+
+
foreach($filter as $name => $value) {
$new_filter[$name] = $value;
}
-
+ //var_dump($new_filter);exit;
return $new_filter;
}
diff --git a/application/Patching/PatchingModel.php b/application/Patching/PatchingModel.php
index 773e29ba5..117ea03db 100644
--- a/application/Patching/PatchingModel.php
+++ b/application/Patching/PatchingModel.php
@@ -200,6 +200,14 @@ class PatchingModel {
}
} else {
$where .= " AND (Patching.patched IS NULL OR Patching.patched = 0)";
+
+ }
+
+ if(array_key_exists("hide_delayed_finish", $filter)) {
+ $hide_delayed_finish = $filter["hide_delayed_finish"];
+ if($hide_delayed_finish) {
+ $where .= " AND (`Order`.finish_after IS NULL OR `Order`.finish_after <= ".(date("U") + (31 * 86400))." )";
+ }
}
if(array_key_exists("network_id", $filter)) {