gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 20:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a lot of todo things.

Browse Source
This commit is contained in:
James Cole
2016-05-15 15:24:23 +02:00
parent 60d732067b
commit 4164ebcc69
20 changed files with 70 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,13 +5,10 @@ namespace FireflyIII\Repositories\Bill;
use Carbon\Carbon;
use DB;
use FireflyIII\Models\Account;
use FireflyIII\Models\Bill;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\User;
use Illuminate\Database\Query\Builder;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
@@ -431,12 +428,12 @@ class BillRepository implements BillRepositoryInterface
if (false === $journal->isWithdrawal()) {
return false;
}
$matches = explode(',', $bill->match);
$description = strtolower($journal->description) . ' ' . strtolower(TransactionJournal::destinationAccount($journal)->name);
// new: add source to word match:
$description .= ' ' . strtolower(TransactionJournal::sourceAccount($journal)->name);
$destinationAccounts = TransactionJournal::destinationAccountList($journal);
$sourceAccounts = TransactionJournal::sourceAccountList($journal);
$matches = explode(',', $bill->match);
$description = strtolower($journal->description) . ' ';
$description .= strtolower(join(' ', $destinationAccounts->pluck('name')->toArray()));
$description .= strtolower(join(' ', $sourceAccounts->pluck('name')->toArray()));
$wordMatch = $this->doWordMatch($matches, $description);
$amountMatch = $this->doAmountMatch(TransactionJournal::amountPositive($journal), $bill->amount_min, $bill->amount_max);

223
app/Repositories/Budget/BudgetRepositoryInterface.php
View File

