IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-27 09:21:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various code cleanup. [skip ci]

Browse Source
This commit is contained in:
James Cole 2018-01-17 09:32:18 +01:00
parent ccf1a6c182
commit 3ccb791674
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Export/Collector/AttachmentCollector.php
View File

@ -52,7 +52,7 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
*/
public function __construct()
{
// @var AttachmentRepositoryInterface repository
/** @var AttachmentRepositoryInterface repository */
$this->repository = app(AttachmentRepositoryInterface::class);
// make storage:
$this->uploadDisk = Storage::disk('upload');

3
app/Generator/Report/Audit/MonthReportGenerator.php
View File

@ -26,6 +26,7 @@ use Carbon\Carbon;
use FireflyIII\Generator\Report\ReportGeneratorInterface;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Account;
use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use Illuminate\Support\Collection;
use Steam;
@ -173,7 +174,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
$startBalance = $dayBeforeBalance;
$currency = $currencyRepos->find(intval($account->getMeta('currency_id')));
// @var Transaction $journal
/** @var Transaction $transaction */
foreach ($journals as $transaction) {
$transaction->before = $startBalance;
$transactionAmount = $transaction->transaction_amount;

8
app/Http/Controllers/Report/CategoryController.php
View File

@ -129,12 +129,12 @@ class CategoryController extends Controller
$report = [];
/** @var Category $category */
foreach ($categories as $category) {
$spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $end);
if (0 !== bccomp($spent, '0')) {
$report[$category->id] = ['name' => $category->name, 'spent' => $spent, 'id' => $category->id];
$spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $end);
$earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $end);
if (0 !== bccomp($spent, '0') || 0 !== bccomp($earned, '0')) {
$report[$category->id] = ['name' => $category->name, 'spent' => $spent, 'earned' => $earned, 'id' => $category->id];
}
}
// sort the result
// Obtain a list of columns
$sum = [];

2
app/Models/PiggyBank.php
View File

@ -158,7 +158,7 @@ class PiggyBank extends Model
public function leftOnAccount(Carbon $date): string
{
$balance = Steam::balanceIgnoreVirtual($this->account, $date);
// @var PiggyBank $p
/** @var PiggyBank $piggyBank */
foreach ($this->account->piggyBanks as $piggyBank) {
$currentAmount = $piggyBank->currentRelevantRep()->currentamount ?? '0';

2
app/Repositories/Tag/TagRepository.php
View File

@ -126,7 +126,7 @@ class TagRepository implements TagRepositoryInterface
public function findByTag(string $tag): Tag
{
$tags = $this->user->tags()->get();
// @var Tag $tag
/** @var Tag $databaseTag */
foreach ($tags as $databaseTag) {
if ($databaseTag->tag === $tag) {
return $databaseTag;

11
resources/views/reports/partials/categories.twig
View File

@ -2,14 +2,17 @@
<thead>
<tr>
<th>{{ 'category'|_ }}</th>
<th style="text-align: right;">{{ 'earned'|_ }}</th>
<th style="text-align: right;">{{ 'spent'|_ }}</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{% set sum = 0 %}
{% set sumSpent = 0 %}
{% set sumEarned = 0 %}
{% for index, category in report %}
{% set sum = sum + category.spent %}
{% set sumSpent = sumSpent + category.spent %}
{% set sumEarned = sumEarned + category.earned %}
{% if loop.index > listLength %}
<tr class="overListLength">
{% else %}
@ -18,6 +21,7 @@
<td>
<a href="{{ route('categories.show', category.id) }}">{{ category.name }}</a>
</td>
<td style="text-align: right;">{{ 0|formatAmount }}</td>
<td style="text-align: right;">{{ category.spent|formatAmount }}</td>
<td style="width:20px;">
<i class="fa fa-fw fa-info-circle text-muted firefly-info-button"
@ -38,7 +42,8 @@
<tr>
<td><em>{{ 'sum'|_ }}</em></td>
<td style="text-align: right;">{{ sum|formatAmount }}</td>
<td style="text-align: right;">{{ sumEarned|formatAmount }}</td>
<td style="text-align: right;">{{ sumSpent|formatAmount }}</td>
<td>&nbsp;</td>
</tr>
</tfoot>