Some javascript clean up

app/Console/Commands/UpgradeDatabase.php

@@ -25,7 +25,9 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Console\Command;
+use Illuminate\Database\Query\JoinClause;
 use Illuminate\Database\QueryException;
 use Log;
 use Preferences;
@@ -69,6 +71,7 @@ class UpgradeDatabase extends Command
         $this->migrateRepetitions();
         $this->repairPiggyBanks();
         $this->updateAccountCurrencies();
+        $this->updateJournalCurrencies();
         $this->info('Firefly III database is up to date.');
     }
 
@@ -252,4 +255,49 @@ class UpgradeDatabase extends Command
             $identifier++;
         }
     }
+
+    /**
+     * Makes sure that withdrawals, deposits and transfers have
+     * a currency setting matching their respective accounts
+     */
+    private function updateJournalCurrencies()
+    {
+        $types      = [
+            TransactionType::WITHDRAWAL => '<',
+            TransactionType::DEPOSIT    => '>',
+        ];
+        $repository = app(CurrencyRepositoryInterface::class);
+
+        foreach ($types as $type => $operator) {
+            $set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')->leftJoin(
+                'transactions', function (JoinClause $join) use ($operator) {
+                $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', $operator, '0');
+            }
+            )
+                                     ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                     ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
+                                     ->where('transaction_types.type', $type)
+                                     ->where('account_meta.name', 'currency_id')
+                                     ->where('transaction_journals.transaction_currency_id', '!=', DB::raw('account_meta.data'))
+                                     ->get(
+                                         ['transaction_journals.*', 'account_meta.data as expected_currency_id', 'transactions.amount as transaction_amount']
+                                     );
+            /** @var TransactionJournal $journal */
+            foreach ($set as $journal) {
+                $expectedCurrency = $repository->find(intval($journal->expected_currency_id));
+                $this->line(
+                    sprintf(
+                        '%s #%d uses %s but should use %s. It has been updated to do so, please verify the amounts.', $type, $journal->id,
+                        $journal->transactionCurrency->code, $expectedCurrency->code
+                    )
+                );
+
+                $journal->setMeta('foreign_amount', $journal->transaction_amount);
+                $journal->setMeta('foreign_currency_id', $journal->transaction_currency_id);
+                $journal->transaction_currency_id = $expectedCurrency->id;
+                $journal->save();
+
+            }
+        }
+    }
 }

app/Http/Controllers/AccountController.php

@@ -249,6 +249,8 @@ class AccountController extends Controller
         if ($account->accountType->type === AccountType::INITIAL_BALANCE) {
             return $this->redirectToOriginalAccount($account);
         }
+        /** @var CurrencyRepositoryInterface $currencyRepos */
+        $currencyRepos = app(CurrencyRepositoryInterface::class);
         $range         = Preferences::get('viewRange', '1M')->data;
         $subTitleIcon  = config('firefly.subIconsByIdentifier.' . $account->accountType->type);
         $page          = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
@@ -257,6 +259,7 @@ class AccountController extends Controller
         $start         = null;
         $end           = null;
         $periods       = new Collection;
