From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 19 Jul 2018 15:53:35 +0000 (+0200)
Subject: wip #2150 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=8fdfd8dec6bf69b164ad9fae02bf510f4c360c30;p=fluidbook-html5.git

wip #2150 @0.5
---

diff --git a/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js b/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
index 2340a1cf..82131ef6 100644
--- a/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
+++ b/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
@@ -166,19 +166,19 @@ FluidbookCartRemarkable.prototype = {
         var totalttc = 0;
         this.data.find('item').each(function () {
             var ref = $(this).find('reference').text();
-            var unit = parseFloat($(this).find('prix_unitaire').text());
+            var unit = $this.parseFloat($(this).find('prix_unitaire').text());
             var remise = 0;
             if ($(this).find('valeur_remise').length > 0) {
-                remise = parseFloat($(this).find('valeur_remise').text());
+                remise = $this.parseFloat($(this).find('valeur_remise').text());
             }
             unit -= remise;
-            var ht = parseFloat($(this).find('prix_total_article').text());
-            var ttc = ht * (1 + (parseFloat($(this).find('taux_tva').text())) / 100);
+            var ht = $this.parseFloat($(this).find('prix_total_article').text());
+            var ttc = ht * (1 + ($this.parseFloat($(this).find('taux_tva').text())) / 100);
 
             content += '<tr>';
             content += '<td class="name">' + $(this).find('designation').text() + '<div class="m">Prix unitaire : ' + $this.formatPrice(unit, 'HT');
             content += '<br />Prix HT : ' + $this.formatPrice(ht, 'HT') + '<br />Prix TTC : ' + $this.formatPrice(ttc, 'TTC') + '</div></td>';
-            content += '<td class="quantity"><input name="' + ref + '" class="cartqty" type="number" min="0" max="10000" value="' + parseInt($(this).find('quantite').text()) + '" step="1" /></td>';
+            content += '<td class="quantity"><input name="' + ref + '" class="cartqty" type="number" min="0" max="10000" value="' + $this.parseInt($(this).find('quantite').text()) + '" step="1" /></td>';
             content += '<td class="price_unit">' + $this.formatPrice(unit, 'HT') + '</td>';
             content += '<td class="price_excluding_taxes">' + $this.formatPrice(ht, 'HT') + '</td>';
             content += '<td class="price">' + $this.formatPrice(ttc, 'TTC') + '</td>';
@@ -189,7 +189,7 @@ FluidbookCartRemarkable.prototype = {
             totalttc += ttc;
         });
 
-        var fp = parseFloat(this.data.find('frais_port').text());
+        var fp = this.parseFloat(this.data.find('frais_port').text());
         if (fp === 0) {
             fp = this.data.find('total_frais_port').text();
         } else {
@@ -198,11 +198,11 @@ FluidbookCartRemarkable.prototype = {
 
         content += '</table>';
         content += '<table class="cart-totals">';
-        content += '<tr><td>Total HT</td><td>' + $this.formatPrice(parseFloat(this.data.find('prix_sous_total').text()), 'HT') + '</td></tr>';
+        content += '<tr><td>Total HT</td><td>' + $this.formatPrice(this.parseFloat(this.data.find('prix_sous_total').text()), 'HT') + '</td></tr>';
         content += '<tr><td>Frais de port</td><td>' + fp + '</td></tr>';
-        content += '<tr><td>TVA</td><td>' + $this.formatPrice(parseFloat(this.data.find('total_tva_commande_ht').text())) + '</td></tr>';
+        content += '<tr><td>TVA</td><td>' + $this.formatPrice(this.parseFloat(this.data.find('total_tva_commande_ht').text())) + '</td></tr>';
         content += '<tr><td colspan="2" class="hr"></td></tr>';
-        content += '<tr class="total"><td>Total TTC</td><td>' + $this.formatPrice(parseFloat(this.data.find('total').text()), 'TTC') + '</td></tr>';
+        content += '<tr class="total"><td>Total TTC</td><td>' + $this.formatPrice(this.parseFloat(this.data.find('total').text()), 'TTC') + '</td></tr>';
         content += '</table>';
 
         content += '<div class="cart-footer">';
@@ -280,4 +280,14 @@ FluidbookCartRemarkable.prototype = {
         $("#view").append('<div class="mview" data-menu="cart">' + view + '</div>');
         callback();
     },
+
+    parseFloat: function (s) {
+        s = s.replace(/\s/g, '');
+        return parseFloat(s);
+    },
+
+    parseInt: function (s) {
+        s = s.replace(/\s/g, '');
+        return parseInt(s);
+    },
 };
\ No newline at end of file