Merged develop into master

Changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.6.2
+* filter out results not suitable to receive packages
+
 ## 1.6.1
 * add weight inputs for articles in custom label form
 * use article weight over orderarticle weight

project.json

@@ -4,7 +4,7 @@
     "pathToModule": "copy_this/modules/mo/mo_dhl",
     "prefix": "mo_",
     "suffix": "",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "compatibility": {
         "minimumVersion": "6.0",
         "maximumVersion": null,

src/modules/mo/mo_dhl/Api/Standortsuche.php

@@ -122,6 +122,25 @@ protected function buildAddressString($address, $postalCode = null, $countryIso2
         return $this->sanitizeAddressString(implode('&', $urlOptions));
     }
 
+    /**
+     * @param $location
+     * @return bool
+     */
+    public function locationFilterFunction($location)
+    {
+        return $location->location->keyword !== "" && $location->location->keywordId !== "";
+    }
+
+    /**
+     * @param $locations
+     * @return object
+     */
+    protected function filterUndelivarableLocations($locations)
+    {
+        $filteredLocations = array_filter($locations->locations, [$this, "locationFilterFunction"]);
+        return (object)['locations' => $filteredLocations];
+    }
+
     /**
      * @param Address|string $address
      * @param string|null $postalCode
@@ -136,7 +155,8 @@ public function getParcellocationByAddress($address, $postalCode = null, $countr
             return new ServiceProviderList([]);
         }
         $locations = $this->callApi($addressString);
-        $oldAPIstandart = $this->convert($locations);
+        $filteredLocations = $this->filterUndelivarableLocations($locations);
+        $oldAPIstandart = $this->convert($filteredLocations);
 
         return $this->extractServiceProviders($oldAPIstandart);
     }

src/modules/mo/mo_dhl/metadata.php

@@ -17,7 +17,7 @@
         'en' => '<p>Enable features providing Post & Paket Delivery to your OXID shop.</p>' . '<p><a href="https://projects.mediaopt.de/projects/mopt-postp-ua/wiki" target="_blank">Handbook</a></p>',
     ],
     'thumbnail'   => 'logo.png',
-    'version'     => '1.6.1',
+    'version'     => '1.6.2',
     'author'      => '<a href="http://www.mediaopt.de" target="_blank">mediaopt.</a>',
     'url'         => 'http://www.mediaopt.de',
     'email'       => '[email protected]',