mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2026-01-06 14:12:15 +00:00
A giant rename action in preparation of v3.2.2
This commit is contained in:
@@ -57,9 +57,9 @@ class Account extends Eloquent
|
||||
/**
|
||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
*/
|
||||
public function piggybanks()
|
||||
public function piggyBanks()
|
||||
{
|
||||
return $this->hasMany('Piggybank');
|
||||
return $this->hasMany('PiggyBank');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -4,9 +4,9 @@ use Illuminate\Database\Eloquent\Model as Eloquent;
|
||||
use Watson\Validating\ValidatingTrait;
|
||||
|
||||
/**
|
||||
* Class Piggybank
|
||||
* Class PiggyBank
|
||||
*/
|
||||
class Piggybank extends Eloquent
|
||||
class PiggyBank extends Eloquent
|
||||
{
|
||||
use ValidatingTrait;
|
||||
public static $rules
|
||||
@@ -62,12 +62,12 @@ class Piggybank extends Eloquent
|
||||
* @param Carbon $start
|
||||
* @param Carbon $target
|
||||
*
|
||||
* @return PiggybankRepetition
|
||||
* @return PiggyBankRepetition
|
||||
*/
|
||||
public function createRepetition(Carbon $start = null, Carbon $target = null)
|
||||
{
|
||||
$rep = new \PiggybankRepetition;
|
||||
$rep->piggybank()->associate($this);
|
||||
$rep = new \PiggyBankRepetition;
|
||||
$rep->piggyBank()->associate($this);
|
||||
$rep->startdate = $start;
|
||||
$rep->targetdate = $target;
|
||||
$rep->currentamount = 0;
|
||||
@@ -81,7 +81,7 @@ class Piggybank extends Eloquent
|
||||
*
|
||||
* Grabs the PiggyBankRepetition that's currently relevant / active
|
||||
*
|
||||
* @returns \PiggybankRepetition
|
||||
* @returns \PiggyBankRepetition
|
||||
*/
|
||||
public function currentRelevantRep()
|
||||
{
|
||||
@@ -89,13 +89,13 @@ class Piggybank extends Eloquent
|
||||
return $this->currentRep;
|
||||
}
|
||||
if ($this->repeats == 0) {
|
||||
$rep = $this->piggybankrepetitions()->first(['piggybank_repetitions.*']);
|
||||
$rep = $this->piggyBankRepetitions()->first(['piggy_bank_repetitions.*']);
|
||||
$this->currentRep = $rep;
|
||||
\Log::debug('currentRelevantRep() reports $rep is null: ' . boolstr(is_null($rep)));
|
||||
|
||||
return $rep;
|
||||
} else {
|
||||
$query = $this->piggybankrepetitions()->where(
|
||||
$query = $this->piggyBankRepetitions()->where(
|
||||
function ($q) {
|
||||
|
||||
$q->where(
|
||||
@@ -126,7 +126,7 @@ class Piggybank extends Eloquent
|
||||
}
|
||||
)
|
||||
->orderBy('startdate', 'ASC');
|
||||
$result = $query->first(['piggybank_repetitions.*']);
|
||||
$result = $query->first(['piggy_bank_repetitions.*']);
|
||||
$this->currentRep = $result;
|
||||
\Log::debug('Found relevant rep in currentRelevantRep(): ' . $result->id);
|
||||
|
||||
@@ -139,9 +139,9 @@ class Piggybank extends Eloquent
|
||||
/**
|
||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
*/
|
||||
public function piggybankrepetitions()
|
||||
public function piggyBankRepetitions()
|
||||
{
|
||||
return $this->hasMany('PiggybankRepetition');
|
||||
return $this->hasMany('PiggyBankRepetition');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -155,9 +155,9 @@ class Piggybank extends Eloquent
|
||||
/**
|
||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
*/
|
||||
public function piggybankevents()
|
||||
public function piggyBankEvents()
|
||||
{
|
||||
return $this->hasMany('PiggybankEvent');
|
||||
return $this->hasMany('PiggyBankEvent');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -175,11 +175,11 @@ class Piggybank extends Eloquent
|
||||
*
|
||||
* @param Carbon $date
|
||||
*
|
||||
* @returns \PiggybankRepetition
|
||||
* @returns \PiggyBankRepetition
|
||||
*/
|
||||
public function repetitionForDate(Carbon $date)
|
||||
{
|
||||
$query = $this->piggybankrepetitions()->where(
|
||||
$query = $this->piggyBankRepetitions()->where(
|
||||
function ($q) use ($date) {
|
||||
|
||||
$q->where(
|
||||
|
||||
@@ -9,7 +9,7 @@ class PiggyBankEvent extends Eloquent
|
||||
|
||||
public static $rules
|
||||
= [
|
||||
'piggybank_id' => 'required|exists:piggybanks,id',
|
||||
'piggy_bank_id' => 'required|exists:piggy_banks,id',
|
||||
'date' => 'required|date',
|
||||
'amount' => 'required|numeric'
|
||||
];
|
||||
@@ -26,9 +26,9 @@ class PiggyBankEvent extends Eloquent
|
||||
/**
|
||||
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
|
||||
*/
|
||||
public function piggybank()
|
||||
public function piggyBank()
|
||||
{
|
||||
return $this->belongsTo('Piggybank');
|
||||
return $this->belongsTo('PiggyBank');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -4,14 +4,14 @@ use Illuminate\Database\Eloquent\Builder;
|
||||
use Watson\Validating\ValidatingTrait;
|
||||
use \Illuminate\Database\Eloquent\Model as Eloquent;
|
||||
/**
|
||||
* Class PiggybankRepetition
|
||||
* Class PiggyBankRepetition
|
||||
*/
|
||||
class PiggybankRepetition extends Eloquent
|
||||
class PiggyBankRepetition extends Eloquent
|
||||
{
|
||||
use ValidatingTrait;
|
||||
public static $rules
|
||||
= [
|
||||
'piggybank_id' => 'required|exists:piggybanks,id',
|
||||
'piggy_bank_id' => 'required|exists:piggy_banks,id',
|
||||
'targetdate' => 'date',
|
||||
'startdate' => 'date',
|
||||
'currentamount' => 'required|numeric'];
|
||||
@@ -31,7 +31,7 @@ class PiggybankRepetition extends Eloquent
|
||||
*/
|
||||
public function pct()
|
||||
{
|
||||
$total = $this->piggybank->targetamount;
|
||||
$total = $this->piggyBank->targetamount;
|
||||
$saved = $this->currentamount;
|
||||
if ($total == 0) {
|
||||
return 0;
|
||||
@@ -44,9 +44,9 @@ class PiggybankRepetition extends Eloquent
|
||||
/**
|
||||
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
|
||||
*/
|
||||
public function piggybank()
|
||||
public function piggyBank()
|
||||
{
|
||||
return $this->belongsTo('Piggybank');
|
||||
return $this->belongsTo('PiggyBank');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -13,7 +13,6 @@ class Transaction extends Eloquent
|
||||
use SoftDeletingTrait, ValidatingTrait;
|
||||
public static $rules
|
||||
= ['account_id' => 'numeric|required|exists:accounts,id',
|
||||
'piggybank_id' => 'numeric|exists:piggybanks,id',
|
||||
'transaction_journal_id' => 'numeric|required|exists:transaction_journals,id',
|
||||
'description' => 'between:1,255',
|
||||
'amount' => 'required|between:-65536,65536|not_in:0,0.00',];
|
||||
@@ -31,7 +30,7 @@ class Transaction extends Eloquent
|
||||
/**
|
||||
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
|
||||
*/
|
||||
public function piggybank()
|
||||
public function piggyBank()
|
||||
{
|
||||
return $this->belongsTo('Piggybank');
|
||||
}
|
||||
|
||||
@@ -77,9 +77,9 @@ class TransactionJournal extends Eloquent
|
||||
/**
|
||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
*/
|
||||
public function piggybankevents()
|
||||
public function piggyBankEvents()
|
||||
{
|
||||
return $this->hasMany('PiggybankEvent');
|
||||
return $this->hasMany('PiggyBankEvent');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -53,7 +53,7 @@ class User extends Eloquent implements UserInterface, RemindableInterface
|
||||
/**
|
||||
* @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
|
||||
*/
|
||||
public function piggybanks()
|
||||
public function piggyBanks()
|
||||
{
|
||||
return $this->hasManyThrough('Piggybank', 'Account');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user