master branch merge
This commit is contained in:
@ -145,29 +145,8 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($invoice->items as $invoice_item)
|
||||
<tr>
|
||||
@stack('name_td_start')
|
||||
<td class="item">
|
||||
{{ $invoice_item->name }}
|
||||
@if (!empty($invoice_item->item->description))
|
||||
<br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}</small>
|
||||
@endif
|
||||
</td>
|
||||
@stack('name_td_end')
|
||||
|
||||
@stack('quantity_td_start')
|
||||
<td class="quantity">{{ $invoice_item->quantity }}</td>
|
||||
@stack('quantity_td_end')
|
||||
|
||||
@stack('price_td_start')
|
||||
<td class="price">@money($invoice_item->price, $invoice->currency_code, true)</td>
|
||||
@stack('price_td_end')
|
||||
|
||||
@stack('total_td_start')
|
||||
<td class="total">@money($invoice_item->total, $invoice->currency_code, true)</td>
|
||||
@stack('total_td_end')
|
||||
</tr>
|
||||
@foreach($invoice->items as $item)
|
||||
@include('partials.documents.item.print', ['document' => $invoice])
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
@ -132,29 +132,8 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($invoice->items as $invoice_item)
|
||||
<tr>
|
||||
@stack('name_td_start')
|
||||
<td class="item">
|
||||
{{ $invoice_item->name }}
|
||||
@if (!empty($invoice_item->item->description))
|
||||
<br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}</small>
|
||||
@endif
|
||||
</td>
|
||||
@stack('name_td_end')
|
||||
|
||||
@stack('quantity_td_start')
|
||||
<td class="quantity">{{ $invoice_item->quantity }}</td>
|
||||
@stack('quantity_td_end')
|
||||
|
||||
@stack('price_td_start')
|
||||
<td class="price">@money($invoice_item->price, $invoice->currency_code, true)</td>
|
||||
@stack('price_td_end')
|
||||
|
||||
@stack('total_td_start')
|
||||
<td class="total">@money($invoice_item->total, $invoice->currency_code, true)</td>
|
||||
@stack('total_td_end')
|
||||
</tr>
|
||||
@foreach($invoice->items as $item)
|
||||
@include('partials.documents.item.print', ['document' => $invoice])
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
@ -114,29 +114,8 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($invoice->items as $invoice_item)
|
||||
<tr>
|
||||
@stack('name_td_start')
|
||||
<td class="item">
|
||||
{{ $invoice_item->name }}
|
||||
@if (!empty($invoice_item->item->description))
|
||||
<br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}</small>
|
||||
@endif
|
||||
</td>
|
||||
@stack('name_td_end')
|
||||
|
||||
@stack('quantity_td_start')
|
||||
<td class="quantity">{{ $invoice_item->quantity }}</td>
|
||||
@stack('quantity_td_end')
|
||||
|
||||
@stack('price_td_start')
|
||||
<td class="price">@money($invoice_item->price, $invoice->currency_code, true)</td>
|
||||
@stack('price_td_end')
|
||||
|
||||
@stack('total_td_start')
|
||||
<td class="total">@money($invoice_item->total, $invoice->currency_code, true)</td>
|
||||
@stack('total_td_end')
|
||||
</tr>
|
||||
@foreach($invoice->items as $item)
|
||||
@include('partials.documents.item.print', ['document' => $invoice])
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
@ -366,35 +366,8 @@
|
||||
<th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('invoices.total') }}</th>
|
||||
@stack('total_th_end')
|
||||
</tr>
|
||||
@foreach($invoice->items as $invoice_item)
|
||||
<tr class="d-flex flex-nowrap">
|
||||
@stack('name_td_start')
|
||||
<td class="col-xs-4 col-sm-5 pl-5">
|
||||
{{ $invoice_item->name }}
|
||||
@if (!empty($invoice_item->item->description))
|
||||
<br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}<small>
|
||||
@endif
|
||||
</td>
|
||||
@stack('name_td_end')
|
||||
|
||||
@stack('quantity_td_start')
|
||||
<td class="col-xs-4 col-sm-1 text-center">{{ $invoice_item->quantity }}</td>
|
||||
@stack('quantity_td_end')
|
||||
|
||||
@stack('price_td_start')
|
||||
<td class="col-sm-3 text-right d-none d-sm-block">@money($invoice_item->price, $invoice->currency_code, true)</td>
|
||||
@stack('price_td_end')
|
||||
|
||||
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
|
||||
@stack('discount_td_start')
|
||||
<td class="col-sm-1 text-center d-none d-sm-block">{{ $invoice_item->discount }}</td>
|
||||
@stack('discount_td_end')
|
||||
@endif
|
||||
|
||||
@stack('total_td_start')
|
||||
<td class="col-xs-4 col-sm-3 text-right pr-5">@money($invoice_item->total, $invoice->currency_code, true)</td>
|
||||
@stack('total_td_end')
|
||||
</tr>
|
||||
@foreach($invoice->items as $item)
|
||||
@include('partials.documents.item.show', ['document' => $invoice])
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
Reference in New Issue
Block a user