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

Merge & fixes

This commit is contained in:
Juan Ferrer 2019-09-30 13:02:03 +02:00
parent 55133ded68 e380e4466c
commit 84572dc398
11 changed files with 117 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/helpers/selectors.js
View File

@ -652,8 +652,8 @@ export default {
kmStartInput: 'vn-route-basic-data vn-input-number[field="$ctrl.route.kmStart"] input',
kmEndInput: 'vn-route-basic-data vn-input-number[model="$ctrl.route.kmEnd"] input',
createdDateInput: 'vn-route-basic-data vn-date-picker[model="$ctrl.route.created"] > div > input',
startedDateInput: 'vn-route-basic-data vn-date-picker[model="$ctrl.route.started"] > div > input',
finishedDateInput: 'vn-route-basic-data vn-date-picker[model="$ctrl.route.finished"] > div > input',
startedHourInput: 'vn-route-basic-data vn-input-time[model="$ctrl.route.started"] input',
finishedHourInput: 'vn-route-basic-data vn-input-time[model="$ctrl.route.finished"] input',
saveButton: 'vn-route-basic-data vn-submit[label="Save"] input'
},
routeTickets: {

4
e2e/paths/08-route-module/02_basic_data.spec.js
View File

@ -20,8 +20,8 @@ describe('Route basic Data path', () => {
.write(selectors.routeBasicData.kmStartInput, 1)
.clearInput(selectors.routeBasicData.kmEndInput)
.write(selectors.routeBasicData.kmEndInput, 2)
.datePicker(selectors.routeBasicData.startedDateInput, 1, null)
.datePicker(selectors.routeBasicData.finishedDateInput, 1, null)
.write(selectors.routeBasicData.startedHourInput, '0800')
.write(selectors.routeBasicData.finishedHourInput, '1230')
.waitToClick(selectors.routeBasicData.saveButton)
.waitForLastSnackbar();

27
modules/route/front/basic-data/index.html
View File

@ -5,7 +5,7 @@
form="form"
save="patch">
</vn-watcher>
<form name="form" ng-submit="watcher.submit()" compact>
<form name="form" ng-submit="$ctrl.onSubmit()" compact>
<vn-card pad-large>
<vn-horizontal>
<vn-autocomplete
@ -56,18 +56,21 @@
</vn-input-number>
</vn-horizontal>
<vn-horizontal>
<vn-date-picker
<vn-input-time
label="Hour started"
model="$ctrl.route.started">
</vn-input-time>
<vn-input-time
label="Hour finished"
model="$ctrl.route.finished">
</vn-input-time>
</vn-horizontal>
<vn-horizontal>
<vn-textfield
vn-one
label="Date started"
model="$ctrl.route.started"
ini-options="{dateFormat: 'd-m-Y'}">
</vn-date-picker>
<vn-date-picker
vn-one
label="Date finished"
model="$ctrl.route.finished"
ini-options="{dateFormat: 'd-m-Y'}">
</vn-date-picker>
label="Description"
field="$ctrl.route.description" vn-focus>
</vn-textfield>
</vn-horizontal>
</vn-card>
<vn-button-bar>

16
modules/route/front/basic-data/index.js
View File

@ -1,8 +1,24 @@
import ngModule from '../module';
class Controller {
constructor($scope, $state) {
this.$scope = $scope;
this.$state = $state;
}
onSubmit() {
this.$scope.watcher.submit().then(() => {
this.card.reload();
});
}
}
ngModule.component('vnRouteBasicData', {
template: require('./index.html'),
controller: Controller,
bindings: {
route: '<'
},
require: {
card: '^vnRouteCard'
}
});

1
modules/route/front/basic-data/locale/es.yml
View File

@ -2,3 +2,4 @@ Date finished: Fecha fin
Date started: Fecha inicio
Km start: Km de inicio
Km end: Km de fin
Description: Descripción

4
modules/route/front/descriptor/index.html
View File

@ -40,7 +40,7 @@
<vn-icon
vn-tooltip="Volume exceded"
icon="icon-volume"
ng-class="{bright: $ctrl.route.m3 > $ctrl.route.vehicle.m3}">
ng-class="{bright: $ctrl.route.m3 > $ctrl.route.vehicle.m3 && $ctrl.route.vehicle.m3 != NULL}">
</vn-icon>
</div>
<div class="quicklinks">
@ -74,5 +74,5 @@
<vn-confirm
vn-id="updateVolumeConfirmation"
on-response="$ctrl.updateVolume(response)"
question="Are you sure you want to book this invoice?">
question="Are you sure you want to update the volume?">
</vn-confirm>

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

@ -1,5 +1,4 @@
import ngModule from '../module';
import {createDecipher} from 'crypto';
class Controller {
constructor($, $http, vnApp, $translate, aclService) {

1
modules/route/front/descriptor/locale/es.yml
View File

@ -4,3 +4,4 @@ Send route report: Enviar informe de ruta
Show route report: Ver informe de ruta
Update volume: Actualizar volumen
Volume updated: Volumen actualizado
Are you sure you want to update the volume?: Estas seguro que quieres actualizar el volumen?

4
modules/route/front/routes.json
View File

@ -6,8 +6,8 @@
"dependencies": ["client", "worker", "ticket"],
"menu": [
{"state": "route.card.basicData", "icon": "settings"},
{"state": "route.card.log", "icon": "history"},
{"state": "route.card.tickets", "icon": "icon-ticket"}],
{"state": "route.card.tickets", "icon": "icon-ticket"},
{"state": "route.card.log", "icon": "history"}],
"routes": [
{
"url": "/route",

79
modules/ticket/back/methods/ticket/specs/transferSales.spec.js
View File

@ -2,9 +2,12 @@ const app = require('vn-loopback/server/server');
describe('sale transferSales()', () => {
let createdTicketId;
let createdTicketsIds = [];
afterAll(async done => {
createdTicketsIds.forEach(async createdTicketId => {
await app.models.Ticket.destroyById(createdTicketId);
});
done();
});
@ -62,22 +65,23 @@ describe('sale transferSales()', () => {
it('should transfer the sales from one ticket to a new one', async() => {
const ctx = {req: {accessToken: {userId: 101}}};
let currentTicket = await app.models.Ticket.findById(11);
let currentTicketSales = await app.models.Ticket.getSales(currentTicket.id);
let originalTicketSales = await app.models.Ticket.getSales(currentTicket.id);
salesToRestone = originalTicketSales;
expect(currentTicketSales.length).toEqual(2);
expect(originalTicketSales.length).toEqual(2);
const currentTicketId = currentTicket.id;
const receiverTicketId = undefined;
const sales = currentTicketSales;
let createdTicket = await app.models.Ticket.transferSales(
ctx, currentTicketId, receiverTicketId, sales);
ctx, currentTicketId, receiverTicketId, originalTicketSales);
createdTicketId = createdTicket.id;
createdTicketsIds.push(createdTicket.id);
currentTicketSales = await app.models.Ticket.getSales(currentTicket.id);
originalTicketSales = await app.models.Ticket.getSales(currentTicket.id);
receiverTicketSales = await app.models.Ticket.getSales(createdTicket.id);
expect(currentTicketSales.length).toEqual(0);
expect(originalTicketSales.length).toEqual(0);
expect(receiverTicketSales.length).toEqual(2);
});
@ -108,4 +112,67 @@ describe('sale transferSales()', () => {
expect(createdTicketSales.length).toEqual(0);
expect(receiverTicketSales.length).toEqual(2);
});
describe('sale transferPartialSales()', () => {
it('should throw an error in the quantity to transfer exceeds the amount from the original sale', async() => {
const ctx = {req: {accessToken: {userId: 101}}};
let error;
let currentTicket = await app.models.Ticket.findById(11);
let currentTicketSales = await app.models.Ticket.getSales(currentTicket.id);
const currentTicketId = currentTicket.id;
const receiverTicketId = undefined;
currentTicketSales[0].quantity = 99;
await app.models.Ticket.transferSales(
ctx, currentTicketId, receiverTicketId, currentTicketSales)
.catch(response => {
expect(response.message).toEqual(`Invalid quantity`);
error = response;
});
expect(error).toBeDefined();
});
it('should partially transfer the sales from one ticket to a new one', async() => {
const ctx = {req: {accessToken: {userId: 101}}};
let currentTicket = await app.models.Ticket.findById(11);
let currentTicketSales = [];
let saleToRestore = await app.models.Sale.findById(7);
currentTicketSales.push(saleToRestore);
expect(currentTicketSales[0].quantity).toEqual(15);
const currentTicketId = currentTicket.id;
const receiverTicketId = undefined;
const originalQuantity = currentTicketSales[0].quantity;
currentTicketSales[0].quantity = 1;
let salesToPartiallyTransfer = [currentTicketSales[0]];
const saleIdToRestore = currentTicketSales[0].id;
let createdTicket = await app.models.Ticket.transferSales(
ctx, currentTicketId, receiverTicketId, salesToPartiallyTransfer);
createdTicketId = createdTicket.id;
createdTicketsIds.push(createdTicket.id);
currentTicketSales = await app.models.Ticket.getSales(currentTicket.id);
receiverTicketSales = await app.models.Ticket.getSales(createdTicket.id);
expect(currentTicketSales.length).toEqual(2);
expect(currentTicketSales[0].quantity).toEqual(14);
expect(receiverTicketSales.length).toEqual(1);
expect(receiverTicketSales[0].quantity).toEqual(1);
saleToRestore.updateAttribute('quantity', originalQuantity);
currentTicketSales = await app.models.Ticket.getSales(currentTicket.id);
expect(currentTicketSales[0].quantity).toEqual(15);
expect(currentTicketSales[0].id).toEqual(saleIdToRestore);
});
});
});

2
modules/ticket/back/methods/ticket/transferSales.js
View File

@ -72,7 +72,7 @@ module.exports = Self => {
await models.Sale.updateAll({
id: sale.id
}, {ticketFk: ticketId}, options);
} else if (sale.quantity < originalSale.quantity) {
} else if (sale.quantity != originalSale.quantity) {
await transferPartialSale(
ticketId, originalSale, sale, options);
}