From 6508a4e4f0f0e6800f2d6d9c44f42c7e521ecb1f Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 23 Jan 2025 16:32:09 +0100 Subject: [PATCH 1/5] refs #8471 Remove transfer and later payments from frontend --- .gitignore | 1 + debian/changelog | 2 +- forms/ecomerce/confirm/index.js | 5 +---- forms/ecomerce/confirm/ui.xml | 26 -------------------------- package.json | 2 +- 5 files changed, 4 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index bc3496c8..e0c1b967 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ node_modules build/ +dist/ config.my.php .vscode/ .quasar diff --git a/debian/changelog b/debian/changelog index 7110d0b8..9697cf9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (24.14.11) stable; urgency=low +hedera-web (24.14.12) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/confirm/index.js b/forms/ecomerce/confirm/index.js index 6f09172d..534cf2fb 100644 --- a/forms/ecomerce/confirm/index.js +++ b/forms/ecomerce/confirm/index.js @@ -67,7 +67,7 @@ export default new Class({ methods = ['balance']; selectedMethod = 'BALANCE'; } else { - methods = ['card', 'transfer', 'later']; + methods = ['card', 'transfer']; if (!creditExceededCond) { methods.push('credit'); @@ -98,9 +98,6 @@ export default new Class({ case 'CARD': id = 'cardMethod'; break; - case 'TRANSFER': - id = 'transferMethod'; - break; default: id = null; } diff --git a/forms/ecomerce/confirm/ui.xml b/forms/ecomerce/confirm/ui.xml index e8b83b63..bd05d1c7 100644 --- a/forms/ecomerce/confirm/ui.xml +++ b/forms/ecomerce/confirm/ui.xml @@ -162,32 +162,6 @@ You will be redirected to the payment. -
- -
- Make a transfer to one account. - - - SELECT name, iban FROM mainAccountBank - - - - - -
-
-
- -
diff --git a/package.json b/package.json index 44bbddb9..e6085812 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "24.14.11", + "version": "24.14.12", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { From c0ab27bd7aeb9ed307745e8fa29cbd5bfd4eed2d Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 23 Jan 2025 16:35:57 +0100 Subject: [PATCH 2/5] refs #8471 Version increased --- debian/changelog | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9697cf9f..c1fc10aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (24.14.12) stable; urgency=low +hedera-web (25.4.1) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index e6085812..4d7ca400 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "24.14.12", + "version": "25.4.1", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { From 20f5dc46f7c2e24290135c842cee2fe46239590a Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 23 Jan 2025 16:54:20 +0100 Subject: [PATCH 3/5] refs #8471 Fix apt key location --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b4c00c2d..70f90f5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ # Hedera -RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \ +RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | tee /etc/apt/trusted.gpg.d/verdnatura.gpg \ && echo "deb http://apt.verdnatura.es/ bookworm main" \ > /etc/apt/sources.list.d/vn.list \ && apt-get update \ From 6dbcf162cab59874d02d8a51d46d7694694d54d5 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 23 Jan 2025 16:58:06 +0100 Subject: [PATCH 4/5] refs #8471 Version increased --- debian/changelog | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1fc10aa..b541fb39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (25.4.1) stable; urgency=low +hedera-web (25.4.2) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index 4d7ca400..fe7af763 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "25.4.1", + "version": "25.4.2", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { From 35efe67c6344f2b82a427510d755e983ea2f4c2d Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 24 Jan 2025 09:13:53 +0100 Subject: [PATCH 5/5] refs #8471 Order confirm code fix --- debian/changelog | 2 +- forms/ecomerce/confirm/index.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b541fb39..2e14f730 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (25.4.2) stable; urgency=low +hedera-web (25.4.3) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/confirm/index.js b/forms/ecomerce/confirm/index.js index 534cf2fb..b3cf7cd6 100644 --- a/forms/ecomerce/confirm/index.js +++ b/forms/ecomerce/confirm/index.js @@ -67,7 +67,7 @@ export default new Class({ methods = ['balance']; selectedMethod = 'BALANCE'; } else { - methods = ['card', 'transfer']; + methods = ['card']; if (!creditExceededCond) { methods.push('credit'); diff --git a/package.json b/package.json index fe7af763..94f74b9c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "25.4.2", + "version": "25.4.3", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": {