kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 12:45:30 +00:00
Code Issues Projects Releases Wiki Activity

More code.

Browse Source
This commit is contained in:
James Cole
2015-02-07 13:15:40 +01:00
parent 07ad43f7a2
commit 6b54ef8398
23 changed files with 239 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/GoogleChartController.php
View File

@@ -21,6 +21,8 @@ use Steam;
*/
class GoogleChartController extends Controller
{
/**
* @param GChart $chart
*

18
app/Http/Controllers/HomeController.php
View File

@@ -1,6 +1,7 @@
<?php namespace FireflyIII\Http\Controllers;
use Auth;
use Cache;
use Carbon\Carbon;
use Navigation;
use Preferences;
@@ -16,15 +17,21 @@ use URL;
class HomeController extends Controller
{
/**
*
*/
public function __construct()
{
$this->middleware('auth');
$this->middleware('range');
//$this->middleware('guest');
}
/**
* @return \Illuminate\Http\RedirectResponse
*/
public function flush()
{
Cache::flush();
return Redirect::route('index');
}
/**
@@ -63,7 +70,8 @@ class HomeController extends Controller
$transactions[] = [$set, $account];
}
}
// var_dump($transactions);
// var_dump($transactions);
return view('index', compact('count', 'title', 'subTitle', 'mainTitleIcon', 'transactions'));
}

184
app/Http/routes.php
View File

@@ -3,142 +3,146 @@
/**
* Home Controller
*/
Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
Route::get('/prev', ['uses' => 'HomeController@sessionPrev', 'as' => 'sessionPrev']);
Route::get('/next', ['uses' => 'HomeController@sessionNext', 'as' => 'sessionNext']);
Route::get('/jump/{range}', ['uses' => 'HomeController@rangeJump', 'as' => 'rangeJump']);
/**
Route::group(
['middleware' => ['auth','range']], function () {
Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
Route::get('/prev', ['uses' => 'HomeController@sessionPrev', 'as' => 'sessionPrev']);
Route::get('/next', ['uses' => 'HomeController@sessionNext', 'as' => 'sessionNext']);
Route::get('/jump/{range}', ['uses' => 'HomeController@rangeJump', 'as' => 'rangeJump']);
Route::get('/flush', ['uses' => 'HomeController@flush', 'as' => 'flush']);
/**
* Account Controller
*/
Route::get('/accounts/{what}', ['uses' => 'AccountController@index', 'as' => 'accounts.index'])->where('what', 'revenue|asset|expense');
Route::get('/accounts/create/{what}', ['uses' => 'AccountController@create', 'as' => 'accounts.create'])->where('what', 'revenue|asset|expense');
//Route::get('/accounts/edit/{account}', ['uses' => 'AccountController@edit', 'as' => 'accounts.edit']);
//Route::get('/accounts/delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'accounts.delete']);
Route::get('/accounts/show/{account}/{view?}', ['uses' => 'AccountController@show', 'as' => 'accounts.show']);
Route::get('/accounts/{what}', ['uses' => 'AccountController@index', 'as' => 'accounts.index'])->where('what', 'revenue|asset|expense');
Route::get('/accounts/create/{what}', ['uses' => 'AccountController@create', 'as' => 'accounts.create'])->where('what', 'revenue|asset|expense');
//Route::get('/accounts/edit/{account}', ['uses' => 'AccountController@edit', 'as' => 'accounts.edit']);
//Route::get('/accounts/delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'accounts.delete']);
Route::get('/accounts/show/{account}/{view?}', ['uses' => 'AccountController@show', 'as' => 'accounts.show']);
/**
/**
* Bills Controller
*/
Route::get('/bills', ['uses' => 'BillController@index', 'as' => 'bills.index']);
//Route::get('/bills/rescan/{bill}', ['uses' => 'BillController@rescan', 'as' => 'bills.rescan']); # rescan for matching.
Route::get('/bills/create', ['uses' => 'BillController@create', 'as' => 'bills.create']);
//Route::get('/bills/edit/{bill}', ['uses' => 'BillController@edit', 'as' => 'bills.edit']);
//Route::get('/bills/delete/{bill}', ['uses' => 'BillController@delete', 'as' => 'bills.delete']);
//Route::get('/bills/show/{bill}', ['uses' => 'BillController@show', 'as' => 'bills.show']);
Route::get('/bills', ['uses' => 'BillController@index', 'as' => 'bills.index']);
//Route::get('/bills/rescan/{bill}', ['uses' => 'BillController@rescan', 'as' => 'bills.rescan']); # rescan for matching.
Route::get('/bills/create', ['uses' => 'BillController@create', 'as' => 'bills.create']);
//Route::get('/bills/edit/{bill}', ['uses' => 'BillController@edit', 'as' => 'bills.edit']);
//Route::get('/bills/delete/{bill}', ['uses' => 'BillController@delete', 'as' => 'bills.delete']);
//Route::get('/bills/show/{bill}', ['uses' => 'BillController@show', 'as' => 'bills.show']);
/**
/**
* Budget Controller
*/
Route::get('/budgets', ['uses' => 'BudgetController@index', 'as' => 'budgets.index']);
//Route::get('/budgets/income', ['uses' => 'BudgetController@updateIncome', 'as' => 'budgets.income']); # extra.
//Route::get('/budgets/create', ['uses' => 'BudgetController@create', 'as' => 'budgets.create']);
//Route::get('/budgets/edit/{budget}', ['uses' => 'BudgetController@edit', 'as' => 'budgets.edit']);
//Route::get('/budgets/delete/{budget}', ['uses' => 'BudgetController@delete', 'as' => 'budgets.delete']);
//Route::get('/budgets/show/{budget}/{limitrepetition?}', ['uses' => 'BudgetController@show', 'as' => 'budgets.show']);
//Route::get('/budgets/list/noBudget', ['uses' => 'BudgetController@noBudget', 'as' => 'budgets.noBudget']);
Route::get('/budgets', ['uses' => 'BudgetController@index', 'as' => 'budgets.index']);
//Route::get('/budgets/income', ['uses' => 'BudgetController@updateIncome', 'as' => 'budgets.income']); # extra.
//Route::get('/budgets/create', ['uses' => 'BudgetController@create', 'as' => 'budgets.create']);
//Route::get('/budgets/edit/{budget}', ['uses' => 'BudgetController@edit', 'as' => 'budgets.edit']);
//Route::get('/budgets/delete/{budget}', ['uses' => 'BudgetController@delete', 'as' => 'budgets.delete']);
//Route::get('/budgets/show/{budget}/{limitrepetition?}', ['uses' => 'BudgetController@show', 'as' => 'budgets.show']);
//Route::get('/budgets/list/noBudget', ['uses' => 'BudgetController@noBudget', 'as' => 'budgets.noBudget']);
/**
/**
* Category Controller
*/
Route::get('/categories', ['uses' => 'CategoryController@index', 'as' => 'categories.index']);
//Route::get('/categories/create', ['uses' => 'CategoryController@create', 'as' => 'categories.create']);
//Route::get('/categories/edit/{category}', ['uses' => 'CategoryController@edit', 'as' => 'categories.edit']);
//Route::get('/categories/delete/{category}', ['uses' => 'CategoryController@delete', 'as' => 'categories.delete']);
//Route::get('/categories/show/{category}', ['uses' => 'CategoryController@show', 'as' => 'categories.show']);
//Route::get('/categories/list/noCategory', ['uses' => 'CategoryController@noCategory', 'as' => 'categories.noCategory']);
Route::get('/categories', ['uses' => 'CategoryController@index', 'as' => 'categories.index']);
//Route::get('/categories/create', ['uses' => 'CategoryController@create', 'as' => 'categories.create']);
//Route::get('/categories/edit/{category}', ['uses' => 'CategoryController@edit', 'as' => 'categories.edit']);
//Route::get('/categories/delete/{category}', ['uses' => 'CategoryController@delete', 'as' => 'categories.delete']);
//Route::get('/categories/show/{category}', ['uses' => 'CategoryController@show', 'as' => 'categories.show']);
//Route::get('/categories/list/noCategory', ['uses' => 'CategoryController@noCategory', 'as' => 'categories.noCategory']);
/**
/**
* Currency Controller
*/
Route::get('/currency', ['uses' => 'CurrencyController@index', 'as' => 'currency.index']);
//Route::get('/currency/create', ['uses' => 'CurrencyController@create', 'as' => 'currency.create']);
//Route::get('/currency/edit/{currency}', ['uses' => 'CurrencyController@edit', 'as' => 'currency.edit']);
//Route::get('/currency/delete/{currency}', ['uses' => 'CurrencyController@delete', 'as' => 'currency.delete']);
//Route::get('/currency/default/{currency}', ['uses' => 'CurrencyController@defaultCurrency', 'as' => 'currency.default']);
Route::get('/currency', ['uses' => 'CurrencyController@index', 'as' => 'currency.index']);
//Route::get('/currency/create', ['uses' => 'CurrencyController@create', 'as' => 'currency.create']);
//Route::get('/currency/edit/{currency}', ['uses' => 'CurrencyController@edit', 'as' => 'currency.edit']);
//Route::get('/currency/delete/{currency}', ['uses' => 'CurrencyController@delete', 'as' => 'currency.delete']);
//Route::get('/currency/default/{currency}', ['uses' => 'CurrencyController@defaultCurrency', 'as' => 'currency.default']);
/**
/**
* Google Chart Controller
*/
Route::get('/chart/home/account', ['uses' => 'GoogleChartController@allAccountsBalanceChart']);
Route::get('/chart/home/budgets', ['uses' => 'GoogleChartController@allBudgetsHomeChart']);
//Route::get('/chart/home/categories', ['uses' => 'GoogleChartController@allCategoriesHomeChart']);
//Route::get('/chart/home/bills', ['uses' => 'GoogleChartController@billsOverview']);
//Route::get('/chart/account/{account}/{view?}', ['uses' => 'GoogleChartController@accountBalanceChart']);
//Route::get('/chart/reports/income-expenses/{year}', ['uses' => 'GoogleChartController@yearInExp']);
//Route::get('/chart/reports/income-expenses-sum/{year}', ['uses' => 'GoogleChartController@yearInExpSum']);
//Route::get('/chart/bills/{bill}', ['uses' => 'GoogleChartController@billOverview']);
Route::get('/chart/home/account', ['uses' => 'GoogleChartController@allAccountsBalanceChart']);
Route::get('/chart/home/budgets', ['uses' => 'GoogleChartController@allBudgetsHomeChart']);
//Route::get('/chart/home/categories', ['uses' => 'GoogleChartController@allCategoriesHomeChart']);
//Route::get('/chart/home/bills', ['uses' => 'GoogleChartController@billsOverview']);
//Route::get('/chart/account/{account}/{view?}', ['uses' => 'GoogleChartController@accountBalanceChart']);
//Route::get('/chart/reports/income-expenses/{year}', ['uses' => 'GoogleChartController@yearInExp']);
//Route::get('/chart/reports/income-expenses-sum/{year}', ['uses' => 'GoogleChartController@yearInExpSum']);
//Route::get('/chart/bills/{bill}', ['uses' => 'GoogleChartController@billOverview']);
/**
/**
* Piggy Bank Controller
*/
// piggy bank controller
Route::get('/piggy_banks', ['uses' => 'PiggyBankController@index', 'as' => 'piggy_banks.index']);
//Route::get('/piggy_banks/add/{piggyBank}', ['uses' => 'PiggyBankController@add']); # add money
//Route::get('/piggy_banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@remove']); #remove money
//Route::get('/piggy_banks/create', ['uses' => 'PiggyBankController@create', 'as' => 'piggy_banks.create']);
//Route::get('/piggy_banks/edit/{piggyBank}', ['uses' => 'PiggyBankController@edit', 'as' => 'piggy_banks.edit']);
//Route::get('/piggy_banks/delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'piggy_banks.delete']);
//Route::get('/piggy_banks/show/{piggyBank}', ['uses' => 'PiggyBankController@show', 'as' => 'piggy_banks.show']);
// piggy bank controller
Route::get('/piggy_banks', ['uses' => 'PiggyBankController@index', 'as' => 'piggy_banks.index']);
//Route::get('/piggy_banks/add/{piggyBank}', ['uses' => 'PiggyBankController@add']); # add money
//Route::get('/piggy_banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@remove']); #remove money
//Route::get('/piggy_banks/create', ['uses' => 'PiggyBankController@create', 'as' => 'piggy_banks.create']);
//Route::get('/piggy_banks/edit/{piggyBank}', ['uses' => 'PiggyBankController@edit', 'as' => 'piggy_banks.edit']);
//Route::get('/piggy_banks/delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'piggy_banks.delete']);
//Route::get('/piggy_banks/show/{piggyBank}', ['uses' => 'PiggyBankController@show', 'as' => 'piggy_banks.show']);
/**
/**
* Preferences Controller
*/
Route::get('/preferences', ['uses' => 'PreferencesController@index', 'as' => 'preferences']);
Route::get('/preferences', ['uses' => 'PreferencesController@index', 'as' => 'preferences']);
/**
/**
* Profile Controller
*/
Route::get('/profile', ['uses' => 'ProfileController@index', 'as' => 'profile']);
//Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
Route::get('/profile', ['uses' => 'ProfileController@index', 'as' => 'profile']);
//Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
/**
/**
* Repeated Expenses Controller
*/
Route::get('/repeatedexpenses', ['uses' => 'RepeatedExpenseController@index', 'as' => 'repeated.index']);
//Route::get('/repeatedexpenses/create', ['uses' => 'RepeatedExpenseController@create', 'as' => 'repeated.create']);
//Route::get('/repeatedexpenses/edit/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@edit', 'as' => 'repeated.edit']);
//Route::get('/repeatedexpenses/delete/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@delete', 'as' => 'repeated.delete']);
//Route::get('/repeatedexpenses/show/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@show', 'as' => 'repeated.show']);
Route::get('/repeatedexpenses', ['uses' => 'RepeatedExpenseController@index', 'as' => 'repeated.index']);
//Route::get('/repeatedexpenses/create', ['uses' => 'RepeatedExpenseController@create', 'as' => 'repeated.create']);
//Route::get('/repeatedexpenses/edit/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@edit', 'as' => 'repeated.edit']);
//Route::get('/repeatedexpenses/delete/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@delete', 'as' => 'repeated.delete']);
//Route::get('/repeatedexpenses/show/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@show', 'as' => 'repeated.show']);
/**
/**
* Report Controller
*/
Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.index']);
//Route::get('/reports/{year}', ['uses' => 'ReportController@year', 'as' => 'reports.year']);
//Route::get('/reports/{year}/{month}', ['uses' => 'ReportController@month', 'as' => 'reports.month']);
//Route::get('/reports/budget/{year}/{month}', ['uses' => 'ReportController@budget', 'as' => 'reports.budget']);
Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.index']);
//Route::get('/reports/{year}', ['uses' => 'ReportController@year', 'as' => 'reports.year']);
//Route::get('/reports/{year}/{month}', ['uses' => 'ReportController@month', 'as' => 'reports.month']);
//Route::get('/reports/budget/{year}/{month}', ['uses' => 'ReportController@budget', 'as' => 'reports.budget']);
/**
/**
* Search Controller
*/
Route::get('/search', ['uses' => 'SearchController@index', 'as' => 'search']);
Route::get('/search', ['uses' => 'SearchController@index', 'as' => 'search']);
/**
/**
* Transaction Controller
*/
Route::get('/transactions/{what}', ['uses' => 'TransactionController@index', 'as' => 'transactions.index'])->where(
Route::get('/transactions/{what}', ['uses' => 'TransactionController@index', 'as' => 'transactions.index'])->where(
['what' => 'expenses|revenue|withdrawal|deposit|transfer|transfers']
);
Route::get('/transactions/create/{what}', ['uses' => 'TransactionController@create', 'as' => 'transactions.create'])->where(
);
Route::get('/transactions/create/{what}', ['uses' => 'TransactionController@create', 'as' => 'transactions.create'])->where(
['what' => 'expenses|revenue|withdrawal|deposit|transfer|transfers']
);
//Route::get('/transaction/edit/{tj}', ['uses' => 'TransactionController@edit', 'as' => 'transactions.edit']);
//Route::get('/transaction/delete/{tj}', ['uses' => 'TransactionController@delete', 'as' => 'transactions.delete']);
Route::get('/transaction/show/{tj}', ['uses' => 'TransactionController@show', 'as' => 'transactions.show']);
//Route::get('/transaction/relate/{tj}', ['uses' => 'TransactionController@relate', 'as' => 'transactions.relate']);
//Route::post('/transactions/relatedSearch/{tj}', ['uses' => 'TransactionController@relatedSearch', 'as' => 'transactions.relatedSearch']);
//Route::post('/transactions/alreadyRelated/{tj}', ['uses' => 'TransactionController@alreadyRelated', 'as' => 'transactions.alreadyRelated']);
//Route::post('/transactions/doRelate', ['uses' => 'TransactionController@doRelate', 'as' => 'transactions.doRelate']);
//Route::any('/transactions/unrelate/{tj}', ['uses' => 'TransactionController@unrelate', 'as' => 'transactions.unrelate']);
);
//Route::get('/transaction/edit/{tj}', ['uses' => 'TransactionController@edit', 'as' => 'transactions.edit']);
//Route::get('/transaction/delete/{tj}', ['uses' => 'TransactionController@delete', 'as' => 'transactions.delete']);
Route::get('/transaction/show/{tj}', ['uses' => 'TransactionController@show', 'as' => 'transactions.show']);
//Route::get('/transaction/relate/{tj}', ['uses' => 'TransactionController@relate', 'as' => 'transactions.relate']);
//Route::post('/transactions/relatedSearch/{tj}', ['uses' => 'TransactionController@relatedSearch', 'as' => 'transactions.relatedSearch']);
//Route::post('/transactions/alreadyRelated/{tj}', ['uses' => 'TransactionController@alreadyRelated', 'as' => 'transactions.alreadyRelated']);
//Route::post('/transactions/doRelate', ['uses' => 'TransactionController@doRelate', 'as' => 'transactions.doRelate']);
//Route::any('/transactions/unrelate/{tj}', ['uses' => 'TransactionController@unrelate', 'as' => 'transactions.unrelate']);
/**
/**
* User Controller
* TODO move to AuthController
*/
Route::get('/logout', ['uses' => 'UserController@logout', 'as' => 'logout']);
Route::get('/logout', ['uses' => 'UserController@logout', 'as' => 'logout']);
}
);
Route::controllers(
[
'auth' => 'Auth\AuthController',

18
app/Models/Account.php
View File

@@ -21,14 +21,9 @@ class Account extends Model
return $this->belongsTo('FireflyIII\Models\AccountType');
}
public function user()
public function getDates()
{
return $this->belongsTo('FireflyIII\User');
}
public function transactions()
{
return $this->hasMany('FireflyIII\Models\Transaction');
return ['created_at', 'updated_at', 'deleted_at'];
}
public function scopeAccountTypeIn(EloquentBuilder $query, array $types)
@@ -40,9 +35,14 @@ class Account extends Model
$query->whereIn('account_types.type', $types);
}
public function getDates()
public function transactions()
{
return ['created_at', 'updated_at','deleted_at'];
return $this->hasMany('FireflyIII\Models\Transaction');
}
public function user()
{
return $this->belongsTo('FireflyIII\User');
}
}

9
app/Models/AccountMeta.php
View File

@@ -16,13 +16,14 @@ class AccountMeta extends Model
return json_decode($value);
}
public function setDataAttribute($value)
{
$this->attributes['data'] = json_encode($value);
}
public function getDates()
{
return ['created_at', 'updated_at'];
}
public function setDataAttribute($value)
{
$this->attributes['data'] = json_encode($value);
}
}

1
app/Models/AccountType.php
View File

@@ -10,6 +10,7 @@ class AccountType extends Model
{
return $this->hasMany('FireflyIII\Models\Account');
}
public function getDates()
{
return ['created_at', 'updated_at'];

9
app/Models/Bill.php
View File

@@ -5,6 +5,11 @@ use Illuminate\Database\Eloquent\Model;
class Bill extends Model
{
public function getDates()
{
return ['created_at', 'updated_at', 'date'];
}
public function transactionjournals()
{
return $this->hasMany('FireflyIII\Models\TransactionJournal');
@@ -14,10 +19,6 @@ class Bill extends Model
{
return $this->belongsTo('FireflyIII\User');
}
public function getDates()
{
return ['created_at', 'updated_at','date'];
}
}

9
app/Models/Budget.php
View File

@@ -11,6 +11,11 @@ class Budget extends Model
return $this->hasMany('FireflyIII\Models\BudgetLimit');
}
public function getDates()
{
return ['created_at', 'updated_at', 'deleted_at'];
}
public function limitrepetitions()
{
return $this->hasManyThrough('FireflyIII\Models\LimitRepetition', 'BudgetLimit', 'budget_id');
@@ -25,10 +30,6 @@ class Budget extends Model
{
return $this->belongsTo('FireflyIII\User');
}
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
}

9
app/Models/BudgetLimit.php
View File

@@ -10,13 +10,14 @@ class BudgetLimit extends Model
return $this->belongsTo('FireflyIII\Models\Budget');
}
public function getDates()
{
return ['created_at', 'updated_at', 'startdate'];
}
public function limitrepetitions()
{
return $this->hasMany('FireflyIII\Models\LimitRepetition');
}
public function getDates()
{
return ['created_at', 'updated_at','startdate'];
}
}

