Merge branch 'beta' into feature/Account-view-refactor

Reviewed-on: #123
Reviewed-by: Javier Segarra <jsegarra@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,4 +1,36 @@
-node_modules
 build/
 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

@@ -1,17 +1,11 @@
-# Not using buster because of bug: https://bugs.php.net/bug.php?id=78870
-FROM debian:stretch-slim
+FROM registry.verdnatura.es/verdnatura/node:20.18.3-vn1
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        curl \
-        ca-certificates \
-        gnupg2
-
 # Apache
 
-RUN apt-get install -y --no-install-recommends \
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
         apache2 \
         libapache2-mod-php \
     && . /etc/apache2/envvars \
@@ -21,21 +15,16 @@ RUN apt-get install -y --no-install-recommends \
 
 RUN a2dissite 000-default
 
-# NodeJs
-
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
-    && apt-get install -y --no-install-recommends nodejs
-
 # Hedera
 
 RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
-    && echo "deb http://apt.verdnatura.es/ stretch main" \
+    && echo "deb http://apt.verdnatura.es/ bookworm main" \
         > /etc/apt/sources.list.d/vn.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
+        php-apcu \
         php-image-text \
         php-text-captcha \
-        php-apcu \
         php-zip \
         hedera-web \
         cron

Jenkinsfile

@@ -1,87 +1,108 @@
 #!/usr/bin/env groovy
 
