diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php
index 7a40f50e81..3bfe30b6f8 100644
--- a/app/Http/Controllers/Json/BoxController.php
+++ b/app/Http/Controllers/Json/BoxController.php
@@ -164,19 +164,16 @@ class BoxController extends Controller
*/
public function netWorth(AccountRepositoryInterface $repository)
{
- $start = session('start', Carbon::now()->startOfMonth());
- $end = session('end', Carbon::now()->endOfMonth());
-
+ $today = new Carbon(date('Y-m-d')); // needed so its per day.
$cache = new CacheProperties;
- $cache->addProperty($start);
- $cache->addProperty($end);
+ $cache->addProperty($today);
$cache->addProperty('box-net-worth');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
}
- $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
+ $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$currency = app('amount')->getDefaultCurrency();
- $balances = app('steam')->balancesByAccounts($accounts, new Carbon);
+ $balances = app('steam')->balancesByAccounts($accounts, $today);
$sum = '0';
foreach ($balances as $entry) {
$sum = bcadd($sum, $entry);
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index f5bf80a478..66928138b4 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -662,10 +662,6 @@ return [
'newWithdrawal' => 'New expense',
'newDeposit' => 'New deposit',
'newTransfer' => 'New transfer',
- 'moneyIn' => 'Money in',
- 'moneyOut' => 'Money out',
- 'billsToPay' => 'Bills to pay',
- 'billsPaid' => 'Bills paid',
'bills_to_pay' => 'Bills to pay',
'per_day' => 'Per day',
diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig
index 2edd63fd82..ef136db47f 100644
--- a/resources/views/bills/index.twig
+++ b/resources/views/bills/index.twig
@@ -32,3 +32,11 @@
{% endif %}
{% endblock %}
+
+{% block styles %}
+
+{% endblock %}
+
+{% block scripts %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/resources/views/partials/boxes.twig b/resources/views/partials/boxes.twig
index e61840b9a9..2fc8f07e68 100644
--- a/resources/views/partials/boxes.twig
+++ b/resources/views/partials/boxes.twig
@@ -85,101 +85,4 @@
-
-
-
- {# box that shows amount spent #}
- {#
-
- #}
-
- {# box that shows amount earned #}
- {#
-
- #}
-
- {# box for total net worth #}
- {#
-
- #}
- {# box for left to spend#}
- {#
-
- #}
- {#
- {% if billCount > 0 %}
-
-
-
-
-
-
-
- {% endif %}
- #}