IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some code.

Browse Source
This commit is contained in:
James Cole 2020-04-12 06:24:35 +02:00
parent 4a7d9b130a
commit 6daf083b3f
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
6 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Chart/AccountController.php
View File

@ -438,7 +438,7 @@ class AccountController extends Controller
// if the account is not expense or revenue, just use the account's default currency.
if (!in_array($account->accountType->type, [AccountType::REVENUE, AccountType::EXPENSE], true)) {
$currencies= [$this->accountRepository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency()];
$currencies = [$this->accountRepository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency()];
}
/** @var TransactionCurrency $currency */

2
database/factories/ModelFactory.php
View File

@ -30,7 +30,7 @@ $factory->define(
'user_id' => 1,
'attachable_id' => 1,
'attachable_type' => TransactionJournal::class,
'md5' => md5($faker->words(6, true)),
'md5' => substr(hash('sha256', $faker->words(6, true)), 0, 32),
'mime' => 'text/plain',
'size' => 1,
'filename' => 'ok',

19
resources/assets/js/components/bills/Index.vue
View File

@ -20,17 +20,18 @@
<template>
<div>
<table class="table table-hover sortable">
<caption>Bills table</caption>
<thead>
<tr>
<th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
<th>{{ 'list.name' | trans }}</th>
<th data-defaultsign="az" class="hidden-sm hidden-md hidden-xs">{{ 'list.matchesOn' | trans }}</th>
<th data-defaultsign="_19" colspan="2">{{ 'list.amount' | trans }}</th>
<th data-defaultsign="month" class="hidden-sm hidden-xs">{{ 'list.paid_current_period' | trans }}</th>
<th data-defaultsign="month" class="hidden-sm hidden-xs">{{ 'list.next_expected_match' | trans }}</th>
<th class="hidden-sm hidden-xs hidden-md">{{ 'list.active' | trans }}</th>
<th class="hidden-sm hidden-xs hidden-md">{{ 'list.automatch' | trans }}</th>
<th data-defaultsign="az" class="hidden-sm hidden-xs">{{ 'list.repeat_freq' | trans }}</th>
<th scope="col" class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
<th scope="col">{{ 'list.name' | trans }}</th>
<th scope="col"data-defaultsign="az" class="hidden-sm hidden-md hidden-xs">{{ 'list.matchesOn' | trans }}</th>
<th scope="col" data-defaultsign="_19" colspan="2">{{ 'list.amount' | trans }}</th>
<th scope="col" data-defaultsign="month" class="hidden-sm hidden-xs">{{ 'list.paid_current_period' | trans }}</th>
<th scope="col" data-defaultsign="month" class="hidden-sm hidden-xs">{{ 'list.next_expected_match' | trans }}</th>
<th scope="col" class="hidden-sm hidden-xs hidden-md">{{ 'list.active' | trans }}</th>
<th scope="col" class="hidden-sm hidden-xs hidden-md">{{ 'list.automatch' | trans }}</th>
<th scope="col" data-defaultsign="az" class="hidden-sm hidden-xs">{{ 'list.repeat_freq' | trans }}</th>
</tr>
</thead>
<tbody>

7
resources/assets/js/components/passport/AuthorizedClients.vue
View File

@ -41,11 +41,12 @@
<div class="box-body">
<!-- Authorized Tokens -->
<table class="table table-borderless m-b-none">
<caption>Authorized clients</caption>
<thead>
<tr>
<th>Name</th>
<th>Scopes</th>
<th></th>
<th scope="col">Name</th>
<th scope="col">Scopes</th>
<th scope="col"></th>
</tr>
</thead>

11
resources/assets/js/components/passport/Clients.vue
View File

@ -45,13 +45,14 @@
</p>
<table class="table table-borderless m-b-none" v-if="clients.length > 0">
<caption>Clients</caption>
<thead>
<tr>
<th>Client ID</th>
<th>Name</th>
<th>Secret</th>
<th></th>
<th></th>
<th scope="col">Client ID</th>
<th scope="col">Name</th>
<th scope="col">Secret</th>
<th scope="col"></th>
<th scope="col"></th>
</tr>
</thead>

5
resources/assets/js/components/passport/PersonalAccessTokens.vue
View File

@ -45,10 +45,11 @@
<!-- Personal Access Tokens -->
<table class="table table-borderless m-b-none" v-if="tokens.length > 0">
<caption>Personal Access Tokens</caption>
<thead>
<tr>
<th>Name</th>
<th></th>
<th scope="col">Name</th>
<th scope="col"></th>
</tr>
</thead>