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

#1696 formulario que se envia a los clientes

This commit is contained in:
Carlos Jimenez Ruiz 2019-09-24 12:08:21 +02:00
parent 1cc8b5512e
commit ebc4dd5616
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
print/report/rpt-claim-pickup-order/index.html
View File

@ -32,12 +32,12 @@
<section class="panel"> <section class="panel">
<section class="header">{{$t('clientData')}}</section> <section class="header">{{$t('clientData')}}</section>
<section class="body"> <section class="body">
<h3 class="uppercase">{{clientName}}</h3> <h3 class="uppercase">{{nickname}}</h3>
<section> <section>
{{street}} {{street}}
</section> </section>
<section> <section>
{{postcode}}, {{city}} ({{province}}) {{postalCode}}, {{city}} ({{province}})
</section> </section>
<section> <section>
{{country}} {{country}}

9
print/report/rpt-claim-pickup-order/index.js
View File

@ -43,16 +43,19 @@ module.exports = {
c.email AS recipient, c.email AS recipient,
c.socialName, c.socialName,
c.name AS clientName, c.name AS clientName,
c.street,
c.postcode,
c.city,
c.fi, c.fi,
a.city,
a.postalCode,
a.street,
a.nickname,
p.name AS province, p.name AS province,
ct.country ct.country
FROM claim cl FROM claim cl
JOIN client c ON c.id = cl.clientFk JOIN client c ON c.id = cl.clientFk
JOIN account.user u ON u.id = c.id JOIN account.user u ON u.id = c.id
JOIN country ct ON ct.id = c.countryFk JOIN country ct ON ct.id = c.countryFk
JOIN ticket t ON t.id = cl.ticketFk
JOIN address a ON a.id = t.addressFk
LEFT JOIN province p ON p.id = c.provinceFk LEFT JOIN province p ON p.id = c.provinceFk
WHERE cl.id = ?`, [claimFk]); WHERE cl.id = ?`, [claimFk]);
}, },

2
print/report/rpt-claim-pickup-order/locale.js
View File

@ -5,7 +5,7 @@ module.exports = {
claimId: 'Reclamación', claimId: 'Reclamación',
clientId: 'Cliente', clientId: 'Cliente',
date: 'Fecha', date: 'Fecha',
clientData: 'Datos del cliente', clientData: 'Dirección de recogida',
quantity: 'Cantidad', quantity: 'Cantidad',
claims: 'Reclama', claims: 'Reclama',
reference: 'Referencia', reference: 'Referencia',