diff --git a/resources/assets/v2/src/pages/dashboard/subscriptions.js b/resources/assets/v2/src/pages/dashboard/subscriptions.js index 57f314d949..bb632f2514 100644 --- a/resources/assets/v2/src/pages/dashboard/subscriptions.js +++ b/resources/assets/v2/src/pages/dashboard/subscriptions.js @@ -163,8 +163,8 @@ function downloadSubscriptions(params) { currency_code: bill.currency_code, paid: 0, unpaid: 0, - native_currency_code: bill.native_currency_code, - native_paid: 0, + // native_currency_code: bill.native_currency_code, + // native_paid: 0, //native_unpaid: 0, }; } @@ -218,6 +218,9 @@ export default () => ({ loading: false, convertToNative: false, subscriptions: [], + formatMoney(amount, currencyCode) { + return formatMoney(amount, currencyCode); + }, startSubscriptions() { this.loading = true; let start = new Date(window.store.get('start')); @@ -256,6 +259,7 @@ export default () => ({ //console.log(group); } } + console.log('Subscriptions: ', this.subscriptions); // then assign to this.subscriptions. this.loading = false; diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index ed675e71eb..f9c07625ad 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -1864,6 +1864,7 @@ return [ 'remove_budgeted_amount' => 'Remove budgeted amount in :currency', // bills: + 'left_to_pay_lc' => 'left to pay', 'skip_help_text' => 'Use the skip field to create bi-monthly (skip = 1) or other custom intervals.', 'subscription' => 'Subscription', 'not_expected_period' => 'Not expected this period', diff --git a/resources/views/v2/partials/dashboard/piggy-banks.blade.php b/resources/views/v2/partials/dashboard/piggy-banks.blade.php index 971bc5c595..53bdd2a23f 100644 --- a/resources/views/v2/partials/dashboard/piggy-banks.blade.php +++ b/resources/views/v2/partials/dashboard/piggy-banks.blade.php @@ -3,10 +3,8 @@