Merge branch 'dev' into 6492-replaceProcedure

Jenkinsfile

@@ -1,5 +1,27 @@
 #!/usr/bin/env groovy
 
+def BRANCH_ENV = [
+    test: 'test',
+    master: 'production'
+]
+
+node {
+    stage('Setup') {
+        env.MAIN_REPLICAS = 1
+        env.CRON_REPLICAS = 0
+        env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev'
+
+        switch (env.BRANCH_NAME) {
+            case 'master':
+                env.MAIN_REPLICAS = 3
+                env.CRON_REPLICAS = 1
+                break
+        }
+
+        echo "NODE_NAME: ${env.NODE_NAME}"
+        echo "WORKSPACE: ${env.WORKSPACE}"
+    }
+}
 pipeline {
     agent any
     environment {
@@ -7,28 +29,6 @@ pipeline {
         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 {
@@ -60,6 +60,10 @@ pipeline {
                 CREDS = credentials('docker-registry')
             }
             steps {
+                script {
+                    def packageJson = readJSON file: 'package.json'
+                    env.VERSION = packageJson.version
+                }
                 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'
@@ -76,12 +80,17 @@ pipeline {
                 DOCKER_HOST = "${env.SWARM_HOST}"
             }
             steps {
+                script {
+                    def packageJson = readJSON file: 'package.json'
+                    env.VERSION = packageJson.version
+                }
                 sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
             }
         }
     }
     post {
         unsuccessful {
+            setEnv()
             sendEmail()
         }
     }

README.md

@@ -1,36 +1,55 @@
 # Hedera
 
-Hedera is the main web page for Verdnatura.
+Hedera is the main web shop page for Verdnatura.
 
-## Getting Started
+## Prerequisites
 
-Required dependencies.
+Required applications.
  * PHP >= 7.0
  * Node.js >= 8.0
+ * [php-vn-lib](https://gitea.verdnatura.es/verdnatura/php-vn-lib)
 
-### Web application
+### Installing dependencies and launching
 
-Launch fronted.
+Pull from repository.
+
+Run this commands on project root directory to install Node dependencies.
 ```
-npm run front
+$ npm install
 ```
 
-Launch backend.
+Install project dependences (debian/control).
+
+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 db
+$ npm run front
-npm run back
+```
-php -S 127.0.0.1:3001 -t . index.php
+
+Launch salix backend.
+```
+$ 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/)
+ * [php](https://www.php.net/)
  * [Webpack](https://webpack.js.org/)
  * [MooTools](https://mootools.net/)
  * [TinyMCE](https://www.tinymce.com/)

config.php

@@ -12,6 +12,8 @@
  *
  *  - http://www.mydomain.org -> config.www.php
  *  - http://test.mydomain.org -> config.test.php
+ * 
+ * Put the password in base64.
  */
 return [
 	/**

debian/changelog

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

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   main:
-    image: registry.verdnatura.es/hedera-web:${BRANCH_NAME:?}
+    image: registry.verdnatura.es/hedera-web:${VERSION:?}
     build:
       context: .
       dockerfile: Dockerfile
@@ -25,7 +25,7 @@ services:
         limits:
           memory: 2G
   cron:
-    image: registry.verdnatura.es/hedera-web:${BRANCH_NAME:?}
+    image: registry.verdnatura.es/hedera-web:${VERSION:?}
     command: 'cron -f'
     configs:
       - source: config

forms/agencies/packages/index.js

@@ -3,12 +3,5 @@ import './style.scss';
 export default new Class({
 	Extends: Hedera.Form,
 	Template: require('./ui.xml'),
-	
-	onShowClick(column, agencyId) {
-		this.hash.setAll({
-			form: 'agencies/provinces',
-			agency: agencyId
-		});
-	}
 });
 

forms/agencies/packages/locale/ca.yml

@@ -1,5 +1,4 @@
 ListByAgency: Paquets per agència
-ShowByProvince: Mostrar desglose per província
 Agency: Agència
 Exps: Exps.
 Bundles: Paquets

forms/agencies/packages/locale/en.yml

@@ -1,5 +1,4 @@
 ListByAgency: Bundles by agency
-ShowByProvince: Show breakdown by province
 Agency: Agency
 Exps: Exps.
 Bundles: Bundles

forms/agencies/packages/locale/es.yml

@@ -1,5 +1,4 @@
 ListByAgency: Bultos por agencia
-ShowByProvince: Mostrar desglose por provincia
 Agency: Agencia
 Exps: Exps.
 Bundles: Bultos

forms/agencies/packages/locale/fr.yml

@@ -1,5 +1,4 @@
 ListByAgency: Liste par agence
-ShowByProvince: Montrer par province
 Agency: Agence
 Exps: Expéditeur
 Bundles: Cartons

forms/agencies/packages/locale/pt.yml

@@ -1,5 +1,4 @@
 ListByAgency: Bultos por agencia
-ShowByProvince: Mostrar desglosse por Distrito
 Agency: Agencia
 Exps: Exps.
 Bundles: Bultos

forms/agencies/packages/ui.xml

@@ -10,11 +10,6 @@
 					CALL vn.agencyVolume()
 				</custom>
 			</db-model>
-			<htk-column-button
-				column="agency_id"
-				icon="search"
-				tip="_ShowByProvince"
-				on-clicked="onShowClick"/>
 			<htk-column-text title="_Agency" column="Agencia"/>
 			<htk-column-spin title="_Exps" column="expediciones"/>
 			<htk-column-spin title="_Bundles" column="Bultos"/>

forms/agencies/provinces/index.js

@@ -1,7 +0,0 @@
-import './style.scss';
-
-export default new Class({
-	Extends: Hedera.Form,
-	Template: require('./ui.xml')
-});
-

forms/agencies/provinces/locale/ca.yml

@@ -1,6 +0,0 @@
-ByProvince: Desglose per província
-Return: Tornar
-SelectAgency: Selecciona una agència al llistat de l'esquerra
-Province: Província
-Expeditions: Exps.
-Left: Falten

forms/agencies/provinces/locale/en.yml

@@ -1,6 +0,0 @@
-ByProvince: Breakdown by province
-Return: Return
-SelectAgency: Select an agency
-Province: Province
-Expeditions: Exps.
-Left: Left

forms/agencies/provinces/locale/es.yml

@@ -1,6 +0,0 @@
-ByProvince: Desglose por provincia
-Return: Volver
-SelectAgency: Selecciona una agencia
-Province: Provincia
-Expeditions: Exps.
-Left: Faltan

forms/agencies/provinces/locale/fr.yml

@@ -1,6 +0,0 @@
-ByProvince: Par province
-Return: Retour
-SelectAgency: Sélectionnez une agence
-Province: Province
-Expeditions: Expéditions
-Left: Restant

forms/agencies/provinces/locale/pt.yml

@@ -1,6 +0,0 @@
-ByProvince: Desglosse por Distritos
-Return: Voltar
-SelectAgency: Seleccione uma agência
-Province: Distrito
-Expeditions: Exps.
-Left: Faltam

forms/agencies/provinces/ui.xml

@@ -1,18 +0,0 @@
-<vn>
-<div id="title">
-	<h1><t>ByProvince</t></h1>
-</div>
-<div id="form" class="provinces vn-w-sm">
-	<div class="box">
-		<htk-grid>
-			<db-model property="model" lot="hash">
-				CALL vn2008.desglose_volume(#agency)
-			</db-model>
-			<htk-column-text title="_Province" column="Provincia"/>
-			<htk-column-spin title="_Expeditions" column="expediciones"/>
-			<htk-column-spin title="_Bundles" column="Bultos"/>
-			<htk-column-spin title="_Left" column="Prevision"/>
-		</htk-grid>
-	</div>
-</div>
-</vn>

import.js

@@ -40,9 +40,7 @@ export const routes = {
 	},
 	agencies: {
 		packages:
-			() => import('agencies/packages'),
+			() => import('agencies/packages')
-		provinces:
-			() => import('agencies/provinces')
 	},
 	cms: {
 		about:

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "hedera-web",
-  "version": "24.8.0",
+  "version": "24.8.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "hedera-web",
-      "version": "24.8.0",
+      "version": "24.8.1",
       "license": "GPL-3.0",
       "dependencies": {
         "js-yaml": "^3.12.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "24.8.0",
+  "version": "24.8.2",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {

rest/edi/lib/segment.php

@@ -18,7 +18,7 @@ class Segment {
 
 		switch ($type) {
 			case Type::DATE:
-				$tmp = Date.vnNew();
+				$tmp = new Date();
 				$tmp->setDate(substr($v, 0, 4), substr($v, 4, 2), substr($v, 6, 2));
 				return $tmp;
 			case Type::TIME: