verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 50 Releases Wiki Activity

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

This commit is contained in:
Bernat 2019-04-16 12:21:58 +02:00
parent c2b3ff8d81 842101e239
commit 54f65a9227
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/claim/front/action/index.spec.js
View File

@ -161,11 +161,13 @@ describe('claim', () => {
describe('onUpdateGreugeResponse()', () => { describe('onUpdateGreugeResponse()', () => {
it('should do nothing', () => { it('should do nothing', () => {
spyOn(controller.$http, 'post');
spyOn(controller.card, 'reload'); spyOn(controller.card, 'reload');
spyOn(controller.vnApp, 'showSuccess'); spyOn(controller.vnApp, 'showSuccess');
controller.onUpdateGreugeResponse('CANCEL'); controller.onUpdateGreugeResponse('CANCEL');
expect(controller.$http.post).not.toHaveBeenCalledWith();
expect(controller.card.reload).not.toHaveBeenCalledWith(); expect(controller.card.reload).not.toHaveBeenCalledWith();
expect(controller.vnApp.showSuccess).not.toHaveBeenCalledWith('Greuge inserted!'); expect(controller.vnApp.showSuccess).not.toHaveBeenCalledWith('Greuge inserted!');
}); });

5
modules/order/front/prices-popover/index.html
View File

@ -48,11 +48,10 @@
<span> x {{::price.price | currency: 'EUR': 2}}</span> <span> x {{::price.price | currency: 'EUR': 2}}</span>
</vn-one> </vn-one>
<vn-one> <vn-one>
<vn-input-number <vn-input-number min="0"
name="quantity" name="quantity"
label="Qty." label="Qty."
field="price.quantity" model="price.quantity"
min="0"
step="price.grouping" step="price.grouping"
on-change="$ctrl.validate()"> on-change="$ctrl.validate()">
</vn-input-number> </vn-input-number>