Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
This commit is contained in:
commit
972f71552a
|
@ -2,6 +2,9 @@
|
|||
|
||||
pipeline {
|
||||
agent any
|
||||
options {
|
||||
disableConcurrentBuilds()
|
||||
}
|
||||
environment {
|
||||
REGISTRY = 'registry.verdnatura.es'
|
||||
DOCKER_HOST_1 = 'tcp://vch1.verdnatura.es:2376'
|
||||
|
|
|
@ -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!'))
|
||||
);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue