Merge branch 'master' of https://github.com/dgvai/laravel-invoicer into release

Author: dgvai

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.0.3
+- Fixed Bugs
+- Updated Invoic Look
+
 ## 2.0.2 
 - Added Coupon Discount
 - Updated Invoice look

src/views/invoice.blade.php

@@ -55,19 +55,19 @@
                         <td class="float-right">{{config('invoicer.header.unit')}}</td>
                         <td class="float-right">{{config('invoicer.header.discount')}}</td>
                         @if(config('invoicer.enabled.extra'))
-                        @php $colspan++ @endphp
+                        @php $colspan1++ @endphp
                         <td class="float-right">{{config('invoicer.header.extra')}}</td>
                         @endif
                         @if(config('invoicer.enabled.addship'))
-                        @php $colspan++ @endphp
+                        @php $colspan1++ @endphp
                         <td class="float-right">{{config('invoicer.header.addship')}}</td>
                         @endif
                         <td class="float-right">{{config('invoicer.header.subtotal')}}</td>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($that->items as $i => $item)
-                    <tr>
+                    <tr class="small">
                         <td>{{$i+1}}</td>
                         <td>{{$item['title']}}</td>
                         <td class="float-center">{{$item['qty']}}</td>
@@ -85,36 +85,36 @@
                     <tr>
                         <td class="no-top-tr" colspan="{{$colspan1}}"></td>
                         <td class="float-right small" colspan="{{$colspan2}}">{{config('invoicer.header.sumtotal')}}</td>
-                        <td class="float-right small">{{$that->sum_total}} {{config('invoicer.currency')}}</td>
+                        <td class="float-right small" colspan="{{$colspan2}}">{{$that->sum_total}} {{config('invoicer.currency')}}</td>
                     </tr>
                     @if(config('invoicer.vat.allowed'))
                     <tr>
                         <td class="no-top-tr float-left small" colspan="{{$colspan1}}">{{$that->vat['number']}}</td>
                         <td class="float-right small" colspan="{{$colspan2}}">VAT/TAX</td>
-                        <td class="float-right small">{{$that->vat['amount']}} {{config('invoicer.currency')}}</td>
+                        <td class="float-right small" colspan="{{$colspan2}}">{{$that->vat['amount']}} {{config('invoicer.currency')}}</td>
                     </tr>
                     @endif
                     <tr>
                         <td class="no-top-tr" colspan="{{$colspan1}}"></td>
                         <td class="float-right small" colspan="{{$colspan2}}">{{config('invoicer.header.shipping')}}</td>
-                        <td class="float-right small">{{$that->ship_total}} {{config('invoicer.currency')}}</td>
+                        <td class="float-right small" colspan="{{$colspan2}}">{{$that->ship_total}} {{config('invoicer.currency')}}</td>
                     </tr>
                     <tr>
                         <td class="no-top-tr" colspan="{{$colspan1}}"></td>
                         <td class="float-right small" colspan="{{$colspan2}}">{{config('invoicer.header.homecost')}}</td>
-                        <td class="float-right small">{{$that->home_cost}} {{config('invoicer.currency')}}</td>
+                        <td class="float-right small" colspan="{{$colspan2}}">{{$that->home_cost}} {{config('invoicer.currency')}}</td>
                     </tr>
                     @if($that->coupon_discount > 0)
                     <tr>
                         <td class="no-top-tr" colspan="{{$colspan1}}">#{{$that->coupon_code}}</td>
                         <td class="float-right small" colspan="{{$colspan2}}">{{config('invoicer.header.coupon')}}</td>
-                        <td class="float-right small">{{$that->coupon_discount}} {{config('invoicer.currency')}}</td>
+                        <td class="float-right small" colspan="{{$colspan2}}">{{$that->coupon_discount}} {{config('invoicer.currency')}}</td>
                     </tr>
                     @endif
                     <tr>
                         <td class="no-top-tr" colspan="{{$colspan1}}"></td>
                         <td class="float-right title" colspan="{{$colspan2}}">Total</td>
-                        <td class="float-right">{{$that->total}} {{config('invoicer.currency')}}</td>
+                        <td class="float-right" colspan="{{$colspan2}}">{{$that->total}} {{config('invoicer.currency')}}</td>
                     </tr>
                 </tbody>
             </table>