+def PROTECTED_BRANCH
+def RUN_BUILD
+
+def BRANCH_ENV = [
+    test: 'test',
+    master: 'production',
+    beta: 'test'
+]
+def remote = [:]
+
+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}"
+    }
+}
 pipeline {
     agent any
     environment {
         PROJECT_NAME = 'hedera-web'
-        STACK_NAME   = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
-        stage('Checkout') {
-            steps {
-                script {
-                    def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
-
-                    switch (env.BRANCH_NAME) {
-                        case 'master':
-                            env.NODE_ENV = 'production'
-                            env.MAIN_REPLICAS = 3
-                            env.CRON_REPLICAS = 1
-                            break
-                        case 'test':
-                            env.NODE_ENV = 'test'
-                            env.MAIN_REPLICAS = 1
-                            env.CRON_REPLICAS = 0
-                            break
-                    }
-                }
-                setEnv()
-            }
-        }
         stage('Debuild') {
             when {
-                anyOf {
-                    branch 'master'
-                    branch 'test'
-                }
+                expression { PROTECTED_BRANCH }
             }
             agent {
                 docker {
-                    image 'registry.verdnatura.es/debuild:2.21.3-vn2'
+                    image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn9'
                     registryUrl 'https://registry.verdnatura.es/'
                     registryCredentialsId 'docker-registry'
-                    args '-v /mnt/appdata/reprepro:/reprepro'
                 }
             }
             steps {
                 sh 'debuild -us -uc -b'
-                sh 'vn-includedeb stretch'
-            }
-        }
-        stage('Container') {
-            when {
-                anyOf {
-                    branch 'master'
-                    branch 'test'
+                sh 'mkdir -p debuild'
+                sh 'mv ../hedera-web_* debuild'
+
+                script {
+                    def files = findFiles(glob: 'debuild/*.changes')
+                    files.each { file -> env.CHANGES_FILE = file.name }
+                }
+
+                configFileProvider([
+                    configFile(fileId: "dput.cf", variable: 'DPUT_CONFIG')
+                ]) {
+                    sshagent(credentials: ['jenkins-agent']) {
+                        sh 'dput --config "$DPUT_CONFIG" verdnatura "debuild/$CHANGES_FILE"'
+                    }
                 }
-            }
-            environment {
-                CREDS = credentials('docker-registry')
-            }
-            steps {
-                sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
-                sh 'docker-compose build --build-arg BUILD_ID=$BUILD_ID --parallel'
-                sh 'docker-compose push'
             }
         }
         stage('Deploy') {
             when {
-                anyOf {
-                    branch 'master'
-                    branch 'test'
-                }
+                expression { PROTECTED_BRANCH }
             }
             environment {
-                DOCKER_HOST = "${env.SWARM_HOST}"
+                CREDS = credentials('docker-registry')
+                IMAGE = "$REGISTRY/verdnatura/hedera-web"
             }
             steps {
-                sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
+                script {
+                    def packageJson = readJSON file: 'package.json'
+                    env.VERSION = "${packageJson.version}"
+                    env.TAG = "${packageJson.version}-build${env.BUILD_ID}"
+                }
+
+                sh 'docker-compose build --build-arg BUILD_ID=$BUILD_ID --parallel'
+                sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
+                sh 'docker push $IMAGE:$TAG'
+
+                script {
+                    if (env.BRANCH_NAME == 'master') {
+                        sh 'docker tag $IMAGE:$TAG $IMAGE:latest'
+                        sh 'docker push $IMAGE:latest'
+                    }
+                }
+
+                withKubeConfig([
+                    serverUrl: "$KUBERNETES_API",
+                    credentialsId: 'kubernetes',
+                    namespace: 'salix'
+                ]) {
+                    sh 'kubectl set image deployment/hedera-web-$BRANCH_NAME hedera-web-$BRANCH_NAME=$IMAGE:$TAG'
+                    sh 'kubectl set image deployment/hedera-web-cron-$BRANCH_NAME hedera-web-cron-$BRANCH_NAME=$IMAGE:$TAG'
+                }
             }
         }
     }
     post {
         unsuccessful {
+            setEnv()
             sendEmail()
         }
     }

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

@@ -5,21 +5,31 @@ Hedera is the main web page for Verdnatura.
 ## Getting Started
 
 Required dependencies.
- * PHP >= 7.0
- * Node.js >= 8.0
+
+-   PHP >= 7.0
+-   Node.js >= 18.0
 
 Launch application for development.
+
 ```
-$ npm run dev 
+$ quasar dev
+```
+
+Launch Salix backend.
+
+```
+
+pnpm run back
 ```
 
 Run server side method from command line.
+
 ```
-$ php hedera-web.php -m method_path 
+php hedera-web.php -m method_path
 ```
 
 ## Built with
 
- * [Webpack](https://webpack.js.org/)
- * [MooTools](https://mootools.net/)
- * [TinyMCE](https://www.tinymce.com/)
+-   [Webpack](https://webpack.js.org/)
+-   [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,19 +9,31 @@
 </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
 	</FilesMatch>
-	
+
 	<FilesMatch "\.(ttf|otf|eot|woff)$">
 		<IfModule mod_headers.c>
 			Header set Access-Control-Allow-Origin "*"

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": "25.8.3",
+    "description": "Verdnatura web page backend",
+    "license": "GPL-3.0",
+    "author": "Verdnatura Levante SL"
+}

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 (22.48.2) stable; urgency=low
+hedera-web (25.8.3) stable; urgency=low
 
   * Initial Release.
 

debian/install

@@ -1,19 +1,12 @@
-apache.conf                 etc/hedera-web
-config.php                  etc/hedera-web
-php.ini                     etc/hedera-web
-web                         usr/share/php/vn
-doc/*                       usr/share/doc/hedera-web
-hedera-web.php              usr/share/hedera-web
-forms                       usr/share/hedera-web
-image                       usr/share/hedera-web
-js                          usr/share/hedera-web
-pages                       usr/share/hedera-web
-reports                     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
+back/apache.conf            etc/hedera-web
+back/config.php             etc/hedera-web
+back/php.ini                etc/hedera-web
+back/web                    usr/share/php/vn
+back/index.php              usr/share/hedera-web/back
+back/hedera-web.php         usr/share/hedera-web/back
+back/rest                   usr/share/hedera-web/back
+back/package.json           usr/share/hedera-web/back
+dist/spa/*                  usr/share/hedera-web/spa
+build-deps/node_modules     usr/share/hedera-web/spa
+back/utils                  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
-etc/hedera-web/apache.conf           etc/apache2/conf-available/hedera-web.conf
-etc/hedera-web/php.ini               etc/php/7.0/apache2/conf.d/99-hedera-web.ini
+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/php.ini                    etc/php/7.0/apache2/conf.d/99-hedera-web.ini

debian/rules

@@ -5,14 +5,15 @@
 %:
 	dh $@
 
-clean:
-	npm run clean
+override_dh_clean:
+	pnpm run clean
+	rm -rf build-deps
 	dh_clean $@
-	
-build:
-	npm install --no-audit --prefer-offline
-	npm --omit=dev run build
+
+override_dh_auto_build:
+	pnpm install --prefer-offline
+	pnpm exec quasar build
 
 	mkdir -p build-deps
-	cp package.json package-lock.json build-deps
-	(cd build-deps && npm install --omit=dev --no-audit --prefer-offline)
+	cp package.json pnpm-lock.yaml build-deps
+	(cd build-deps && pnpm install --prod --shamefully-hoist --config.audit=true --prefer-offline)

docker-compose.yml

@@ -1,41 +1,9 @@
 version: '3.7'
 services:
   main:
-    image: registry.verdnatura.es/hedera-web:${BRANCH_NAME:?}
+    image: registry.verdnatura.es/verdnatura/hedera-web:${TAG:?}
     build:
       context: .
       dockerfile: Dockerfile
       args:
         - VERSION=${VERSION:?}
-    ports:
-      - 80
-    configs:
-      - source: config
-        target: /etc/hedera-web/config.my.php
-    volumes:
-      - /mnt/appdata:/mnt/storage
-      - /mnt/appdata/image:/var/lib/hedera-web/image-db
-      - /mnt/appdata/vn-access:/var/lib/hedera-web/vn-access
-    deploy:
-      replicas: ${MAIN_REPLICAS:?}
-      placement:
-        constraints:
-          - node.role == worker
-  cron:
-    image: registry.verdnatura.es/hedera-web:${BRANCH_NAME:?}
-    command: 'cron -f'
-    configs:
-      - source: config
-        target: /etc/hedera-web/config.my.php
-    volumes:
-      - /mnt/appdata:/mnt/storage
-      - /mnt/appdata/image:/var/lib/hedera-web/image-db
-    deploy:
-      replicas: ${CRON_REPLICAS:?}
-      placement:
-        constraints:
-          - node.role == worker
-configs:
-  config:
-    external: true
-    name: ${PROJECT_NAME:?}-${BRANCH_NAME:?}

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

forms/account/address/locale/en.yml

@@ -1,10 +0,0 @@
-AddEditAddress: Add or edit address
-Name: Consignee
-Address: Address
-City: City
-ZipCode: Zip code
-Country: Country
-Province: Province
-Return: Return
-Accept: Accept
-AddressChangedSuccessfully: Address changed successfully