Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price

This commit is contained in:
Alex Moreno 2022-03-23 12:17:14 +01:00
commit f6ff8ea081
5 changed files with 17 additions and 2 deletions

View File

@ -0,0 +1,8 @@
CREATE TABLE `vn`.`claimConfig` (
`id` int(11) NOT NULL,
`pickupContact` varchar(250),
PRIMARY KEY (`id`)
);
INSERT INTO vn.claimConfig (id, pickupContact)
VALUES(1, 'Email: cmorenoa@logista.com Telf: 961594250 Extensión: 206');

View File

@ -80,6 +80,7 @@
</div>
<p v-html="$t('sections.agency.description')"></p>
<p>{{claimConfig.pickupContact}}</p>
</div>
</div>
<!-- Footer block -->

View File

@ -7,6 +7,7 @@ module.exports = {
async serverPrefetch() {
this.client = await this.fetchClient(this.claimId);
this.sales = await this.fetchSales(this.claimId);
this.claimConfig = await this.fetchClaimConfig();
if (!this.client)
throw new Error('Something went wrong');
@ -25,6 +26,9 @@ module.exports = {
fetchSales(claimId) {
return this.rawSqlFromDef('sales', [claimId]);
},
fetchClaimConfig() {
return this.findOneFromDef('claimConfig');
},
},
components: {
'report-header': reportHeader.build(),

View File

@ -14,4 +14,4 @@ phone: Teléfono
sections:
agency:
description: 'Para agilizar su recogida, por favor, póngase en contacto con la oficina
de Logista Parcel. <br/> Tlf: 96 166 77 88 - Ana Gómez (Ext. 2113) <em>(atcsalidas.i2valencia@integra2.es)</em>'
de Logista Parcel.'

View File

@ -0,0 +1,2 @@
SELECT pickupContact
FROM claimConfig;