diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php index 488245e61a..9f85c7231f 100644 --- a/app/Helpers/Report/ReportQuery.php +++ b/app/Helpers/Report/ReportQuery.php @@ -143,7 +143,7 @@ class ReportQuery implements ReportQueryInterface ) ->orderBy('accounts.name', 'ASC') ->where( - function (Builder $query) use ($showSharedReports) { + function (Builder $query) { $query->where('account_meta.data', '!=', '"sharedAsset"'); $query->orWhereNull('account_meta.data'); diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 298b389018..48981f8143 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -90,7 +90,6 @@ class JsonController extends Controller $count = $bill->transactionjournals()->before($range['end'])->after($range['start'])->count(); if ($count != 0) { $journal = $bill->transactionjournals()->with('transactions')->before($range['end'])->after($range['start'])->first(); - $paid['items'][] = $journal->description; $currentAmount = 0; foreach ($journal->transactions as $t) { if (floatval($t->amount) > 0) { diff --git a/app/Http/Controllers/ReminderController.php b/app/Http/Controllers/ReminderController.php index 72bd61b0b4..4f4ec5fe94 100644 --- a/app/Http/Controllers/ReminderController.php +++ b/app/Http/Controllers/ReminderController.php @@ -82,7 +82,7 @@ class ReminderController extends Controller // inactive reminders $inactive = $reminders->filter( - function (Reminder $reminder) use ($today) { + function (Reminder $reminder) { if ($reminder->active === false) { return $reminder; } @@ -91,7 +91,7 @@ class ReminderController extends Controller // dismissed reminders $dismissed = $reminders->filter( - function (Reminder $reminder) use ($today) { + function (Reminder $reminder) { if ($reminder->notnow === true) { return $reminder; } diff --git a/app/Http/Middleware/PiggyBanks.php b/app/Http/Middleware/PiggyBanks.php index 0f4b197cb5..7f273507f3 100644 --- a/app/Http/Middleware/PiggyBanks.php +++ b/app/Http/Middleware/PiggyBanks.php @@ -91,7 +91,6 @@ class PiggyBanks $start = clone $piggyBank->startdate; $end = clone $piggyBank->targetdate; $max = clone $piggyBank->targetdate; - $index = 0; // first loop: start date to target date. // then, continue looping until end is > today diff --git a/database/seeds/TestDataSeeder.php b/database/seeds/TestDataSeeder.php index 4d82f29137..4aaaa78e0a 100644 --- a/database/seeds/TestDataSeeder.php +++ b/database/seeds/TestDataSeeder.php @@ -135,9 +135,9 @@ class TestDataSeeder extends Seeder $acc_c = Account::create(['user_id' => $user->id, 'account_type_id' => $assetType->id, 'name' => 'Delete me', 'active' => 1]); // create account meta: - $meta_a = AccountMeta::create(['account_id' => $acc_a->id, 'name' => 'accountRole', 'data' => 'defaultAsset']); - $meta_b = AccountMeta::create(['account_id' => $acc_b->id, 'name' => 'accountRole', 'data' => 'savingAsset']); - $meta_c = AccountMeta::create(['account_id' => $acc_c->id, 'name' => 'accountRole', 'data' => 'defaultAsset']); + AccountMeta::create(['account_id' => $acc_a->id, 'name' => 'accountRole', 'data' => 'defaultAsset']); + AccountMeta::create(['account_id' => $acc_b->id, 'name' => 'accountRole', 'data' => 'savingAsset']); + AccountMeta::create(['account_id' => $acc_c->id, 'name' => 'accountRole', 'data' => 'defaultAsset']); $acc_d = Account::create(['user_id' => $user->id, 'account_type_id' => $ibType->id, 'name' => 'Checking account initial balance', 'active' => 0]); $acc_e = Account::create(['user_id' => $user->id, 'account_type_id' => $ibType->id, 'name' => 'Savings account initial balance', 'active' => 0]); @@ -206,13 +206,13 @@ class TestDataSeeder extends Seeder $bills = Budget::create(['user_id' => $user->id, 'name' => 'Bills']); $deleteMe = Budget::create(['user_id' => $user->id, 'name' => 'Delete me']); Budget::create(['user_id' => $user->id, 'name' => 'Budget without repetition']); - $groceriesLimit = BudgetLimit::create( + BudgetLimit::create( ['startdate' => $this->som, 'amount' => 201, 'repeats' => 0, 'repeat_freq' => 'monthly', 'budget_id' => $groceries->id] ); - $billsLimit = BudgetLimit::create( + BudgetLimit::create( ['startdate' => $this->som, 'amount' => 202, 'repeats' => 0, 'repeat_freq' => 'monthly', 'budget_id' => $bills->id] ); - $deleteMeLimit = BudgetLimit::create( + BudgetLimit::create( ['startdate' => $this->som, 'amount' => 203, 'repeats' => 0, 'repeat_freq' => 'monthly', 'budget_id' => $deleteMe->id] ); @@ -247,7 +247,6 @@ class TestDataSeeder extends Seeder $endDate->addMonths(4); $nextYear->addYear()->subDay(); - $next = $nextYear->format('Y-m-d'); $end = $endDate->format('Y-m-d'); // piggy bank @@ -343,8 +342,6 @@ class TestDataSeeder extends Seeder */ public function createReminders() { - $user = User::whereEmail('thegrumpydictator@gmail.com')->first(); - // for weekly piggy bank (clothes) }