kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Removed a bunch of methods and code that wasn't used. Also added a repository for repeated expenses.

Browse Source
This commit is contained in:
James Cole
2014-11-22 23:30:45 +01:00
parent 34454261d2
commit c6b6ed7fa8
18 changed files with 250 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
app/lib/FireflyIII/Database/Account.php
View File

@@ -81,11 +81,10 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
/**
* @param array $types
* @param array $parameters
*
* @return Collection
*/
public function getAccountsByType(array $types, array $parameters = [])
public function getAccountsByType(array $types)
{
/*
* Basic query:
@@ -103,10 +102,9 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
/*
* Not used, but useful for the balance within a certain month / year.
*/
$balanceOnDate = isset($parameters['date']) ? $parameters['date'] : Carbon::now();
$query->where(
function ($q) use ($balanceOnDate) {
$q->where('transaction_journals.date', '<=', $balanceOnDate->format('Y-m-d'));
function ($q) {
$q->where('transaction_journals.date', '<=', Carbon::now()->format('Y-m-d'));
$q->orWhereNull('transaction_journals.date');
}
);
@@ -118,23 +116,6 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
*/
$query->orderBy('name', 'ASC');
/*
* If present, process parameters for searching.
*/
if (isset($parameters['search'])) {
$query->where('name', 'LIKE', '%' . e($parameters['search']['value'] . '%'));
}
/*
* If present, start at $start:
*/
if (isset($parameters['start'])) {
$query->skip(intval($parameters['start']));
}
if (isset($parameters['length'])) {
$query->take(intval($parameters['length']));
}
return $query->get(['accounts.*', \DB::Raw('SUM(`transactions`.`amount`) as `balance`')]);
}
@@ -145,43 +126,28 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
*
* @return Collection
*/
public function getAssetAccounts(array $parameters = [])
public function getAssetAccounts()
{
return $this->getAccountsByType(['Default account', 'Asset account'], $parameters);
return $this->getAccountsByType(['Default account', 'Asset account']);
}
/**
* Get all default accounts.
*
* @return Collection
*/
public function getDefaultAccounts()
public function getExpenseAccounts()
{
// TODO: Implement getDefaultAccounts() method.
throw new NotImplementedException;
}
/**
* @param array $parameters
*
* @return Collection
*/
public function getExpenseAccounts(array $parameters = [])
{
return $this->getAccountsByType(['Expense account', 'Beneficiary account'], $parameters);
return $this->getAccountsByType(['Expense account', 'Beneficiary account']);
}
/**
* Get all revenue accounts.
*
* @param array $parameters
*
* @return Collection
*/
public function getRevenueAccounts(array $parameters = [])
public function getRevenueAccounts()
{
return $this->getAccountsByType(['Revenue account'], $parameters);
return $this->getAccountsByType(['Revenue account']);
}
/**
@@ -397,20 +363,6 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
return ['errors' => $errors, 'warnings' => $warnings, 'successes' => $successes];
}
/**
* Validates a model. Returns an array containing MessageBags
* errors/warnings/successes.
*
* @param Ardent $model
*
* @return array
*/
public function validateObject(Ardent $model)
{
// TODO: Implement validateObject() method.
throw new NotImplementedException;
}
/**
* Returns an object with id $id.
*