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

merge

This commit is contained in:
Joan Sanchez 2017-05-31 14:56:51 +02:00
parent a4d8574321 e061c01946
commit ce728c2224
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/client/src/billing-data/billing-data.js
View File

@ -3,10 +3,12 @@ import {module} from '../module';
export const NAME = 'vnClientBillingData';
class billingData {
constructor($scope, $http, $timeout) {
constructor($scope, $http, $timeout, vnAppLogger, $translate) {
this.$ = $scope;
this.http = $http;
this.timeout = $timeout;
this.logger = vnAppLogger;
this.translate = $translate;
this.payId = null;
this.dueDay = null;
this.copyData();
@ -26,10 +28,9 @@ class billingData {
checkChanges() {
let payId = this.client.payMethodFk || null;
let dueDay = this.client.dueDay || null;
let dialog = this.$.sendMail;
if (dialog && (this.payId !== payId || this.dueDay !== dueDay)) {
dialog.show();
if (this.payId !== payId || this.dueDay !== dueDay) {
this.$.sendMail.show();
return false;
}
@ -37,16 +38,19 @@ class billingData {
}
returnDialog(response) {
if (response === 'ACCEPT') {
this.sendMail();
this.sendMail().then(
() => this.logger.showMessage(this.translate.instant('Notification sent!')),
() => this.logger.showMessage(this.translate.instant('Notification error'))
);
}
this.timeout(() => this.$.watcher.submit());
}
sendMail() {
this.http.post(`/mailer/manuscript/paymentUpdate`, {user: this.client.id});
return this.http.post(`/mailer/manuscript/paymentUpdate`, {user: this.client.id});
}
}
billingData.$inject = ['$scope', '$http', '$timeout'];
billingData.$inject = ['$scope', '$http', '$timeout', 'vnAppLogger', '$translate'];
export const COMPONENT = {
template: require('./billing-data.html'),

4
client/client/src/billing-data/locale/es.json
View File

@ -2,5 +2,7 @@
"Changed terms": "Has modificado las condiciones de pago",
"Notify customer?" : "¿Deseas notificar al cliente de dichos cambios?",
"No": "No",
"Yes, notify": "Sí, notificar"
"Yes, notify": "Sí, notificar",
"Notification sent!": "¡Notificación enviada!",
"Notification error": "Error al enviar notificación"
}

2
client/salix/src/components/searchbar/searchbar.js
View File

@ -25,7 +25,7 @@ export default class Controller {
Object.assign(this.index.filter, filter);
this.onSubmit();
}
onSubmit() {
if (this.onSearch)
this.onSearch();