Merge branch 'dev' of https://git.verdnatura.es/salix into dev

Jenkinsfile

@@ -2,12 +2,11 @@
 
 def branchName = "${env.BRANCH_NAME}";
 
+// TODO: We are using latest tag until image rotation it's implemented
+env.TAG = "latest" /* "${env.BUILD_NUMBER}" */;
 env.BRANCH_NAME = branchName;
-env.TAG = "${env.BUILD_NUMBER}";
 env.salixUser="${env.salixUser}";
 env.salixPassword="${env.salixPassword}";
-env.salixHost = "${env.productionSalixHost}";
-env.salixPort = "${env.productionSalixPort}";
 
 switch (branchName) {
     case "test": 
@@ -17,7 +16,9 @@ switch (branchName) {
         break;
     case "master":
         env.NODE_ENV = "production"
-        env.DOCKER_HOST = "tcp://172.16.255.29:2375";
+        env.salixHost = "${env.productionSalixHost}";
+        env.salixPort = "${env.productionSalixPort}";
+        env.DOCKER_HOST = "tcp://vch1.verdnatura.es:2375";
         break;
 }
 
@@ -28,26 +29,19 @@ node {
     stage ('Checkout') {
         checkout scm
     }
-
+    stage ('Install client Node dependencies') {
-    stage ('install modules') {
         sh "npm install"
     }
-    
+    stage ("Removing old dockers") {
-    stage ('build Project') {
-        sh "gulp build"
-    }
-
-    stage ("docker") {
-        stage ("install modules loopback service") {
-            sh "cd ./services/loopback && npm install"
-        }
-        
-        stage ("Stopping/Removing Docker") {
             sh "docker-compose down --rmi 'all'" 
     }
-
+    stage ('Build project') {
-        stage ("Generar dockers") {
+        sh "gulp build"
+    }
+    stage ("Install services Node dependencies") {
+        sh "cd ./services/loopback && npm install"
+    }
+    stage ("Generating new dockers") {
         sh "docker-compose up -d --build"
     }
 }
-}

client/client/src/locale/es.yml

@@ -21,4 +21,3 @@ Credit contracts: Contratos de crédito
 Verified data: Datos comprobados
 Mandate: Mandato
 Amount: Importe
-Sales person: Comercial

services/db/export-data.cmd

@@ -6,7 +6,7 @@ mysqldump --defaults-file=connect.ini --no-create-info salix ACL >> install/dump
 echo USE `vn`; >> install/dump/03-dumpedFixtures.sql
 mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc >> install/dump/03-dumpedFixtures.sql
 echo USE `vn2008`; >> install/dump/03-dumpedFixtures.sql
-mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options >> install/dump/03-dumpedFixtures.sql
+mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options Grupos >> install/dump/03-dumpedFixtures.sql
 echo USE `bi`; >> install/dump/03-dumpedFixtures.sql
 mysqldump --defaults-file=connect.ini --no-create-info bi tarifa_componentes tarifa_componentes_series >> install/dump/03-dumpedFixtures.sql
 echo USE `cache`; >> install/dump/03-dumpedFixtures.sql

services/db/export-data.sh

@@ -7,7 +7,7 @@ mysqldump --defaults-file=connect.ini --no-create-info salix ACL >> install/dump
 echo "USE \`vn\`;" >> install/dump/03-dumpedFixtures.sql
 mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc  >> install/dump/03-dumpedFixtures.sql
 echo "USE \`vn2008\`;" >> install/dump/03-dumpedFixtures.sql
-mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options >> install/dump/03-dumpedFixtures.sql
+mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options Grupos>> install/dump/03-dumpedFixtures.sql
 echo "USE \`bi\`;" >> install/dump/03-dumpedFixtures.sql
 mysqldump --defaults-file=connect.ini --no-create-info bi tarifa_componentes tarifa_componentes_series >> install/dump/03-dumpedFixtures.sql
 echo "USE \`cache\`;" >> install/dump/03-dumpedFixtures.sql

services/db/install/changes/1.0.3/05-workerMana.sql

@@ -0,0 +1,10 @@
+USE `bs`;
+CREATE 
+     OR REPLACE ALGORITHM = UNDEFINED 
+    DEFINER = `root`@`%` 
+    SQL SECURITY DEFINER
+VIEW `bs`.`workerMana` AS
+    SELECT 
+        `m`.`Id_Trabajador` AS `workerFk`, `m`.`used` AS `amount`
+    FROM
+        `bs`.`mana_spellers` `m`;

services/db/install/dump/fixtures.sql

@@ -574,3 +574,11 @@ INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_
         ( 1, 2, 'available', CONCAT_WS('/',1,CURDATE()), CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(),INTERVAL 15 MINUTE), CURDATE(), NULL),
         ( 2, 4, 'last_buy',  CONCAT_WS('/',1,CURDATE()), CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(),INTERVAL 15 MINUTE), CURDATE(), NULL),
         ( 3, 8, 'visible',   CONCAT_WS('/',1,CURDATE()), CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(),INTERVAL 15 MINUTE), CURDATE(), NULL);
+
+INSERT INTO `bs`.`workerMana`(`workerFk`, `amount`)
+    VALUES
+        ( 1, -500),
+        ( 3, 0),
+        ( 5, 250),
+        ( 6, 1000),
+        ( 9, 1500);

services/loopback/common/methods/item-tag/specs/filterItemTags.spec.js

@@ -4,6 +4,6 @@ describe('item filterItemTags()', () => {
     it('should call the filterItemTags method', async() => {
         let [result] = await app.models.ItemTag.filterItemTags(1);
 
-        expect(result.name).toEqual('Yellow');
+        expect(result.name).toEqual('Blue');
     });
 });

services/loopback/common/methods/ticket/specs/get-taxes.spec.js

@@ -4,7 +4,7 @@ describe('ticket getTaxes()', () => {
     it('should call the getTaxes method', done => {
         app.models.Ticket.getTaxes(1)
             .then(response => {
-                expect(response[0].tax).toEqual(1.05);
+                expect(response[0].tax).toEqual(6.05);
                 done();
             });
     });

services/loopback/common/methods/ticket/specs/get-total.spec.js

@@ -4,7 +4,7 @@ describe('ticket getTotal()', () => {
     it('should call the getTotal method and return the response', done => {
         app.models.Ticket.getTotal(1)
             .then(response => {
-                expect(response).toEqual(11.55);
+                expect(response).toEqual(248.05);
                 done();
             });
     });

services/loopback/common/methods/ticket/summary.js

@@ -78,7 +78,7 @@ module.exports = Self => {
             where: {
                 ticketFk: ticketFk
             },
-            order: 'concept ASC',
+            order: 'itemFk ASC',
             include: [{
                 relation: 'item',
                 scope: {

services/loopback/common/models/workerMana.json

@@ -0,0 +1,25 @@
+{
+    "name": "WorkerMana",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+        "table": "workerMana"
+        }
+    },
+    "properties": {
+        "amount": {
+        "type": "String"
+        },
+        "workerFk": {
+        "id": true,
+        "type": "String"
+        }
+    },
+    "relations": {
+        "worker": {
+        "type": "belongsTo",
+        "model": "Worker",
+        "foreignKey": "workerFk"
+        }
+    }
+}

services/loopback/server/datasources.json

@@ -45,5 +45,16 @@
     "password": "${salixPassword}",
     "connectTimeout": 20000,
     "acquireTimeout": 20000
+  },
+  "bs": {
+    "connector": "mysql",
+    "database": "bs",
+    "debug": false,
+    "host": "${salixHost}",
+    "port": "${salixPort}",
+    "username": "${salixUser}",
+    "password": "${salixPassword}",
+    "connectTimeout": 20000,
+    "acquireTimeout": 20000
   }
 }

services/loopback/server/model-config.json

@@ -104,5 +104,8 @@
   },
   "Message": {
     "dataSource": "vn"
+  },
+  "WorkerMana": {
+    "dataSource": "bs"
   }
 }