From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 24 Apr 2018 13:18:04 +0000 (+0200)
Subject: wip #1927 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=369019d3202acddd874d1b76afe14564a3259150;p=fluidbook-html5.git

wip #1927 @1
---

diff --git a/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js b/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
index cd2ef9b7..d8bf05e3 100644
--- a/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
+++ b/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
@@ -214,7 +214,7 @@ FluidbookCartRemarkable.prototype = {
         res += '<input type="text" name="billing_zip" placeholder="Code postal" pattern="[0-9]{5}" tabindex="106" required>';
         res += '<input type="text" name="billing_city" placeholder="Ville" tabindex="107" required>';
         res += '</div>';
-        
+
         res += '<div class="col col-right">';
         res += '<p>Adresse de livraison - Enseigne (si différente) : </p>';
         res += '<input type="text" name="shipping_company" placeholder="Nom de la société"  tabindex="108">';
@@ -243,7 +243,7 @@ FluidbookCartRemarkable.prototype = {
             "<br>\n" +
             "<br>\n" +
             "LIVRAISON<br>\n" +
-            "Livraison 48 h par transporteur<br>\n" +
+            "Livraison 72 h par transporteur<br>\n" +
             "<br>\n" +
             " <br>\n" +
             "<br>\n" +
@@ -294,12 +294,17 @@ FluidbookCartRemarkable.prototype = {
             fp = 8.3;
             fpv = this.formatPrice(fp);
         }
-        var totalttcfp = totalttc + (fpv * 1.2);
+        var totalttcfp = this.formatPrice(totalttc + (fp * 1.2));
 
         $.ajax({
             url: 'https://workshop.fluidbook.com/services/orderRemarkable',
             method: 'post',
-            data: {'items': items, 'fpv': fpv, 'details': this.fluidbook.cache.get('shipping-details')},
+            data: {
+                'items': items,
+                'fpv': fpv,
+                'totalttc': totalttcfp,
+                'details': this.fluidbook.cache.get('shipping-details')
+            },
             success: function (data) {
                 success(data);
             },
diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index dec0297a..aae0c582 100644
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -414,7 +414,7 @@ FluidbookNav.prototype = {
                 link = this.addLink(navType, 'nav-print', '#', 'print', 'print', 'print');
             } else if (icon == 'basket' && this.fluidbook.cart.enabled) {
                 link = this.addLink(navType, 'nav-basket', '#/cart', 'cart', 'basket', 'basket');
-                $(this.fluidbook).on('fluidbook.cart.updateIcon', {link: link.attr('id')}, function (e, data) {
+                $(this.fluidbook).on('fluidbook.cart.updateIcon', {link: $(link).attr('id')}, function (e, data) {
                     var n = data.number;
                     var l = $("#" + e.data.link);