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

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

This commit is contained in:
Carlos Jimenez Ruiz 2019-04-01 10:00:21 +02:00
parent b483ccba27 3f1889daa3
commit fc63fdf379
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/install/dump/fixtures.sql
View File

@ -615,7 +615,7 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
(5, 1, 2, 'Ranged weapon longbow 2m', 10, 9.10, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -10 DAY)),
(6, 1, 3, 'Ranged weapon longbow 2m', 15, 6.50, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -5 DAY)),
(7, 2, 11, 'Melee weapon combat first 15cm', 15, 1.46, 0, 0, 0, CURDATE()),
(8, 4, 11, 'Melee weapon heavy shield 1x0.5m', 10, 3.05, 0, 0, 0, CURDATE()),
(8, 4, 11, 'Melee weapon heavy shield 1x0.5m', 10, 3.04, 0, 0, 0, CURDATE()),
(9, 1, 16, 'Ranged weapon longbow 2m', 5, 9.10, 0, 0, 0, CURDATE()),
(10, 2, 16, 'Melee weapon combat first 15cm', 10, 1.07, 0, 0, 0, CURDATE()),
(11, 1, 16, 'Ranged weapon longbow 2m', 2, 9.10, 0, 0, 0, CURDATE()),

2
e2e/paths/ticket-module/06_edit_basic_data_steps.spec.js
View File

@ -73,7 +73,7 @@ describe('Ticket Edit basic data path', () => {
.wait(1900)
.waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText');
expect(result).toContain('-€202.25');
expect(result).toContain('-€203.25');
});
it(`should then click next to move on to step three`, async() => {

5
front/core/components/input-time/index.js
View File

@ -1,9 +1,10 @@
import ngModule from '../../module';
import Textfield from '../textfield/textfield';
import Input from '../../lib/input';
import './style.scss';
export default class InputTime extends Textfield {
export default class InputTime extends Input {
set offsetedValue(value) {
if (!value) return;
this._offsetedValue = value;
let date = new Date(value);

2
modules/client/back/methods/client/specs/getCard.spec.js
View File

@ -7,6 +7,6 @@ describe('Client get', () => {
expect(result.id).toEqual(101);
expect(result.name).toEqual('Bruce Wayne');
expect(result.debt).toEqual(329.26);
expect(result.debt).toEqual(329.13);
});
});

2
modules/client/back/methods/client/specs/summary.spec.js
View File

@ -17,7 +17,7 @@ describe('client summary()', () => {
it('should return a summary object containing debt', async() => {
let result = await app.models.Client.summary(101);
expect(result.debt.debt).toEqual(329.26);
expect(result.debt.debt).toEqual(329.13);
});
it('should return a summary object containing averageInvoiced', async() => {

1
modules/ticket/front/descriptor/index.js
View File

@ -132,6 +132,7 @@ class Controller {
state: `client.card.summary({id: ${value.clientFk}})`,
tooltip: 'Client card'
}};
if (value.stowaway) {
links.btnTwo = {
icon: 'icon-stowaway',