From 64fc6b65232dbcc327a30719bc4b6a44c096ff4e Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 18 Nov 2017 06:02:15 +0100
Subject: [PATCH] Some charts will render correctly #1000

---
 app/Http/Controllers/JavascriptController.php | 20 ++++++++++++++-----
 resources/views/layout/default.twig           |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php
index 2e4ea3b92b..4c310de894 100644
--- a/app/Http/Controllers/JavascriptController.php
+++ b/app/Http/Controllers/JavascriptController.php
@@ -92,20 +92,30 @@ class JavascriptController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function variables(Request $request)
+    public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository)
     {
+        $account    = $repository->find(intval($request->get('account')));
+        $currencyId = 0;
+        if (null !== $account) {
+            $currencyId = intval($account->getMeta('currency_id'));
+        }
+        /** @var TransactionCurrency $currency */
+        $currency   = $currencyRepository->find($currencyId);
+        if (0 === $currencyId) {
+            $currency = app('amount')->getDefaultCurrency();
+        }
+
         $localeconv                = localeconv();
         $accounting                = app('amount')->getJsConfig($localeconv);
         $localeconv                = localeconv();
-        $defaultCurrency           = app('amount')->getDefaultCurrency();
-        $localeconv['frac_digits'] = $defaultCurrency->decimal_places;
+        $localeconv['frac_digits'] = $currency->decimal_places;
         $pref                      = Preferences::get('language', config('firefly.default_language', 'en_US'));
         $lang                      = $pref->data;
         $dateRange                 = $this->getDateRangeConfig();
 
         $data = [
-            'currencyCode'    => app('amount')->getCurrencyCode(),
-            'currencySymbol'  => app('amount')->getCurrencySymbol(),
+            'currencyCode'    => $currency->code,
+            'currencySymbol'  => $currency->symbol,
             'accounting'      => $accounting,
             'localeconv'      => $localeconv,
             'language'        => $lang,
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 1c900ad955..bf3f982760 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -185,7 +185,7 @@
 <script src="js/lib/daterangepicker.js?v={{ FF_VERSION }}" type="text/javascript"></script>
 <script src="lib/adminlte/js/app.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
 <script type="text/javascript" src="js/lib/accounting.min.js?v={{ FF_VERSION }}"></script>
-<script src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}" type="text/javascript"></script>
+<script src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}" type="text/javascript"></script>
 <script type="text/javascript" src="js/ff/firefly.js?v={{ FF_VERSION }}"></script>
 <script type="text/javascript" src="js/ff/help.js?v={{ FF_VERSION }}"></script>
 {% if not shownDemo %}