From 022b203823dced0b14e7f69cedbb5c2b6f9f16b5 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Thu, 16 Aug 2018 15:26:44 +0300
Subject: [PATCH] refs #451 Add payment on Invoice and Bill, Account create and
 edit save issue solved.

---
 app/Http/Controllers/Banking/Accounts.php         | 1 +
 resources/views/banking/accounts/create.blade.php | 6 +++---
 resources/views/banking/accounts/edit.blade.php   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Banking/Accounts.php b/app/Http/Controllers/Banking/Accounts.php
index 0c2205dd4..9f1c7f699 100644
--- a/app/Http/Controllers/Banking/Accounts.php
+++ b/app/Http/Controllers/Banking/Accounts.php
@@ -240,6 +240,7 @@ class Accounts extends Controller
         // Get currency object
         $currency = Currency::where('code', $currency_code)->first();
 
+        $account->currency_name = $currency->name;
         $account->currency_code = $currency_code;
         $account->currency_rate = $currency->rate;
 
diff --git a/resources/views/banking/accounts/create.blade.php b/resources/views/banking/accounts/create.blade.php
index 3c33b1713..48c69db48 100644
--- a/resources/views/banking/accounts/create.blade.php
+++ b/resources/views/banking/accounts/create.blade.php
@@ -73,10 +73,10 @@
                 dataType: 'JSON',
                 data: 'code=' + $(this).val(),
                 success: function(data) {
-                    $('#currency').val(data.currency_code);
+                    $('#currency').val(data.code);
 
-                    $('#currency_code').val(data.currency_code);
-                    $('#currency_rate').val(data.currency_rate);
+                    $('#currency_code').val(data.code);
+                    $('#currency_rate').val(data.rate);
 
                     opening_balance = $('#opening_balance').maskMoney('unmasked')[0];
 
diff --git a/resources/views/banking/accounts/edit.blade.php b/resources/views/banking/accounts/edit.blade.php
index 0917015c1..7e53f8f37 100644
--- a/resources/views/banking/accounts/edit.blade.php
+++ b/resources/views/banking/accounts/edit.blade.php
@@ -75,10 +75,10 @@
                 dataType: 'JSON',
                 data: 'code=' + $(this).val(),
                 success: function(data) {
-                    $('#currency').val(data.currency_code);
+                    $('#currency').val(data.code);
 
-                    $('#currency_code').val(data.currency_code);
-                    $('#currency_rate').val(data.currency_rate);
+                    $('#currency_code').val(data.code);
+                    $('#currency_rate').val(data.rate);
 
                     opening_balance = $('#opening_balance').maskMoney('unmasked')[0];