From f47e7e07a71b60ab6c26b22dc0178948a4e9ab73 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 24 Feb 2023 08:46:49 +0100
Subject: [PATCH 1/4] refs #5122 Pending orders: Show taxable base instead of
 total

---
 debian/changelog              | 2 +-
 forms/ecomerce/pending/ui.xml | 4 ++--
 package.json                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae27ee23..0b1782b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (23.6.5) stable; urgency=low
+hedera-web (23.6.6) stable; urgency=low
 
   * Initial Release.
 
diff --git a/forms/ecomerce/pending/ui.xml b/forms/ecomerce/pending/ui.xml
index e0c1fc15..9ca0d667 100644
--- a/forms/ecomerce/pending/ui.xml
+++ b/forms/ecomerce/pending/ui.xml
@@ -14,7 +14,7 @@
 		class="htk-list box confirmed vn-w-sm"
 		form-id="iter">
 		<db-model property="model" id="orders">
-			SELECT o.id, o.sent, o.deliveryMethodFk, o.total,
+			SELECT o.id, o.sent, o.deliveryMethodFk, o.taxableBase,
 					a.nickname, am.description agency
 				FROM myOrder o
 					JOIN myAddress a ON a.id = o.addressFk
@@ -33,7 +33,7 @@
 					<p>#{{iter.id}}</p>
 					<p>{{iter.nickname}}</p>
 					<p>{{iter.agency}}</p>
-					<p>{{Vn.Value.format(iter.total, '%.2d€')}}</p>
+					<p>{{Vn.Value.format(iter.taxableBase, '%.2d€')}}</p>
 				</div>
 				<div
 					class="actions"
diff --git a/package.json b/package.json
index 37e1247e..6480ed48 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "23.6.5",
+  "version": "23.6.6",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {

From 511e925467b0075ebe99c1e1d13e6dcbd039cb7a Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 24 Feb 2023 08:59:45 +0100
Subject: [PATCH 2/4] refs #5122 Show shopping bag icon in basket

---
 debian/changelog             | 2 +-
 forms/ecomerce/basket/ui.xml | 2 +-
 package.json                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b1782b3..2fbf2427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (23.6.6) stable; urgency=low
+hedera-web (23.6.7) stable; urgency=low
 
   * Initial Release.
 
diff --git a/forms/ecomerce/basket/ui.xml b/forms/ecomerce/basket/ui.xml
index 04b7af32..fbdc502b 100644
--- a/forms/ecomerce/basket/ui.xml
+++ b/forms/ecomerce/basket/ui.xml
@@ -8,7 +8,7 @@
 		tip="_ConfigureOrder"
 		on-click="this.onConfigureClick()"/>
 	<htk-bar-button
-		icon="local_florist"
+		icon="shopping_bag"
 		tip="_Catalog"
 		on-click="this.onCatalogClick()"/>
 	<htk-bar-button
diff --git a/package.json b/package.json
index 6480ed48..fad57250 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "23.6.6",
+  "version": "23.6.7",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {

From 197758f2bcf4194422fe112d8ff3c5a9fd2ed192 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Sun, 26 Feb 2023 02:12:45 +0100
Subject: [PATCH 3/4] refs #4253 supplant security code uncommented

---
 rest/client/supplant.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest/client/supplant.php b/rest/client/supplant.php
index 87715601..4ef83402 100644
--- a/rest/client/supplant.php
+++ b/rest/client/supplant.php
@@ -10,7 +10,7 @@ class Supplant extends Vn\Web\JsonRequest {
 			'SELECT id FROM account.user WHERE `name` = #',
 			[$_REQUEST['supplantUser']]
 		);
-/*
+
 		$isClient = $db->getValue(
 			'SELECT COUNT(*) > 0 FROM vn.client WHERE id = #',
 			[$userId]
@@ -24,7 +24,7 @@ class Supplant extends Vn\Web\JsonRequest {
 		);
 		if ($hasAccount)
 			throw new Web\ForbiddenException(s('The user is not impersonable'));
-*/
+
 		return $this->service->createToken($_REQUEST['supplantUser']);
 	}
 }

From 1ef0d48ba7a89bd1f2416660a5c1cedb6cb55320 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Sun, 26 Feb 2023 02:13:28 +0100
Subject: [PATCH 4/4] refs #4253 Version increased

---
 debian/changelog | 2 +-
 package.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2fbf2427..a2cdbfb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (23.6.7) stable; urgency=low
+hedera-web (23.6.8) stable; urgency=low
 
   * Initial Release.
 
diff --git a/package.json b/package.json
index fad57250..5a11b3a9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "23.6.7",
+  "version": "23.6.8",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {