shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

description added for invoice and bill

Browse Source
This commit is contained in:
batuhanbas 2020-01-22 12:52:46 +03:00
parent 59754fe6e6
commit 0c8fd8ddec
8 changed files with 71 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
resources/views/portal/invoices/show.blade.php
View File

@ -180,22 +180,27 @@
<th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('invoices.total') }}</th> <th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('invoices.total') }}</th>
@stack('total_th_end') @stack('total_th_end')
</tr> </tr>
@foreach($invoice->items as $item) @foreach($invoice->items as $invoice_item)
<tr class="row"> <tr class="row">
@stack('name_td_start') @stack('name_td_start')
<td class="col-xs-4 col-sm-3 pl-5">{{ $item->name }}</td> <td class="col-xs-4 col-sm-3 pl-5">
{{ $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('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="col-xs-4 col-sm-3 text-center">{{ $item->quantity }}</td> <td class="col-xs-4 col-sm-3 text-center">{{ $invoice_item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="col-sm-3 text-center d-none d-sm-block pl-5">@money($item->price, $invoice->currency_code, true)</td> <td class="col-sm-3 text-center d-none d-sm-block pl-5">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('total_td_start') @stack('total_td_start')
<td class="col-xs-4 col-sm-3 text-right pr-5">@money($item->total, $invoice->currency_code, true)</td> <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') @stack('total_td_end')
</tr> </tr>
@endforeach @endforeach

15
resources/views/portal/invoices/signed.blade.php
View File

@ -150,12 +150,17 @@
<th class="text-center pl-7">{{ trans('invoices.price') }}</th> <th class="text-center pl-7">{{ trans('invoices.price') }}</th>
<th class="text-right pr-5">{{ trans('invoices.total') }}</th> <th class="text-right pr-5">{{ trans('invoices.total') }}</th>
</tr> </tr>
@foreach($invoice->items as $item) @foreach($invoice->items as $invoice_item)
<tr> <tr>
<td class="pl-5">{{ $item->name }}</td> <td class="pl-5">
<td class="text-center">{{ $item->quantity }}</td> {{ $invoice_item->name }}
<td class="text-center pl-7">@money($item->price, $invoice->currency_code, true)</td> @if (!empty($invoice_item->item->description))
<td class="text-right pr-5">@money($item->total, $invoice->currency_code, true)</td> <br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}<small>
@endif
</td>
<td class="text-center">{{ $invoice_item->quantity }}</td>
<td class="text-center pl-7">@money($invoice_item->price, $invoice->currency_code, true)</td>
<td class="text-right pr-5">@money($invoice_item->total, $invoice->currency_code, true)</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>

15
resources/views/purchases/bills/print.blade.php
View File

@ -178,22 +178,27 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($bill->items as $item) @foreach($bill->items as $bill_item)
<tr> <tr>
@stack('name_td_start') @stack('name_td_start')
<td>{{ $item->name }}</td> <td>
{{ $bill_item->name }}
@if (!empty($bill_item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!}<small>
@endif
</td>
@stack('name_td_end') @stack('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="text-center">{{ $item->quantity }}</td> <td class="text-center">{{ $bill_item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="text-center pr-5">@money($item->price, $bill->currency_code, true)</td> <td class="text-center pr-5">@money($bill_item->price, $bill->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('total_td_start') @stack('total_td_start')
<td class="text-right">@money($item->total, $bill->currency_code, true)</td> <td class="text-right">@money($bill_item->total, $bill->currency_code, true)</td>
@stack('total_td_end') @stack('total_td_end')
</tr> </tr>
@endforeach @endforeach

15
resources/views/purchases/bills/show.blade.php
View File

@ -327,22 +327,27 @@
<th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('bills.total') }}</th> <th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('bills.total') }}</th>
@stack('total_th_end') @stack('total_th_end')
</tr> </tr>
@foreach($bill->items as $item) @foreach($bill->items as $bill_item)
<tr class="row"> <tr class="row">
@stack('name_td_start') @stack('name_td_start')
<td class="col-xs-4 col-sm-3 pl-5">{{ $item->name }}</td> <td class="col-xs-4 col-sm-3 pl-5">
{{ $bill_item->name }}
@if (!empty($bill_item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!}<small>
@endif
</td>
@stack('name_td_end') @stack('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="col-xs-4 col-sm-3 text-center">{{ $item->quantity }}</td> <td class="col-xs-4 col-sm-3 text-center">{{ $bill_item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="col-sm-3 text-right d-none d-sm-block pl-8">@money($item->price, $bill->currency_code, true)</td> <td class="col-sm-3 text-right d-none d-sm-block pl-8">@money($bill_item->price, $bill->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('total_td_start') @stack('total_td_start')
<td class="col-xs-4 col-sm-3 text-right pr-5">@money($item->total, $bill->currency_code, true)</td> <td class="col-xs-4 col-sm-3 text-right pr-5">@money($bill_item->total, $bill->currency_code, true)</td>
@stack('total_td_end') @stack('total_td_end')
</tr> </tr>
@endforeach @endforeach

14
resources/views/sales/invoices/print_classic.blade.php
View File

@ -153,27 +153,27 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($invoice->items as $item) @foreach($invoice->items as $invoice_item)
<tr> <tr>
@stack('name_td_start') @stack('name_td_start')
<td class="item"> <td class="item">
{{ $item->name }} {{ $invoice_item->name }}
@if ($item->desc) @if (!empty($invoice_item->item->description))
<br><small>{!! $item->desc !!}</small> <br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}</small>
@endif @endif
</td> </td>
@stack('name_td_end') @stack('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="quantity">{{ $item->quantity }}</td> <td class="quantity">{{ $invoice_item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="price">@money($item->price, $invoice->currency_code, true)</td> <td class="price">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('total_td_start') @stack('total_td_start')
<td class="total">@money($item->total, $invoice->currency_code, true)</td> <td class="total">@money($invoice_item->total, $invoice->currency_code, true)</td>
@stack('total_td_end') @stack('total_td_end')
</tr> </tr>
@endforeach @endforeach

14
resources/views/sales/invoices/print_default.blade.php
View File

@ -136,27 +136,27 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($invoice->items as $item) @foreach($invoice->items as $invoice_item)
<tr> <tr>
@stack('name_td_start') @stack('name_td_start')
<td class="item"> <td class="item">
{{ $item->name }} {{ $invoice_item->name }}
@if ($item->desc) @if (!empty($invoice_item->item->description))
<br><small>{!! $item->desc !!}</small> <br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}</small>
@endif @endif
</td> </td>
@stack('name_td_end') @stack('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="quantity">{{ $item->quantity }}</td> <td class="quantity">{{ $invoice_item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="price">@money($item->price, $invoice->currency_code, true)</td> <td class="price">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('total_td_start') @stack('total_td_start')
<td class="total">@money($item->total, $invoice->currency_code, true)</td> <td class="total">@money($invoice_item->total, $invoice->currency_code, true)</td>
@stack('total_td_end') @stack('total_td_end')
</tr> </tr>
@endforeach @endforeach

14
resources/views/sales/invoices/print_modern.blade.php
View File

@ -125,27 +125,27 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($invoice->items as $item) @foreach($invoice->items as $invoice_item)
<tr> <tr>
@stack('name_td_start') @stack('name_td_start')
<td class="item"> <td class="item">
{{ $item->name }} {{ $invoice_item->name }}
@if ($item->desc) @if (!empty($invoice_item->item->description))
{!! $item->desc !!} <br><small>{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!}</small>
@endif @endif
</td> </td>
@stack('name_td_end') @stack('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="quantity">{{ $item->quantity }}</td> <td class="quantity">{{ $invoice_item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="price">@money($item->price, $invoice->currency_code, true)</td> <td class="price">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('total_td_start') @stack('total_td_start')
<td class="total">@money($item->total, $invoice->currency_code, true)</td> <td class="total">@money($invoice_item->total, $invoice->currency_code, true)</td>
@stack('total_td_end') @stack('total_td_end')
</tr> </tr>
@endforeach @endforeach

15
resources/views/sales/invoices/show.blade.php
View File

@ -350,22 +350,27 @@
<th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('invoices.total') }}</th> <th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('invoices.total') }}</th>
@stack('total_th_end') @stack('total_th_end')
</tr> </tr>
@foreach($invoice->items as $item) @foreach($invoice->items as $invoice_item)
<tr class="row"> <tr class="row">
@stack('name_td_start') @stack('name_td_start')
<td class="col-xs-4 col-sm-3 pl-5">{{ $item->name }}</td> <td class="col-xs-4 col-sm-3 pl-5">
{{ $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('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="col-xs-4 col-sm-3 text-center">{{ $item->quantity }}</td> <td class="col-xs-4 col-sm-3 text-center">{{ $invoice_item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
<td class="col-sm-3 text-right d-none d-sm-block pl-8">@money($item->price, $invoice->currency_code, true)</td> <td class="col-sm-3 text-right d-none d-sm-block pl-8">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('total_td_start') @stack('total_td_start')
<td class="col-xs-4 col-sm-3 text-right pr-5">@money($item->total, $invoice->currency_code, true)</td> <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') @stack('total_td_end')
</tr> </tr>
@endforeach @endforeach