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

Some code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-03-03 10:24:59 +01:00
parent abf92b6df3
commit 35ff3f0cbf
7 changed files with 55 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/auth.php
View File

@@ -24,11 +24,6 @@ return [
'driver' => 'eloquent', 'driver' => 'eloquent',
'model' => FireflyIII\User::class, 'model' => FireflyIII\User::class,
], ],
// 'users' => [
// 'driver' => 'database',
// 'table' => 'users',
// ],
], ],
'passwords' => [ 'passwords' => [

7
config/filesystems.php
View File

@@ -62,13 +62,6 @@ return [
'host' => 'ftp.example.com', 'host' => 'ftp.example.com',
'username' => 'your-username', 'username' => 'your-username',
'password' => 'your-password', 'password' => 'your-password',
// Optional FTP Settings...
// 'port' => 21,
// 'root' => '',
// 'passive' => true,
// 'ssl' => true,
// 'timeout' => 30,
], ],
's3' => [ 's3' => [

2
config/firefly.php
View File

@@ -11,7 +11,7 @@ return [
'export_formats' => [ 'export_formats' => [
'csv' => 'FireflyIII\Export\Exporter\CsvExporter', 'csv' => 'FireflyIII\Export\Exporter\CsvExporter',
//'mt940' => 'FireflyIII\Export\Exporter\MtExporter', // mt940 FireflyIII Export Exporter MtExporter
], ],
'default_export_format' => 'csv', 'default_export_format' => 'csv',

1
config/twigbridge.php
View File

@@ -28,7 +28,6 @@ return [
'debug' => config('app.debug', false), 'debug' => config('app.debug', false),
// The charset used by the templates. // The charset used by the templates.
// default: utf-8
'charset' => 'utf-8', 'charset' => 'utf-8',
// The base template class to use for generated templates. // The base template class to use for generated templates.

10
database/migrations/2014_12_13_190730_changes_for_v321.php
View File

@@ -359,7 +359,6 @@ class ChangesForV321 extends Migration
]; ];
$budget = Budget::firstOrCreate($entry); $budget = Budget::firstOrCreate($entry);
Log::debug('Migrated budget #' . $budget->id . ': ' . $budget->name);
// create entry in budget_transaction_journal // create entry in budget_transaction_journal
$connections = DB::table('component_transaction_journal')->where('component_id', $c->id)->get(); $connections = DB::table('component_transaction_journal')->where('component_id', $c->id)->get();
/** @var \stdClass $connection */ /** @var \stdClass $connection */
@@ -400,7 +399,6 @@ class ChangesForV321 extends Migration
]; ];
$category = Category::firstOrCreate($entry); $category = Category::firstOrCreate($entry);
Log::debug('Migrated category #' . $category->id . ': ' . $category->name);
// create entry in category_transaction_journal // create entry in category_transaction_journal
$connections = DB::table('component_transaction_journal')->where('component_id', $c->id)->get(); $connections = DB::table('component_transaction_journal')->where('component_id', $c->id)->get();
/** @var \stdClass $connection */ /** @var \stdClass $connection */
@@ -435,21 +433,13 @@ class ChangesForV321 extends Migration
{ {
BudgetLimit::get()->each( BudgetLimit::get()->each(
function (BudgetLimit $bl) { function (BudgetLimit $bl) {
Log::debug('Now at budgetLimit #' . $bl->id . ' with component_id: ' . $bl->component_id);
$component = Component::find($bl->component_id); $component = Component::find($bl->component_id);
if ($component) { if ($component) {
Log::debug('Found component with id #' . $component->id . ' and name ' . $component->name);
$budget = Budget::whereName($component->name)->whereUserId($component->user_id)->first(); $budget = Budget::whereName($component->name)->whereUserId($component->user_id)->first();
if ($budget) { if ($budget) {
Log::debug('Found a budget with ID #' . $budget->id . ' and name ' . $budget->name);
$bl->budget_id = $budget->id; $bl->budget_id = $budget->id;
$bl->save(); $bl->save();
Log::debug('Connected budgetLimit #' . $bl->id . ' to budget_id' . $budget->id);
} else {
Log::debug('Could not find a matching budget with name ' . $component->name);
} }
} else {
Log::debug('Could not find a component with id ' . $bl->component_id);
} }
} }
); );

1
database/seeds/TestDataSeeder.php
View File

@@ -88,7 +88,6 @@ class TestDataSeeder extends Seeder
TestData::createBudgetLimit($user, $current, 'Bills', '1000'); TestData::createBudgetLimit($user, $current, 'Bills', '1000');
TestData::createBudgetLimit($user, $current, 'Car', '100'); TestData::createBudgetLimit($user, $current, 'Car', '100');
Log::info('Created test data for ' . $month);
$current->addMonth(); $current->addMonth();
} }
} }

