fix escaping quotes in js func parameter

wuunder · Sep 7, 2018 · 52bbab2 · 52bbab2
1 parent 3b0507a
commit 52bbab2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/assets/js/parcelshop.js b/assets/js/parcelshop.js
@@ -270,7 +270,11 @@ function addParcelshopList(data) {
     data.forEach(function (shops, i) {
         var hours = getHours(shops.opening_hours);
         var logo = getLogo(shops.carrier_name);
+        var parcelshopInfoHtml = capFirst(shops.company_name) + "<br>" + capFirst(shops.address.street_name) +
+            " " + shops.address.house_number + "<br>" + shops.address.city;
         addMarkerToMap(shops.latitude, shops.longitude, logo, i);
+        parcelshopInfoHtml = parcelshopInfoHtml.replace(/"/g, '\\"').replace(/'/g, "\\'");
+        console.log(parcelshopInfoHtml);
 
         var node = document.createElement("div");
         node.className += "parcelshopItem parcelshopItem" + i;
@@ -281,8 +285,7 @@ function addParcelshopList(data) {
             "<div id='zip_code_and_city'>" + shops.address.zip_code + " " + shops.address.city + "</div>" +
             "<div id='distance'>" + Math.round(shops.distance * 1000) + "m</div></div></div>" +
             "<div class='opening_hours_list'><br><strong>Openingstijden</strong>" +
-            "<div>" + hours + "</div><br><div id='buttonContainer'><button class='parcelshopButton' onclick='chooseParcelshopButton(\"" + capFirst(shops.company_name) + "<br>" + capFirst(shops.address.street_name) +
-            " " + shops.address.house_number + "<br>" + shops.address.city + "\", \"" + shops.id + "\", \"" + shops.address.alpha2 + "\")' type='button'>Kies</button></div>";
+            "<div>" + hours + "</div><br><div id='buttonContainer'><button class='parcelshopButton' onclick=\"chooseParcelshopButton('" + parcelshopInfoHtml + "', '" + shops.id + "', '" + shops.address.alpha2 + "')\" type='button'>Kies</button></div>";
         window.parent.document.getElementById('parcelshopList').appendChild(node);
     });
 }

diff --git a/composer.lock b/composer.lock
diff --git a/includes/wcwuunder-create.php b/includes/wcwuunder-create.php
@@ -13,7 +13,7 @@ public function __construct()
             $this->version_obj = array(
                 "product" => "Woocommerce extension",
                 "version" => array(
-                    "build" => "2.4.6",
+                    "build" => "2.4.7",
                     "plugin" => "2.0"),
                 "platform" => array(
                     "name" => "Woocommerce",
@@ -118,6 +118,7 @@ private function setBookingConfig($orderId)
             $bookingConfig->setWidth($this->roundButNull($dimensions[1]));
             $bookingConfig->setHeight($this->roundButNull($dimensions[2]));
             $bookingConfig->setWeight($totalWeight ? $totalWeight : null);
+            $bookingConfig->setCustomerReference($orderId);
             $bookingConfig->setPreferredServiceLevel((count($order->get_items('shipping')) > 0) ? $this->get_filter_from_shippingmethod(reset($order->get_items('shipping'))->get_method_id()) : "");
             $bookingConfig->setSource($this->version_obj);