kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-03 20:55:05 +00:00
Code Issues Projects Releases Wiki Activity

Some cleaning up courtesy of PHPStorm.

Browse Source
This commit is contained in:
James Cole
2016-01-15 23:12:52 +01:00
parent 3857e8d49f
commit 7bf75128a8
56 changed files with 193 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Kernel.php
View File

@@ -24,13 +24,15 @@ class Kernel extends ConsoleKernel
*
* @var array
*/
protected $commands = [
];
protected $commands
= [
];
/**
* Define the application's command schedule.
*
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @param \Illuminate\Console\Scheduling\Schedule $schedule
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameters)

2
app/Generator/Chart/Bill/ChartJsBillChartGenerator.php
View File

@@ -35,7 +35,7 @@ class ChartJsBillChartGenerator implements BillChartGenerator
'color' => 'rgba(0, 141, 76, 0.7)',
'highlight' => 'rgba(0, 141, 76, 0.9)',
'label' => trans('firefly.paid'),
]
],
];
return $data;

10
app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php
View File

@@ -28,12 +28,12 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
'datasets' => [
[
'label' => trans('firefly.spent'),
'data' => []
'data' => [],
],
[
'label' => trans('firefly.earned'),
'data' => []
]
'data' => [],
],
],
];
@@ -95,8 +95,8 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
'datasets' => [
[
'label' => trans('firefly.spent'),
'data' => []
]
'data' => [],
],
],
];
foreach ($entries as $entry) {

4
app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php
View File

@@ -31,8 +31,8 @@ class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
'datasets' => [
[
'label' => 'Diff',
'data' => []
]
'data' => [],
],
],
];
$sum = '0';

24
app/Generator/Chart/Report/ChartJsReportChartGenerator.php
View File

@@ -27,12 +27,12 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
'datasets' => [
[
'label' => trans('firefly.income'),
'data' => []
'data' => [],
],
[
'label' => trans('firefly.expenses'),
'data' => []
]
'data' => [],
],
],
];
@@ -60,12 +60,12 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
'datasets' => [
[
'label' => trans('firefly.income'),
'data' => []
'data' => [],
],
[
'label' => trans('firefly.expenses'),
'data' => []
]
'data' => [],
],
],
];
$data['datasets'][0]['data'][] = round($income, 2);
@@ -92,12 +92,12 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
'datasets' => [
[
'label' => trans('firefly.income'),
'data' => []
'data' => [],
],
[
'label' => trans('firefly.expenses'),
'data' => []
]
'data' => [],
],
],
];
@@ -126,12 +126,12 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
'datasets' => [
[
'label' => trans('firefly.income'),
'data' => []
'data' => [],
],
[
'label' => trans('firefly.expenses'),
'data' => []
]
'data' => [],
],
],
];
$data['datasets'][0]['data'][] = round($income, 2);

4
app/Handlers/Events/FireRulesForStore.php
View File

@@ -74,7 +74,7 @@ class FireRulesForStore
}
}
// echo 'Done processing rules. See log.';
// exit;
// echo 'Done processing rules. See log.';
// exit;
}
}

1
app/Handlers/Events/FireRulesForUpdate.php
View File

@@ -8,6 +8,7 @@
*/
namespace FireflyIII\Handlers\Events;
use FireflyIII\Events\TransactionJournalUpdated;
use Log;

2
app/Helpers/Csv/Converter/CategoryName.php
View File

@@ -24,7 +24,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
$category = Category::firstOrCreateEncrypted(
[
'name' => $this->value,
'user_id' => Auth::user()->id
'user_id' => Auth::user()->id,
]
);
}

42
app/Helpers/Csv/Data.php
View File

