From 5de16013482b252c629d7ac23c9d2aa868926917 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 11 Nov 2022 13:18:52 +0100
Subject: [PATCH] refs #3971 Select input & basket style fixes

---
 debian/changelog                  |  2 +-
 forms/cms/contact/ui.xml          |  2 +-
 forms/ecomerce/basket/style.css   | 10 +++++++++-
 forms/ecomerce/basket/ui.xml      |  6 +++---
 js/htk/popup/style.scss           |  2 +-
 js/htk/select/style.scss          |  3 ---
 package.json                      |  4 ++--
 rest/{misc => client}/contact.php |  0
 rest/misc/contact.sql             | 26 --------------------------
 9 files changed, 17 insertions(+), 38 deletions(-)
 rename rest/{misc => client}/contact.php (100%)
 delete mode 100644 rest/misc/contact.sql

diff --git a/debian/changelog b/debian/changelog
index 73efde51..84335954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (22.44.1) stable; urgency=low
+hedera-web (22.44.2) stable; urgency=low
 
   * Initial Release.
 
diff --git a/forms/cms/contact/ui.xml b/forms/cms/contact/ui.xml
index d00840ae..44a203b0 100644
--- a/forms/cms/contact/ui.xml
+++ b/forms/cms/contact/ui.xml
@@ -7,7 +7,7 @@
 		<p><t>FillFormData</t></p>
 		<p><t>OrCallUs</t></p>
 		<form id="contact-form">
-			<input type="hidden" name="srv" value="json:misc/contact"/>
+			<input type="hidden" name="srv" value="json:client/contact"/>
 			<div class="form-group">
 				<label><t>Name</t></label>
 				<input type="text" name="name"/>
diff --git a/forms/ecomerce/basket/style.css b/forms/ecomerce/basket/style.css
index f49533d6..90070ee5 100644
--- a/forms/ecomerce/basket/style.css
+++ b/forms/ecomerce/basket/style.css
@@ -20,7 +20,7 @@
 
 .basket .line {
 	display: flex;
-	gap: 20px;
+	gap: 15px;
 	margin: 24px 0;
 	height: 65px;
 }
@@ -29,14 +29,22 @@
 }
 .basket .line > .delete {
 	align-self: center;
+	margin-right: -8px;
 }
 .basket .line > .photo {
 	flex: none;
 	border-radius: 50%;
 	width: 65px;
+	gap: 0;
 }
 .basket .line > .info {
 	flex: 1;
+	overflow: hidden;
+}
+.basket .line > .info > * {
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
 }
 .basket .line > .info > h2 {
 	font-size: 1em;
diff --git a/forms/ecomerce/basket/ui.xml b/forms/ecomerce/basket/ui.xml
index 8a6d1f0a..1988c3e6 100644
--- a/forms/ecomerce/basket/ui.xml
+++ b/forms/ecomerce/basket/ui.xml
@@ -57,11 +57,11 @@
 							<p class="tags">
 								{{iter.value5}} {{iter.value6}} {{iter.value7}}
 							</p>
+							<span class="subtotal">
+								{{Vn.Value.format(iter.price * iter.amount, '%.2d€')}}
+							</span>
 							<p class="amount">
 								{{iter.amount}} x {{Vn.Value.format(iter.price, '%.2d€')}}
-								<span class="subtotal">
-									{{Vn.Value.format(iter.price * iter.amount, '%.2d€')}}
-								</span>
 							</p>
 						</div>
 					</div>
diff --git a/js/htk/popup/style.scss b/js/htk/popup/style.scss
index 89a15908..696d1a71 100644
--- a/js/htk/popup/style.scss
+++ b/js/htk/popup/style.scss
@@ -3,7 +3,7 @@
 	z-index: 200;
 	display: block;
 	position: fixed;
-	overflow: hidden;
+	overflow: auto;
 	background-color: white;
 	border-radius: 10px;
 	box-shadow: 0 0 0.4em rgba(1, 1, 1, 0.6);
diff --git a/js/htk/select/style.scss b/js/htk/select/style.scss
index 050534b0..a19ecd92 100644
--- a/js/htk/select/style.scss
+++ b/js/htk/select/style.scss
@@ -28,9 +28,6 @@
 	}
 }
 .htk-select-menu {
-	height: 100%;
-	max-height: 80em;
-	overflow: auto;
 	min-width: 14em;
 
 	tbody > tr {
diff --git a/package.json b/package.json
index d1d9cb33..c33a8bd3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "22.44.1",
+  "version": "22.44.2",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {
@@ -37,7 +37,7 @@
   },
   "scripts": {
     "front": "webpack serve --open",
-    "back": "cd ../salix && gulp backOnly",
+    "back": "cd ../salix && NODE_ENV=test gulp backOnly",
     "build": "rm -rf build/ ; webpack",
     "clean": "rm -rf build/"
   }
diff --git a/rest/misc/contact.php b/rest/client/contact.php
similarity index 100%
rename from rest/misc/contact.php
rename to rest/client/contact.php
diff --git a/rest/misc/contact.sql b/rest/misc/contact.sql
deleted file mode 100644
index 0f927d2f..00000000
--- a/rest/misc/contact.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-
-INSERT INTO vn2008.Clientes SET
-	 cliente = #tradename
-	,razonsocial = #business-name
-	,`if` = #nif
-	,telefono = #phone
-	,movil = #mobile
-	,`e-mail` = #email
-	,contacto = #contact
-	,re = #es
-	,domicilio = #address
-	,poblacion = #city
-	,codpostal = #pc
-	,id_pais = #country
-	,province_id = #province
-	,chanel_id = NULL -- How did he find us?
-	,activo = FALSE;
-	
-SET @id := LAST_INSERT_ID();
-	
-INSERT INTO account.user SET
-	id = @id,
-	name = #user,
-	password = #password,
-	active = FALSE;
-