Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price
This commit is contained in:
commit
f6ff8ea081
|
@ -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');
|
|
@ -80,6 +80,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p v-html="$t('sections.agency.description')"></p>
|
<p v-html="$t('sections.agency.description')"></p>
|
||||||
|
<p>{{claimConfig.pickupContact}}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- Footer block -->
|
<!-- Footer block -->
|
||||||
|
|
|
@ -7,6 +7,7 @@ module.exports = {
|
||||||
async serverPrefetch() {
|
async serverPrefetch() {
|
||||||
this.client = await this.fetchClient(this.claimId);
|
this.client = await this.fetchClient(this.claimId);
|
||||||
this.sales = await this.fetchSales(this.claimId);
|
this.sales = await this.fetchSales(this.claimId);
|
||||||
|
this.claimConfig = await this.fetchClaimConfig();
|
||||||
|
|
||||||
if (!this.client)
|
if (!this.client)
|
||||||
throw new Error('Something went wrong');
|
throw new Error('Something went wrong');
|
||||||
|
@ -25,6 +26,9 @@ module.exports = {
|
||||||
fetchSales(claimId) {
|
fetchSales(claimId) {
|
||||||
return this.rawSqlFromDef('sales', [claimId]);
|
return this.rawSqlFromDef('sales', [claimId]);
|
||||||
},
|
},
|
||||||
|
fetchClaimConfig() {
|
||||||
|
return this.findOneFromDef('claimConfig');
|
||||||
|
},
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
'report-header': reportHeader.build(),
|
'report-header': reportHeader.build(),
|
||||||
|
|
|
@ -14,4 +14,4 @@ phone: Teléfono
|
||||||
sections:
|
sections:
|
||||||
agency:
|
agency:
|
||||||
description: 'Para agilizar su recogida, por favor, póngase en contacto con la oficina
|
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.'
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
SELECT pickupContact
|
||||||
|
FROM claimConfig;
|
Loading…
Reference in New Issue