From 7c6a40374d8bd79ca38087e2ede8e5b01c104673 Mon Sep 17 00:00:00 2001
From: raishvaria <raishvaria1996@gmail.com>
Date: Sat, 14 Dec 2019 14:42:34 +0530
Subject: [PATCH] fix tax percent & pdf money format issue

---
 .../js/components/base/modal/TaxTypeModal.vue |  2 +-
 .../app/pdf/estimate/partials/table.blade.php | 40 +++++++++++++++----
 .../app/pdf/invoice/partials/table.blade.php  | 35 +++++++++++++---
 .../views/app/pdf/reports/expenses.blade.php  |  8 +++-
 .../app/pdf/reports/profit-loss.blade.php     |  8 +++-
 .../app/pdf/reports/sales-customers.blade.php | 16 ++++++--
 .../app/pdf/reports/sales-items.blade.php     | 16 ++++++--
 .../app/pdf/reports/tax-summary.blade.php     | 24 ++++++++---
 8 files changed, 116 insertions(+), 33 deletions(-)

diff --git a/resources/assets/js/components/base/modal/TaxTypeModal.vue b/resources/assets/js/components/base/modal/TaxTypeModal.vue
index 7461cee9..151ba30c 100644
--- a/resources/assets/js/components/base/modal/TaxTypeModal.vue
+++ b/resources/assets/js/components/base/modal/TaxTypeModal.vue
@@ -124,7 +124,7 @@ export default {
       },
       percent: {
         required,
-        between: between(-1, 100)
+        between: between(0, 100)
       },
       description: {
         maxLength: maxLength(255)
diff --git a/resources/views/app/pdf/estimate/partials/table.blade.php b/resources/views/app/pdf/estimate/partials/table.blade.php
index b7ec1471..0278ff56 100644
--- a/resources/views/app/pdf/estimate/partials/table.blade.php
+++ b/resources/views/app/pdf/estimate/partials/table.blade.php
@@ -18,24 +18,48 @@
     @endphp
     @foreach ($estimate->items as $item)
         <tr class="item-details">
-            <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 20px; vertical-align: top;">{{$index}}</td>
-            <td class="inv-item items" style="text-align: left; color: #040405;padding-left: 0px">
-                <span>{{ $item->name }}</span><br>
-                <span style="text-align: left; color: #595959; font-size: 9px; font-weight:300; line-height: 12px;">{{ $item->description }}</span>
+            <td
+                class="inv-item items"
+                style="text-align: right; color: #040405; padding-right: 20px; vertical-align: top;"
+            >
+                {{$index}}
+            </td>
+            <td
+                class="inv-item items"
+                style="text-align: left; color: #040405;padding-left: 0px"
+            >
+                <span>{{ $item->name }}</span><br>
+                <span
+                    style="text-align: left; color: #595959; font-size: 9px; font-weight:300; line-height: 12px;"
+                >
+                    {{ $item->description }}
+                </span>
+            </td>
+            <td
+                class="inv-item items"
+                style="text-align: right; color: #040405; padding-right: 20px"
+            >
+                {{$item->quantity}}
+            </td>
+            <td
+                class="inv-item items"
+                style="text-align: right; color: #040405; padding-right: 40px"
+            >
+                {!! format_money_pdf($item->price, $estimate->user->currency) !!}
             </td>
-            <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 20px">{{$item->quantity}}</td>
-            <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 40px">{{$item->price/100}}</td>
             @if($estimate->discount_per_item === 'YES')
                 <td class="inv-item items" style="text-align: right; color: #040405; padding-left: 10px">
                     @if($item->discount_type === 'fixed')
-                        {{$item->discount_val/100}}
+                        {!! format_money_pdf($item->discount_val, $estimate->user->currency) !!}
                     @endif
                     @if($item->discount_type === 'percentage')
                         {{$item->discount}}%
                     @endif
                 </td>
             @endif
-            <td class="inv-item items" style="text-align: right; color: #040405;">{{$item->total/100}}</td>
+            <td class="inv-item items" style="text-align: right; color: #040405;">
+                {!! format_money_pdf($item->total, $estimate->user->currency) !!}
+            </td>
         </tr>
         @php
             $index += 1
diff --git a/resources/views/app/pdf/invoice/partials/table.blade.php b/resources/views/app/pdf/invoice/partials/table.blade.php
index 0bcc30c2..363bfe29 100644
--- a/resources/views/app/pdf/invoice/partials/table.blade.php
+++ b/resources/views/app/pdf/invoice/partials/table.blade.php
@@ -18,24 +18,47 @@
     @endphp
     @foreach ($invoice->items as $item)
         <tr class="item-details">
-            <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 20px; vertical-align: top;">{{$index}}</td>
-            <td class="inv-item items" style="text-align: left; color: #040405;padding-left: 0px">
+            <td
+                class="inv-item items"
+                style="text-align: right; color: #040405; padding-right: 20px; vertical-align: top;"
+            >
+                {{$index}}
+            </td>
+            <td
+                class="inv-item items"
+                style="text-align: left; color: #040405;padding-left: 0px"
+            >
                 <span>{{ $item->name }}</span><br>
                 <span style="text-align: left; color: #595959; font-size: 9px; font-weight:300; line-height: 12px;">{{ $item->description }}</span>
             </td>
-            <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 20px">{{$item->quantity}}</td>
-            <td class="inv-item items" style="text-align: right; color: #040405; padding-right: 40px">{{$item->price/100}}</td>
+            <td
+                class="inv-item items"
+                style="text-align: right; color: #040405; padding-right: 20px"
+            >
+                {{$item->quantity}}
+            </td>
+            <td
+                class="inv-item items"
+                style="text-align: right; color: #040405; padding-right: 40px"
+            >
+                {!! format_money_pdf($item->price, $invoice->user->currency) !!}
+            </td>
             @if($invoice->discount_per_item === 'YES')
                 <td class="inv-item items" style="text-align: right; color: #040405; padding-left: 10px">
                     @if($item->discount_type === 'fixed')
-                        {{$item->discount_val/100}}
+                        {!! format_money_pdf($item->discount_val, $invoice->user->currency) !!}
                     @endif
                     @if($item->discount_type === 'percentage')
                         {{$item->discount}}%
                     @endif
                 </td>
             @endif
-            <td class="inv-item items" style="text-align: right; color: #040405;">{{$item->total/100}}</td>
+            <td
+                class="inv-item items"
+                style="text-align: right; color: #040405;"
+            >
+                {!! format_money_pdf($item->total, $invoice->user->currency) !!}
+            </td>
         </tr>
         @php
             $index += 1
diff --git a/resources/views/app/pdf/reports/expenses.blade.php b/resources/views/app/pdf/reports/expenses.blade.php
index 6912d765..054bd79f 100644
--- a/resources/views/app/pdf/reports/expenses.blade.php
+++ b/resources/views/app/pdf/reports/expenses.blade.php
@@ -181,10 +181,14 @@
                     @foreach ($expenseCategories as $expenseCategory)
                         <tr>
                             <td>
-                                <p class="expense-title">{{ $expenseCategory->category->name }}</p>
+                                <p class="expense-title">
+                                    {{ $expenseCategory->category->name }}
+                                </p>
                             </td>
                             <td>
-                                <p class="expense-money">{!! format_money_pdf($expenseCategory->total_amount) !!}</p>
+                                <p class="expense-money">
+                                    {!! format_money_pdf($expenseCategory->total_amount) !!}
+                                </p>
                             </td>
                         </tr>
                     @endforeach
diff --git a/resources/views/app/pdf/reports/profit-loss.blade.php b/resources/views/app/pdf/reports/profit-loss.blade.php
index 1c5d89e7..fbcb59c7 100644
--- a/resources/views/app/pdf/reports/profit-loss.blade.php
+++ b/resources/views/app/pdf/reports/profit-loss.blade.php
@@ -220,10 +220,14 @@
                     @foreach ($expenseCategories as $expenseCategory)
                         <tr>
                             <td>
-                                <p class="expense-title">{{ $expenseCategory->category->name }}</p>
+                                <p class="expense-title">
+                                    {{ $expenseCategory->category->name }}
+                                </p>
                             </td>
                             <td>
-                                <p class="expense-money">{!! format_money_pdf($expenseCategory->total_amount) !!}</p>
+                                <p class="expense-money">
+                                    {!! format_money_pdf($expenseCategory->total_amount) !!}
+                                </p>
                             </td>
                         </tr>
                     @endforeach
diff --git a/resources/views/app/pdf/reports/sales-customers.blade.php b/resources/views/app/pdf/reports/sales-customers.blade.php
index dd33385c..d91337e6 100644
--- a/resources/views/app/pdf/reports/sales-customers.blade.php
+++ b/resources/views/app/pdf/reports/sales-customers.blade.php
@@ -223,10 +223,14 @@
                         @foreach ($customer->invoices as $invoice)
                             <tr>
                                 <td>
-                                    <p class="expense-title">{{ $invoice->formattedInvoiceDate }} ({{ $invoice->invoice_number }})</p>
+                                    <p class="expense-title">
+                                        {{ $invoice->formattedInvoiceDate }} ({{ $invoice->invoice_number }})
+                                    </p>
                                 </td>
                                 <td>
-                                    <p class="expense-money">{!! format_money_pdf($invoice->total) !!}</p>
+                                    <p class="expense-money">
+                                        {!! format_money_pdf($invoice->total) !!}
+                                    </p>
                                 </td>
                             </tr>
                         @endforeach
@@ -235,7 +239,9 @@
                 <table class="expense-total-table">
                     <tr>
                         <td class="expense-total-cell">
-                            <p class="expense-total">{!! format_money_pdf($customer->totalAmount) !!}</p>
+                            <p class="expense-total">
+                                {!! format_money_pdf($customer->totalAmount) !!}
+                            </p>
                         </td>
                     </tr>
                 </table>
@@ -249,7 +255,9 @@
                     <p class="profit-title">TOTAL SALES</p>
                 </td>
                 <td>
-                    <p class="profit-money">{!! format_money_pdf($totalAmount) !!}</p>
+                    <p class="profit-money">
+                        {!! format_money_pdf($totalAmount) !!}
+                    </p>
                 </td>
             </tr>
         </table>
diff --git a/resources/views/app/pdf/reports/sales-items.blade.php b/resources/views/app/pdf/reports/sales-items.blade.php
index 55619d0a..e939a57c 100644
--- a/resources/views/app/pdf/reports/sales-items.blade.php
+++ b/resources/views/app/pdf/reports/sales-items.blade.php
@@ -222,10 +222,14 @@
                     <table class="expenses-table">
                         <tr>
                             <td>
-                                <p class="expense-title">{{ $item->name }}</p>
+                                <p class="expense-title">
+                                    {{ $item->name }}
+                                </p>
                             </td>
                             <td>
-                                <p class="expense-money">{!! format_money_pdf($item->total_amount) !!}</p>
+                                <p class="expense-money">
+                                    {!! format_money_pdf($item->total_amount) !!}
+                                </p>
                             </td>
                         </tr>
                     </table>
@@ -235,7 +239,9 @@
                 <table class="expense-total-table">
                     <tr>
                         <td class="expense-total-cell">
-                            <p class="expense-total">{!! format_money_pdf($totalAmount) !!}</p>
+                            <p class="expense-total">
+                                {!! format_money_pdf($totalAmount) !!}
+                            </p>
                         </td>
                     </tr>
                 </table>
@@ -248,7 +254,9 @@
                     <p class="profit-title">TOTAL SALES</p>
                 </td>
                 <td>
-                    <p class="profit-money">{!! format_money_pdf($totalAmount) !!}</p>
+                    <p class="profit-money">
+                        {!! format_money_pdf($totalAmount) !!}
+                    </p>
                 </td>
             </tr>
         </table>
diff --git a/resources/views/app/pdf/reports/tax-summary.blade.php b/resources/views/app/pdf/reports/tax-summary.blade.php
index 8ef69eb6..33931627 100644
--- a/resources/views/app/pdf/reports/tax-summary.blade.php
+++ b/resources/views/app/pdf/reports/tax-summary.blade.php
@@ -174,10 +174,14 @@
             <table class="header">
                 <tr>
                     <td>
-                        <p class="heading-text">{{ $company->name }}</p>
+                        <p class="heading-text">
+                            {{ $company->name }}
+                        </p>
                     </td>
                     <td>
-                        <p class="heading-date-range">{{ $from_date }} - {{ $to_date }}</p>
+                        <p class="heading-date-range">
+                            {{ $from_date }} - {{ $to_date }}
+                        </p>
                     </td>
                 </tr>
                 <tr>
@@ -192,10 +196,14 @@
                     @foreach ($taxTypes as $tax)
                         <tr>
                             <td>
-                                <p class="tax-title">{{ $tax->taxType->name }}</p>
+                                <p class="tax-title">
+                                    {{ $tax->taxType->name }}
+                                </p>
                             </td>
                             <td>
-                                <p class="tax-money">{!! format_money_pdf($tax->total_tax_amount) !!}</p>
+                                <p class="tax-money">
+                                    {!! format_money_pdf($tax->total_tax_amount) !!}
+                                </p>
                             </td>
                         </tr>
                     @endforeach
@@ -207,7 +215,9 @@
         <table class="tax-total-table">
             <tr>
                 <td class="tax-total-cell">
-                    <p class="tax-total">{!! format_money_pdf($totalTaxAmount) !!}</p>
+                    <p class="tax-total">
+                        {!! format_money_pdf($totalTaxAmount) !!}
+                    </p>
                 </td>
             </tr>
         </table>
@@ -217,7 +227,9 @@
                     <p class="total-tax-title">TOTAL TAX</p>
                 </td>
                 <td>
-                    <p class="total-tax-money">{!! format_money_pdf($totalTaxAmount) !!}</p>
+                    <p class="total-tax-money">
+                        {!! format_money_pdf($totalTaxAmount) !!}
+                    </p>
                 </td>
             </tr>
         </table>