Compare commits

..

No commits in common. "6b96fe5b65cf23cbe35194df13082dad422b1a4b" and "0a3edef6d1707b54b7526a362ff764f53d1275eb" have entirely different histories.

2 changed files with 1 additions and 8 deletions

View File

@ -16,7 +16,6 @@
<tr> <tr>
<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> <tr>
<td class="font gray uppercase">{{$t('invoice')}}</td> <td class="font gray uppercase">{{$t('invoice')}}</td>
@ -81,9 +80,6 @@
<span>{{formatDate(ticket.shipped, '%d-%m-%Y')}}</span> <span>{{formatDate(ticket.shipped, '%d-%m-%Y')}}</span>
</div> </div>
</div> </div>
<span class="pull-right">
<h2>{{ticket.street}}</h2>
</span>
<span id="nickname" class="pull-right"> <span id="nickname" class="pull-right">
<h2>{{ticket.nickname}}</h2> <h2>{{ticket.nickname}}</h2>
</span> </span>

View File

@ -2,12 +2,9 @@ SELECT
t.id, t.id,
t.shipped, t.shipped,
t.nickname, t.nickname,
tto.description, tto.description
t.addressFk,
a.street
FROM invoiceOut io FROM invoiceOut io
JOIN ticket t ON t.refFk = io.REF JOIN ticket t ON t.refFk = io.REF
JOIN `address` a ON a.id = t.addressFk
LEFT JOIN observationType ot ON ot.code = 'invoiceOut' LEFT JOIN observationType ot ON ot.code = 'invoiceOut'
LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id
AND tto.observationTypeFk = ot.id AND tto.observationTypeFk = ot.id