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

Jenkinsfile

@@ -2,6 +2,9 @@
 
 pipeline {
     agent any
+    options {
+        disableConcurrentBuilds()
+    }
     environment {
         REGISTRY = 'registry.verdnatura.es'
         DOCKER_HOST_1 = 'tcp://vch1.verdnatura.es:2376'

modules/claim/front/detail/index.html

@@ -47,7 +47,6 @@
                         <vn-td number>
                             <vn-textfield 
                                 vn-focus
-                                id="claimedQuantity"
                                 model="saleClaimed.quantity"
                                 on-change="$ctrl.setClaimedQuantity(saleClaimed.id, saleClaimed.quantity)"
                                 type="text">

modules/claim/front/detail/index.js

@@ -92,7 +92,9 @@ class Controller {
     }
 
     getSaleTotal(sale) {
-        return (sale.quantity * sale.price) - ((100 - sale.discount) / 100);
+        let total = 0.0;
+        total += sale.quantity * sale.price - ((sale.discount * (sale.quantity * sale.price)) / 100);
+        return total;
     }
 
     // Item Descriptor

modules/client/front/billing-data/index.js

@@ -35,7 +35,7 @@ export default class Controller {
     }
 
     notifyChanges() {
-        this.$http.get(`/email/payment-update`, {clientFk: this.client.id}).then(
+        this.$http.post(`/email/payment-update`, {clientFk: this.client.id}).then(
             () => this.vnApp.showMessage(this.$translate.instant('Notification sent!'))
         );
     }

print/lib/config.js

@@ -1,7 +1,7 @@
 const fs = require('fs-extra');
 let env = process.env.NODE_ENV ? process.env.NODE_ENV : 'development';
 
-let configPath = `/etc/`;
+let configPath = `/etc/salix`;
 let config = require('../config/print.json');
 let configFiles = [
     `${configPath}/print.json`,
@@ -28,4 +28,5 @@ for (let proxyFile of proxyFiles) {
 // config.proxy = proxyConf;
 config.env = env;
 
+
 module.exports = config;