From 3b14d419d6bae3d9f5a22f31092a6c95076e88d3 Mon Sep 17 00:00:00 2001
From: Juan <juan@pc-juan.verdnatura.es>
Date: Tue, 27 Mar 2018 16:35:53 +0200
Subject: [PATCH] Tags beta v2

---
 forms/ecomerce/catalog/locale/ca.yml |  2 +-
 forms/ecomerce/catalog/locale/en.yml |  2 +-
 forms/ecomerce/catalog/locale/es.yml |  2 +-
 forms/ecomerce/catalog/locale/fr.yml |  2 +-
 forms/ecomerce/catalog/locale/pt.yml |  2 +-
 forms/ecomerce/catalog/style.css     | 11 +++++
 forms/ecomerce/catalog/ui.xml        | 69 +++++++++++++---------------
 7 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/forms/ecomerce/catalog/locale/ca.yml b/forms/ecomerce/catalog/locale/ca.yml
index 8c08e22c..d5c7ee3a 100644
--- a/forms/ecomerce/catalog/locale/ca.yml
+++ b/forms/ecomerce/catalog/locale/ca.yml
@@ -34,7 +34,7 @@ Lower price: Preu més baix
 Higher price: Preu més alt
 Lower size: Mida més petita
 Higher size: Mida més gran
-', %.0d Units': ', %.0d Unitats'
+'%.0d Units': ', %.0d Unitats'
 from: des de
 from %.2d€: des de %.2d€
 AddToBasket: Afegir article
diff --git a/forms/ecomerce/catalog/locale/en.yml b/forms/ecomerce/catalog/locale/en.yml
index 1d0991f3..cb2f560e 100644
--- a/forms/ecomerce/catalog/locale/en.yml
+++ b/forms/ecomerce/catalog/locale/en.yml
@@ -34,7 +34,7 @@ Lower price: Lower price
 Higher price: Higher price
 Lower size: Lower size
 Higher size: Higher size
-', %.0d Units': ', %.0d Units'
+'%.0d Units': '%.0d Units'
 from: from
 from %.2d€: from %.2d€
 AddToBasket: Add to basket
diff --git a/forms/ecomerce/catalog/locale/es.yml b/forms/ecomerce/catalog/locale/es.yml
index 36c8283b..3067a2c5 100644
--- a/forms/ecomerce/catalog/locale/es.yml
+++ b/forms/ecomerce/catalog/locale/es.yml
@@ -34,7 +34,7 @@ Higher price: Precio más alto
 Lower size: Medida más pequeña
 Higher size: Medida más grande
 Relevancy: Relevancia
-', %.0d Units': ', %.0d Unidades'
+'%.0d Units': ', %.0d Unidades'
 from: desde
 from %.2d€: desde %.2d€
 AddToBasket: Añadir artículo
diff --git a/forms/ecomerce/catalog/locale/fr.yml b/forms/ecomerce/catalog/locale/fr.yml
index 74b6567f..eb801d82 100644
--- a/forms/ecomerce/catalog/locale/fr.yml
+++ b/forms/ecomerce/catalog/locale/fr.yml
@@ -34,7 +34,7 @@ Lower price: Prix le plus bas
 Higher price: Prix le plus élevé
 Lower size: Taille le plus bas
 Higher size: Taille le plus élevé
-', %.0d Units': ', %.0d Unités'
+'%.0d Units': ', %.0d Unités'
 from: pour
 from %.2d€: pour %.2d€
 AddToBasket: Ajouter article
diff --git a/forms/ecomerce/catalog/locale/pt.yml b/forms/ecomerce/catalog/locale/pt.yml
index 5cafd941..22a75bf5 100644
--- a/forms/ecomerce/catalog/locale/pt.yml
+++ b/forms/ecomerce/catalog/locale/pt.yml
@@ -34,7 +34,7 @@ Lower price: Menor preço
 Higher price: Maior preço
 Lower size: Tamanho menor
 Higher size: Tamanho maior
-', %.0d Units': ', %.0d Unidades'
+'%.0d Units': ', %.0d Unidades'
 from: desde
 from %.2d€: desde %.2d€
 AddToBasket: Adicionar à Cesta
diff --git a/forms/ecomerce/catalog/style.css b/forms/ecomerce/catalog/style.css
index 699c0f85..1cff0339 100644
--- a/forms/ecomerce/catalog/style.css
+++ b/forms/ecomerce/catalog/style.css
@@ -246,6 +246,17 @@
 	margin-top: 1em;
 	font-size: .9em;
 }
