mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-18 02:03:40 +00:00
Removed commented out code.
This commit is contained in:
@@ -95,7 +95,6 @@ class ReminderHelper implements ReminderHelperInterface
|
|||||||
|
|
||||||
if (!is_null($piggyBank->targetdate)) {
|
if (!is_null($piggyBank->targetdate)) {
|
||||||
// count back until now.
|
// count back until now.
|
||||||
// echo 'Count back!<br>';
|
|
||||||
$start = $piggyBank->targetdate;
|
$start = $piggyBank->targetdate;
|
||||||
$end = $piggyBank->startdate;
|
$end = $piggyBank->startdate;
|
||||||
|
|
||||||
|
@@ -381,8 +381,6 @@ class ReportController extends Controller
|
|||||||
$groupedIncomes = $query->journalsByRevenueAccount($date, $end, $showSharedReports);
|
$groupedIncomes = $query->journalsByRevenueAccount($date, $end, $showSharedReports);
|
||||||
$groupedExpenses = $query->journalsByExpenseAccount($date, $end, $showSharedReports);
|
$groupedExpenses = $query->journalsByExpenseAccount($date, $end, $showSharedReports);
|
||||||
|
|
||||||
//$groupedExpenses = $helper-> expensesGroupedByAccount($date, $end, 15);
|
|
||||||
|
|
||||||
return view(
|
return view(
|
||||||
'reports.year', compact('date', 'groupedIncomes', 'groupedExpenses', 'year', 'balances', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon')
|
'reports.year', compact('date', 'groupedIncomes', 'groupedExpenses', 'year', 'balances', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon')
|
||||||
);
|
);
|
||||||
|
@@ -127,7 +127,6 @@ class PiggyBanks
|
|||||||
$repetition->targetdate = is_null($piggyBank->targetdate) ? null : $piggyBank->targetdate;
|
$repetition->targetdate = is_null($piggyBank->targetdate) ? null : $piggyBank->targetdate;
|
||||||
$repetition->currentamount = 0;
|
$repetition->currentamount = 0;
|
||||||
// it might exist, catch:
|
// it might exist, catch:
|
||||||
//$repetition->save();
|
|
||||||
|
|
||||||
// then, loop from original target up to now.
|
// then, loop from original target up to now.
|
||||||
}
|
}
|
||||||
|
@@ -32,22 +32,6 @@ class RouteServiceProvider extends ServiceProvider
|
|||||||
{
|
{
|
||||||
parent::boot($router);
|
parent::boot($router);
|
||||||
|
|
||||||
$router->before(
|
|
||||||
function (Request $request) {
|
|
||||||
|
|
||||||
// put IP in session if not already there.
|
|
||||||
|
|
||||||
$reminders = [];
|
|
||||||
|
|
||||||
if ($request->user()) {
|
|
||||||
//Filter::setSessionDateRange();
|
|
||||||
//Reminders::updateReminders();
|
|
||||||
//Steam::removeEmptyBudgetLimits();
|
|
||||||
//$reminders = Reminders::getReminders();
|
|
||||||
}
|
|
||||||
// View::share('reminders', $reminders);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -118,7 +118,6 @@ class AccountRepository implements AccountRepositoryInterface
|
|||||||
|
|
||||||
return $paginator;
|
return $paginator;
|
||||||
|
|
||||||
//return Paginator::make($items, $count, 50);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -51,16 +51,11 @@ class BillRepository implements BillRepositoryInterface
|
|||||||
foreach ($billStarts as $dateEntry) {
|
foreach ($billStarts as $dateEntry) {
|
||||||
if ($dateEntry['end'] > $start && $dateEntry['start'] < $end) {
|
if ($dateEntry['end'] > $start && $dateEntry['start'] < $end) {
|
||||||
// count transactions for bill in this range (not relevant yet!):
|
// count transactions for bill in this range (not relevant yet!):
|
||||||
// $count = $bill->transactionjournals()->before($dateEntry['end'])->after($dateEntry['start'])->count();
|
|
||||||
// if ($count == 0) {
|
|
||||||
$validRanges[] = $dateEntry;
|
$validRanges[] = $dateEntry;
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $validRanges;
|
return $validRanges;
|
||||||
// echo $bill->name;
|
|
||||||
// var_dump($validRanges);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -97,7 +97,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
|
|||||||
->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.id')
|
->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.id')
|
||||||
->where('accounts.user_id', Auth::user()->id)
|
->where('accounts.user_id', Auth::user()->id)
|
||||||
->update(['order' => 0, 'piggy_banks.updated_at' => DB::Raw('NOW()')]);
|
->update(['order' => 0, 'piggy_banks.updated_at' => DB::Raw('NOW()')]);
|
||||||
//Auth::user()->piggyBanks()->update(['order' => 0]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -138,9 +138,6 @@ class TestDataSeeder extends Seeder
|
|||||||
$meta_a = AccountMeta::create(['account_id' => $acc_a->id, 'name' => 'accountRole', 'data' => 'defaultAsset']);
|
$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_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']);
|
$meta_c = AccountMeta::create(['account_id' => $acc_c->id, 'name' => 'accountRole', 'data' => 'defaultAsset']);
|
||||||
// var_dump($meta_a->toArray());
|
|
||||||
// var_dump($meta_b->toArray());
|
|
||||||
// var_dump($meta_c->toArray());
|
|
||||||
|
|
||||||
$acc_d = Account::create(['user_id' => $user->id, 'account_type_id' => $ibType->id, 'name' => 'Checking account initial balance', 'active' => 0]);
|
$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]);
|
$acc_e = Account::create(['user_id' => $user->id, 'account_type_id' => $ibType->id, 'name' => 'Savings account initial balance', 'active' => 0]);
|
||||||
@@ -220,9 +217,6 @@ class TestDataSeeder extends Seeder
|
|||||||
);
|
);
|
||||||
|
|
||||||
// and because we have no filters, some repetitions:
|
// and because we have no filters, some repetitions:
|
||||||
// LimitRepetition::create(['budget_limit_id' => $groceriesLimit->id, 'startdate' => $this->som, 'enddate' => $this->eom, 'amount' => 201]);
|
|
||||||
// LimitRepetition::create(['budget_limit_id' => $billsLimit->id, 'startdate' => $this->som, 'enddate' => $this->eom, 'amount' => 202]);
|
|
||||||
// LimitRepetition::create(['budget_limit_id' => $deleteMeLimit->id, 'startdate' => $this->som, 'enddate' => $this->eom, 'amount' => 203]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user