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

Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details

This commit is contained in:
Joan Sanchez 2020-02-10 14:54:21 +01:00
parent 5d0f72af4e d26597c395
commit 8ad2344735
9 changed files with 86 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/client/front/sms/index.html
View File

@ -8,7 +8,9 @@
<vn-textfield
vn-one
label="Destination"
ng-model="$ctrl.sms.destination">
ng-model="$ctrl.sms.destination"
required="true"
rule>
</vn-textfield>
</vn-horizontal>
<vn-horizontal >
@ -18,6 +20,7 @@
ng-model="$ctrl.sms.message"
rows="5"
maxlength="160"
required="true"
rule>
</vn-textarea>
</vn-horizontal>

19
modules/client/front/sms/index.js
View File

@ -28,12 +28,23 @@ class Controller extends Component {
onResponse(response) {
if (response === 'accept') {
this.$http.post(`Clients/${this.$params.id}/sendSms`, this.sms).then(res => {
this.vnApp.showMessage(this.$translate.instant('SMS sent!'));
try {
if (!this.sms.destination)
throw new Error(`The destination can't be empty`);
if (!this.sms.message)
throw new Error(`The message can't be empty`);
if (res.data) this.emit('send', {response: res.data});
});
this.$http.post(`Clients/${this.$params.id}/sendSms`, this.sms).then(res => {
this.vnApp.showMessage(this.$translate.instant('SMS sent!'));
if (res.data) this.emit('send', {response: res.data});
});
} catch (e) {
this.vnApp.showError(this.$translate.instant(e.message));
return false;
}
}
return true;
}
}

20
modules/client/front/sms/index.spec.js
View File

@ -30,6 +30,26 @@ describe('Client', () => {
expect(controller.vnApp.showMessage).toHaveBeenCalledWith('SMS sent!');
});
it('should call onResponse without the destination and show an error snackbar', () => {
controller.sms = {destinationFk: 101, message: 'My SMS'};
spyOn(controller.vnApp, 'showError');
controller.onResponse('accept');
expect(controller.vnApp.showError).toHaveBeenCalledWith(`The destination can't be empty`);
});
it('should call onResponse without the message and show an error snackbar', () => {
controller.sms = {destinationFk: 101, destination: 222222222};
spyOn(controller.vnApp, 'showError');
controller.onResponse('accept');
expect(controller.vnApp.showError).toHaveBeenCalledWith(`The message can't be empty`);
});
});
describe('charactersRemaining()', () => {

4
modules/client/front/sms/locale/es.yml
View File

@ -2,4 +2,6 @@ Send SMS: Enviar SMS
Destination: Destinatario
Message: Mensaje
SMS sent!: ¡SMS enviado!
Characters remaining: Carácteres restantes
Characters remaining: Carácteres restantes
The destination can't be empty: El destinatario no puede estar vacio
The message can't be empty: El mensaje no puede estar vacio

4
modules/ticket/front/sale/index.html
View File

@ -370,10 +370,10 @@
</vn-dialog>
<!-- SMS Dialog -->
<vn-client-sms
<vn-ticket-sms
vn-id="sms"
sms="$ctrl.newSMS">
</vn-client-sms>
</vn-ticket-sms>
<vn-confirm
vn-id="delete-lines"

5
modules/ticket/front/sms/index.html
View File

@ -8,7 +8,9 @@
<vn-textfield
vn-one
label="Destination"
ng-model="$ctrl.sms.destination">
ng-model="$ctrl.sms.destination"
required="true"
rule>
</vn-textfield>
</vn-horizontal>
<vn-horizontal >
@ -18,6 +20,7 @@
ng-model="$ctrl.sms.message"
rows="5"
maxlength="160"
required="true"
rule>
</vn-textarea>
</vn-horizontal>

19
modules/ticket/front/sms/index.js
View File

@ -28,12 +28,23 @@ class Controller extends Component {
onResponse(response) {
if (response === 'accept') {
this.$http.post(`Tickets/${this.$params.id}/sendSms`, this.sms).then(res => {
this.vnApp.showMessage(this.$translate.instant('SMS sent!'));
try {
if (!this.sms.destination)
throw new Error(`The destination can't be empty`);
if (!this.sms.message)
throw new Error(`The message can't be empty`);
if (res.data) this.emit('send', {response: res.data});
});
this.$http.post(`Tickets/${this.$params.id}/sendSms`, this.sms).then(res => {
this.vnApp.showMessage(this.$translate.instant('SMS sent!'));
if (res.data) this.emit('send', {response: res.data});
});
} catch (e) {
this.vnApp.showError(this.$translate.instant(e.message));
return false;
}
}
return true;
}
}

20
modules/ticket/front/sms/index.spec.js
View File

@ -29,6 +29,26 @@ describe('Ticket', () => {
expect(controller.vnApp.showMessage).toHaveBeenCalledWith('SMS sent!');
});
it('should call onResponse without the destination and show an error snackbar', () => {
controller.sms = {destinationFk: 101, message: 'My SMS'};
spyOn(controller.vnApp, 'showError');
controller.onResponse('accept');
expect(controller.vnApp.showError).toHaveBeenCalledWith(`The destination can't be empty`);
});
it('should call onResponse without the message and show an error snackbar', () => {
controller.sms = {destinationFk: 101, destination: 222222222};
spyOn(controller.vnApp, 'showError');
controller.onResponse('accept');
expect(controller.vnApp.showError).toHaveBeenCalledWith(`The message can't be empty`);
});
});
describe('charactersRemaining()', () => {

4
modules/ticket/front/sms/locale/es.yml
View File

@ -2,4 +2,6 @@ Send SMS: Enviar SMS
Destination: Destinatario
Message: Mensaje
SMS sent!: ¡SMS enviado!
Characters remaining: Carácteres restantes
Characters remaining: Carácteres restantes
The destination can't be empty: El destinatario no puede estar vacio
The message can't be empty: El mensaje no puede estar vacio