@@ -64,7 +64,7 @@ class Data
protected function sessionHasHeaders()
{
if (Session::has('csv-has-headers')) {
$this->hasHeaders = (bool) Session::get('csv-has-headers');
$this->hasHeaders = (bool)Session::get('csv-has-headers');
}
}
@@ -78,42 +78,42 @@ class Data
protected function sessionDateFormat()
{
if (Session::has('csv-date-format')) {
$this->dateFormat = (string) Session::get('csv-date-format');
$this->dateFormat = (string)Session::get('csv-date-format');
}
}
protected function sessionCsvFileLocation()
{
if (Session::has('csv-file')) {
$this->csvFileLocation = (string) Session::get('csv-file');
$this->csvFileLocation = (string)Session::get('csv-file');
}
}
protected function sessionMap()
{
if (Session::has('csv-map')) {
$this->map = (array) Session::get('csv-map');
$this->map = (array)Session::get('csv-map');
}
}
protected function sessionRoles()
{
if (Session::has('csv-roles')) {
$this->roles = (array) Session::get('csv-roles');
$this->roles = (array)Session::get('csv-roles');
}
}
protected function sessionMapped()
{
if (Session::has('csv-mapped')) {
$this->mapped = (array) Session::get('csv-mapped');
$this->mapped = (array)Session::get('csv-mapped');
}
}
protected function sessionSpecifix()
{
if (Session::has('csv-specifix')) {
$this->specifix = (array) Session::get('csv-specifix');
$this->specifix = (array)Session::get('csv-specifix');
}
}
@@ -135,7 +135,7 @@ class Data
/**
*
* @param mixed $dateFormat
* @param mixed $dateFormat
*/
public function setDateFormat($dateFormat)
{
@@ -145,7 +145,7 @@ class Data
/**
*
* @param int $importAccount
* @param int $importAccount
*/
public function setImportAccount($importAccount)
{
@@ -164,7 +164,7 @@ class Data
/**
*
* @param bool $hasHeaders
* @param bool $hasHeaders
*/
public function setHasHeaders($hasHeaders)
{
@@ -183,7 +183,7 @@ class Data
/**
*
* @param array $map
* @param array $map
*/
public function setMap(array $map)
{
@@ -202,7 +202,7 @@ class Data
/**
*
* @param array $mapped
* @param array $mapped
*/
public function setMapped(array $mapped)
{
@@ -219,19 +219,19 @@ class Data
if (strlen($this->csvFileContent) === 0) {
$this->loadCsvFile();
}
if (is_null($this->reader)) {
$this->reader = Reader::createFromString($this->getCsvFileContent());
$this->reader->setDelimiter($this->delimiter);
}
return $this->reader;
}
protected function loadCsvFile()
{
$file = $this->getCsvFileLocation();
$content = file_get_contents($file);
$file = $this->getCsvFileLocation();
$content = file_get_contents($file);
$contentDecrypted = Crypt::decrypt($content);
$this->setCsvFileContent($contentDecrypted);
}
@@ -247,7 +247,7 @@ class Data
/**
*
* @param string $csvFileLocation
* @param string $csvFileLocation
*/
public function setCsvFileLocation($csvFileLocation)
{
@@ -266,7 +266,7 @@ class Data
/**
*
* @param string $csvFileContent
* @param string $csvFileContent
*/
public function setCsvFileContent($csvFileContent)
{
@@ -284,7 +284,7 @@ class Data
/**
*
* @param array $roles
* @param array $roles
*/
public function setRoles(array $roles)
{
@@ -303,7 +303,7 @@ class Data
/**
*
* @param array $specifix
* @param array $specifix
*/
public function setSpecifix($specifix)
{
@@ -322,7 +322,7 @@ class Data
/**
*
* @param string $delimiter
* @param string $delimiter
*/
public function setDelimiter($delimiter)
{

2
app/Helpers/Report/ReportHelper.php
View File

@@ -18,8 +18,8 @@ use FireflyIII\Helpers\Collection\Expense;
use FireflyIII\Helpers\Collection\Income;
use FireflyIII\Models\Account;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Budget as BudgetModel;
use FireflyIII\Models\Budget;
use FireflyIII\Models\LimitRepetition;
use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionJournal;

4
app/Helpers/Report/ReportQuery.php
View File

@@ -50,7 +50,7 @@ class ReportQuery implements ReportQueryInterface
->get(
[
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`t_from`.`amount`) AS `sum`')
DB::Raw('SUM(`t_from`.`amount`) AS `sum`'),
]
);
$array = [];
@@ -95,7 +95,7 @@ class ReportQuery implements ReportQueryInterface
->get(
[
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`t_to`.`amount`) AS `sum`')
DB::Raw('SUM(`t_to`.`amount`) AS `sum`'),
]
);
$array = [];

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

@@ -133,7 +133,7 @@ class AccountController extends Controller
'ccMonthlyPaymentDate' => $account->getMeta('ccMonthlyPaymentDate'),
'openingBalanceDate' => $openingBalance ? $openingBalance->date->format('Y-m-d') : null,
'openingBalance' => $openingBalanceAmount,
'virtualBalance' => round($account->virtual_balance, 2)
'virtualBalance' => round($account->virtual_balance, 2),
];
Session::flash('preFilled', $preFilled);
Session::flash('gaEventCategory', 'accounts');

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

@@ -57,7 +57,7 @@ class Controller extends BaseController
$localeconv = [
'mon_decimal_point' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL)),
'mon_thousands_sep' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL)),
'frac_digits' => $numberFormatter->getAttribute(NumberFormatter::MAX_FRACTION_DIGITS)
'frac_digits' => $numberFormatter->getAttribute(NumberFormatter::MAX_FRACTION_DIGITS),
];
View::share('monthFormat', $this->monthFormat);
View::share('monthAndDayFormat', $this->monthAndDayFormat);

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

@@ -186,7 +186,7 @@ class PiggyBankController extends Controller
'leftForPiggyBanks' => $repository->leftOnAccount($account, $end),
'sumOfSaved' => $piggyBank->savedSoFar,
'sumOfTargets' => round($piggyBank->targetamount, 2),
'leftToSave' => $piggyBank->leftToSave
'leftToSave' => $piggyBank->leftToSave,
];
} else {
$accounts[$account->id]['sumOfSaved'] = bcadd($accounts[$account->id]['sumOfSaved'], $piggyBank->savedSoFar);

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

@@ -126,7 +126,7 @@ class ProfileController extends Controller
'email' => $email,
'password' => 'deleted',
'blocked' => 1,
'blocked_code' => 'deleted'
'blocked_code' => 'deleted',
]
);

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

