Fix PDF issues

tipened · Dec 13, 2019 · ce99fa3 · ce99fa3
1 parent e28c890
commit ce99fa3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 16 deletions.
diff --git a/app/Space/helpers.php b/app/Space/helpers.php
@@ -41,10 +41,18 @@ function clean_slug($string)
  * @param $money
  * @return formated_money
  */
-function format_money_pdf($money)
+function format_money_pdf($money, $getCurrency = null)
 {
     $money = $money / 100;
-    $currency = Currency::findOrFail(CompanySetting::getSetting('currency', 1));
+
+    $currency = null;
+
+    if ($getCurrency == null) {
+        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', 1));
+    } else {
+        $currency = $getCurrency;
+    }
+
     $format_money = number_format(
         $money,
         $currency->precision,

diff --git a/resources/assets/js/components/base/modal/CustomerModal.vue b/resources/assets/js/components/base/modal/CustomerModal.vue
@@ -55,6 +55,7 @@
                     v-model="currency"
                     :options="currencies"
                     :searchable="true"
+                    :allow-empty="false"
                     :show-labels="false"
                     :placeholder="$t('customers.select_currency')"
                     label="name"

diff --git a/resources/views/app/pdf/estimate/partials/table.blade.php b/resources/views/app/pdf/estimate/partials/table.blade.php
@@ -47,7 +47,7 @@
     <tr>
         <td class="no-borde" style="color: #55547A; padding-left:10px;  font-size:12px;">Subtotal</td>
         <td class="no-border items"
-            style="padding-right:10px; text-align: right;  font-size:12px; color: #040405; font-weight: 500;">{!! format_money_pdf($estimate->sub_total) !!}</td>
+            style="padding-right:10px; text-align: right;  font-size:12px; color: #040405; font-weight: 500;">{!! format_money_pdf($estimate->sub_total, $estimate->user->currency) !!}</td>
     </tr>
 
     @if ($estimate->tax_per_item === 'YES')
@@ -57,7 +57,7 @@
                     {{$labels[$i]}}
                 </td>
                 <td class="no-border items padd2" style="padding-right:10px; font-weight: 500; text-align: right; font-size:12px;  color: #040405">
-                    {!! format_money_pdf($taxes[$i]) !!}
+                    {!! format_money_pdf($taxes[$i], $estimate->user->currency) !!}
                 </td>
             </tr>
         @endfor
@@ -68,7 +68,7 @@
                     {{$tax->name.' ('.$tax->percent.'%)'}}
                 </td>
                 <td class="no-border items padd2" style="padding-right:10px; font-weight: 500; text-align: right; font-size:12px;  color: #040405">
-                    {!! format_money_pdf($tax->amount) !!}
+                    {!! format_money_pdf($tax->amount, $estimate->user->currency) !!}
                 </td>
             </tr>
         @endforeach
@@ -77,14 +77,19 @@
     @if ($estimate->discount_per_item === 'NO')
         <tr>
             <td class="no-border" style="padding-left:10px; text-align:left; font-size:12px; color: #55547A;">
-                Discount ({{$estimate->discount}}%)
+                @if($estimate->discount_type === 'fixed')
+                    Discount
+                @endif
+                @if($estimate->discount_type === 'percentage')
+                    Discount ({{$estimate->discount}}%)
+                @endif
             </td>
             <td class="no-border items padd2" style="padding-right:10px; font-weight: 500; text-align: right; font-size:12px;  color: #040405">
                 @if($estimate->discount_type === 'fixed')
-                    {!! format_money_pdf($estimate->discount_val) !!}
+                    {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
                 @endif
                 @if($estimate->discount_type === 'percentage')
-                    {!! format_money_pdf($estimate->discount_val) !!}
+                    {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
                 @endif
             </td>
         </tr>
@@ -103,7 +108,7 @@
             class="no-border total-border-right items padd8"
             style="padding-right:10px; font-weight: 500; text-align: right; font-size:12px;  padding-top:20px; color: #5851DB"
         >
-            {!! format_money_pdf($estimate->total)!!}
+            {!! format_money_pdf($estimate->total, $estimate->user->currency)!!}
         </td>
     </tr>
 </table>
diff --git a/resources/views/app/pdf/invoice/partials/table.blade.php b/resources/views/app/pdf/invoice/partials/table.blade.php
@@ -47,7 +47,7 @@
     <tr>
         <td class="no-borde" style="color: #55547A; padding-left:10px;  font-size:12px;">Subtotal</td>
         <td class="no-border items"
-            style="padding-right:10px; text-align: right;  font-size:12px; color: #040405; font-weight: 500;">{!! format_money_pdf($invoice->sub_total) !!}</td>
+            style="padding-right:10px; text-align: right;  font-size:12px; color: #040405; font-weight: 500;">{!! format_money_pdf($invoice->sub_total, $invoice->user->currency) !!}</td>
     </tr>
 
     @if ($invoice->tax_per_item === 'YES')
@@ -57,7 +57,7 @@
                     {{$labels[$i]}}
                 </td>
                 <td class="no-border items padd2" style="padding-right:10px; font-weight: 500; text-align: right; font-size:12px;  color: #040405">
-                    {!! format_money_pdf($taxes[$i]) !!}
+                    {!! format_money_pdf($taxes[$i], $invoice->user->currency) !!}
                 </td>
             </tr>
         @endfor
@@ -68,7 +68,7 @@
                     {{$tax->name.' ('.$tax->percent.'%)'}}
                 </td>
                 <td class="no-border items padd2" style="padding-right:10px; font-weight: 500; text-align: right; font-size:12px;  color: #040405">
-                    {!! format_money_pdf($tax->amount) !!}
+                    {!! format_money_pdf($tax->amount, $invoice->user->currency) !!}
                 </td>
             </tr>
         @endforeach
@@ -77,14 +77,19 @@
     @if ($invoice->discount_per_item === 'NO')
         <tr>
             <td class="no-border" style="padding-left:10px; text-align:left; font-size:12px; color: #55547A;">
-                Discount ({{$invoice->discount}}%)
+                @if($invoice->discount_type === 'fixed')
+                    Discount
+                @endif
+                @if($invoice->discount_type === 'percentage')
+                    Discount ({{$invoice->discount}}%)
+                @endif
             </td>
             <td class="no-border items padd2" style="padding-right:10px; font-weight: 500; text-align: right; font-size:12px;  color: #040405">
                 @if($invoice->discount_type === 'fixed')
-                    {!! format_money_pdf($invoice->discount_val) !!}
+                    {!! format_money_pdf($invoice->discount_val, $invoice->user->currency) !!}
                 @endif
                 @if($invoice->discount_type === 'percentage')
-                    {!! format_money_pdf($invoice->discount_val) !!}
+                    {!! format_money_pdf($invoice->discount_val, $invoice->user->currency) !!}
                 @endif
             </td>
         </tr>
@@ -103,7 +108,7 @@
             class="no-border total-border-right items padd8"
             style="padding-right:10px; font-weight: 500; text-align: right; font-size:12px;  padding-top:20px; color: #5851DB"
         >
-            {!! format_money_pdf($invoice->total)!!}
+            {!! format_money_pdf($invoice->total, $invoice->user->currency)!!}
         </td>
     </tr>
 </table>