From 0c8fd8ddec2b6feaca28eaa8445d2c4bedde7b80 Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Wed, 22 Jan 2020 12:52:46 +0300
Subject: [PATCH] description added for invoice and bill

---
 resources/views/portal/invoices/show.blade.php    | 15 ++++++++++-----
 resources/views/portal/invoices/signed.blade.php  | 15 ++++++++++-----
 resources/views/purchases/bills/print.blade.php   | 15 ++++++++++-----
 resources/views/purchases/bills/show.blade.php    | 15 ++++++++++-----
 .../views/sales/invoices/print_classic.blade.php  | 14 +++++++-------
 .../views/sales/invoices/print_default.blade.php  | 14 +++++++-------
 .../views/sales/invoices/print_modern.blade.php   | 14 +++++++-------
 resources/views/sales/invoices/show.blade.php     | 15 ++++++++++-----
 8 files changed, 71 insertions(+), 46 deletions(-)

diff --git a/resources/views/portal/invoices/show.blade.php b/resources/views/portal/invoices/show.blade.php
index caac50192..45b7ec490 100644
--- a/resources/views/portal/invoices/show.blade.php
+++ b/resources/views/portal/invoices/show.blade.php
@@ -180,22 +180,27 @@
                                                 <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 $item)
+                                        @foreach($invoice->items as $invoice_item)
                                             <tr class="row">
                                                 @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('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('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('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')
                                             </tr>
                                         @endforeach
diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php
index d6ba1abae..af1164640 100644
--- a/resources/views/portal/invoices/signed.blade.php
+++ b/resources/views/portal/invoices/signed.blade.php
@@ -150,12 +150,17 @@
                                 <th class="text-center pl-7">{{ trans('invoices.price') }}</th>
                                 <th class="text-right pr-5">{{ trans('invoices.total') }}</th>
                             </tr>
-                            @foreach($invoice->items as $item)
+                            @foreach($invoice->items as $invoice_item)
                                 <tr>
-                                    <td class="pl-5">{{ $item->name }}</td>
-                                    <td class="text-center">{{ $item->quantity }}</td>
-                                    <td class="text-center pl-7">@money($item->price, $invoice->currency_code, true)</td>
-                                    <td class="text-right pr-5">@money($item->total, $invoice->currency_code, true)</td>
+                                    <td class="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>
+                                    <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>
                             @endforeach
                         </tbody>
diff --git a/resources/views/purchases/bills/print.blade.php b/resources/views/purchases/bills/print.blade.php
index 41ad8271d..f59269197 100644
--- a/resources/views/purchases/bills/print.blade.php
+++ b/resources/views/purchases/bills/print.blade.php
@@ -178,22 +178,27 @@
                 </tr>
             </thead>
             <tbody>
-                @foreach($bill->items as $item)
+                @foreach($bill->items as $bill_item)
                     <tr>
                         @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('quantity_td_start')
-                            <td class="text-center">{{ $item->quantity }}</td>
+                            <td class="text-center">{{ $bill_item->quantity }}</td>
                         @stack('quantity_td_end')
 
                         @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('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')
                     </tr>
                 @endforeach
diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php
index d49b7fc71..7fc7f921b 100644
--- a/resources/views/purchases/bills/show.blade.php
+++ b/resources/views/purchases/bills/show.blade.php
@@ -327,22 +327,27 @@
                                                 <th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('bills.total') }}</th>
                                             @stack('total_th_end')
                                         </tr>
-                                        @foreach($bill->items as $item)
+                                        @foreach($bill->items as $bill_item)
                                             <tr class="row">
                                                 @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('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('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('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')
                                             </tr>
                                         @endforeach
diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php
index 27371fff1..63d8eabfa 100644
--- a/resources/views/sales/invoices/print_classic.blade.php
+++ b/resources/views/sales/invoices/print_classic.blade.php
@@ -153,27 +153,27 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach($invoice->items as $item)
+                        @foreach($invoice->items as $invoice_item)
                             <tr>
                                 @stack('name_td_start')
                                     <td class="item">
-                                        {{ $item->name }}
-                                        @if ($item->desc)
-                                            <br><small>{!! $item->desc !!}</small>
+                                        {{ $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">{{ $item->quantity }}</td>
+                                    <td class="quantity">{{ $invoice_item->quantity }}</td>
                                 @stack('quantity_td_end')
 
                                 @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('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')
                             </tr>
                         @endforeach
diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php
index 96a47ce31..5b155cd7b 100644
--- a/resources/views/sales/invoices/print_default.blade.php
+++ b/resources/views/sales/invoices/print_default.blade.php
@@ -136,27 +136,27 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach($invoice->items as $item)
+                        @foreach($invoice->items as $invoice_item)
                             <tr>
                                 @stack('name_td_start')
                                     <td class="item">
-                                        {{ $item->name }}
-                                        @if ($item->desc)
-                                            <br><small>{!! $item->desc !!}</small>
+                                        {{ $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">{{ $item->quantity }}</td>
+                                    <td class="quantity">{{ $invoice_item->quantity }}</td>
                                 @stack('quantity_td_end')
 
                                 @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('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')
                             </tr>
                         @endforeach
diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php
index 2890521d9..500041dc9 100644
--- a/resources/views/sales/invoices/print_modern.blade.php
+++ b/resources/views/sales/invoices/print_modern.blade.php
@@ -125,27 +125,27 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach($invoice->items as $item)
+                        @foreach($invoice->items as $invoice_item)
                             <tr>
                                 @stack('name_td_start')
                                     <td class="item">
-                                        {{ $item->name }}
-                                        @if ($item->desc)
-                                            {!! $item->desc !!}
+                                        {{ $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">{{ $item->quantity }}</td>
+                                    <td class="quantity">{{ $invoice_item->quantity }}</td>
                                 @stack('quantity_td_end')
 
                                 @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('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')
                             </tr>
                         @endforeach
diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php
index bdcb01599..fdb3a5a1a 100644
--- a/resources/views/sales/invoices/show.blade.php
+++ b/resources/views/sales/invoices/show.blade.php
@@ -350,22 +350,27 @@
                                                 <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 $item)
+                                        @foreach($invoice->items as $invoice_item)
                                             <tr class="row">
                                                 @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('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('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('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')
                                             </tr>
                                         @endforeach