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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable

This commit is contained in:
Carlos Satorres 2023-06-14 17:03:09 +02:00
parent 66c5eda6f2 9b692e00d4
commit 9cdc914a25
10 changed files with 210 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
back/methods/docuware/specs/upload.spec.js
View File

@ -2,8 +2,9 @@ const models = require('vn-loopback/server/server').models;
describe('docuware upload()', () => {
const userId = 9;
const ticketId = 10;
const ticketIds = [10];
const ctx = {
args: {ticketIds},
req: {
getLocale: () => {
return 'en';
@ -27,7 +28,7 @@ describe('docuware upload()', () => {
let error;
try {
await models.Docuware.upload(ctx, ticketId, fileCabinetName);
await models.Docuware.upload(ctx, ticketIds, fileCabinetName);
} catch (e) {
error = e.message;
}

52
back/methods/docuware/upload.js
View File

@ -3,34 +3,34 @@ const axios = require('axios');
module.exports = Self => {
Self.remoteMethodCtx('upload', {
description: 'Upload an docuware PDF',
description: 'Upload docuware PDFs',
accessType: 'WRITE',
accepts: [
{
arg: 'id',
type: 'number',
description: 'The ticket id',
http: {source: 'path'}
arg: 'ticketIds',
type: ['number'],
description: 'The ticket ids',
required: true
},
{
arg: 'fileCabinet',
type: 'string',
description: 'The file cabinet'
},
{
arg: 'dialog',
type: 'string',
description: 'The dialog'
description: 'The file cabinet',
required: true
}
],
returns: [],
returns: {
type: 'object',
root: true
},
http: {
path: `/:id/upload`,
path: `/upload`,
verb: 'POST'
}
});
Self.upload = async function(ctx, id, fileCabinet) {
Self.upload = async function(ctx, ticketIds, fileCabinet) {
delete ctx.args.ticketIds;
const models = Self.app.models;
const action = 'store';
@ -38,18 +38,20 @@ module.exports = Self => {
const fileCabinetId = await Self.getFileCabinet(fileCabinet);
const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId);
const uploaded = [];
for (id of ticketIds) {
// get delivery note
ctx.args.id = id;
const deliveryNote = await models.Ticket.deliveryNotePdf(ctx, {
id,
type: 'deliveryNote'
});
// get ticket data
const ticket = await models.Ticket.findById(id, {
include: [{
relation: 'client',
scope: {
fields: ['id', 'socialName', 'fi']
fields: ['id', 'name', 'fi']
}
}]
});
@ -75,7 +77,7 @@ module.exports = Self => {
{
'FieldName': 'NOMBRE_PROVEEDOR',
'ItemElementName': 'string',
'Item': ticket.client().socialName,
'Item': ticket.client().name + ' - ' + id,
},
{
'FieldName': 'FECHA_FACTURA',
@ -133,9 +135,17 @@ module.exports = Self => {
},
};
return await axios.post(uploadUri, data, uploadOptions)
.catch(() => {
throw new UserError('Failed to upload file');
});
try {
await axios.post(uploadUri, data, uploadOptions);
} catch (err) {
const $t = ctx.req.__;
const message = $t('Failed to upload delivery note', {id});
if (uploaded.length)
await models.TicketTracking.setDelivered(ctx, uploaded);
throw new UserError(message);
}
uploaded.push(id);
}
return models.TicketTracking.setDelivered(ctx, ticketIds);
};
};

3
loopback/locale/en.json
View File

@ -174,5 +174,6 @@
"A claim with that sale already exists": "A claim with that sale already exists",
"Pass expired": "The password has expired, change it from Salix",
"Can't transfer claimed sales": "Can't transfer claimed sales",
"Invalid quantity": "Invalid quantity"
"Invalid quantity": "Invalid quantity",
"Failed to upload delivery note": "Error to upload delivery note {{id}}"
}

2
loopback/locale/es.json
View File

@ -258,7 +258,7 @@
"App name does not exist": "El nombre de aplicación no es válido",
"Try again": "Vuelve a intentarlo",
"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
"Failed to upload file": "Error al subir archivo",
"Failed to upload delivery note": "Error al subir albarán {{id}}",
"The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
"It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
"It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",

21
modules/route/front/index/index.html
View File

@ -1,6 +1,21 @@
<vn-auto-search
model="model">
</vn-auto-search>
<vn-crud-model
auto-load="true"
url="AgencyModes"
data="agencyModes">
</vn-crud-model>
<vn-crud-model
auto-load="true"
url="Vehicles"
data="vehicles">
</vn-crud-model>
<vn-crud-model
auto-load="true"
url="Workers/activeWithInheritedRole"
data="activeWithInheritedRole">
</vn-crud-model>
<div class="vn-w-xl">
<vn-card>
<smart-table
@ -83,7 +98,7 @@
<td>
<vn-autocomplete
ng-model="route.workerFk"
url="Workers/activeWithInheritedRole"
data="activeWithInheritedRole"
show-field="nickname"
search-function="{firstName: $search}"
value-field="id"
@ -98,7 +113,7 @@
<td expand>
<vn-autocomplete
ng-model="route.agencyModeFk"
url="AgencyModes"
data="agencyModes"
show-field="name"
value-field="id"
on-change="$ctrl.updateAttributes(route)"
@ -108,7 +123,7 @@
<td expand>
<vn-autocomplete
ng-model="route.vehicleFk"
url="Vehicles"
data="vehicles"
show-field="numberPlate"
value-field="id"
on-change="$ctrl.updateAttributes(route)"

8
modules/ticket/front/descriptor-menu/index.js
View File

@ -326,14 +326,8 @@ class Controller extends Section {
if (!force)
return this.$.pdfToTablet.show();
return this.$http.post(`Docuwares/${this.id}/upload`, {fileCabinet: 'deliveryNote'})
return this.$http.post(`Docuwares/upload`, {fileCabinet: 'deliveryNote', ticketIds: [this.id]})
.then(() => {
this.$.balanceCreate.amountPaid = this.ticket.totalWithVat;
this.$.balanceCreate.clientFk = this.ticket.clientFk;
this.$.balanceCreate.description = 'Albaran: ';
this.$.balanceCreate.description += this.ticket.id;
this.$.balanceCreate.show();
this.vnApp.showSuccess(this.$t('PDF sent!'));
});
}

6
modules/ticket/front/descriptor-menu/index.spec.js
View File

@ -304,17 +304,15 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
expect(controller.$.pdfToTablet.show).toHaveBeenCalled();
});
it('should make a query and show balance create', () => {
it('should make a query', () => {
controller.$.balanceCreate = {show: () => {}};
jest.spyOn(controller.$.balanceCreate, 'show');
jest.spyOn(controller.vnApp, 'showSuccess');
$httpBackend.whenPOST(`Docuwares/${ticket.id}/upload`).respond(true);
$httpBackend.whenPOST(`Docuwares/upload`).respond(true);
controller.uploadDocuware(true);
$httpBackend.flush();
expect(controller.vnApp.showSuccess).toHaveBeenCalled();
expect(controller.$.balanceCreate.show).toHaveBeenCalled();
});
});

10
modules/ticket/front/index/index.html
View File

@ -152,21 +152,21 @@
</vn-data-viewer>
<div fixed-bottom-right>
<vn-vertical style="align-items: center;">
<vn-button class="round sm vn-mb-sm"
icon="print"
<vn-button class="round vn-mb-sm"
icon="install_mobile"
ng-show="$ctrl.totalChecked > 0"
ng-click="$ctrl.setDelivered()"
ng-click="$ctrl.sendDocuware()"
vn-tooltip="Set as delivered and open delivery note(s)"
tooltip-position="left">
</vn-button>
<vn-button class="round sm vn-mb-sm"
<vn-button class="round vn-mb-sm"
icon="icon-recovery"
ng-show="$ctrl.totalChecked > 0"
ng-click="$ctrl.openBalanceDialog()"
vn-tooltip="Payment on account..."
tooltip-position="left">
</vn-button>
<vn-button class="round sm vn-mb-sm"
<vn-button class="round vn-mb-sm"
icon="icon-invoice"
ng-click="makeInvoiceConfirmation.show()"
ng-show="$ctrl.totalChecked > 0"

15
modules/ticket/front/index/index.js
View File

@ -9,14 +9,15 @@ export default class Controller extends Section {
this.vnReport = vnReport;
}
setDelivered() {
sendDocuware() {
const checkedTickets = this.checked;
let ids = [];
let ticketIds = [];
for (let ticket of checkedTickets)
ids.push(ticket.id);
ticketIds.push(ticket.id);
this.$http.post('TicketTrackings/setDelivered', ids).then(res => {
return this.$http.post(`Docuwares/upload`, {fileCabinet: 'deliveryNote', ticketIds})
.then(res => {
let state = res.data;
for (let ticket of checkedTickets) {
ticket.stateFk = state.id;
@ -24,15 +25,9 @@ export default class Controller extends Section {
ticket.alertLevel = state.alertLevel;
ticket.alertLevelCode = state.code;
}
this.openDeliveryNotes(ids);
});
}
openDeliveryNotes(ids) {
for (let id of ids)
this.vnReport.show(`Tickets/${id}/delivery-note-pdf`);
}
openBalanceDialog() {
const checkedTickets = this.checked;
const description = [];

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

@ -12,12 +12,14 @@ describe('Component vnTicketIndex', () => {
id: 2,
clientFk: 1,
checked: true,
totalWithVat: 20.5
totalWithVat: 20.5,
stateFk: 1
}, {
id: 3,
clientFk: 1,
checked: true,
totalWithVat: 30
totalWithVat: 30,
stateFk: 1
}];
beforeEach(ngModule('ticket'));
@ -86,18 +88,16 @@ describe('Component vnTicketIndex', () => {
});
});
describe('setDelivered()/openDeliveryNotes()', () => {
it('should perform a post to setDelivered and open tabs with the delivery notes', () => {
describe('sendDocuware()', () => {
it('should perform a post to sendDocuware and change tickets state', () => {
controller.$.model = {data: tickets, refresh: () => {}};
const newState = {id: 2};
$window.open = jest.fn();
$httpBackend.expect('POST', 'TicketTrackings/setDelivered').respond('ok');
controller.setDelivered();
$httpBackend.expect('POST', 'Docuwares/upload').respond({id: newState.id});
controller.sendDocuware();
$httpBackend.flush();
expect($window.open).toHaveBeenCalledWith(`api/Tickets/${tickets[1].id}/delivery-note-pdf`);
expect($window.open).toHaveBeenCalledWith(`api/Tickets/${tickets[2].id}/delivery-note-pdf`);
expect(controller.$.model.data[1].stateFk).toEqual(newState.id);
});
});