kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 19:35:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix code for boxes.

Browse Source
This commit is contained in:
James Cole
2017-09-27 14:42:12 +02:00
parent fb140b1379
commit fdfe18a952
4 changed files with 12 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Json/BoxController.php
View File

@@ -164,19 +164,16 @@ class BoxController extends Controller
*/ */
public function netWorth(AccountRepositoryInterface $repository) public function netWorth(AccountRepositoryInterface $repository)
{ {
$start = session('start', Carbon::now()->startOfMonth()); $today = new Carbon(date('Y-m-d')); // needed so its per day.
$end = session('end', Carbon::now()->endOfMonth());
$cache = new CacheProperties; $cache = new CacheProperties;
$cache->addProperty($start); $cache->addProperty($today);
$cache->addProperty($end);
$cache->addProperty('box-net-worth'); $cache->addProperty('box-net-worth');
if ($cache->has()) { if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore 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(); $currency = app('amount')->getDefaultCurrency();
$balances = app('steam')->balancesByAccounts($accounts, new Carbon); $balances = app('steam')->balancesByAccounts($accounts, $today);
$sum = '0'; $sum = '0';
foreach ($balances as $entry) { foreach ($balances as $entry) {
$sum = bcadd($sum, $entry); $sum = bcadd($sum, $entry);

4
resources/lang/en_US/firefly.php
View File

@@ -662,10 +662,6 @@ return [
'newWithdrawal' => 'New expense', 'newWithdrawal' => 'New expense',
'newDeposit' => 'New deposit', 'newDeposit' => 'New deposit',
'newTransfer' => 'New transfer', 'newTransfer' => 'New transfer',
'moneyIn' => 'Money in',
'moneyOut' => 'Money out',
'billsToPay' => 'Bills to pay',
'billsPaid' => 'Bills paid',
'bills_to_pay' => 'Bills to pay', 'bills_to_pay' => 'Bills to pay',
'per_day' => 'Per day', 'per_day' => 'Per day',

8
resources/views/bills/index.twig
View File

@@ -32,3 +32,11 @@
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block styles %}
<link href="css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all">
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
{% endblock %}

97
resources/views/partials/boxes.twig
View File

@@ -85,101 +85,4 @@
</div> </div>
</div> </div>
</div> </div>
{# box that shows amount spent #}
{#
<div class="{{ boxClasses }}" id="box_out_holder">
<div class="info-box">
<span class="info-box-icon bg-red">
<a href="{{ route('transactions.index',['withdrawal']) }}"><i class="fa fa-upload fa-fw"></i></a>
</span>
<div class="info-box-content">
<span class="info-box-text"><a href="{{ route('transactions.index',['withdrawal']) }}">{{ 'moneyOut'|_ }}</a></span>
<span class="info-box-number"><a href="{{ route('transactions.index',['withdrawal']) }}" id="box-out"></a></span>
</div>
</div>
</div>
#}
{# box that shows amount earned #}
{#
<div class="{{ boxClasses }}">
<div class="info-box">
<span class="info-box-icon bg-green">
<a href="{{ route('transactions.index',['deposit']) }}"><i class="fa fa-download faw-fw"></i></a>
</span>
<div class="info-box-content">
<span class="info-box-text"><a href="{{ route('transactions.index',['deposit']) }}">{{ 'moneyIn'|_ }}</a></span>
<span class="info-box-number"><a href="{{ route('transactions.index',['deposit']) }}" id="box-in"></a></span>
</div>
</div>
</div>
#}
{# box for total net worth #}
{#
<div class="{{ boxClasses }}">
<div class="info-box">
<span class="info-box-icon bg-teal">
<a href="{{ route('transactions.index',['deposit']) }}"><i class="fa fa-download faw-fw"></i></a>
</span>
<div class="info-box-content">
<span class="info-box-text"><a href="{{ route('transactions.index',['deposit']) }}">{{ 'net_worth'|_ }}</a></span>
<span class="info-box-number"><a href="{{ route('transactions.index',['deposit']) }}" id="box-net-worth"></a></span>
</div>
</div>
</div>
#}
{# box for left to spend#}
{#
<div class="{{ boxClasses }}">
<div class="info-box">
<span class="info-box-icon bg-green">
<a href="{{ route('transactions.index',['deposit']) }}"><i class="fa fa-download faw-fw"></i></a>
</span>
<div class="info-box-content">
<span class="info-box-text"><a href="{{ route('transactions.index',['deposit']) }}">{{ 'amount_available'|_ }}</a></span>
<span class="info-box-number"><a href="{{ route('transactions.index',['deposit']) }}" id="box-in"></a></span>
</div>
</div>
</div>
#}
{#
{% if billCount > 0 %}
<div class="clearfix visible-sm-block"></div>
<!-- box that shows unpaid bills -->
<div class="{{ boxClasses }}">
<div class="info-box">
<span class="info-box-icon bg-blue">
<a href="{{ route('bills.index') }}"><i class="fa fa-calendar fa-fw"></i></a>
</span>
<div class="info-box-content">
<span class="info-box-text"><a href="{{ route('bills.index') }}">{{ 'billsToPay'|_ }}</a></span>
<span class="info-box-number"><a id="box-bills-unpaid" href="{{ route('bills.index') }}"></a></span>
</div>
</div>
</div>
<!-- box that shows paid bills -->
<div class="{{ boxClasses }}">
<div class="info-box">
<span class="info-box-icon bg-aqua">
<a href="{{ route('bills.index') }}"><i class="fa fa-line-chart fa-fw"></i></a>
</span>
<div class="info-box-content">
<span class="info-box-text"><a href="{{ route('bills.index') }}">{{ 'billsPaid'|_ }}</a></span>
<span class="info-box-number"><a id="box-bills-paid" href="{{ route('bills.index') }}"></a></span>
</div>
</div>
</div>
{% endif %}
#}
</div> </div>