9
app/Models/Category.php
View File

@@ -5,6 +5,11 @@ use Illuminate\Database\Eloquent\Model;
class Category extends Model
{
public function getDates()
{
return ['created_at', 'updated_at', 'deleted_at'];
}
public function transactionjournals()
{
return $this->belongsToMany('FireflyIII\Models\TransactionJournal', 'category_transaction_journal', 'category_id');
@@ -14,9 +19,5 @@ class Category extends Model
{
return $this->belongsTo('FireflyIII\User');
}
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
}

2
app/Models/Component.php
View File

@@ -7,6 +7,6 @@ class Component extends Model
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
return ['created_at', 'updated_at', 'deleted_at'];
}
}

3
app/Models/LimitRepetition.php
View File

@@ -9,9 +9,10 @@ class LimitRepetition extends Model
{
return $this->belongsTo('FireflyIII\Models\BudgetLimit');
}
public function getDates()
{
return ['created_at', 'updated_at','startdate','enddate'];
return ['created_at', 'updated_at', 'startdate', 'enddate'];
}
}

9
app/Models/PiggyBank.php
View File

@@ -10,6 +10,11 @@ class PiggyBank extends Model
return $this->belongsTo('FireflyIII\Models\Account');
}
public function getDates()
{
return ['created_at', 'updated_at', 'deleted_at', 'startdate', 'targetdate'];
}
public function piggyBankEvents()
{
return $this->hasMany('FireflyIII\Models\PiggyBankEvent');
@@ -24,8 +29,4 @@ class PiggyBank extends Model
{
return $this->morphMany('FireflyIII\Models\Reminder', 'remindersable');
}
public function getDates()
{
return ['created_at', 'updated_at','deleted_at','startdate','targetdate'];
}
}

