Merge pull request '3444-print_claim-pickup-order add client.phone' (#829) from 3444-print_claim-pickup-order into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #829 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
This commit is contained in:
commit
f07e92aa58
|
@ -23,6 +23,10 @@
|
||||||
<td class="font gray uppercase">{{$t('clientId')}}</td>
|
<td class="font gray uppercase">{{$t('clientId')}}</td>
|
||||||
<th>{{client.id}}</th>
|
<th>{{client.id}}</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="font gray uppercase">{{$t('phone')}}</td>
|
||||||
|
<th>{{client.phone}}</th>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="font gray uppercase">{{$t('date')}}</td>
|
<td class="font gray uppercase">{{$t('date')}}</td>
|
||||||
<th>{{dated}}</th>
|
<th>{{dated}}</th>
|
||||||
|
|
|
@ -9,6 +9,7 @@ reference: Referencia
|
||||||
concept: Concepto
|
concept: Concepto
|
||||||
clientSignature: Firma del cliente
|
clientSignature: Firma del cliente
|
||||||
claim: Reclamación {0}
|
claim: Reclamación {0}
|
||||||
|
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
|
||||||
|
|
|
@ -8,7 +8,8 @@ SELECT
|
||||||
a.street,
|
a.street,
|
||||||
a.nickname,
|
a.nickname,
|
||||||
p.name AS province,
|
p.name AS province,
|
||||||
ct.country
|
ct.country,
|
||||||
|
IFNULL(c.phone, cc.phone) AS phone
|
||||||
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
|
||||||
|
@ -17,4 +18,6 @@ FROM claim cl
|
||||||
LEFT JOIN province p ON p.id = a.provinceFk
|
LEFT JOIN province p ON p.id = a.provinceFk
|
||||||
LEFT JOIN autonomy amy ON amy.id = p.autonomyFk
|
LEFT JOIN autonomy amy ON amy.id = p.autonomyFk
|
||||||
LEFT JOIN country ct ON ct.id = amy.countryFk
|
LEFT JOIN country ct ON ct.id = amy.countryFk
|
||||||
WHERE cl.id = ?
|
LEFT JOIN clientContact cc ON cc.clientFk = c.id
|
||||||
|
WHERE cl.id = ?
|
||||||
|
LIMIT 1;
|
Loading…
Reference in New Issue