diff --git a/print/report/rpt-claim-pickup-order/index.html b/print/report/rpt-claim-pickup-order/index.html index 9a8f48098..b5c571a5c 100644 --- a/print/report/rpt-claim-pickup-order/index.html +++ b/print/report/rpt-claim-pickup-order/index.html @@ -32,12 +32,12 @@
{{$t('clientData')}}
-

{{clientName}}

+

{{nickname}}

{{street}}
- {{postcode}}, {{city}} ({{province}}) + {{postalCode}}, {{city}} ({{province}})
{{country}} diff --git a/print/report/rpt-claim-pickup-order/index.js b/print/report/rpt-claim-pickup-order/index.js index 8c172aa9c..2124be828 100755 --- a/print/report/rpt-claim-pickup-order/index.js +++ b/print/report/rpt-claim-pickup-order/index.js @@ -43,16 +43,19 @@ module.exports = { c.email AS recipient, c.socialName, c.name AS clientName, - c.street, - c.postcode, - c.city, c.fi, + a.city, + a.postalCode, + a.street, + a.nickname, p.name AS province, ct.country FROM claim cl JOIN client c ON c.id = cl.clientFk JOIN account.user u ON u.id = c.id 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 WHERE cl.id = ?`, [claimFk]); }, diff --git a/print/report/rpt-claim-pickup-order/locale.js b/print/report/rpt-claim-pickup-order/locale.js index 523ac5379..e15bd28c1 100644 --- a/print/report/rpt-claim-pickup-order/locale.js +++ b/print/report/rpt-claim-pickup-order/locale.js @@ -5,7 +5,7 @@ module.exports = { claimId: 'Reclamación', clientId: 'Cliente', date: 'Fecha', - clientData: 'Datos del cliente', + clientData: 'Dirección de recogida', quantity: 'Cantidad', claims: 'Reclama', reference: 'Referencia',