verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 55 Releases Wiki Activity

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

This commit is contained in:
Carlos Jimenez Ruiz 2019-01-22 14:08:35 +01:00
parent 2037c3e1dd 972f71552a
commit 8f23b0b127
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

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

1
modules/claim/front/detail/index.html
View File

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

4
modules/claim/front/detail/index.js
View File

@ -92,7 +92,9 @@ class Controller {
} }
getSaleTotal(sale) { 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 // Item Descriptor

2
modules/client/front/billing-data/index.js
View File

@ -35,7 +35,7 @@ export default class Controller {
} }
notifyChanges() { 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!')) () => this.vnApp.showMessage(this.$translate.instant('Notification sent!'))
); );
} }

3
print/lib/config.js
View File

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