From 3589a0b5fcab9665579ab5ebeda3f174e8f3a480 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Thu, 30 Aug 2018 13:08:31 +0300
Subject: [PATCH] close #466 Fixed: Bill Payment Problem

---
 app/Http/Controllers/Expenses/Bills.php         | 4 ++--
 app/Http/Controllers/Modals/BillPayments.php    | 2 +-
 app/Models/Expense/BillPayment.php              | 5 +++++
 resources/views/expenses/bills/create.blade.php | 5 +++++
 resources/views/expenses/bills/edit.blade.php   | 5 +++++
 resources/views/expenses/bills/item.blade.php   | 2 +-
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php
index 9eda13e4e..20734ddb9 100644
--- a/app/Http/Controllers/Expenses/Bills.php
+++ b/app/Http/Controllers/Expenses/Bills.php
@@ -74,7 +74,7 @@ class Bills extends Controller
                 $default_amount = $item->amount;
 
                 if ($bill->currency_code != $item->currency_code) {
-                    $default_amount_model = new InvoicePayment();
+                    $default_amount_model = new BillPayment();
 
                     $default_amount_model->default_currency_code = $bill->currency_code;
                     $default_amount_model->amount = $default_amount;
@@ -84,7 +84,7 @@ class Bills extends Controller
                     $default_amount = (double) $default_amount_model->getDivideConvertedAmount();
                 }
 
-                $convert_amount = new InvoicePayment();
+                $convert_amount = new BillPayment();
 
                 $convert_amount->default_currency_code = $item->currency_code;
                 $convert_amount->amount = $default_amount;
diff --git a/app/Http/Controllers/Modals/BillPayments.php b/app/Http/Controllers/Modals/BillPayments.php
index df7b23d82..b437ffbb2 100644
--- a/app/Http/Controllers/Modals/BillPayments.php
+++ b/app/Http/Controllers/Modals/BillPayments.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Modals;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Expsense\BillPayment as Request;
+use App\Http\Requests\Expense\BillPayment as Request;
 use App\Models\Expense\Bill;
 use App\Models\Banking\Account;
 use App\Models\Expense\BillPayment;
diff --git a/app/Models/Expense/BillPayment.php b/app/Models/Expense/BillPayment.php
index 339c48b69..b6ba13420 100644
--- a/app/Models/Expense/BillPayment.php
+++ b/app/Models/Expense/BillPayment.php
@@ -101,4 +101,9 @@ class BillPayment extends Model
 
         return $this->getMedia('attachment')->last();
     }
+
+    public function getDivideConvertedAmount($format = false)
+    {
+        return $this->divide($this->amount, $this->currency_code, $this->currency_rate, $format);
+    }
 }
diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php
index adefdfe1c..47f98e852 100644
--- a/resources/views/expenses/bills/create.blade.php
+++ b/resources/views/expenses/bills/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({
diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php
index 29d7f32a9..7e5da64fb 100644
--- a/resources/views/expenses/bills/edit.blade.php
+++ b/resources/views/expenses/bills/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({
diff --git a/resources/views/expenses/bills/item.blade.php b/resources/views/expenses/bills/item.blade.php
index 403585fcf..fe5d8ec2f 100644
--- a/resources/views/expenses/bills/item.blade.php
+++ b/resources/views/expenses/bills/item.blade.php
@@ -24,7 +24,7 @@
     @stack('price_td_start')
     <td>
         @stack('price_input_start')
-        <input value="{{ empty($item) ? '' : $item->price }}" class="form-control text-right" required="required" name="item[{{ $item_row }}][price]" type="text" id="item-price-{{ $item_row }}">
+        <input value="{{ empty($item) ? '' : $item->price }}" class="form-control text-right input-price" required="required" name="item[{{ $item_row }}][price]" type="text" id="item-price-{{ $item_row }}">
         <input value="{{ $currency->code }}" name="item[{{ $item_row }}][currency]" type="hidden" id="item-currency-{{ $item_row }}">
         @stack('price_input_end')
     </td>