+.item-card .tags
+{
+	font-size: .9em;
+	color: #777;
+	margin: 0;
+	padding-top: .5em;
+}
+.item-card .tags p
+{
+	margin: 0;
+}
 .item-card .lots-grid
 {
 	border-top: 1px solid #DDD;
diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml
index 6405c4ed..1df805b8 100644
--- a/forms/ecomerce/catalog/ui.xml
+++ b/forms/ecomerce/catalog/ui.xml
@@ -53,16 +53,16 @@
 		result-index="2"
 		on-status-changed="onItemsChange">
 		CREATE TEMPORARY TABLE tmp.bionic_calc
-		(INDEX (item_id))
-		ENGINE=MEMORY
-		SELECT i.id item_id
-			FROM vn.item i
-				JOIN vn.itemType t ON t.id = i.typeFk
-			WHERE #filter;
-		CALL bionic_calc ();
+			(INDEX (item_id))
+			ENGINE = MEMORY
+			SELECT i.id item_id
+				FROM vn.item i
+					JOIN vn.itemType t ON t.id = i.typeFk
+				WHERE #filter;
+		CALL bionic_calc;
 		SELECT i.id itemFk, i.description, b.available, b.price,
 				b.producer, i.image, i.name item, i.category, i.size,
-				IF(i.stems > 1, i.stems, NULL) stems, c.name color,
+				IF(i.stems > 1, i.stems, NULL) stems, c.name color, o.name origin,
 				t.tag1, t.val1, t.tag2, t.val2, t.tag3, t.val3
 			FROM tmp.bionic_item b
 				JOIN vn.item i ON i.id = b.item_id
@@ -139,7 +139,9 @@
 				</p>
 				<p class="color">
 					<htk-text form="item" column="tag3"/> <htk-text form="item" column="val3"/>
-					<htk-text form="item" column="stems" format="_, %.0d Units"/>
+				</p>
+				<p class="color">
+					<htk-text form="item" column="stems" format="_%.0d Units"/>
 				</p>
 				<div class="aval-price">
 					<htk-text form="item" column="available"/> 
@@ -231,12 +233,11 @@
 				param="color">
 				<db-model property="model" auto-load="false" result-index="1">
 					CALL item_available ();
-					SELECT DISTINCT k.id, l.name
+					SELECT DISTINCT l.id, l.name
 						FROM vn.item i
 							JOIN vn.itemType t ON t.id = i.typeFk
 							JOIN tmp.item_available a ON a.item_id = i.id
-							JOIN vn.ink k ON k.id = i.inkFk
-							JOIN vn.inkL10n l ON l.id = i.id
+							JOIN vn.inkL10n l ON l.id = i.inkFk
 						WHERE #filter
 						ORDER BY name
 				</db-model>
@@ -399,38 +400,30 @@
 					@<htk-text form="card" column="itemFk"/>
 				</p>
 				<p>
-					<t>Size</t> <htk-text form="card" column="size"/>, 
-					<t>Category</t> <htk-text form="card" column="category"/>
-				</p>
-				<p>
-					<t>Color</t> <htk-text form="card" column="color"/>
-					<htk-text form="card" column="stems" format="_, %.0d Units"/>
-				</p>
-				<p>
-					<t>Origin</t> <htk-text form="card-extend" column="origin"/>
+					<htk-text form="card" column="stems" format="_%.0d Units"/>
 				</p>
 			</div>
 			<p class="desc">
 				<htk-text form="card-extend" column="description" id="desc"/>
 			</p>
+			<htk-repeater show-status="false" form-id="tag" class="tags">
+				<db-model
+					property="model"
+					batch="card-batch"
+					on-status-changed-after="onCardLoad">
+					SELECT l.name, it.value
+						FROM vn.itemTag it
+							JOIN vn.tag t ON t.id = it.tagFk
+							JOIN vn.tagL10n l ON l.id = t.id
+						WHERE it.itemFk = #item
+				</db-model>
+				<custom>
+					<p>
+						<htk-text form="tag" column="name"/> <htk-text form="tag" column="value"/>
+					</p>
+				</custom>
+			</htk-repeater>
 		</div>
-		<htk-repeater show-status="false">
-			<db-model
-				property="model"
-				batch="card-batch"
-				on-status-changed-after="onCardLoad">
-				SELECT l.name, it.value
-					FROM vn.itemTag it
-						JOIN vn.tag t ON t.id = it.tagFk
-						JOIN vn.tagL10n l ON l.id = t.id
-					WHERE it.itemFk = #item
-			</db-model>
-			<custom>
-				<p>
-					<htk-text form="form" column="name"/> <htk-text form="form" column="value"/>
-				</p>
-			</custom>
-		</htk-repeater>
 		<htk-grid class="lots-grid" show-header="false">
 			<db-model
 				id="item-lots"