From 1e514ab12a53170d7a2b119b60b36222603970a1 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Wed, 5 Oct 2022 10:49:54 +0200
Subject: [PATCH] #4365 Fixes & refactor

---
 debian/changelog                           |  2 +-
 forms/account/address-list/address-list.js |  3 +--
 forms/account/address-list/ui.xml          | 18 +++++++-----------
 forms/ecomerce/checkout/ui.xml             |  6 +++---
 package.json                               |  2 +-
 web/json-service.php                       |  5 +++--
 web/rest-service.php                       |  6 +++---
 7 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e6d4ff98..5a59dd73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.408.15) stable; urgency=low
+hedera-web (1.408.16) stable; urgency=low
 
   * Initial Release.
 
diff --git a/forms/account/address-list/address-list.js b/forms/account/address-list/address-list.js
index a75df3b8..4078e792 100644
--- a/forms/account/address-list/address-list.js
+++ b/forms/account/address-list/address-list.js
@@ -1,6 +1,5 @@
 
-Hedera.AddressList = new Class
-({
+Hedera.AddressList = new Class({
 	Extends: Hedera.Form
 
 	,activate: function() {
diff --git a/forms/account/address-list/ui.xml b/forms/account/address-list/ui.xml
index b97313bb..ed1b9519 100644
--- a/forms/account/address-list/ui.xml
+++ b/forms/account/address-list/ui.xml
@@ -2,20 +2,16 @@
 <vn-group>
 	<db-form id="user-form">
 		<db-model property="model" id="user-model" updatable="true">
-			<custom>
-				SELECT id, defaultAddressFk
-					FROM myClient c
-			</custom>
+			SELECT id, defaultAddressFk
+				FROM myClient c
 		</db-model>
 	</db-form>
 	<db-model id="addresses" updatable="true">
-		<custom>
-			SELECT a.id, a.nickname, p.name province, a.postalCode,
-			a.city, a.street, a.isActive
-				FROM myAddress a
-				LEFT JOIN vn.province p ON p.id = a.provinceFk
-					WHERE a.isActive
-		</custom>
+		SELECT a.id, a.nickname, p.name province, a.postalCode,
+		a.city, a.street, a.isActive
+			FROM myAddress a
+			LEFT JOIN vn.province p ON p.id = a.provinceFk
+				WHERE a.isActive
 	</db-model>
 </vn-group>
 <div id="title">
diff --git a/forms/ecomerce/checkout/ui.xml b/forms/ecomerce/checkout/ui.xml
index a78b9313..849b9286 100644
--- a/forms/ecomerce/checkout/ui.xml
+++ b/forms/ecomerce/checkout/ui.xml
@@ -118,9 +118,9 @@
 							<db-model property="model" id="addresses">
 								SELECT a.id, a.nickname, p.name province, a.city, a.street, a.isActive, c.country
 									FROM myAddress a
-									LEFT JOIN vn.province p ON p.id = a.provinceFk
-									JOIN vn.country c ON c.id = p.countryFk
-										WHERE a.isActive
+										LEFT JOIN vn.province p ON p.id = a.provinceFk
+										JOIN vn.country c ON c.id = p.countryFk
+									WHERE a.isActive
 							</db-model>
 							<custom>
 								<div
diff --git a/package.json b/package.json
index cb3e4aa7..bd206bd3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "1.408.15",
+  "version": "1.408.16",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {
diff --git a/web/json-service.php b/web/json-service.php
index 1cc3a8c0..07cad21a 100644
--- a/web/json-service.php
+++ b/web/json-service.php
@@ -3,6 +3,7 @@
 namespace Vn\Web;
 
 use Vn\Lib;
+use Vn\Lib\Locale;
 
 /**
  * Base class for JSON application.
@@ -50,7 +51,7 @@ class JsonService extends RestService {
 		if (_ENABLE_DEBUG || $errno & $eUser)
 			$json->message = $message;
 		else
-			$json->message = \s('Something went wrong');
+			$json->message = s('Something went wrong');
 		
 		if (_ENABLE_DEBUG) {
 			$json->code = $errno;
@@ -80,7 +81,7 @@ class JsonService extends RestService {
 			$json->message = $e->getMessage();
 		} else {
 			$json->exception = 'Exception';
-			$json->message = \s('Something went wrong');
+			$json->message = s('Something went wrong');
 		}
 
 		if (_ENABLE_DEBUG) {
diff --git a/web/rest-service.php b/web/rest-service.php
index 409c4788..aa32e1cb 100644
--- a/web/rest-service.php
+++ b/web/rest-service.php
@@ -34,7 +34,7 @@ class RestService extends Service {
 		$isAuthorized = $db->getValue('SELECT myUser_checkRestPriv(#)',
 			[$_REQUEST['method']]);
 		if (!$isAuthorized)
-			throw new ForbiddenException(\s('You don\'t have enough privileges'));
+			throw new ForbiddenException(s('You don\'t have enough privileges'));
 
 		if ($method::SECURITY == Security::DEFINER) {
 			$methodDb = $db;
@@ -42,7 +42,7 @@ class RestService extends Service {
 			$methodDb = $this->getUserDb($_SESSION['user']);
 
 		if ($method::PARAMS !== NULL && !$method->checkParams($_REQUEST, $method::PARAMS))
-			throw new UserException (\s('Missing parameters'));
+			throw new UserException (s('Missing parameters'));
 		
 		Locale::addPath('rest/'. dirname($_REQUEST['method']));
 
@@ -52,7 +52,7 @@ class RestService extends Service {
 			$res = $method->run($methodDb);
 		} catch (Db\Exception $e) {
 			if ($e->getCode() == 1644)
-				throw new UserException(\s($e->getMessage()));
+				throw new UserException(s($e->getMessage()));
 		}
 
 		if ($method::SECURITY == Security::DEFINER)