kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 17:33:45 +00:00
Code Issues Projects Releases Wiki Activity

Large commit to get rid of a lot of static methods.

Browse Source
This commit is contained in:
James Cole
2017-03-04 07:18:35 +01:00
parent 33c20c8dc4
commit d9aa074330
25 changed files with 144 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Models/Tag.php
View File

@@ -14,7 +14,8 @@ declare(strict_types = 1);
namespace FireflyIII\Models;
use Crypt;
use FireflyIII\Support\Models\TagSupport;
use FireflyIII\Support\Models\TagTrait;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Watson\Validating\ValidatingTrait;
@@ -24,8 +25,10 @@ use Watson\Validating\ValidatingTrait;
*
* @package FireflyIII\Models
*/
class Tag extends TagSupport
class Tag extends Model
{
use ValidatingTrait, SoftDeletes, TagTrait;
/**
* The attributes that should be casted to native types.
*
@@ -44,7 +47,6 @@ class Tag extends TagSupport
protected $fillable = ['user_id', 'tag', 'date', 'description', 'longitude', 'latitude', 'zoomLevel', 'tagMode'];
protected $rules = ['tag' => 'required|between:1,200',];
use ValidatingTrait, SoftDeletes;
/**
* @param array $fields
@@ -103,7 +105,7 @@ class Tag extends TagSupport
$sum = '0';
/** @var TransactionJournal $journal */
foreach ($tag->transactionjournals as $journal) {
bcadd($sum, TransactionJournal::amount($journal));
bcadd($sum, $journal->amount());
}
return $sum;

7
app/Models/TransactionJournal.php
View File

@@ -16,8 +16,9 @@ namespace FireflyIII\Models;
use Carbon\Carbon;
use Crypt;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Models\TransactionJournalSupport;
use FireflyIII\Support\Models\TransactionJournalTrait;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Log;
@@ -30,9 +31,9 @@ use Watson\Validating\ValidatingTrait;
*
* @package FireflyIII\Models
*/
class TransactionJournal extends TransactionJournalSupport
class TransactionJournal extends Model
{
use SoftDeletes, ValidatingTrait;
use SoftDeletes, ValidatingTrait, TransactionJournalTrait;
/**
* The attributes that should be casted to native types.