@@ -60,7 +60,7 @@ class TagController extends Controller
$subTitleIcon = 'fa-tag';
$preFilled = [
'tagMode' => 'nothing'
'tagMode' => 'nothing',
];
if (!Input::old('tagMode')) {
Session::flash('preFilled', $preFilled);

1
app/Http/Middleware/Binder.php
View File

@@ -54,6 +54,7 @@ class Binder
private function performBinding($key, $value, $route)
{
$class = $this->binders[$key];
return $class::routeBinder($value, $route);
}
}

7
app/Http/Middleware/EncryptCookies.php
View File

@@ -16,7 +16,8 @@ class EncryptCookies extends BaseEncrypter
*
* @var array
*/
protected $except = [
//
];
protected $except
= [
//
];
}

2
app/Http/Requests/AccountFormRequest.php
View File

@@ -53,7 +53,7 @@ class AccountFormRequest extends Request
'ccMonthlyPaymentDate' => 'date',
'amount_currency_id_openingBalance' => 'exists:transaction_currencies,id',
'amount_currency_id_virtualBalance' => 'exists:transaction_currencies,id',
'what' => 'in:' . $types
'what' => 'in:' . $types,
];
}
}

2
app/Http/Requests/BudgetFormRequest.php
View File

@@ -36,7 +36,7 @@ class BudgetFormRequest extends Request
return [
'name' => $nameRule,
'active' => 'numeric|between:0,1'
'active' => 'numeric|between:0,1',
];
}
}

