mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Various code cleanup.
This commit is contained in:
parent
23826557c3
commit
60abe2a3af
@ -1,86 +0,0 @@
|
|||||||
<?php
|
|
||||||
/**
|
|
||||||
* LimitRepetition.php
|
|
||||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
|
||||||
*
|
|
||||||
* This file is part of Firefly III.
|
|
||||||
*
|
|
||||||
* Firefly III is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Firefly III is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace FireflyIII\Models;
|
|
||||||
|
|
||||||
use Carbon\Carbon;
|
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class LimitRepetition.
|
|
||||||
*
|
|
||||||
* @deprecated
|
|
||||||
*/
|
|
||||||
class LimitRepetition extends Model
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The attributes that should be casted to native types.
|
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
|
||||||
protected $casts
|
|
||||||
= [
|
|
||||||
'created_at' => 'datetime',
|
|
||||||
'updated_at' => 'datetime',
|
|
||||||
'startdate' => 'date',
|
|
||||||
'enddate' => 'date',
|
|
||||||
];
|
|
||||||
/** @var array */
|
|
||||||
protected $dates = ['startdate', 'enddate'];
|
|
||||||
/** @var array */
|
|
||||||
protected $hidden = ['amount_encrypted'];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
|
|
||||||
*/
|
|
||||||
public function budgetLimit()
|
|
||||||
{
|
|
||||||
return $this->belongsTo('FireflyIII\Models\BudgetLimit');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param Builder $query
|
|
||||||
* @param Carbon $date
|
|
||||||
*/
|
|
||||||
public function scopeAfter(Builder $query, Carbon $date)
|
|
||||||
{
|
|
||||||
$query->where('limit_repetitions.startdate', '>=', $date->format('Y-m-d 00:00:00'));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param Builder $query
|
|
||||||
* @param Carbon $date
|
|
||||||
*/
|
|
||||||
public function scopeBefore(Builder $query, Carbon $date)
|
|
||||||
{
|
|
||||||
$query->where('limit_repetitions.enddate', '<=', $date->format('Y-m-d 00:00:00'));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param $value
|
|
||||||
*/
|
|
||||||
public function setAmountAttribute($value)
|
|
||||||
{
|
|
||||||
$this->attributes['amount'] = strval(round($value, 2));
|
|
||||||
}
|
|
||||||
}
|
|
@ -71,7 +71,7 @@ class AccountServiceProvider extends ServiceProvider
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Register the tasker.
|
||||||
*/
|
*/
|
||||||
private function registerTasker()
|
private function registerTasker()
|
||||||
{
|
{
|
||||||
|
@ -27,6 +27,9 @@ use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
|
|||||||
use Illuminate\Foundation\Application;
|
use Illuminate\Foundation\Application;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class AdminServiceProvider
|
||||||
|
*/
|
||||||
class AdminServiceProvider extends ServiceProvider
|
class AdminServiceProvider extends ServiceProvider
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
@ -34,6 +34,9 @@ namespace FireflyIII\Providers;
|
|||||||
use Illuminate\Support\Facades\Broadcast;
|
use Illuminate\Support\Facades\Broadcast;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class BroadcastServiceProvider
|
||||||
|
*/
|
||||||
class BroadcastServiceProvider extends ServiceProvider
|
class BroadcastServiceProvider extends ServiceProvider
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
@ -26,6 +26,9 @@ use FireflyIII\Http\Middleware\StartFireflySession;
|
|||||||
use Illuminate\Session\SessionManager;
|
use Illuminate\Session\SessionManager;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class FireflySessionProvider
|
||||||
|
*/
|
||||||
class FireflySessionProvider extends ServiceProvider
|
class FireflySessionProvider extends ServiceProvider
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
@ -54,7 +54,7 @@ class JournalServiceProvider extends ServiceProvider
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Register the collector.
|
||||||
*/
|
*/
|
||||||
private function registerCollector()
|
private function registerCollector()
|
||||||
{
|
{
|
||||||
@ -73,7 +73,7 @@ class JournalServiceProvider extends ServiceProvider
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Register repository.
|
||||||
*/
|
*/
|
||||||
private function registerRepository()
|
private function registerRepository()
|
||||||
{
|
{
|
||||||
@ -92,7 +92,7 @@ class JournalServiceProvider extends ServiceProvider
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Register the tasker.
|
||||||
*/
|
*/
|
||||||
private function registerTasker()
|
private function registerTasker()
|
||||||
{
|
{
|
||||||
|
@ -29,9 +29,9 @@ use FireflyIII\TransactionRules\Actions\ActionInterface;
|
|||||||
use Log;
|
use Log;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @codeCoverageIgnore
|
|
||||||
*
|
|
||||||
* Class ActionFactory can create actions.
|
* Class ActionFactory can create actions.
|
||||||
|
*
|
||||||
|
* @codeCoverageIgnore
|
||||||
*/
|
*/
|
||||||
class ActionFactory
|
class ActionFactory
|
||||||
{
|
{
|
||||||
|
@ -30,9 +30,9 @@ use FireflyIII\TransactionRules\Triggers\TriggerInterface;
|
|||||||
use Log;
|
use Log;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @codeCoverageIgnore
|
|
||||||
*
|
|
||||||
* Class TriggerFactory can create triggers.
|
* Class TriggerFactory can create triggers.
|
||||||
|
*
|
||||||
|
* @codeCoverageIgnore
|
||||||
*/
|
*/
|
||||||
class TriggerFactory
|
class TriggerFactory
|
||||||
{
|
{
|
||||||
|
36
app/User.php
36
app/User.php
@ -59,6 +59,8 @@ class User extends Authenticatable
|
|||||||
protected $table = 'users';
|
protected $table = 'users';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to accounts.
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function accounts(): HasMany
|
public function accounts(): HasMany
|
||||||
@ -87,6 +89,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to attachments
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function attachments(): HasMany
|
public function attachments(): HasMany
|
||||||
@ -95,6 +99,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to available budgets
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function availableBudgets(): HasMany
|
public function availableBudgets(): HasMany
|
||||||
@ -103,6 +109,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to bills.
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function bills(): HasMany
|
public function bills(): HasMany
|
||||||
@ -111,6 +119,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to budgets.
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function budgets(): HasMany
|
public function budgets(): HasMany
|
||||||
@ -119,6 +129,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to categories
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function categories(): HasMany
|
public function categories(): HasMany
|
||||||
@ -127,6 +139,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to currency exchange rates
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function currencyExchangeRates(): HasMany
|
public function currencyExchangeRates(): HasMany
|
||||||
@ -135,6 +149,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to export jobs
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function exportJobs(): HasMany
|
public function exportJobs(): HasMany
|
||||||
@ -143,6 +159,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Generates access token.
|
||||||
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function generateAccessToken(): string
|
public function generateAccessToken(): string
|
||||||
@ -173,6 +191,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to import jobs.
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function importJobs(): HasMany
|
public function importJobs(): HasMany
|
||||||
@ -181,6 +201,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to piggy banks.
|
||||||
|
*
|
||||||
* @return HasManyThrough
|
* @return HasManyThrough
|
||||||
*/
|
*/
|
||||||
public function piggyBanks(): HasManyThrough
|
public function piggyBanks(): HasManyThrough
|
||||||
@ -189,6 +211,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to preferences.
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function preferences(): HasMany
|
public function preferences(): HasMany
|
||||||
@ -197,6 +221,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to roles.
|
||||||
|
*
|
||||||
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
|
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
|
||||||
*/
|
*/
|
||||||
public function roles(): BelongsToMany
|
public function roles(): BelongsToMany
|
||||||
@ -205,6 +231,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to rule groups.
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function ruleGroups(): HasMany
|
public function ruleGroups(): HasMany
|
||||||
@ -213,6 +241,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to rules.
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function rules(): HasMany
|
public function rules(): HasMany
|
||||||
@ -233,6 +263,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to tags.
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function tags(): HasMany
|
public function tags(): HasMany
|
||||||
@ -241,6 +273,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to transaction journals.
|
||||||
|
*
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
public function transactionJournals(): HasMany
|
public function transactionJournals(): HasMany
|
||||||
@ -249,6 +283,8 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Link to transactions.
|
||||||
|
*
|
||||||
* @return HasManyThrough
|
* @return HasManyThrough
|
||||||
*/
|
*/
|
||||||
public function transactions(): HasManyThrough
|
public function transactions(): HasManyThrough
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
version: '2'
|
version: '2'
|
||||||
services:
|
services:
|
||||||
firefly-db:
|
firefly-db:
|
||||||
image: mysql:latest
|
image: mysql:8
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_DATABASE=firefly_db
|
- MYSQL_DATABASE=firefly_db
|
||||||
- MYSQL_USER=firefly_db
|
- MYSQL_USER=firefly_db
|
||||||
|
@ -2,7 +2,7 @@ version: '2'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
firefly-db:
|
firefly-db:
|
||||||
image: mysql:latest
|
image: mysql:8
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_DATABASE=firefly_db
|
- MYSQL_DATABASE=firefly_db
|
||||||
- MYSQL_USER=firefly_db
|
- MYSQL_USER=firefly_db
|
||||||
|
Loading…
Reference in New Issue
Block a user