requested changes refs #4732 @1h
This commit is contained in:
parent
f652e86c78
commit
f6f6d0866d
|
@ -1,7 +1,7 @@
|
||||||
const {Report} = require('vn-print');
|
const {Report} = require('vn-print');
|
||||||
|
|
||||||
module.exports = Self => {
|
module.exports = Self => {
|
||||||
Self.remoteMethodCtx('previaLabelPdf', {
|
Self.remoteMethodCtx('previousLabel', {
|
||||||
description: 'Returns the previa label pdf',
|
description: 'Returns the previa label pdf',
|
||||||
accessType: 'READ',
|
accessType: 'READ',
|
||||||
accepts: [
|
accepts: [
|
||||||
|
@ -28,12 +28,12 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
http: {
|
http: {
|
||||||
path: '/:id/previa-label-pdf',
|
path: '/:id/previousLabel',
|
||||||
verb: 'GET'
|
verb: 'GET'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
Self.previaLabelPdf = async(ctx, id) => {
|
Self.previousLabel = async(ctx, id) => {
|
||||||
const args = Object.assign({}, ctx.args);
|
const args = Object.assign({}, ctx.args);
|
||||||
const params = {lang: ctx.req.getLocale()};
|
const params = {lang: ctx.req.getLocale()};
|
||||||
|
|
|
@ -3,5 +3,5 @@ module.exports = Self => {
|
||||||
require('../methods/collection/newCollection')(Self);
|
require('../methods/collection/newCollection')(Self);
|
||||||
require('../methods/collection/getSectors')(Self);
|
require('../methods/collection/getSectors')(Self);
|
||||||
require('../methods/collection/setSaleQuantity')(Self);
|
require('../methods/collection/setSaleQuantity')(Self);
|
||||||
require('../methods/collection/previaLabelPdf')(Self);
|
require('../methods/collection/previousLabel')(Self);
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
UPDATE vn.collection
|
UPDATE `vn`.`collection`
|
||||||
SET sectorFk=1
|
SET sectorFk=1
|
||||||
WHERE id=1;
|
WHERE id=1;
|
|
@ -247,7 +247,8 @@
|
||||||
"Empty data source": "Origen de datos vacio",
|
"Empty data source": "Origen de datos vacio",
|
||||||
"Email verify": "Correo de verificación",
|
"Email verify": "Correo de verificación",
|
||||||
"Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
|
"Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
|
||||||
"Receipt's bank was not found": "No se encontró el banco del recibo",
|
"Receipt's bank was not found": "No se encontró el banco del recibo",
|
||||||
"This receipt was not compensated": "Este recibo no ha sido compensado",
|
"This receipt was not compensated": "Este recibo no ha sido compensado",
|
||||||
"Client's email was not found": "No se encontró el email del cliente"
|
"Client's email was not found": "No se encontró el email del cliente",
|
||||||
|
"Something went wrong - no sector found": "Something went wrong - no sector found"
|
||||||
}
|
}
|
|
@ -0,0 +1,2 @@
|
||||||
|
previous: PREVIOUS
|
||||||
|
report: Report
|
|
@ -1 +1,2 @@
|
||||||
reportName: Etiqueta
|
previous: PREVIA
|
||||||
|
report: Ticket
|
||||||
|
|
|
@ -10,12 +10,12 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="data">
|
<div class="data">
|
||||||
<div class="header">PREVIA</div>
|
<div class="header">{{ $t('previous') }}</div>
|
||||||
<div v-if="sector.description.length > 16" class="sector-sm">
|
<div v-if="sector.description.length > 16" class="sector-sm">
|
||||||
{{sector.description}}
|
{{sector.description}}
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="sector">{{sector.description}}</div>
|
<div v-else class="sector">{{sector.description}}</div>
|
||||||
<div class="producer">Ticket #{{previa.ticketFk}}</div>
|
<div class="producer">{{ $t('report') }}#{{previa.ticketFk}}</div>
|
||||||
<div class="details">
|
<div class="details">
|
||||||
<div class="package">
|
<div class="package">
|
||||||
<div class="packing">{{previa.itemPackingTypeFk}}</div>
|
<div class="packing">{{previa.itemPackingTypeFk}}</div>
|
||||||
|
|
|
@ -1,20 +1,20 @@
|
||||||
const Component = require(`vn-print/core/component`);
|
const Component = require(`vn-print/core/component`);
|
||||||
const reportBody = new Component('report-body');
|
const reportBody = new Component('report-body');
|
||||||
const qrcode = require('qrcode');
|
const qrcode = require('qrcode');
|
||||||
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
name: 'previa-label',
|
name: 'previa-label',
|
||||||
async serverPrefetch() {
|
async serverPrefetch() {
|
||||||
this.previa = await this.fetchPrevia(this.id);
|
this.previa = await this.fetchPrevia(this.id);
|
||||||
this.sector = await this.fetchSector(this.id);
|
this.sector = await this.fetchSector(this.id);
|
||||||
this.previa = this.previa[0];
|
|
||||||
this.barcode = await this.getBarcodeBase64(this.id);
|
this.barcode = await this.getBarcodeBase64(this.id);
|
||||||
|
|
||||||
if (!this.previa)
|
if (this.previa)
|
||||||
throw new Error('Something went wrong - previa');
|
this.previa = this.previa[0];
|
||||||
|
|
||||||
if (!this.sector)
|
if (!this.sector)
|
||||||
throw new Error('Something went wrong - sector');
|
throw new UserError('Something went wrong - no sector found');
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
fetchPrevia(id) {
|
fetchPrevia(id) {
|
||||||
|
|
Loading…
Reference in New Issue