@@ -23,24 +23,6 @@ interface BudgetRepositoryInterface
*/
public function destroy(Budget $budget): bool;
// /**
// *
// * Same as ::spentInPeriod but corrects journals for a set of accounts
// *
// * @param Budget $budget
// * @param Carbon $start
// * @param Carbon $end
// * @param Collection $accounts
// *
// * @return string
// */
// public function balanceInPeriod(Budget $budget, Carbon $start, Carbon $end, Collection $accounts);
// /**
// * @return bool
// */
// public function cleanupBudgets(): bool;
/**
* Find a budget.
*
@@ -60,28 +42,11 @@ interface BudgetRepositoryInterface
*/
public function firstUseDate(Budget $budget): Carbon;
// /**
// * @param Budget $budget
// * @param Account $account
// * @param Carbon $start
// * @param Carbon $end
// *
// * @return Collection
// */
// public function expensesSplit(Budget $budget, Account $account, Carbon $start, Carbon $end): Collection;
/**
* @return Collection
*/
public function getActiveBudgets(): Collection;
// /**
// * @param Budget $budget
// *
// * @return Carbon
// */
// public function firstActivity(Budget $budget): Carbon;
/**
* @param Carbon $start
* @param Carbon $end
@@ -95,111 +60,11 @@ interface BudgetRepositoryInterface
*/
public function getBudgets(): Collection;
// /**
// * @param Account $account
// * @param Collection $accounts
// * @param Carbon $start
// * @param Carbon $end
// *
// * @return Collection
// */
// public function getAllWithoutBudget(Account $account, Collection $accounts, Carbon $start, Carbon $end): Collection;
// /**
// * Get the budgeted amounts for each budgets in each year.
// *
// * @param Collection $budgets
// * @param Carbon $start
// * @param Carbon $end
// *
// * @return Collection
// */
// public function getBudgetedPerYear(Collection $budgets, Carbon $start, Carbon $end): Collection;
/**
* @return Collection
*/
public function getInactiveBudgets(): Collection;
// /**
// * Returns an array with every budget in it and the expenses for each budget
// * per month.
// *
// * @param Collection $accounts
// * @param Carbon $start
// * @param Carbon $end
// *
// * @return array
// */
// public function getBudgetsAndExpensesPerMonth(Collection $accounts, Carbon $start, Carbon $end): array;
// /**
// * Returns an array with every budget in it and the expenses for each budget
// * per year for.
// *
// * @param Collection $budgets
// * @param Collection $accounts
// * @param Carbon $start
// * @param Carbon $end
// *
// * @deprecated
// *
// * @return array
// */
// public function getBudgetsAndExpensesPerYear(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): array;
// /**
// * Returns a list of budgets, budget limits and limit repetitions
// * (doubling any of them in a left join)
// *
// * @param Carbon $start
// * @param Carbon $end
// *
// * @return Collection
// */
// public function getBudgetsAndLimitsInRange(Carbon $start, Carbon $end): Collection;
// /**
// * Returns a list of budget limits that are valid in the current given range.
// *
// * @param Budget $budget
// * @param Carbon $start
// * @param Carbon $end
// * @param LimitRepetition $ignore
// *
// * @return Collection
// */
// public function getValidRepetitions(Budget $budget, Carbon $start, Carbon $end, LimitRepetition $ignore) : Collection;
// /**
// * @param Budget $budget
// * @param string $repeatFreq
// * @param Carbon $start
// * @param Carbon $end
// *
// * @return LimitRepetition
// */
// public function getCurrentRepetition(Budget $budget, string $repeatFreq, Carbon $start, Carbon $end): LimitRepetition;
// /**
// * Returns all expenses for the given budget and the given accounts, in the given period.
// *
// * @param Budget $budget
// * @param Collection $accounts
// * @param Carbon $start
// * @param Carbon $end
// *
// * @return Collection
// */
// public function getExpenses(Budget $budget, Collection $accounts, Carbon $start, Carbon $end):Collection;
// /**
// * @param Budget $budget
// *
// * @return Carbon
// */
// public function getFirstBudgetLimitDate(Budget $budget):Carbon;
/**
* @param Collection $budgets
* @param Collection $accounts
@@ -238,94 +103,6 @@ interface BudgetRepositoryInterface
*/
public function spentInPeriod(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end) : string;
// /**
// * Returns all the transaction journals for a limit, possibly limited by a limit repetition.
// *
// * @param Budget $budget
// * @param LimitRepetition $repetition
// * @param int $take
// *
// * @return LengthAwarePaginator
// */
// public function getJournals(Budget $budget, LimitRepetition $repetition = null, int $take = 50): LengthAwarePaginator;
// /**
// * @param Carbon $start
// * @param Carbon $end
// * @param int $page
// * @param int $pageSize
// *
// * @return LengthAwarePaginator
// */
// public function getWithoutBudget(Carbon $start, Carbon $end, int $page, int $pageSize = 50): LengthAwarePaginator;
// /**
// * @param Collection $accounts
// * @param Carbon $start
// * @param Carbon $end
// *
// * @return Collection
// */
// public function getWithoutBudgetForAccounts(Collection $accounts, Carbon $start, Carbon $end): Collection;
// /**
// * @param Collection $accounts
// * @param Carbon $start
// * @param Carbon $end
// *
// * @return string
// */
// public function getWithoutBudgetSum(Collection $accounts, Carbon $start, Carbon $end): string;
// /**
// * Returns an array with the following key:value pairs:
// *
// * yyyy-mm-dd:<array>
// *
// * That array contains:
// *
// * budgetid:<amount>
// *
// * Where yyyy-mm-dd is the date and <amount> is the money spent using WITHDRAWALS in the $budget
// * from the given users accounts..
// *
// * @param Collection $accounts
// * @param Carbon $start
// * @param Carbon $end
// *
// * @return array
// */
// public function spentAllPerDayForAccounts(Collection $accounts, Carbon $start, Carbon $end): array;
// /**
// * Returns a list of expenses (in the field "spent", grouped per budget per account.
// *
// * @param Collection $budgets
// * @param Collection $accounts
// * @param Carbon $start
// * @param Carbon $end
// *
// * @return Collection
// */
// public function spentPerBudgetPerAccount(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): Collection;
// /**
// * Returns an array with the following key:value pairs:
// *
// * yyyy-mm-dd:<amount>
// *
// * Where yyyy-mm-dd is the date and <amount> is the money spent using WITHDRAWALS in the $budget
// * from all the users accounts.
// *
// * @param Budget $budget
// * @param Carbon $start
// * @param Carbon $end
// * @param Collection $accounts
// *
// * @return array
// */
// public function spentPerDay(Budget $budget, Carbon $start, Carbon $end, Collection $accounts): array;
/**
* @param array $data
*

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

@@ -131,32 +131,6 @@ class JournalRepository implements JournalRepositoryInterface
return $entry;
}
/**
* @deprecated
*
* @param TransactionJournal $journal
* @param Transaction $transaction
*
* @return string
*/
public function getAmountBefore(TransactionJournal $journal, Transaction $transaction): string
{
$set = $transaction->account->transactions()->leftJoin(
'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
)
->where('transaction_journals.date', '<=', $journal->date->format('Y-m-d'))
->where('transaction_journals.order', '>=', $journal->order)
->where('transaction_journals.id', '!=', $journal->id)
->get(['transactions.*']);
$sum = '0';
foreach ($set as $entry) {
$sum = bcadd($entry->amount, $sum);
}
return $sum;
}
/**
* @param array $types
* @param int $page

12
app/Repositories/Journal/JournalRepositoryInterface.php
View File

@@ -50,18 +50,6 @@ interface JournalRepositoryInterface
*/
public function first(): TransactionJournal;
/**
* Returns the amount in the account before the specified transaction took place.
*
* @deprecated
*
* @param TransactionJournal $journal
* @param Transaction $transaction
*
* @return string
*/
public function getAmountBefore(TransactionJournal $journal, Transaction $transaction): string;
/**
* Returns a page of a specific type(s) of journal.
*

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

@@ -229,9 +229,11 @@ class TagRepository implements TagRepositoryInterface
// $checkAccount is the source_account for a withdrawal
// $checkAccount is the destination_account for a deposit
// TODO match split journals
if ($check->isWithdrawal() && TransactionJournal::sourceAccount($check)->id != TransactionJournal::destinationAccount($journal)->id) {
$match = false;
}
// TODO match split journals
if ($check->isDeposit() && TransactionJournal::destinationAccount($check)->id != TransactionJournal::destinationAccount($journal)->id) {
$match = false;
}