9
app/Models/PiggyBankEvent.php
View File

@@ -5,6 +5,11 @@ use Illuminate\Database\Eloquent\Model;
class PiggyBankEvent extends Model
{
public function getDates()
{
return ['created_at', 'updated_at', 'date'];
}
public function piggyBank()
{
return $this->belongsTo('FireflyIII\Models\PiggyBank');
@@ -14,9 +19,5 @@ class PiggyBankEvent extends Model
{
return $this->belongsTo('FireflyIII\Models\TransactionJournal');
}
public function getDates()
{
return ['created_at', 'updated_at','date'];
}
}

9
app/Models/PiggyBankRepetition.php
View File

@@ -5,13 +5,14 @@ use Illuminate\Database\Eloquent\Model;
class PiggyBankRepetition extends Model
{
public function getDates()
{
return ['created_at', 'updated_at', 'startdate', 'targetdate'];
}
public function piggyBank()
{
return $this->belongsTo('FireflyIII\Models\PiggyBank');
}
public function getDates()
{
return ['created_at', 'updated_at','startdate','targetdate'];
}
}

11
app/Models/Preference.php
View File

@@ -5,11 +5,18 @@ use Illuminate\Database\Eloquent\Model;
class Preference extends Model
{
protected $fillable = ['user_id', 'data', 'name'];
public function getDataAttribute($value)
{
return json_decode($value);
}
public function getDates()
{
return ['created_at', 'updated_at'];
}
public function setDataAttribute($value)
{
$this->attributes['data'] = json_encode($value);
@@ -19,9 +26,5 @@ class Preference extends Model
{
return $this->belongsTo('FireflyIII\User');
}
public function getDates()
{
return ['created_at', 'updated_at'];
}
}

9
app/Models/Reminder.php
View File

@@ -5,6 +5,11 @@ use Illuminate\Database\Eloquent\Model;
class Reminder extends Model
{
public function getDates()
{
return ['created_at', 'updated_at', 'startdate', 'enddate'];
}
public function remindersable()
{
return $this->morphTo();
@@ -14,9 +19,5 @@ class Reminder extends Model
{
return $this->belongsTo('FireflyIII\User');
}
public function getDates()
{
return ['created_at', 'updated_at','startdate','enddate'];
}
}

9
app/Models/Transaction.php
View File

@@ -10,12 +10,13 @@ class Transaction extends Model
return $this->belongsTo('FireflyIII\Models\Account');
}
public function getDates()
{
return ['created_at', 'updated_at', 'deleted_at'];
}
public function transactionJournal()
{
return $this->belongsTo('FireflyIII\Models\TransactionJournal');
}
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
}

9
app/Models/TransactionCurrency.php
View File

@@ -5,12 +5,13 @@ use Illuminate\Database\Eloquent\Model;
class TransactionCurrency extends Model
{
public function getDates()
{
return ['created_at', 'updated_at', 'deleted_at'];
}
public function transactionJournals()
{
return $this->hasMany('FireflyIII\Models\TransactionJournal');
}
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
}

9
app/Models/TransactionGroup.php
View File

@@ -5,6 +5,11 @@ use Illuminate\Database\Eloquent\Model;
class TransactionGroup extends Model
{
public function getDates()
{
return ['created_at', 'updated_at', 'deleted_at'];
}
public function transactionjournals()
{
return $this->belongsToMany('FireflyIII\Models\TransactionJournal');
@@ -14,9 +19,5 @@ class TransactionGroup extends Model
{
return $this->belongsTo('FireflyIII\User');
}
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
}

2
app/Models/TransactionJournal.php
View File

@@ -25,7 +25,7 @@ class TransactionJournal extends Model
public function getDates()
{
return ['created_at', 'updated_at', 'date','deleted_at'];
return ['created_at', 'updated_at', 'date', 'deleted_at'];
}
public function getDescriptionAttribute($value)

9
app/Models/TransactionType.php
View File

@@ -5,12 +5,13 @@ use Illuminate\Database\Eloquent\Model;
class TransactionType extends Model
{
public function getDates()
{
return ['created_at', 'updated_at', 'deleted_at'];
}
public function transactionJournals()
{
return $this->hasMany('FireflyIII\Models\TransactionJournal');
}
public function getDates()
{
return ['created_at', 'updated_at','deleted_at'];
}
}

2
app/User.php
View File

@@ -16,7 +16,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
*
* @var array
*/
protected $fillable = ['name', 'email', 'password'];
protected $fillable = ['email', 'password'];
/**
* The attributes excluded from the model's JSON form.
*