Merge branch 'composer' of https://github.com/kabisa/wuunder-webshopp…

…lugin-woocommerce into parcelshop-locator
wuunder · Jul 30, 2018 · 067a644 · 067a644
2 parents f9ee77d + 63c7140
commit 067a644
Show file tree

Hide file tree

Showing 5 changed files with 205 additions and 171 deletions.
diff --git a/assets/js/parcelshop.js b/assets/js/parcelshop.js
@@ -248,7 +248,7 @@ function ajaxRequest(address) {
     var xhttp = new XMLHttpRequest();
     xhttp.onreadystatechange = function () {
         if (this.readyState === 4 && this.status === 200) {
-            var val = JSON.parse(xhttp.responseText.substring(0, xhttp.responseText.length - 1));
+            var val = JSON.parse(xhttp.responseText);
             displayMap(val.location);
             setAddress(val.address);
             addParcelshopList(sortParcelshops(val.parcelshops));

diff --git a/composer.lock b/composer.lock
diff --git a/includes/parcelshop.php b/includes/parcelshop.php
@@ -1,6 +1,6 @@
 <?php
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
+//error_reporting(E_ALL);
+//ini_set('display_errors', 1);
 
 function parcelShopLocator()
 {
@@ -35,4 +35,5 @@ function parcelShopLocator()
         $parcelshops = "ParcelshopsConfig not complete";
     }
     echo json_encode($parcelshops);
+    exit;
 }