1
app/Http/Requests/RuleFormRequest.php
View File

@@ -62,6 +62,7 @@ class RuleFormRequest extends Request
for ($i = 0; $i < 10; $i++) {
$rules['rule-action-value.' . $i] = 'required_if:rule-action.' . $i . ',' . $contextActions . '|ruleActionValue';
}
return $rules;
}
}

2
app/Http/Requests/RuleGroupFormRequest.php
View File

@@ -42,7 +42,7 @@ class RuleGroupFormRequest extends Request
}
return [
'title' => $titleRule,
'title' => $titleRule,
'description' => 'between:1,5000',
];
}

2
app/Http/Requests/TagFormRequest.php
View File

@@ -42,7 +42,7 @@ class TagFormRequest extends Request
'latitude' => 'numeric|min:-90|max:90',
'longitude' => 'numeric|min:-90|max:90',
'zoomLevel' => 'numeric|min:0|max:80',
'tagMode' => 'required|in:nothing,balancingAct,advancePayment'
'tagMode' => 'required|in:nothing,balancingAct,advancePayment',
];
}
}

2
app/Models/AccountMeta.php
View File

@@ -17,9 +17,9 @@ use Illuminate\Database\Eloquent\Model;
class AccountMeta extends Model
{
protected $dates = ['created_at', 'updated_at'];
protected $fillable = ['account_id', 'name', 'data'];
protected $table = 'account_meta';
protected $dates = ['created_at', 'updated_at'];
/**
*

2
app/Models/BudgetLimit.php
View File

@@ -22,7 +22,7 @@ class BudgetLimit extends Model
{
protected $hidden = ['amount_encrypted'];
protected $dates = ['created_at', 'updated_at', 'startdate'];
protected $dates = ['created_at', 'updated_at', 'startdate'];
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo

2
app/Models/Component.php
View File

@@ -1,8 +1,6 @@
<?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class Component

2
app/Models/PiggyBankEvent.php
View File

@@ -19,9 +19,9 @@ use Illuminate\Database\Eloquent\Model;
class PiggyBankEvent extends Model
{
protected $dates = ['created_at', 'updated_at', 'date'];
protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount'];
protected $hidden = ['amount_encrypted'];
protected $dates = ['created_at', 'updated_at', 'date'];
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo

2
app/Models/PiggyBankRepetition.php
View File

@@ -24,7 +24,7 @@ class PiggyBankRepetition extends Model
protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount'];
protected $hidden = ['currentamount_encrypted'];
protected $dates = ['created_at', 'updated_at', 'startdate', 'targetdate'];
protected $dates = ['created_at', 'updated_at', 'startdate', 'targetdate'];
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo

3
app/Models/Preference.php
View File

@@ -23,7 +23,8 @@ class Preference extends Model
protected $fillable = ['user_id', 'data', 'name'];
protected $hidden = ['data_encrypted', 'name_encrypted'];
protected $dates = ['created_at', 'updated_at'];
protected $dates = ['created_at', 'updated_at'];
/**
* @param $value
*

1
app/Models/Rule.php
View File

@@ -37,6 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class Rule extends Model
{
use SoftDeletes;
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/

18
app/Models/RuleAction.php
View File

@@ -15,15 +15,15 @@ use Illuminate\Database\Eloquent\Model;
/**
* FireflyIII\Models\RuleAction
*
* @property integer $id
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property integer $rule_id
* @property integer $order
* @property boolean $active
* @property boolean $stop_processing
* @property string $action_type
* @property string $action_value
* @property integer $id
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property integer $rule_id
* @property integer $order
* @property boolean $active
* @property boolean $stop_processing
* @property string $action_type
* @property string $action_value
* @property-read \FireflyIII\Models\Rule $rule
*/
class RuleAction extends Model

20
app/Models/RuleTrigger.php
View File

@@ -14,16 +14,16 @@ use Illuminate\Database\Eloquent\Model;
/**
* FireflyIII\Models\RuleTrigger
*
* @property integer $id
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property integer $rule_id
* @property integer $order
* @property string $title
* @property string $trigger_type
* @property string $trigger_value
* @property boolean $active
* @property boolean $stop_processing
* @property integer $id
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property integer $rule_id
* @property integer $order
* @property string $title
* @property string $trigger_type
* @property string $trigger_value
* @property boolean $active
* @property boolean $stop_processing
* @property-read \FireflyIII\Models\Rule $rule
*/
class RuleTrigger extends Model

10
app/Providers/AuthServiceProvider.php
View File

@@ -17,14 +17,16 @@ class AuthServiceProvider extends ServiceProvider
*
* @var array
*/
protected $policies = [
'FireflyIII\Model' => 'FireflyIII\Policies\ModelPolicy',
];
protected $policies
= [
'FireflyIII\Model' => 'FireflyIII\Policies\ModelPolicy',
];
/**
* Register any application authentication / authorization services.
*
* @param \Illuminate\Contracts\Auth\Access\Gate $gate
* @param \Illuminate\Contracts\Auth\Access\Gate $gate
*
* @return void
*/
public function boot(GateContract $gate)

6
app/Providers/EventServiceProvider.php
View File

@@ -29,19 +29,19 @@ class EventServiceProvider extends ServiceProvider
*/
protected $listen
= [
'FireflyIII\Events\TransactionJournalUpdated' => [
'FireflyIII\Events\TransactionJournalUpdated' => [
'FireflyIII\Handlers\Events\ScanForBillsAfterUpdate',
'FireflyIII\Handlers\Events\UpdateJournalConnection',
'FireflyIII\Handlers\Events\FireRulesForUpdate',
],
'FireflyIII\Events\TransactionJournalStored' => [
'FireflyIII\Events\TransactionJournalStored' => [
'FireflyIII\Handlers\Events\ScanForBillsAfterStore',
'FireflyIII\Handlers\Events\ConnectJournalToPiggyBank',
'FireflyIII\Handlers\Events\FireRulesForStore',
]
],
];

2
app/Providers/FireflyServiceProvider.php
View File

@@ -11,8 +11,8 @@ use FireflyIII\Support\Twig\Budget;
use FireflyIII\Support\Twig\General;
use FireflyIII\Support\Twig\Journal;
use FireflyIII\Support\Twig\PiggyBank;
use FireflyIII\Support\Twig\Translation;
use FireflyIII\Support\Twig\Rule;
use FireflyIII\Support\Twig\Translation;
use FireflyIII\Validation\FireflyValidator;
use Illuminate\Support\ServiceProvider;
use Twig;

14
app/Providers/RouteServiceProvider.php
View File

@@ -2,8 +2,8 @@
namespace FireflyIII\Providers;
use Illuminate\Routing\Router;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Routing\Router;
/**
* Class RouteServiceProvider
@@ -24,7 +24,8 @@ class RouteServiceProvider extends ServiceProvider
/**
* Define your route model bindings, pattern filters, etc.
*
* @param \Illuminate\Routing\Router $router
* @param \Illuminate\Routing\Router $router
*
* @return void
*/
public function boot(Router $router)
@@ -37,13 +38,16 @@ class RouteServiceProvider extends ServiceProvider
/**
* Define the routes for the application.
*
* @param \Illuminate\Routing\Router $router
* @param \Illuminate\Routing\Router $router
*
* @return void
*/
public function map(Router $router)
{
$router->group(['namespace' => $this->namespace], function ($router) {
$router->group(
['namespace' => $this->namespace], function ($router) {
require app_path('Http/routes.php');
});
}
);
}
}

4
app/Repositories/Bill/BillRepository.php
View File

@@ -61,7 +61,7 @@ class BillRepository implements BillRepositoryInterface
->get(
[
'transaction_journals.bill_id',
DB::Raw('SUM(`transactions`.`amount`) as `journalAmount`')
DB::Raw('SUM(`transactions`.`amount`) as `journalAmount`'),
]
);
@@ -476,7 +476,7 @@ class BillRepository implements BillRepositoryInterface
->get(
[
'bills.*',
DB::Raw('(`bills`.`amount_min` + `bills`.`amount_max` / 2) as `expectedAmount`')
DB::Raw('(`bills`.`amount_min` + `bills`.`amount_max` / 2) as `expectedAmount`'),
]
)->sortBy('name');

10
app/Repositories/Budget/BudgetRepository.php
View File

@@ -89,7 +89,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
->get(
[
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`, "%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`transactions`.`amount`) as `monthlyAmount`')
DB::Raw('SUM(`transactions`.`amount`) as `monthlyAmount`'),
]
);
@@ -316,7 +316,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
[
'budgets.*',
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`, "%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`transactions`.`amount`) AS `sumAmount`')
DB::Raw('SUM(`transactions`.`amount`) AS `sumAmount`'),
]
);
@@ -559,7 +559,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
[
'budgets.*',
DB::Raw('DATE_FORMAT(`limit_repetitions`.`startdate`,"%Y") as `dateFormatted`'),
DB::Raw('SUM(`limit_repetitions`.`amount`) as `budgeted`')
DB::Raw('SUM(`limit_repetitions`.`amount`) as `budgeted`'),
]
);
@@ -603,7 +603,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
[
'budgets.*',
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`, "%Y") AS `dateFormatted`'),
DB::Raw('SUM(`transactions`.`amount`) AS `sumAmount`')
DB::Raw('SUM(`transactions`.`amount`) AS `sumAmount`'),
]
);
@@ -720,7 +720,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
->get(
[
't_from.account_id', 'budget_transaction_journal.budget_id',
DB::Raw('SUM(`t_from`.`amount`) AS `spent`')
DB::Raw('SUM(`t_from`.`amount`) AS `spent`'),
]
);

4
app/Repositories/Journal/JournalRepository.php
View File

@@ -196,14 +196,14 @@ class JournalRepository implements JournalRepositoryInterface
[
'account_id' => $fromAccount->id,
'transaction_journal_id' => $journal->id,
'amount' => $data['amount'] * -1
'amount' => $data['amount'] * -1,
]
);
Transaction::create( // second transaction.
[
'account_id' => $toAccount->id,
'transaction_journal_id' => $journal->id,
'amount' => $data['amount']
'amount' => $data['amount'],
]
);
$journal->completed = 1;

2
app/Repositories/Tag/TagRepository.php
View File

@@ -131,7 +131,7 @@ class TagRepository implements TagRepositoryInterface
->get(
[
't_to.account_id',
DB::Raw('SUM(`t_to`.`amount`) as `sum`')
DB::Raw('SUM(`t_to`.`amount`) as `sum`'),
]
);

3
app/Rules/Actions/ActionInterface.php
View File

@@ -8,6 +8,7 @@
*/
namespace FireflyIII\Rules\Actions;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal;
@@ -21,7 +22,7 @@ interface ActionInterface
/**
* TriggerInterface constructor.
*
* @param RuleAction $action
* @param RuleAction $action
* @param TransactionJournal $journal
*/
public function __construct(RuleAction $action, TransactionJournal $journal);

3
app/Rules/Actions/SetBudget.php
View File

@@ -15,6 +15,7 @@ use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use Log;
/**
* Class SetBudget
*
@@ -56,7 +57,7 @@ class SetBudget implements ActionInterface
Log::debug('Will set budget "' . $search . '" (#' . $budget->id . ') on journal #' . $this->journal->id . '.');
$this->journal->budgets()->save($budget);
} else {
Log::debug('Could not find budget "'.$search.'". Failed.');
Log::debug('Could not find budget "' . $search . '". Failed.');
}
return true;

8
app/Support/Domain.php
View File

@@ -30,16 +30,16 @@ class Domain
/**
* @return array
*/
public static function getRuleTriggers()
public static function getRuleActions()
{
return Config::get('firefly.rule-triggers');
return Config::get('firefly.rule-actions');
}
/**
* @return array
*/
public static function getRuleActions()
public static function getRuleTriggers()
{
return Config::get('firefly.rule-actions');
return Config::get('firefly.rule-triggers');
}
}

2
app/Support/Twig/Journal.php
View File

@@ -37,7 +37,7 @@ class Journal extends Twig_Extension
{
$functions = [
$this->invalidJournal(),
$this->relevantTags()
$this->relevantTags(),
];
return $functions;

98
app/User.php
View File

@@ -9,24 +9,24 @@ use Zizaco\Entrust\Traits\EntrustUserTrait;
* Class User
*
* @package FireflyIII
* @property integer $id
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property string $email
* @property string $password
* @property string $remember_token
* @property string $reset
* @property boolean $blocked
* @property string $blocked_code
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[] $bills
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Preference[] $preferences
* @property integer $id
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property string $email
* @property string $password
* @property string $remember_token
* @property string $reset
* @property boolean $blocked
* @property string $blocked_code
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[] $bills
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Preference[] $preferences
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Role[] $roles
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Role[] $roles
*/
class User extends Authenticatable
{
@@ -71,30 +71,6 @@ class User extends Authenticatable
return $this->hasMany('FireflyIII\Models\Attachment');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function tags()
{
return $this->hasMany('FireflyIII\Models\Tag');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function rules()
{
return $this->hasMany('FireflyIII\Models\Rule');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function ruleGroups()
{
return $this->hasMany('FireflyIII\Models\RuleGroup');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
@@ -127,14 +103,6 @@ class User extends Authenticatable
return $this->hasManyThrough('FireflyIII\Models\PiggyBank', 'FireflyIII\Models\Account');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
*/
public function transactions()
{
return $this->hasManyThrough('FireflyIII\Models\Transaction', 'FireflyIII\Models\TransactionJournal');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
@@ -143,6 +111,30 @@ class User extends Authenticatable
return $this->hasMany('FireflyIII\Models\Preference');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function ruleGroups()
{
return $this->hasMany('FireflyIII\Models\RuleGroup');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function rules()
{
return $this->hasMany('FireflyIII\Models\Rule');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function tags()
{
return $this->hasMany('FireflyIII\Models\Tag');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
@@ -151,4 +143,12 @@ class User extends Authenticatable
return $this->hasMany('FireflyIII\Models\TransactionJournal');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
*/
public function transactions()
{
return $this->hasManyThrough('FireflyIII\Models\Transaction', 'FireflyIII\Models\TransactionJournal');
}
}

2
resources/lang/en_US/firefly.php
View File

@@ -282,7 +282,7 @@ return [
'csv_specifix_RabobankDescription' => 'Select this when you\'re importing Rabobank CSV export files.',
'csv_specifix_Dummy' => 'Checking this has no effect whatsoever.',
'csv_import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_date_parse_error' => 'Could not parse a valid date from ":value", using the format ":format". Are you sure your CSV is correct?',
// create new stuff:

2
resources/lang/en_US/passwords.php
View File

@@ -17,6 +17,6 @@ return [
"token" => "This password reset token is invalid.",
"sent" => "We have e-mailed your password reset link!",
"reset" => "Your password has been reset!",
'blocked' => 'Nice try though.'
'blocked' => 'Nice try though.',
];

2
resources/lang/fr_FR/firefly.php
View File

@@ -282,7 +282,7 @@ return [
'csv_specifix_RabobankDescription' => 'Select this when you\'re importing Rabobank CSV export files.',
'csv_specifix_Dummy' => 'Checking this has no effect whatsoever.',
'csv_import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_date_parse_error' => 'Could not parse a valid date from ":value", using the format ":format". Are you sure your CSV is correct?',
// create new stuff:

2
resources/lang/fr_FR/passwords.php
View File

@@ -17,6 +17,6 @@ return [
"token" => "Le jeton de réinitialisation de mot de passe est invalide.",
"sent" => "Nous avons envoyé votre lien de réinitialisation de mot de passe!",
"reset" => "Le mot de passe a été réinitialisé!",
'blocked' => 'Nice try though.'
'blocked' => 'Nice try though.',
];

2
resources/lang/nl_NL/firefly.php
View File

@@ -282,7 +282,7 @@ return [
'csv_specifix_RabobankDescription' => 'Vink dit aan als je Rabobank bestanden importeert.',
'csv_specifix_Dummy' => 'Dit vinkje doet niks (dummy).',
'csv_import_account_help' => 'Als jouw CSV bestand geen referenties bevat naar jouw rekening(en), geef dan hier aan om welke rekening het gaat.',
'csv_delimiter_help' => 'Kies het veldscheidingsteken dat in het invoerbestand is gebruikt. Bij twijfel is de komma de veiligste optie.',
'csv_delimiter_help' => 'Kies het veldscheidingsteken dat in het invoerbestand is gebruikt. Bij twijfel is de komma de veiligste optie.',
'csv_date_parse_error' => 'Firefly kan van ":value" geen datum maken, gegeven het formaat ":format". Weet je zeker dat je CSV goed is?',
// create new stuff:

2
resources/lang/nl_NL/passwords.php
View File

@@ -17,6 +17,6 @@ return [
"token" => "Ongeldig token! Sorry",
"sent" => "Je krijgt een mailtje met een linkje om je wachtwoord te herstellen!",
"reset" => "Je wachtwoord is hersteld!",
'blocked' => 'Leuk geprobeerd wel.'
'blocked' => 'Leuk geprobeerd wel.',
];

2
resources/lang/pt_BR/firefly.php
View File

@@ -282,7 +282,7 @@ return [
'csv_specifix_RabobankDescription' => 'Select this when you\'re importing Rabobank CSV export files.',
'csv_specifix_Dummy' => 'Checking this has no effect whatsoever.',
'csv_import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
'csv_date_parse_error' => 'Could not parse a valid date from ":value", using the format ":format". Are you sure your CSV is correct?',
// create new stuff:

2
resources/lang/pt_BR/passwords.php
View File

@@ -17,6 +17,6 @@ return [
"token" => "Este token de redefinição de senha é inválido.",
"sent" => "Nós te enviamos um email com um link para trocar a senha!",
"reset" => "Sua senha foi redefinida!",
'blocked' => 'Nice try though.'
'blocked' => 'Nice try though.',
];

1
resources/views/emails/registered-html.twig
View File

@@ -62,6 +62,7 @@
</script>
</body>

6
resources/views/rules/partials/trigger.twig
View File

@@ -23,9 +23,9 @@
<input type="text" value="{{ oldValue }}" name="rule-trigger-value[{{ count }}]"
class="form-control">
{% if errors.has(('rule-trigger-value.'~count)) %}
<p class="text-danger">
{{ errors.first('rule-trigger-value.'~count) }}
</p>
<p class="text-danger">
{{ errors.first('rule-trigger-value.'~count) }}
</p>
{% endif %}
</td>
<td style="width:20%;">

1
resources/views/rules/rule/delete.twig
View File

@@ -1,4 +1,3 @@
{% extends "./layout/default.twig" %}
{% block breadcrumbs %}