+        $currency      = $currencyRepos->find(intval($account->getMeta('currency_id')));
 
         // prep for "all" view.
         if ($moment === 'all') {
@@ -323,7 +326,7 @@ class AccountController extends Controller
 
 
         return view(
-            'accounts.show', compact('account', 'moment', 'accountType', 'periods', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri')
+            'accounts.show', compact('account','currency', 'moment', 'accountType', 'periods', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri')
         );
     }
 

public/js/ff/firefly.js

@@ -13,6 +13,8 @@
 $(function () {
     "use strict";
 
+    configAccounting(currencySymbol);
+
     $.ajaxSetup({
                     headers: {
                         'X-CSRF-Token': $('meta[name="_token"]').attr('content')
@@ -108,10 +110,12 @@ function currencySelect(e) {
     return false;
 }
 
+function configAccounting(customCurrency) {
+
 // Settings object that controls default parameters for library methods:
     accounting.settings = {
         currency: {
-        symbol: currencySymbol,   // default currency symbol is '$'
+            symbol: customCurrency,   // default currency symbol is '$'
             format: accountingConfig, // controls output: %s = symbol, %v = value/number (can be object: see below)
             decimal: mon_decimal_point,  // decimal point separator
             thousand: mon_thousands_sep,  // thousands separator
@@ -123,7 +127,7 @@ accounting.settings = {
             decimal: "."
         }
     };
-
+}
 
 function listLengthInitial() {
     "use strict";

public/js/ff/transactions/single/create.js

@@ -26,7 +26,6 @@ $(document).ready(function () {
     updateNativeCurrency();
 
 
-
     // when user changes source account or destination, native currency may be different.
     $('select[name="source_account_id"]').on('change', updateNativeCurrency);
     $('select[name="destination_account_id"]').on('change', updateNativeCurrency);
@@ -101,85 +100,83 @@ function updateForm() {
     "use strict";
 
     $('input[name="what"]').val(what);
+
+    var destName = $('#ffInput_destination_account_name');
+    var srcName = $('#ffInput_source_account_name');
+
     switch (what) {
         case 'withdrawal':
             // show source_id and dest_name
-            $('#source_account_id_holder').show();
+            document.getElementById('source_account_id_holder').style.display = 'block';
-            $('#destination_account_name_holder').show();
+            document.getElementById('destination_account_name_holder').style.display = 'block';
 
             // hide others:
-            $('#source_account_name_holder').hide();
+            document.getElementById('source_account_name_holder').style.display = 'none';
-            $('#destination_account_id_holder').hide();
+            document.getElementById('destination_account_id_holder').style.display = 'none';
-
+            document.getElementById('budget_id_holder').style.display = 'block';
-            //
-            $('#budget_id_holder').show();
 
             // hide piggy bank:
-            $('#piggy_bank_id_holder').hide();
+            document.getElementById('piggy_bank_id_holder').style.display = 'none';
 
-            // copy destination account name to
+            // copy destination account name to source account name:
-            // source account name:
+            if (destName.val().length > 0) {
-            if ($('#ffInput_destination_account_name').val().length > 0) {
+                srcName.val(destName.val());
-                $('#ffInput_source_account_name').val($('#ffInput_destination_account_name').val());
             }
 
             // exchange / foreign currencies:
-            // hide explanation, hide source and destination amounts:
+            // hide explanation, hide source and destination amounts, show normal amount
-            $('#exchange_rate_instruction_holder').hide();
+            document.getElementById('exchange_rate_instruction_holder').style.display = 'none';
-            $('#source_amount_holder').hide();
+            document.getElementById('source_amount_holder').style.display = 'none';
-            $('#destination_amount_holder').hide();
+            document.getElementById('destination_amount_holder').style.display = 'none';
-            // show normal amount:
+            document.getElementById('amount_holder').style.display = 'block';
-            $('#amount_holder').show();
             break;
         case 'deposit':
             // show source_name and dest_id:
-            $('#source_account_name_holder').show();
+            document.getElementById('source_account_name_holder').style.display = 'block';
-            $('#destination_account_id_holder').show();
+            document.getElementById('destination_account_id_holder').style.display = 'block';
 
             // hide others:
-            $('#source_account_id_holder').hide();
+            document.getElementById('source_account_id_holder').style.display = 'none';
-            $('#destination_account_name_holder').hide();
+            document.getElementById('destination_account_name_holder').style.display = 'none';
 
             // hide budget
-            $('#budget_id_holder').hide();
+            document.getElementById('budget_id_holder').style.display = 'none';
 
             // hide piggy bank
-            $('#piggy_bank_id_holder').hide();
+            document.getElementById('piggy_bank_id_holder').style.display = 'none';
 
-            if ($('#ffInput_source_account_name').val().length > 0) {
+            // copy name
-                $('#ffInput_destination_account_name').val($('#ffInput_source_account_name').val());
+            if (srcName.val().length > 0) {
+                destName.val(srcName.val());
             }
 
             // exchange / foreign currencies:
-            // hide explanation, hide source and destination amounts:
+            // hide explanation, hide source and destination amounts, show amount
-            $('#exchange_rate_instruction_holder').hide();
+            document.getElementById('exchange_rate_instruction_holder').style.display = 'none';
-            $('#source_amount_holder').hide();
+            document.getElementById('source_amount_holder').style.display = 'none';
-            $('#destination_amount_holder').hide();
+            document.getElementById('destination_amount_holder').style.display = 'none';
-            // show normal amount:
+            document.getElementById('amount_holder').style.display = 'block';
-            $('#amount_holder').show();
             break;
         case 'transfer':
             // show source_id and dest_id:
-            $('#source_account_id_holder').show();
+            document.getElementById('source_account_id_holder').style.display = 'block';
-            $('#destination_account_id_holder').show();
+            document.getElementById('destination_account_id_holder').style.display = 'block';
 
             // hide others:
-            $('#source_account_name_holder').hide();
+            document.getElementById('source_account_name_holder').style.display = 'none';
-            $('#destination_account_name_holder').hide();
+            document.getElementById('destination_account_name_holder').style.display = 'none';
 
             // hide budget
-            $('#budget_id_holder').hide();
+            document.getElementById('budget_id_holder').style.display = 'none';
+
+            // optional piggies
+            var showPiggies = 'block';
             if (piggiesLength === 0) {
-                $('#piggy_bank_id_holder').hide();
+                showPiggies = 'none';
-            } else {
-                $('#piggy_bank_id_holder').show();
             }
-            break;
+            document.getElementById('piggy_bank_id_holder').style.display = showPiggies;
-        default:
-            // no action.
             break;
     }
-    // update the amount thing:
     updateNativeCurrency();
 }
 

public/js/ff/transactions/single/edit.js

@@ -49,6 +49,8 @@ function updateInitialPage() {
 
         return;
     }
+    $('#source_amount_holder').hide();
+    $('#destination_amount_holder').hide();
 
 
     if (journalData.native_currency.id === journalData.currency.id) {

resources/views/accounts/show.twig

@@ -140,6 +140,7 @@
 
 {% block scripts %}
     <script type="text/javascript">
+        currencySymbol = "{{ currency.symbol }}";
         var accountID = {{ account.id }};
         // uri's for charts:
         var chartUri = '{{ chartUri }}';
@@ -155,9 +156,15 @@
 
     </script>
 
+    <script type="text/javascript">
+        {# overrule currency symbol for charts: #}
+
+    </script>
+
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
     <script type="text/javascript" src="js/ff/charts.defaults.js"></script>
     <script type="text/javascript" src="js/ff/charts.js"></script>
+
     <script src="js/lib/jquery-ui.min.js" type="text/javascript"></script>
     <script src="js/lib/jquery.color-2.1.2.min.js" type="text/javascript"></script>
     <script src="js/ff/accounts/show.js" type="text/javascript"></script>