Merge pull request 'beta_fix_build' (!107) from beta_fix_build into beta

Reviewed-on: #107
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

.eslintignore

@@ -0,0 +1,8 @@
+/dist
+/src-bex/www
+/src-capacitor
+/src-cordova
+/.quasar
+/node_modules
+.eslintrc.js
+babel.config.js

.eslintrc.js

@@ -0,0 +1,86 @@
+module.exports = {
+    // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
+    // This option interrupts the configuration hierarchy at this file
+    // Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
+    root: true,
+
+    parserOptions: {
+        parser: '@babel/eslint-parser',
+        ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
+        sourceType: 'module' // Allows for the use of imports
+    },
+
+    env: {
+        browser: true,
+        'vue/setup-compiler-macros': true
+    },
+
+    extends: ['standard'],
+    plugins: ['vue', 'prettier'],
+    globals: {
+        ga: 'readonly', // Google Analytics
+        cordova: 'readonly',
+        __statics: 'readonly',
+        __QUASAR_SSR__: 'readonly',
+        __QUASAR_SSR_SERVER__: 'readonly',
+        __QUASAR_SSR_CLIENT__: 'readonly',
+        __QUASAR_SSR_PWA__: 'readonly',
+        process: 'readonly',
+        Capacitor: 'readonly',
+        chrome: 'readonly'
+    },
+
+    // add your custom rules here
+    rules: {
+        // allow async-await
+        'generator-star-spacing': 'off',
+        // allow paren-less arrow functions
+        'arrow-parens': 'off',
+        'one-var': 'off',
+        'no-void': 'off',
+        'multiline-ternary': 'off',
+
+        'import/first': 'off',
+        'import/named': 'error',
+        'import/namespace': 'error',
+        'import/default': 'error',
+        'import/export': 'error',
+        'import/extensions': 'off',
+        'import/no-unresolved': 'off',
+        'import/no-extraneous-dependencies': 'off',
+
+        'prefer-promise-reject-errors': 'off',
+        semi: 'off',
+        // allow debugger during development only
+        'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+    },
+    overrides: [
+        {
+            files: ['src/**/*.{js,vue,scss}', 'quasar.config.js'], // Aplica ESLint solo a archivos .js, .vue y .scss dentro de src (Proyecto de quasar)
+            extends: [
+                // Base ESLint recommended rules
+                'eslint:recommended',
+                // Uncomment any of the lines below to choose desired strictness,
+                // but leave only one uncommented!
+                // See https://eslint.vuejs.org/rules/#available-rules
+                // 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
+                'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
+                // 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
+                // https://github.com/prettier/eslint-config-prettier#installation
+                // usage with Prettier, provided by 'eslint-config-prettier'.
+                'prettier',
+                'plugin:cypress/recommended'
+            ],
+            rules: {
+                semi: 'off',
+                'space-before-function-paren': 'off',
+                'prefer-promise-reject-errors': 'off',
+                'vue/no-multiple-template-root': 'off'
+            },
+            parserOptions: {
+                ecmaVersion: '2021'
+            },
+            plugins: ['vue']
+        }
+    ]
+};

.eslintrc.yml

@@ -1,15 +0,0 @@
-extends: eslint:recommended
-parserOptions:
-    ecmaVersion: 2017
-    sourceType: module
-rules:
-    no-undef: 0
-    no-redeclare: 0
-    no-mixed-spaces-and-tabs: 0
-    no-console: 0
-    no-cond-assign: 0
-    no-unexpected-multiline: 0
-    brace-style: [error, 1tbs]
-    space-before-function-paren: [error, never]
-    padded-blocks: [error, never]
-    func-call-spacing: [error, never]

.gitignore

@@ -1,6 +1,36 @@
-node_modules
 build/
-dist/
 config.my.php
-.vscode/
+
+.DS_Store
+.thumbs.db
+node_modules
+
+# Quasar core related directories
 .quasar
+/dist
+
+# Cordova related directories and files
+/src-cordova/node_modules
+/src-cordova/platforms
+/src-cordova/plugins
+/src-cordova/www
+
+# Capacitor related directories and files
+/src-capacitor/www
+/src-capacitor/node_modules
+
+# BEX related directories and files
+/src-bex/www
+/src-bex/js/core
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

.postcssrc.js

@@ -0,0 +1,9 @@
+/* eslint-disable */
+// https://github.com/michael-ciniawsky/postcss-load-config
+
+module.exports = {
+  plugins: [
+    // to edit target browsers: use "browserslist" field in package.json
+    require('autoprefixer')
+  ]
+}

.prettierrc.js

@@ -0,0 +1,9 @@
+module.exports = {
+    printWidth: 80,
+    tabWidth: 4,
+    useTabs: false,
+    singleQuote: true,
+    bracketSpacing: true,
+    arrowParens: 'avoid',
+    trailingComma: 'none'
+};

.vscode/extensions.json

@@ -0,0 +1,14 @@
+{
+  "recommendations": [
+    "dbaeumer.vscode-eslint",
+    "editorconfig.editorconfig",
+    "vue.volar",
+    "wayou.vscode-todo-highlight"
+  ],
+  "unwantedRecommendations": [
+    "octref.vetur",
+    "hookyqr.beautify",
+    "dbaeumer.jshint",
+    "ms-vscode.vscode-typescript-tslint-plugin"
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Listen for XDebug",
+            "type": "php",
+            "request": "launch",
+            "port": 9000
+        },
+        {
+            "name": "Launch currently open script",
+            "type": "php",
+            "request": "launch",
+            "program": "${file}",
+            "cwd": "${fileDirname}",
+            "port": 9000
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+    "editor.bracketPairColorization.enabled": true,
+    "editor.guides.bracketPairs": true,
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.codeActionsOnSave": ["source.fixAll.eslint"],
+    "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
+    "cSpell.words": ["axios", "composables"]
+}

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 | tee /etc/apt/trusted.gpg.d/verdnatura.gpg \
+RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
     && echo "deb http://apt.verdnatura.es/ bookworm main" \
         > /etc/apt/sources.list.d/vn.list \
     && apt-get update \

Jenkinsfile

@@ -1,8 +1,12 @@
 #!/usr/bin/env groovy
 
+def PROTECTED_BRANCH
+def RUN_BUILD
+
 def BRANCH_ENV = [
     test: 'test',
-    master: 'production'
+    master: 'production',
+    beta: 'test'
 ]
 def remote = [:]
 
@@ -10,6 +14,15 @@ node {
     stage('Setup') {
         env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev'
 
+        PROTECTED_BRANCH = [
+            'dev',
+            'test',
+            'master',
+            'beta'
+        ].contains(env.BRANCH_NAME)
+
+        RUN_BUILD = PROTECTED_BRANCH
+
         echo "NODE_NAME: ${env.NODE_NAME}"
         echo "WORKSPACE: ${env.WORKSPACE}"
     }
@@ -22,14 +35,11 @@ pipeline {
     stages {
         stage('Debuild') {
             when {
-                anyOf {
+                expression { PROTECTED_BRANCH }
-                    branch 'master'
-                    branch 'test'
-                }
             }
             agent {
                 docker {
-                    image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn7'
+                    image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn8'
                     registryUrl 'https://registry.verdnatura.es/'
                     registryCredentialsId 'docker-registry'
                 }
@@ -55,10 +65,7 @@ pipeline {
         }
         stage('Deploy') {
             when {
-                anyOf {
+                expression { PROTECTED_BRANCH }
-                    branch 'master'
-                    branch 'test'
-                }
             }
             environment {
                 CREDS = credentials('docker-registry')

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2016 - Juan Ferrer Toribio
+Copyright (C) 2024 - Verdnatura Levante SL
 
 This package is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

README.md

@@ -1,58 +1,35 @@
 # Hedera
 
-Hedera is the main web shop page for Verdnatura.
+Hedera is the main web page for Verdnatura.
 
-## Prerequisites
+## Getting Started
 
-Required applications.
+Required dependencies.
- * PHP >= 8.4
- * Node.js >= 20.0
 
-Take a look to *debian/control* file to see additional dependencies.
+-   PHP >= 7.0
+-   Node.js >= 18.0
 
-Copy config.php to *config.my.php* and place your DB config there.
+Launch application for development.
 
-### Installing dependencies and launching
-
-Pull from repository.
-
-Run this commands on project root directory to install Node dependencies.
 ```
-$ npm install
+$ quasar dev
 ```
 
-Install project dependences (debian/control).
+Launch Salix backend.
 
-Pull from repository [php-vn-lib](https://gitea.verdnatura.es/verdnatura/php-vn-lib) and install [dependences](https://gitea.verdnatura.es/verdnatura/php-vn-lib/src/branch/master/debian/control) of this project.
-
-Configure config.php file.
-
-Launch project fronted.
-```
-$ npm run front
 ```
 
-Launch salix backend.
+pnpm run back
 ```
-$ npm run db
-$ npm run back
-```
-Launch project backend.
-```
-$ php -S 127.0.0.1:3001 -t . index.php
-```
-
-### Command line
 
 Run server side method from command line.
+
 ```
-$ php hedera-web.php -m method_path 
+php hedera-web.php -m method_path
 ```
 
 ## Built with
 
- * [nodejs](https://nodejs.org/)
+-   [Webpack](https://webpack.js.org/)
- * [php](https://www.php.net/)
+-   [MooTools](https://mootools.net/)
- * [Webpack](https://webpack.js.org/)
+-   [TinyMCE](https://www.tinymce.com/)
- * [MooTools](https://mootools.net/)
- * [TinyMCE](https://www.tinymce.com/)

app.js

@@ -1,41 +0,0 @@
-__webpack_public_path__ = _PUBLIC_PATH;
-
-import 'promise-polyfill/src/polyfill';
-import 'hedera/hedera';
-const locales = require('./import').locales;
-const packageJson = require('./package.json');
-
-window.onload = function() {
-	loadLocale(main);
-}
-
-function main() {
-	Vn.setVersion(packageJson.version);
-	const hederaWeb = new Hedera.App();
-	window.hederaWeb = hederaWeb;
-	hederaWeb.run();
-}
-
-function loadLocale(callback) {
-	Vn.Locale.init();
-	var lang = Vn.Locale.language;
-
-	var req = require.context('js', true, /locale\/en.yml$/);
-	onLocaleLoad(Vn.Locale.fallbackLang, req);
-
-	const loadFn = locales[lang];
-	if (loadFn)
-		loadFn(function(req) {
-			onLocaleLoad(lang, req);
-			callback();
-		});
-	else
-		callback();
-}
-
-function onLocaleLoad(lang, req) {
-	var keys = req.keys();
-
-	for (var i = 0; i < keys.length; i++)
-		Vn.Locale.add(req(keys[i]), lang);
-}

babel.config.js

@@ -0,0 +1,14 @@
+/* eslint-disable */
+
+module.exports = api => {
+  return {
+    presets: [
+      [
+        '@quasar/babel-preset-app',
+        api.caller(caller => caller && caller.target === 'node')
+          ? { targets: { node: 'current' } }
+          : {}
+      ]
+    ]
+  }
+}

back/apache.conf

@@ -9,14 +9,26 @@
 </IfModule>
 
 <VirtualHost *:80>
-	DocumentRoot /usr/share/hedera-web/
+	DocumentRoot /usr/share/hedera-web/spa
+
+	RewriteEngine On
+	RewriteCond %{QUERY_STRING} (^|&)srv=([^&]+) [OR]
+	RewriteCond %{REQUEST_METHOD} POST
+	RewriteRule ^/$ /usr/share/hedera-web/back/index.php [L]
 </VirtualHost>
 
-<Directory /usr/share/hedera-web/>
+<Directory /usr/share/hedera-web/back>
 	Options -Indexes -FollowSymLinks
 	AllowOverride None
 	Require all granted
+
 	SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
+</Directory>
+
+<Directory /usr/share/hedera-web/spa>
+	Options -FollowSymLinks
+	AllowOverride None
+	Require all granted
 
 	<FilesMatch "\.(css|js|json|yml|php|xml|html|svg)$">
 		SetOutputFilter DEFLATE

back/config.php

@@ -12,8 +12,6 @@
  *
  *  - http://www.mydomain.org -> config.www.php
  *  - http://test.mydomain.org -> config.test.php
- * 
- * Put the password in base64.
  */
 return [
 	/**
@@ -24,7 +22,7 @@ return [
 		,'port'   => 3306
 		,'schema' => 'hedera'
 		,'user'   => 'hedera-web'
-		,'pass'   => '' // base64 encoded
+		,'pass'   => ''
 		,'tz'     => 'Europe/madrid'
 	]
 ];

back/env.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__.'/../php-vn-lib/env.php';
+require_once __DIR__.'/../../php-vn-lib/env.php';
 
 set_include_path(__DIR__.PATH_SEPARATOR.get_include_path());
 

back/package.json

@@ -0,0 +1,7 @@
+{
+    "name": "hedera-web-back",
+    "version": "24.50.16",
+    "description": "Verdnatura web page backend",
+    "license": "GPL-3.0",
+    "author": "Verdnatura Levante SL"
+}

back/rest/core/locale/ca.json

@@ -0,0 +1,5 @@
+{
+	 "InvalidAction": "Acció invàlida"
+
+	,"EmptyQuery": "Consulta buida"
+}

back/rest/core/locale/en.json

@@ -0,0 +1,5 @@
+{
+	 "InvalidAction": "Invalid action"
+
+	,"EmptyQuery": "Empty query"
+}

back/rest/core/locale/es.json

@@ -0,0 +1,7 @@
+{
+	 "InvalidAction": "Acción inválida"
+	,"EmptyQuery": "Consulta vacía"
+	,"Invalid password": "Contraseña inválida"
+	,"Password does not meet requirements":
+		"La nueva contraseña no reune los requisitos de seguridad necesarios"
+}

back/rest/core/locale/fr.json

@@ -0,0 +1,5 @@
+{
+	 "InvalidAction": "Action non valide"
+
+	,"EmptyQuery": "Requête vide"
+}

back/rest/core/locale/pt.json

@@ -0,0 +1,5 @@
+{
+	 "InvalidAction": "Ação Inválida"
+
+	,"EmptyQuery": "Consulta vazía"
+}

back/rest/core/query.php

@@ -1,7 +1,6 @@
 <?php
 
 use Vn\Lib;
-use Vn\Lib\Locale;
 use Vn\Web\Security;
 use Vn\Lib\Type;
 
@@ -23,38 +22,53 @@ class Query extends Vn\Web\JsonRequest {
 
 	function run($db) {
 		$results = [];
-		$db->multiQuery($_REQUEST['sql']);
 
-		do {
+		try {
-			$result = $db->storeResult();
+			$db->multiQuery($_REQUEST['sql']);
 
-			if ($result !== FALSE) {
+			do {
-				$results[] = $this->transformResult($result);
+				$result = $db->storeResult();
-				$result->free();
-			} else
-				$results[] = TRUE;
-		}
-		while ($db->moreResults() && $db->nextResult());
 
-		if ($db->checkWarnings()
+				if ($result !== FALSE) {
-		&& ($result = $db->query('SHOW WARNINGS'))) {
+					$results[] = $this->transformResult($result);
-			$sql =
+					$result->free();
-				'SELECT IFNULL(i.`description`, m.`description`) `description`, @warn `code`
+				} else
-					FROM `message` m
+					$results[] = TRUE;
-						LEFT JOIN `messageI18n` i
-							ON i.`code` = m.`code` AND i.lang = #
-					WHERE m.`code` = @warn';
-
-			while ($row = $result->fetch_object()) {
-				if ($row->Code == 1265
-				&& ($warning = $db->getObject($sql, [Locale::get()])))
-					trigger_error("{$warning->code}: {$warning->description}", E_USER_WARNING);
-				else
-					trigger_error("{$row->Code}: {$row->Message}", E_USER_WARNING);
 			}
+			while ($db->moreResults() && $db->nextResult());
+		
+			// Checks for warnings
+		
+			if ($db->checkWarnings()
+			&&($result = $db->query('SHOW WARNINGS'))) {
+				$sql = 'SELECT `description`, @warn `code` 
+					FROM `message` WHERE `code` = @warn';
+
+				while ($row = $result->fetch_object()) {
+					if ($row->Code == 1265
+					&&($warning = $db->getObject($sql)))
+						trigger_error("{$warning->code}: {$warning->description}", E_USER_WARNING);
+					else
+						trigger_error("{$row->Code}: {$row->Message}", E_USER_WARNING);
+				}
+			}
+		
+			// Checks for errors
+
+			$db->checkError();
+		} catch (Vn\Db\Exception $e) {
+			if ($e->getCode() == 1644) {
+				$dbMessage = $e->getMessage();
+				$sql = 'SELECT `description` FROM `message` WHERE `code` = #';
+				$message = $db->getValue($sql, [$dbMessage]);
+
+				if ($message)
+					throw new Lib\UserException($message, $dbMessage);
+			}
+
+			throw $e;
 		}
 
-		$db->checkError();
 		return $results;
 	}
 

back/rest/dms/invoice.php

@@ -0,0 +1,21 @@
+<?php
+
+use Vn\Web\Security;
+use Vn\Web\Util;
+use Vn\Lib;
+
+class Invoice extends Vn\Web\RestRequest {
+	const PARAMS = ['invoice'];
+	const SECURITY = Security::INVOKER;
+
+	function run($db) {
+		$pdfPath = $db->getValueFromFile(__DIR__ .'/invoice',
+			['invoice' =>(int) $_GET['invoice']]);
+
+		if (!$pdfPath)
+			throw new Lib\UserException(s('Invoice id not found'));
+
+		Util::printFile($pdfPath);
+	}
+}
+

back/rest/dms/invoice.sql

@@ -0,0 +1,5 @@
+
+SELECT CONCAT_WS('/', c.pdfsDir, vn.invoiceOut_getPath(#invoice))
+	FROM config c
+	JOIN myInvoice i
+		WHERE i.id = #invoice

back/rest/edi/clean.php

@@ -8,7 +8,7 @@ class Clean extends Edi\Method {
 
 		$cleanPeriod = $db->getValue(
 			"SELECT ic.cleanPeriod
-				FROM imapMultiConfig ic
+				FROM imapConfig ic
 				JOIN util.config c ON c.environment = ic.environment");
 
 		$deleted = 0;

back/rest/edi/lib/method.php

@@ -14,7 +14,7 @@ abstract class Method extends \Vn\Lib\Method {
 
 		$imapConf = $db->getRow(
 			"SELECT ic.host, ic.user, ic.pass, ic.successFolder, ic.errorFolder
-				FROM imapMultiConfig ic
+				FROM imapConfig ic
 				JOIN util.config c ON c.environment = ic.environment");
 
 		$this->mailbox = sprintf('{%s/imap/ssl/novalidate-cert}',

back/rest/image/locale/en.json

@@ -0,0 +1,29 @@
+{
+	 "Cant lock cache": "The cache could not be blocked"
+	,"Bad file format": "Unrecognized file format"
+	,"File not choosed": "You have not selected any file"
+	,"Permission denied": "You are not allowed to upload the file"
+	,"File upload error": "Failed to upload the file, check that size is not too large"
+	,"File save error": "Failed to save the file: %s"
+	,"File size error": "The file must be no longer than %.2f MB"
+	,"Bad file name": "The file name must contain only lowercase letters, digits or the '_' character"
+	,"Bad collection name": "Invalid collection name"
+	,"Collection not exists": "Collection does not exist"
+	,"Unreferenced file": "The file is not referenced by the database"
+	,"Cannot update matching id": "Cannot update matching id"
+	,"Com error": "Error communicating with the server"
+	,"Image open error": "Error opening the image file"
+	,"Operation disabled": "Operation disabled for security"
+	,"Image added": "Image added correctly"
+	
+	,"ErrIniSize": "File exceeds the upload_max_filesize directive in php.ini"
+	,"ErrFormSize": "File exceeds the MAX_FILE_SIZE specified in the HTML form"
+	,"ErrPartial": "File was partially uploaded"
+	,"ErrNoFile": "No file was uploaded"
+	,"ErrNoTmpDir": "Missing a temporary folder"
+	,"ErrCantWrite": "Failed to write file to disk"
+	,"ErrExtension": "File upload stopped by extension"
+	,"ErrDefault": "Unknown upload error"
+
+	,"Sync complete": "Synchronization complete"
+}

back/rest/image/locale/es.json

@@ -0,0 +1,29 @@
+{
+	 "Cant lock cache": "La caché no pudo ser bloqueada"
+	,"Bad file format": "Formato de archivo no reconocido"
+	,"File not choosed": "No has seleccionado ningún archivo"
+	,"Permission denied": "No tienes permiso para subir el fichero"
+	,"File upload error": "Error al subir el fichero, comprueba que su tamaño no sea demasiado grande"
+	,"File save error": "Error al guardar el fichero: %s"
+	,"File size error": "El fichero no debe ocupar más de %.2f MB"
+	,"Bad file name": "El nombre del archivo solo debe contener letras minúsculas, dígitos o el carácter '_'"
+	,"Bad collection name": "Nombre de colección no válido"
+	,"Collection not exists": "La colección no existe"
+	,"Unreferenced file": "El archivo no está referenciado por la base de datos"
+	,"Cannot update matching id": "No es posible actualizar los ítems con id coincidente"
+	,"Com error": "Error en la comunicación con el servidor"
+	,"Image open error": "Error al abrir el archivo de imagen"
+	,"Operation disabled": "Operación deshabilitada por seguridad"
+	,"Image added": "Imagen añadida correctamente"
+	
+	,"ErrIniSize": "File exceeds the upload_max_filesize directive in php.ini"
+	,"ErrFormSize": "File exceeds the MAX_FILE_SIZE specified in the HTML form"
+	,"ErrPartial": "File was partially uploaded"
+	,"ErrNoFile": "No file was uploaded"
+	,"ErrNoTmpDir": "Missing a temporary folder"
+	,"ErrCantWrite": "Failed to write file to disk"
+	,"ErrExtension": "File upload stopped by extension"
+	,"ErrDefault": "Unknown upload error"
+
+	,"Sync complete": "Sincronización completada"
+}

back/rest/image/locale/pt.json

@@ -0,0 +1,29 @@
+{
+	 "Cant lock cache": "O cache não pôde ser bloqueado"
+	,"Bad file format": "Formato de arquivo inválido"
+	,"File not choosed": "Não selecionastes nenhum arquivo"
+	,"Permission denied": "Não estas autorizado a subir o arquivo"
+	,"File upload error": "Erro ao subir o arquivo, verifique o tamanho"
+	,"File save error": "Erro ao salvar o arquivo: %s"
+	,"File size error": "O arquivo não deve ser maior que: %.2f MB"
+	,"Bad file name": "O nome do arquivo deve conter somente letras minusculas, numeros  ou '_' "
+	,"Bad collection name": "Nome de coleção inválido"
+	,"Collection not exists": "Coleção não existe"
+	,"Unreferenced file": "O arquivo não é referenciado pelo banco de dados"
+	,"Cannot update matching id": "Não é possível atualizar os itens com id coincidente"
+	,"Com error": "Erro de comunicação com o servidor"
+	,"Image open error": "Erro ao abrir a imagem"
+	,"Operation disabled": "Operação desativada por segurança"
+	,"Image added": "Imagem adicionada corretamente"
+	
+	,"ErrIniSize": "Arquivo supera o tamanho maximo de protocolo em php.ini"
+	,"ErrFormSize": "Arquivo supera o tamanho maximo de protocolo em HTML form"
+	,"ErrPartial": "Arquivo subido parcialmente"
+	,"ErrNoFile": "Nenhum arquivo subido"
+	,"ErrNoTmpDir": "Falta a pasta de arquivo temporal"
+	,"ErrCantWrite": "Erro ao gravar arquivo no disco"
+	,"ErrExtension": "Erro de extensão do arquivo"
+	,"ErrDefault": "Erro desconhecido ao subir arquivo"
+
+	,"Sync complete": "Sincronização completa"
+}

back/rest/image/upload.php

@@ -39,31 +39,31 @@ class Upload extends Vn\Web\JsonRequest {
 
 		if ($_FILES['image']['error'] != 0) {
 			switch ($_FILES['image']['error']) {
-				case UPLOAD_ERR_INI_SIZE:
+		        case UPLOAD_ERR_INI_SIZE:
-					$message = 'ErrIniSize';
+		            $message = 'ErrIniSize';
-					break;
+		            break;
-				case UPLOAD_ERR_FORM_SIZE:
+		        case UPLOAD_ERR_FORM_SIZE:
-					$message = 'ErrFormSize';
+		            $message = 'ErrFormSize';
-					break;
+		            break;
-				case UPLOAD_ERR_PARTIAL:
+		        case UPLOAD_ERR_PARTIAL:
-					$message = 'ErrPartial';
+		            $message = 'ErrPartial';
-					break;
+		            break;
-				case UPLOAD_ERR_NO_FILE:
+		        case UPLOAD_ERR_NO_FILE:
-					$message = 'ErrNoFile';
+		            $message = 'ErrNoFile';
-					break;
+		            break;
-				case UPLOAD_ERR_NO_TMP_DIR:
+		        case UPLOAD_ERR_NO_TMP_DIR:
-					$message = 'ErrNoTmpDir';
+		            $message = 'ErrNoTmpDir';
-					break;
+		            break;
-				case UPLOAD_ERR_CANT_WRITE:
+		        case UPLOAD_ERR_CANT_WRITE:
-					$message = 'ErrCantWrite';
+		            $message = 'ErrCantWrite';
-					break;
+		            break;
-				case UPLOAD_ERR_EXTENSION:
+		        case UPLOAD_ERR_EXTENSION:
-					$message = 'ErrExtension';
+		            $message = 'ErrExtension';
-					break;
+		            break;
-				default:
+		        default:
-					$message = 'ErrDefault';
+		            $message = 'ErrDefault';
-					break;
+		            break;
-			}
+		    }
 
 			throw new Lib\Exception(s($message));
 		}
@@ -101,6 +101,12 @@ class Upload extends Vn\Web\JsonRequest {
 		$symbolicSrc = "../full/$fileName";
 	
 		$image = Image::create($tmpName);
+		Image::resizeSave($image, $fullFile, $info['maxHeight'], $info['maxWidth']);
+
+		foreach ($info['sizes'] as $size => $i) {
+			$dstFile = "$collectionPath/$size/$fileName";
+			Image::resizeSave($image, $dstFile, $i['height'], $i['width'], $i['crop'], $symbolicSrc);
+		}
 
 		$query =
 			"INSERT INTO `image`
@@ -115,13 +121,6 @@ class Upload extends Vn\Web\JsonRequest {
 			'name' => $name
 		]);
 
-		Image::resizeSave($image, $fullFile, $info['maxHeight'], $info['maxWidth']);
-
-		foreach ($info['sizes'] as $size => $i) {
-			$dstFile = "$collectionPath/$size/$fileName";
-			Image::resizeSave($image, $dstFile, $i['height'], $i['width'], $i['crop'], $symbolicSrc);
-		}
-
 		imagedestroy($image);
 		unlink($tmpName);
 		return TRUE;

back/rest/misc/exchange-rate.php

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Ejemplo:
+ * <Cube><Cube time="2010-12-10"><Cube currency="USD" rate="1.3244"/>
+ */
+class ExchangeRate extends Vn\Lib\Method {
+	function run($db) {
+		$db->selectDb('vn2008');
+
+		// Indica la URL del archivo
+
+		$xml = new SimpleXMLElement(
+			'http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml', 0, TRUE);
+
+		$date = $db->getValue("SELECT MAX(date) fecha FROM reference_rate");
+		$maxDate = $date ? DateTime::createFromFormat('Y-m-d', $date) : NULL;
+
+		foreach ($xml->Cube[0]->Cube as $cube) {
+			$xmlDate = new DateTime($cube['time']);
+
+			// Si existen datos más recientes de la máxima fecha los añade
+
+			if ($maxDate <= $xmlDate)
+			foreach ($cube->Cube as $subCube)
+			if ($subCube['currency'] == 'USD') {
+				$params = [
+					'date' => $xmlDate,
+					'rate' => $subCube['rate']
+				];
+				$db->query(
+					'REPLACE INTO reference_rate(moneda_id, date, rate)
+						VALUES(2, #date, #rate)',
+					$params
+				);
+			}
+		}  
+
+		$db->queryFromFile(__DIR__.'/exrate-add');
+	}
+}

back/rest/misc/exrate-add.sql

@@ -0,0 +1,6 @@
+INSERT INTO reference_rate (moneda_id, date, rate)
+	SELECT 2, TIMESTAMPADD (DAY, 1, r1.date), r1.rate
+		FROM reference_rate r1
+			LEFT JOIN reference_rate r2
+				ON TIMESTAMPADD(DAY, 1, r1.date) = r2.date
+		WHERE r2.date IS NULL AND r1.date < TIMESTAMPADD (DAY, -2, CURDATE())

back/rest/misc/locale/es.json

@@ -0,0 +1,6 @@
+{
+     "An automated message could not be delivered": "Un mensaje automatizado no se ha podido entregar"
+    ,"Notification from IT department about problem.": "Desde el departamento de informática te enviamos este correo porque ha habido un problema al intentar entregar un correo automatizado."
+    ,"If you have questions, resend this email to cau@verdnatura.es.": "Si tienes dudas, reenvia este correo a cau@verdnatura.es."
+    ,"The response from the remote server was:": "La respuesta del servidor remoto ha sido:"
+}

back/rest/misc/mail.php

@@ -48,13 +48,13 @@ class Mail extends Vn\Lib\Method {
 				if ($row->replyTo) {
 					Vn\Lib\Locale::set('es');
 					$errorMsg = 
-						 '<p>'. s('ITProblemNotification') .'</p>'
+						 '<p>'. s('Notification from IT department about problem.') .'</p>'
-						.'<p>'. s('ifQuestionsResendEmailToIT') .'</p>'
+						.'<p>'. s('If you have questions, resend this email to cau@verdnatura.es.') .'</p>'
 						.'<p style="color: gray">'. $status .'</p>';
 
 					$errorMail = $mailer->createObject($row->replyTo,
 						$errorMsg,
-						s('automatedMessageNotDelivered')
+						s('An automated message could not be delivered')
 					);
 					$errorMail->AddStringAttachment(
 						$mail->getSentMIMEMessage(),

back/web/json-service.php

@@ -48,13 +48,13 @@ class JsonService extends RestService {
 
 		$json = new JsonException();
 		
-		if (_ENABLE_DEBUG || $errno & $eUser) {
+		if (_ENABLE_DEBUG || $errno & $eUser)
 			$json->message = $message;
-			$json->code = $errno;
+		else
-		} else
 			$json->message = s('Something went wrong');
 		
 		if (_ENABLE_DEBUG) {
+			$json->code = $errno;
 			$json->file = $file;
 			$json->line = $line;
 		}
@@ -79,13 +79,13 @@ class JsonService extends RestService {
 		if (_ENABLE_DEBUG || $e instanceof Lib\UserException) {
 			$json->exception = get_class($e);
 			$json->message = $e->getMessage();
-			$json->code = $e->getCode();
 		} else {
 			$json->exception = 'Exception';
 			$json->message = s('Something went wrong');
 		}
 
 		if (_ENABLE_DEBUG) {
+			$json->code = $e->getCode();
 			$json->file = $e->getFile();
 			$json->line = $e->getLine();
 			$json->trace = $e->getTrace();

back/web/mailer.php

@@ -5,7 +5,6 @@ namespace Vn\Web;
 require_once 'libphp-phpmailer/autoload.php';
 
 use Vn\Lib\UserException;
-use PHPMailer\PHPMailer\PHPMailer;
 
 class Mailer {
 	private $conf;
@@ -20,7 +19,7 @@ class Mailer {
 	function createObject($mailTo, $body, $subject) {
 		$conf = $this->conf;
 
-		$mail = new PHPMailer();
+		$mail = new \PHPMailer();
 		$mail->isSMTP();
 		$mail->Host = $conf->host;
 

back/web/rest-service.php

@@ -50,22 +50,9 @@ class RestService extends Service {
 
 		try {
 			$res = $method->run($methodDb);
-		} catch (\Vn\Db\Exception $e) {
+		} catch (Db\Exception $e) {
-			if ($e->getCode() == 1644) {
+			if ($e->getCode() == 1644)
-				$eMessage = $e->getMessage();
+				throw new UserException(s($e->getMessage()));
-				$tMessage = $db->getValue(
-					'SELECT IFNULL(i.`description`, m.`description`) `description`
-						FROM `message` m
-							LEFT JOIN `messageI18n` i
-								ON i.`code` = m.`code` AND i.lang = #
-						WHERE m.`code` = #',
-					[Locale::get(), $eMessage]
-				);
-				if (!$tMessage) $tMessage = $eMessage;
-				throw new Lib\UserException($tMessage, $eMessage);
-			}
-
-			throw $e;
 		}
 
 		if ($method::SECURITY == Security::DEFINER)

back/web/service.php

@@ -158,10 +158,8 @@ abstract class Service {
 				[$token]
 			);
 
-			if (!$userId) {
+			if (!$userId)
-				$_SESSION['user'] = null;
 				throw new SessionExpiredException();
-			}
 
 			$anonymousUser = FALSE;
 			$user = $db->getValue(
@@ -177,10 +175,8 @@ abstract class Service {
 				[$user]
 			);
 
-			if (!$isActive) {
+			if (!$isActive)
-				$_SESSION['user'] = null;
 				throw new UserDisabledException();
-			}
 		}
 
 		$db->query('CALL account.myUser_loginWithName(#)', [$user]);
@@ -191,6 +187,7 @@ abstract class Service {
 		$_SESSION['user'] = $user;
 
 		// Registering the user access
+
 		if (isset($_SESSION['access']) && $userChanged)
 			$db->query(
 				'CALL visitUser_new(#, #)',

back/web/unavailable.html

@@ -3,7 +3,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-	<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=no"/>
 	<title>Not available - Verdnatura</title>
 	<style type="text/css">
 		body {
@@ -23,7 +22,7 @@
 			font-weight: normal;
 		}
 		div a {
-			color: #6a1;
+			color: #2962FF;
 			text-decoration: none;
 		}
 	</style>

cypress.config.js

@@ -0,0 +1,32 @@
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:8080/',
+    supportFile: 'src/test/cypress/support/index.js',
+    fixturesFolder: 'src/test/cypress/fixtures',
+    specPattern: 'src/test/cypress/integration/**/*.spec.js',
+    viewportHeight: 660,
+    viewportWidth: 1240,
+    experimentalMemoryManagement: true,
+    numTestsKeptInMemory: 0,
+    video: false,
+    screenshotOnRunFailure: false,
+    reporter: 'cypress-mochawesome-reporter',
+    reporterOptions: {
+      charts: true,
+      reportPageTitle: 'Hedera-Web E2E Reporter',
+      embeddedScreenshots: true,
+      reportDir: 'src/test/cypress/reports',
+      inlineAssets: true
+    },
+    setupNodeEvents (on, config) {
+      require('cypress-mochawesome-reporter/plugin')(on);
+      on('after:spec', (spec, results) => {
+        console.log('Finished running', spec.relative);
+        console.log('❌spec:', results.stats.failures);
+        console.log('✅spec:', results.stats.passes);
+      });
+    }
+  }
+});

debian/changelog

@@ -1,4 +1,4 @@
-hedera-web (25.4.4) stable; urgency=low
+hedera-web (24.50.16) stable; urgency=low
 
   * Initial Release.
 

debian/control

@@ -10,7 +10,7 @@ Vcs-Git: https://gitea.verdnatura.es/verdnatura/hedera-web
 Package: hedera-web
 Architecture: all
 Depends: apache2 | httpd, nodejs, php-cli, php-vn-lib, php-apcu, php-imap, php-soap, libphp-phpmailer, php-gd, php-pear
-Suggests: php-image-text, php-text-captcha, php-zip, cron
+Suggests: php-text-captcha, php-zip, cron
 Section: misc
 Priority: optional
 Description: Verdnatura's web page

debian/cron.d

@@ -1,8 +1,10 @@
 MAILTO=webmaster
 */1    *  * * *   root  hedera-web.php -m misc/mail
+*/4    *  * * *   root  hedera-web.php -m tpv/confirm-mail
 */2    *  * * *   root  hedera-web.php -m edi/load
 0     23  * * *   root  hedera-web.php -m edi/clean
 0      5  * * *   root  hedera-web.php -m edi/update
+0      5  * * *   root  hedera-web.php -m misc/exchange-rate
 0      0  * * *   root  hedera-web.php -m image/sync
 0      1  * * *   root  /usr/share/hedera-web/utils/image-clean.sh > /dev/null
 0    */1  * * *   root  /usr/share/hedera-web/utils/update-browscap.sh > /dev/null

debian/install

@@ -1,19 +1,12 @@
-apache.conf                 etc/hedera-web
+back/apache.conf            etc/hedera-web
-config.php                  etc/hedera-web
+back/config.php             etc/hedera-web
-php.ini                     etc/hedera-web
+back/php.ini                etc/hedera-web
-web                         usr/share/php/vn
+back/web                    usr/share/php/vn
-doc/*                       usr/share/doc/hedera-web
+back/index.php              usr/share/hedera-web/back
-hedera-web.php              usr/share/hedera-web
+back/hedera-web.php         usr/share/hedera-web/back
-forms                       usr/share/hedera-web
+back/rest                   usr/share/hedera-web/back
-image                       usr/share/hedera-web
+back/package.json           usr/share/hedera-web/back
-js                          usr/share/hedera-web
+dist/spa/*                  usr/share/hedera-web/spa
-pages                       usr/share/hedera-web
+build-deps/node_modules     usr/share/hedera-web/spa
-reports                     usr/share/hedera-web
+back/utils                  usr/share/hedera-web
-rest                        usr/share/hedera-web
-utils                       usr/share/hedera-web
-index.php                   usr/share/hedera-web
-package.json                usr/share/hedera-web
-build                       usr/share/hedera-web
 README.md                   usr/share/hedera-web
-webpack.config.json         usr/share/hedera-web
-build-deps/node_modules     usr/share/hedera-web

debian/links

@@ -1,3 +1,3 @@
-usr/share/hedera-web/hedera-web.php  usr/bin/hedera-web.php
+usr/share/hedera-web/back/hedera-web.php  usr/bin/hedera-web.php
-etc/hedera-web/apache.conf           etc/apache2/conf-available/hedera-web.conf
+etc/hedera-web/apache.conf                etc/apache2/conf-available/hedera-web.conf
-etc/hedera-web/php.ini               etc/php/8.2/apache2/conf.d/99-hedera-web.ini
+etc/hedera-web/php.ini                    etc/php/7.0/apache2/conf.d/99-hedera-web.ini

debian/rules

@@ -10,9 +10,9 @@ clean:
 	dh_clean $@
 
 build:
-	npm install --no-audit --prefer-offline
+	pnpm install --prefer-offline
-	npm --omit=dev run build
+	pnpm exec quasar build
 
 	mkdir -p build-deps
-	cp package.json package-lock.json build-deps
+	cp package.json build-deps
 	(cd build-deps && npm install --omit=dev --no-audit --prefer-offline)

forms/account/address-list/index.js

@@ -1,43 +0,0 @@
-import './style.scss';
-
-export default new Class({
-	Extends: Hedera.Form,
-	Template: require('./ui.xml')
-
-	,activate() {
-		this.$.userModel.setInfo('c', 'myClient', 'hedera');
-		this.$.addresses.setInfo('a', 'myAddress', 'hedera');
-	}
-	
-	,onAddAddressClick() {
-		this.hash.setAll({
-			form: 'account/address',
-			address: 0
-		});
-	}
-	
-	,onReturnClick() {
-		window.history.back();
-	}
-
-	,onSetDefaultClick(event, addressId) {
-		if (event.defaultPrevented) return;
-		this.$.defaultAddress.value = addressId;
-		Htk.Toast.showMessage(_('DefaultAddressModified'));
-	}
-	
-	,async onRemoveAddressClick(form) {
-		if (confirm(_('AreYouSureDeleteAddress'))) {
-			await form.set('isActive', false);
-			await form.refresh();
-		}
-	}
-	
-	,onEditAddressClick(address) {
-		this.hash.setAll({
-			form: 'account/address',
-			address
-		});
-	}
-});
-

forms/account/address-list/locale/ca.yml

@@ -1,8 +0,0 @@
-Addresses: Adreces
-Return: Tornar
-AddAddress: Afegir adreça
-SetAsDefault: Establir com per defecte
-RemoveAddress: Esborrar direcció
-EditAddress: Modificar direcció
-AreYouSureDeleteAddress: Estàs segur de que vols eliminar la direcció?
-DefaultAddressModified: Adreça per defecte modificada

forms/account/address-list/locale/en.yml

@@ -1,8 +0,0 @@
-Addresses: Addresses
-Return: Return
-AddAddress: Add address
-SetAsDefault: Set as default
-RemoveAddress: Remove address
-EditAddress: Edit address
-AreYouSureDeleteAddress: Are you sure you want to delete the address?
-DefaultAddressModified: Default address modified

forms/account/address-list/locale/es.yml

@@ -1,8 +0,0 @@
-Addresses: Direcciones
-Return: Volver
-AddAddress: Añadir dirección
-SetAsDefault: Establecer como predeterminada
-RemoveAddress: Borrar dirección
-EditAddress: Modificar dirección
-AreYouSureDeleteAddress: ¿Estás seguro de que quieres borrar la dirección?
-DefaultAddressModified: Dirección por defecto modificada

forms/account/address-list/locale/fr.yml

@@ -1,8 +0,0 @@
-Addresses: Adresses
-Return: Retour
-AddAddress: Ajouter une adresse
-SetAsDefault: Définir par défaut
-RemoveAddress: Supprimer l'adresse
-EditAddress: Changement d'adresse
-AreYouSureDeleteAddress: Souhaitez-vous vraiment supprier l'adresse?
-DefaultAddressModified: Adresse par défaut modifiée

forms/account/address-list/locale/pt.yml

@@ -1,8 +0,0 @@
-Addresses: Moradas
-Return: Voltar
-AddAddress: Adicionar Morada
-SetAsDefault: Selecionar como pre-determinado
-RemoveAddress: Eliminar Morada
-EditAddress: Modificar Morada
-AreYouSureDeleteAddress: Tens certeza que queres eliminar esta morada?
-DefaultAddressModified: Endereço padrão modificado

forms/account/address-list/style.scss

@@ -1,6 +0,0 @@
-
-hedera-address-list {
-	.htk-list .side {
-		padding-right: 16px;
-	}
-}

forms/account/address-list/ui.xml

@@ -1,70 +0,0 @@
-<vn>
-<vn-group>
-	<db-form id="user-form">
-		<db-model property="model" id="user-model" updatable="true">
-			SELECT id, defaultAddressFk
-				FROM myClient c
-		</db-model>
-	</db-form>
-	<db-model id="addresses" updatable="true">
-		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">
-	<h1><t>Addresses</t></h1>
-</div>
-<div id="actions">
-	<htk-bar-button
-		icon="add"
-		tip="_AddAddress"
-		on-click="this.onAddAddressClick()"/>
-</div>
-<div id="form" class="hedera-address-list">
-	<div class="box vn-w-sm">
-		<htk-radio-group
-			id="default-address"
-			column="defaultAddressFk"
-			form="user-form"/>
-		<htk-repeater model="addresses" form-id="address" class="htk-list">
-			<custom>
-			<div class="item clickable" on-click="this.onSetDefaultClick($event, address.id)">
-				<div class="side">
-					<htk-radio
-						radio-group="default-address"
-						val="{{address.id}}"
-						tip="_SetAsDefault"
-						name="test"/>
-				</div>
-				<div class="content">
-					<p class="important">
-						{{address.nickname}}
-					</p>
-					<p>
-						{{address.street}}
-					</p>
-					<p>
-						{{address.postalCode}}, {{address.city}}
-					</p>
-				</div>
-				<div
-					class="actions"
-					on-click="$event.preventDefault()">
-					<htk-button
-						icon="delete"
-						tip="_RemoveAddress"
-						on-click="this.onRemoveAddressClick($iter)"/>
-					<htk-button
-						icon="edit"
-						tip="_EditAddress"
-						on-click="this.onEditAddressClick(address.id)"/>
-				</div>
-			</div>
-			</custom>
-		</htk-repeater>
-	</div>
-</div>
-</vn>

forms/account/address/index.js

@@ -1,20 +0,0 @@
-export default new Class({
-	Extends: Hedera.Form,
-	Template: require('./ui.xml'),
-
-	activate() {
-		this.$.model.setInfo('a', 'myAddress', 'hedera', ['id'], 'id');
-		this.$.model.setDefault('clientFk', 'a',
-			new Sql.Function({schema: 'account', name: 'myUser_getId'}));
-	},
-	
-	onStatusChange() {
-		if (this.$.iter.ready && this.hash.$.address == 0)
-			this.$.iter.insertRow();
-	},
-	
-	onOperationsDone() {
-		Htk.Toast.showMessage(_('AddressChangedSuccessfully'));
-		window.history.back()
-	}
-});

forms/account/address/locale/ca.yml

@@ -1,10 +0,0 @@
-AddEditAddress: Afegir o modificar adreça
-Name: Consignatari
-Address: Direcció
-City: Ciutat
-ZipCode: Codi postal
-Country: País
-Province: Província
-Return: Tornar
-Accept: Acceptar
-AddressChangedSuccessfully: Adreça modificada correctament