Merge branch 'shipping-note-fix-float-hours' into 'master'

added new borderpoint filter for preorder

See merge request fronk/thetool!835

application/Preorder/PreorderController.php

@@ -231,6 +231,12 @@ class PreorderController extends mfBaseController {
             $new_filter['addon_services'] = true;
         }
 
+        if(array_key_exists("borderpoint", $filter) && $filter['borderpoint'] == 1) {
+            $new_filter['add-where'] .= " AND (adb_hausnummer.borderpoint_lat IS NOT NULL AND adb_hausnummer.borderpoint_long IS NOT NULL)";
+        } elseif(array_key_exists("borderpoint", $filter) && $filter['borderpoint'] == 0) {
+            $new_filter['add-where'] .= " AND (adb_hausnummer.borderpoint_lat IS NULL OR adb_hausnummer.borderpoint_long IS NULL)";
+        }
+
         if(array_key_exists("address_source", $filter)) {
             if($filter['address_source'] == "manual") {
                 $new_filter['address_created'] = true;
@@ -293,10 +299,6 @@ class PreorderController extends mfBaseController {
             }
         }
 
-        /*if(array_key_exists("attributes", $filter) && count($filter['attributes'])) {
-
-        }*/
-
         if(is_array($filter) && count($filter)) {
             foreach($filter as $name => $value) {
                 $new_filter[$name] = $value;