From 3ad710e7fd15cb1c87d05cb319cff2466b1e914c Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 17 Apr 2018 13:59:54 +0200
Subject: [PATCH] wip #1927 @1.5

---
 .../cart/fluidbook.cart.remarkable.js         | 14 +++--
 js/libs/fluidbook/fluidbook.menu.js           |  3 +
 style/fluidbook.less                          | 58 ++++++++++++++++++-
 3 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js b/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
index e3e97423..cd2ef9b7 100644
--- a/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
+++ b/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
@@ -114,7 +114,7 @@ FluidbookCartRemarkable.prototype = {
             var ht = item.price * quantity;
             var ttc = ht * (1 + item.tax);
             content += '<tr>';
-            content += '<td class="name">' + item.name + '</td>';
+            content += '<td class="name">' + item.name + '<div class="m">Prix unitaire : ' + $this.formatPrice(item.price, 'HT') + '<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="100" value="' + quantity + '" step="1" /></td>';
             content += '<td class="price_unit">' + $this.formatPrice(item.price, 'HT') + '</td>';
             content += '<td class="price_excluding_taxes">' + $this.formatPrice(ht, 'HT') + '</td>';
@@ -200,16 +200,22 @@ FluidbookCartRemarkable.prototype = {
         res += '<div class="col col-left">';
         res += '<input type="text" name="firstname" placeholder="Prénom" tabindex="100" required>';
         res += '<input type="text" name="lastname" placeholder="Nom" tabindex="101" required>';
+        res += '</div>';
+
+        res += '<div class="col col-right">';
+        res += '<input type="tel" name="phone" placeholder="Téléphone" tabindex="102" pattern="[0-9\+\.\ \-]+" required>';
+        res += '<input type="email" name="email" placeholder="E-mail" tabindex="103" required>';
+        res += '</div>';
+
+        res += '<div class="col col-left">';
         res += '<p>Adresse de facturation : </p>';
         res += '<input type="text" name="billing_company" placeholder="Nom de la société"  tabindex="104" required>';
         res += '<input type="text" name="billing_address" placeholder="Adresse" tabindex="105" required>';
         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 += '<input type="tel" name="phone" placeholder="Téléphone" tabindex="102" pattern="[0-9\+\.\ \-]+" required>';
-        res += '<input type="email" name="email" placeholder="E-mail" tabindex="103" required>';
         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">';
         res += '<input type="text" name="shipping_address" placeholder="Adresse" tabindex="109">';
diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index 44898945..0db9909d 100644
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -407,6 +407,9 @@ FluidbookMenu.prototype = {
                 break;
             case 'cart':
                 w = 1024;
+                if (ww < 1024) {
+                    fullscreen = true;
+                }
                 break;
             case 'bookmarks':
                 var max = Math.floor((ww * 0.8) / 120) * 120 + 40;
diff --git a/style/fluidbook.less b/style/fluidbook.less
index 37633444..29a0a093 100644
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -864,8 +864,61 @@ a.bookmark {
 		padding: 50px;
 	}
 
+	&.fs {
+		table {
+			td {
+				&.name {
+					width: 100%;
+					.m {
+						display: block;
+					}
+				}
+				&.price, &.price_excluding_taxes, &.price_unit {
+					display: none;
+				}
+			}
+		}
+
+		.cart-footer {
+			clear: both;
+			width: 100%;
+			text-align: left;
+			position: relative;
+			top: -40px;
+			p {
+				float: none;
+				width: 100%;
+				font-size: 0.8em;
+				padding: 0 30px 30px;
+				margin: 0;
+			}
+
+			.fonctions {
+				float: none;
+				width: 100%;
+			}
+		}
+
+		.cart-shipping-form {
+			margin-top: 30px;
+			.col {
+				&.col-left, &.col-right {
+					width: 100%;
+					left: 0;
+					margin-top: 0;
+					margin-right: 0;
+					padding: 0 30px;
+				}
+			}
+			.cart-footer{
+				top: 0;
+			}
+		}
+
+	}
+
 	table {
-		width: 1004px;
+		max-width: 1004px;
 		margin-left: 10px;
 		td {
 			padding: 15px;
@@ -874,6 +927,9 @@ a.bookmark {
 			white-space: nowrap;
 			&.name {
 				white-space: normal;
+				.m {
+					display: none;
+				}
 			}
 			&.price {
 				font-weight: 700;
-- 
2.39.5