From 8b6c765af19d54b86d08315c697a3ede68ec2c65 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Wed, 7 Jun 2017 14:19:20 +0200
Subject: [PATCH] Relevancia

---
 .gitignore                            | 1 +
 debian/changelog                      | 2 +-
 forms/ecomerce/catalog/locale/ca.json | 1 +
 forms/ecomerce/catalog/locale/en.json | 1 +
 forms/ecomerce/catalog/locale/es.json | 3 ++-
 forms/ecomerce/catalog/locale/fr.json | 1 +
 forms/ecomerce/catalog/locale/mn.json | 1 +
 forms/ecomerce/catalog/locale/pt.json | 1 +
 forms/ecomerce/catalog/ui.xml         | 7 +++++--
 9 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c3629e6..25871d04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 node_modules
+build/
diff --git a/debian/changelog b/debian/changelog
index de89af2a..7e4d431b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.405.4) stable; urgency=low
+hedera-web (1.405.5) stable; urgency=low
 
   * Initial Release.
 
diff --git a/forms/ecomerce/catalog/locale/ca.json b/forms/ecomerce/catalog/locale/ca.json
index 0589742e..583e5a50 100755
--- a/forms/ecomerce/catalog/locale/ca.json
+++ b/forms/ecomerce/catalog/locale/ca.json
@@ -31,6 +31,7 @@
 	,"Origin": "Origen"
 	,"Category": "Categoria"
 	,"Remove filters": "Esborrar filtres"
+	,"Relevancy": "Rellevància"
 
 	,"Price": "Precio"
 	,"Amount": "Quantitat"
diff --git a/forms/ecomerce/catalog/locale/en.json b/forms/ecomerce/catalog/locale/en.json
index 981bc119..d93ab1f9 100755
--- a/forms/ecomerce/catalog/locale/en.json
+++ b/forms/ecomerce/catalog/locale/en.json
@@ -31,6 +31,7 @@
 	,"Origin": "Origin"
 	,"Category": "Category"
 	,"Remove filters": "Remove filters"
+	,"Relevancy": "Relevance"
 
 	,"Price": "Price"
 	,"Amount": "Amount"
diff --git a/forms/ecomerce/catalog/locale/es.json b/forms/ecomerce/catalog/locale/es.json
index 4a588d82..012354e2 100755
--- a/forms/ecomerce/catalog/locale/es.json
+++ b/forms/ecomerce/catalog/locale/es.json
@@ -40,8 +40,9 @@
 	,"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"
-	
 	,"from": "desde"
 	,"from %.2d€": "desde %.2d€"
 	,"AddToBasket": "Añadir artículo"
diff --git a/forms/ecomerce/catalog/locale/fr.json b/forms/ecomerce/catalog/locale/fr.json
index 9c9b99eb..4bbdc865 100755
--- a/forms/ecomerce/catalog/locale/fr.json
+++ b/forms/ecomerce/catalog/locale/fr.json
@@ -31,6 +31,7 @@
 	,"Origin": "Origine"
 	,"Category": "Catégorie"
 	,"Remove filters": "Retirer les filtres"
+	,"Relevancy": "Pertinence"
 
 	,"Price": "Prix"
 	,"Amount": "Quantité"
diff --git a/forms/ecomerce/catalog/locale/mn.json b/forms/ecomerce/catalog/locale/mn.json
index 981bc119..1c6d8df8 100755
--- a/forms/ecomerce/catalog/locale/mn.json
+++ b/forms/ecomerce/catalog/locale/mn.json
@@ -31,6 +31,7 @@
 	,"Origin": "Origin"
 	,"Category": "Category"
 	,"Remove filters": "Remove filters"
+	,"Relevancy": "хамаарал"
 
 	,"Price": "Price"
 	,"Amount": "Amount"
diff --git a/forms/ecomerce/catalog/locale/pt.json b/forms/ecomerce/catalog/locale/pt.json
index bfe501f8..9003febb 100644
--- a/forms/ecomerce/catalog/locale/pt.json
+++ b/forms/ecomerce/catalog/locale/pt.json
@@ -31,6 +31,7 @@
 	,"Origin": "Orígem"
 	,"Category": "Categoria"
 	,"Remove filters": "Eliminar filtros"
+	,"Relevancy": "Relevância"
 
 	,"Price": "Preço"
 	,"Amount": "Quantidade"
diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml
index baabdb05..2125b998 100755
--- a/forms/ecomerce/catalog/ui.xml
+++ b/forms/ecomerce/catalog/ui.xml
@@ -78,7 +78,7 @@
 					LEFT JOIN vn_locale.color_view c ON c.color_id = a.Color
 					LEFT JOIN vn_locale.origin_view o ON o.origin_id = a.id_origen
 				WHERE b.available > 0
-				ORDER BY a.Article, a.Medida
+				ORDER BY a.relevancy, a.Article, a.Medida
 				LIMIT 400;
 		</custom>
 		<sql-batch property="batch" id="filter-batch">
@@ -366,7 +366,10 @@
 		<div id="order" class="order">
 			<h2><t>Order by</t></h2>
 			<select on-change="onOrderChange">
-				<option value="A|Article" selected="true">
+				<option value="A|relevancy" selected="true">
+					<t>Relevancy</t>
+				</option>
+				<option value="A|Article">
 					<t>Name</t>
 				</option>
 				<option value="A|price">