106
resources/lang/en_US/validation.php
View File

@@ -10,62 +10,62 @@ return [
'file_attached' => 'Succesfully uploaded file ":name".', 'file_attached' => 'Succesfully uploaded file ":name".',
'file_invalid_mime' => 'File ":name" is of type ":mime" which is not accepted as a new upload.', 'file_invalid_mime' => 'File ":name" is of type ":mime" which is not accepted as a new upload.',
'file_too_large' => 'File ":name" is too large.', 'file_too_large' => 'File ":name" is too large.',
"accepted" => "The :attribute must be accepted.", 'accepted' => 'The :attribute must be accepted.',
"active_url" => "The :attribute is not a valid URL.", 'active_url' => 'The :attribute is not a valid URL.',
"after" => "The :attribute must be a date after :date.", 'after' => 'The :attribute must be a date after :date.',
"alpha" => "The :attribute may only contain letters.", 'alpha' => 'The :attribute may only contain letters.',
"alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.", 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
"alpha_num" => "The :attribute may only contain letters and numbers.", 'alpha_num' => 'The :attribute may only contain letters and numbers.',
"array" => "The :attribute must be an array.", 'array' => 'The :attribute must be an array.',
"unique_for_user" => "There already is an entry with this :attribute.", 'unique_for_user' => 'There already is an entry with this :attribute.',
"before" => "The :attribute must be a date before :date.", 'before' => 'The :attribute must be a date before :date.',
'unique_object_for_user' => 'This name is already in use', 'unique_object_for_user' => 'This name is already in use',
'unique_account_for_user' => 'This account name is already in use', 'unique_account_for_user' => 'This account name is already in use',
"between.numeric" => "The :attribute must be between :min and :max.", 'between.numeric' => 'The :attribute must be between :min and :max.',
"between.file" => "The :attribute must be between :min and :max kilobytes.", 'between.file' => 'The :attribute must be between :min and :max kilobytes.',
"between.string" => "The :attribute must be between :min and :max characters.", 'between.string' => 'The :attribute must be between :min and :max characters.',
"between.array" => "The :attribute must have between :min and :max items.", 'between.array' => 'The :attribute must have between :min and :max items.',
"boolean" => "The :attribute field must be true or false.", 'boolean' => 'The :attribute field must be true or false.',
"confirmed" => "The :attribute confirmation does not match.", 'confirmed' => 'The :attribute confirmation does not match.',
"date" => "The :attribute is not a valid date.", 'date' => 'The :attribute is not a valid date.',
"date_format" => "The :attribute does not match the format :format.", 'date_format' => 'The :attribute does not match the format :format.',
"different" => "The :attribute and :other must be different.", 'different' => 'The :attribute and :other must be different.',
"digits" => "The :attribute must be :digits digits.", 'digits' => 'The :attribute must be :digits digits.',
"digits_between" => "The :attribute must be between :min and :max digits.", 'digits_between' => 'The :attribute must be between :min and :max digits.',
"email" => "The :attribute must be a valid email address.", 'email' => 'The :attribute must be a valid email address.',
"filled" => "The :attribute field is required.", 'filled' => 'The :attribute field is required.',
"exists" => "The selected :attribute is invalid.", 'exists' => 'The selected :attribute is invalid.',
"image" => "The :attribute must be an image.", 'image' => 'The :attribute must be an image.',
"in" => "The selected :attribute is invalid.", 'in' => 'The selected :attribute is invalid.',
"integer" => "The :attribute must be an integer.", 'integer' => 'The :attribute must be an integer.',
"ip" => "The :attribute must be a valid IP address.", 'ip' => 'The :attribute must be a valid IP address.',
'json' => 'The :attribute must be a valid JSON string.', 'json' => 'The :attribute must be a valid JSON string.',
"max.numeric" => "The :attribute may not be greater than :max.", 'max.numeric' => 'The :attribute may not be greater than :max.',
"max.file" => "The :attribute may not be greater than :max kilobytes.", 'max.file' => 'The :attribute may not be greater than :max kilobytes.',
"max.string" => "The :attribute may not be greater than :max characters.", 'max.string' => 'The :attribute may not be greater than :max characters.',
"max.array" => "The :attribute may not have more than :max items.", 'max.array' => 'The :attribute may not have more than :max items.',
"mimes" => "The :attribute must be a file of type: :values.", 'mimes' => 'The :attribute must be a file of type: :values.',
"min.numeric" => "The :attribute must be at least :min.", 'min.numeric' => 'The :attribute must be at least :min.',
"min.file" => "The :attribute must be at least :min kilobytes.", 'min.file' => 'The :attribute must be at least :min kilobytes.',
"min.string" => "The :attribute must be at least :min characters.", 'min.string' => 'The :attribute must be at least :min characters.',
"min.array" => "The :attribute must have at least :min items.", 'min.array' => 'The :attribute must have at least :min items.',
"not_in" => "The selected :attribute is invalid.", 'not_in' => 'The selected :attribute is invalid.',
"numeric" => "The :attribute must be a number.", 'numeric' => 'The :attribute must be a number.',
"regex" => "The :attribute format is invalid.", 'regex' => 'The :attribute format is invalid.',
"required" => "The :attribute field is required.", 'required' => 'The :attribute field is required.',
"required_if" => "The :attribute field is required when :other is :value.", 'required_if' => 'The :attribute field is required when :other is :value.',
'required_unless' => 'The :attribute field is required unless :other is in :values.', 'required_unless' => 'The :attribute field is required unless :other is in :values.',
"required_with" => "The :attribute field is required when :values is present.", 'required_with' => 'The :attribute field is required when :values is present.',
"required_with_all" => "The :attribute field is required when :values is present.", 'required_with_all' => 'The :attribute field is required when :values is present.',
"required_without" => "The :attribute field is required when :values is not present.", 'required_without' => 'The :attribute field is required when :values is not present.',
"required_without_all" => "The :attribute field is required when none of :values are present.", 'required_without_all' => 'The :attribute field is required when none of :values are present.',
"same" => "The :attribute and :other must match.", 'same' => 'The :attribute and :other must match.',
"size.numeric" => "The :attribute must be :size.", 'size.numeric' => 'The :attribute must be :size.',
"size.file" => "The :attribute must be :size kilobytes.", 'size.file' => 'The :attribute must be :size kilobytes.',
"size.string" => "The :attribute must be :size characters.", 'size.string' => 'The :attribute must be :size characters.',
"size.array" => "The :attribute must contain :size items.", 'size.array' => 'The :attribute must contain :size items.',
"unique" => "The :attribute has already been taken.", 'unique' => 'The :attribute has already been taken.',
'string' => 'The :attribute must be a string.', 'string' => 'The :attribute must be a string.',
"url" => "The :attribute format is invalid.", 'url' => 'The :attribute format is invalid.',
"timezone" => "The :attribute must be a valid zone.", 'timezone' => 'The :attribute must be a valid zone.',
]; ];