Merge pull request #461 from batuhawk/master

refs #451 invoice and bill currency issue some fix

app/Http/Controllers/Common/Items.php

@@ -280,8 +280,8 @@ class Items extends Controller
                     $item_tax_price = ($item->sale_price / 100) * $tax->rate;
                 }
 
-                $item->sale_price = $this->convertPrice($item->sale_price, $currency_code, $currency->rate);
+                //$item->sale_price = $this->convertPrice($item->sale_price, $currency_code, $currency->rate);
-                $item->purchase_price = $this->convertPrice($item->purchase_price, $currency_code, $currency->rate);
+                //$item->purchase_price = $this->convertPrice($item->purchase_price, $currency_code, $currency->rate);
 
                 switch ($type) {
                     case 'bill':

app/Http/Controllers/Incomes/Invoices.php

@@ -76,7 +76,9 @@ class Invoices extends Controller
             foreach ($invoice->payments as $item) {
                 $default_amount = $item->amount;
 
-                if ($invoice->currency_code != $item->currency_code) {
+                if ($invoice->currency_code == $item->currency_code) {
+                    $amount = (double)$default_amount;
+                } else {
                     $default_amount_model = new InvoicePayment();
 
                     $default_amount_model->default_currency_code = $invoice->currency_code;
@@ -85,7 +87,6 @@ class Invoices extends Controller
                     $default_amount_model->currency_rate = $_currencies[$item->currency_code];
 
                     $default_amount = (double) $default_amount_model->getDivideConvertedAmount();
-                }
 
                     $convert_amount = new InvoicePayment();
 
@@ -95,6 +96,7 @@ class Invoices extends Controller
                     $convert_amount->currency_rate = $_currencies[$invoice->currency_code];
 
                     $amount = (double) $convert_amount->getDynamicConvertedAmount();
+                }
 
                 $paid += $amount;
             }

app/Http/Controllers/Modals/InvoicePayments.php

@@ -39,13 +39,13 @@ class InvoicePayments extends Controller
 
         $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
 
-        $currency = Currency::where('code', setting('general.default_currency'))->first();
-
         $account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first();
 
+        $currency = Currency::where('code', $account_currency_code)->first();
+
         $payment_methods = Modules::getPaymentMethods();
 
-        $invoice->paid = $this->getPaid($invoice);
+        $paid = $this->getPaid($invoice);
 
         // Get Invoice Totals
         foreach ($invoice->totals as $invoice_total) {
@@ -88,7 +88,9 @@ class InvoicePayments extends Controller
 
         $default_amount = (double) $request['amount'];
 
-        if ($invoice->currency_code != $request['currency_code']) {
+        if ($invoice->currency_code == $request['currency_code']) {
+            $amount = $default_amount;
+        } else {
             $default_amount_model = new InvoicePayment();
 
             $default_amount_model->default_currency_code = $invoice->currency_code;
@@ -97,7 +99,6 @@ class InvoicePayments extends Controller
             $default_amount_model->currency_rate         = $currencies[$request['currency_code']];
 
             $default_amount = (double) $default_amount_model->getDivideConvertedAmount();
-        }
 
             $convert_amount = new InvoicePayment();
 
@@ -107,6 +108,7 @@ class InvoicePayments extends Controller
             $convert_amount->currency_rate = $currencies[$invoice->currency_code];
 
             $amount = (double) $convert_amount->getDynamicConvertedAmount();
+        }
 
         if ($invoice->payments()->count()) {
             $total_amount -= $this->getPaid($invoice);
@@ -134,7 +136,6 @@ class InvoicePayments extends Controller
                 $error_amount_model->currency_rate         = $currencies[$invoice->currency_code];
 
                 $error_amount = (double) $error_amount_model->getDivideConvertedAmount();
-            }
 
                 $convert_amount = new InvoicePayment();
 
@@ -144,6 +145,7 @@ class InvoicePayments extends Controller
                 $convert_amount->currency_rate = $currencies[$request['currency_code']];
 
                 $error_amount = (double) $convert_amount->getDynamicConvertedAmount();
+            }
 
             $message = trans('messages.error.over_payment', ['amount' => money($error_amount, $request['currency_code'],true)]);
 
@@ -217,7 +219,9 @@ class InvoicePayments extends Controller
             foreach ($invoice->payments as $item) {
                 $default_amount = $item->amount;
 
-                if ($invoice->currency_code != $item->currency_code) {
+                if ($invoice->currency_code == $item->currency_code) {
+                    $amount = (double) $default_amount;
+                } else {
                     $default_amount_model = new InvoicePayment();
 
                     $default_amount_model->default_currency_code = $invoice->currency_code;
@@ -226,7 +230,6 @@ class InvoicePayments extends Controller
                     $default_amount_model->currency_rate = $_currencies[$item->currency_code];
 
                     $default_amount = (double) $default_amount_model->getDivideConvertedAmount();
-                }
 
                     $convert_amount = new InvoicePayment();
 
@@ -236,6 +239,7 @@ class InvoicePayments extends Controller
                     $convert_amount->currency_rate = $_currencies[$invoice->currency_code];
 
                     $amount = (double) $convert_amount->getDynamicConvertedAmount();
+                }
 
                 $paid += $amount;
             }

resources/views/incomes/invoices/create.blade.php

@@ -373,6 +373,11 @@
                         $('#currency_rate').val(data.currency_rate);
 
                         $('.input-price').each(function(){
+                            input_price_id = $(this).attr('id');
+                            input_currency_id = input_price_id.replace('price', 'currency');
+
+                            $('#' + input_currency_id).val(data.currency_code);
+
                             amount = $(this).maskMoney('unmasked')[0];
 
                             $(this).maskMoney({

resources/views/incomes/invoices/edit.blade.php

@@ -381,6 +381,11 @@
                         $('#currency_rate').val(data.currency_rate);
 
                         $('.input-price').each(function(){
+                            input_price_id = $(this).attr('id');
+                            input_currency_id = input_price_id.replace('price', 'currency');
+
+                            $('#' + input_currency_id).val(data.currency_code);
+
                             amount = $(this).maskMoney('unmasked')[0];
 
                             $(this).maskMoney({