kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 07:38:29 +00:00
Code Issues Projects Releases Wiki Activity

Some basic fixes for the transaction controller [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-08-02 07:34:38 +02:00
parent af856a135f
commit d756324432
31 changed files with 726 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

305
app/controllers/TransactionController.php
View File

@@ -1,9 +1,6 @@
<?php
use Firefly\Storage\Account\AccountRepositoryInterface as ARI;
use Firefly\Storage\Budget\BudgetRepositoryInterface as Bud;
use Firefly\Storage\Category\CategoryRepositoryInterface as Cat;
use Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface as TJRI;
/**
@@ -12,38 +9,33 @@ use Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface as
class TransactionController extends BaseController
{
protected $_accounts;
protected $_budgets;
protected $_categories;
protected $_journal;
protected $_repository;
/**
* @param ARI $accounts
* @param Bud $budgets
* @param Cat $categories
* @param TJRI $journal
* @param TJRI $repository
*/
public function __construct(ARI $accounts, Bud $budgets, Cat $categories, TJRI $journal)
public function __construct(TJRI $repository)
{
$this->_accounts = $accounts;
$this->_budgets = $budgets;
$this->_categories = $categories;
$this->_journal = $journal;
$this->_repository = $repository;
View::share('menu', 'home');
}
/**
* @param $what
* @param string $what
*
* @return $this|\Illuminate\View\View
* @return \Illuminate\View\View
*/
public function create($what)
public function create($what = 'deposit')
{
// get accounts with names and id's.
$accounts = $this->_accounts->getActiveDefaultAsSelectList();
$budgets = $this->_budgets->getAsSelectList();
/** @var \Firefly\Storage\Account\AccountRepositoryInterface $accountRepository */
$accountRepository = App::make('Firefly\Storage\Account\AccountRepositoryInterface');
$accounts = $accountRepository->getActiveDefaultAsSelectList();
// get budgets as a select list.
/** @var \Firefly\Storage\Budget\BudgetRepositoryInterface $budgetRepository */
$budgetRepository = App::make('Firefly\Storage\Budget\BudgetRepositoryInterface');
$budgets = $budgetRepository->getAsSelectList();
$budgets[0] = '(no budget)';
@@ -52,63 +44,78 @@ class TransactionController extends BaseController
);
}
public function delete(TransactionJournal $transactionJournal)
{
return View::make('transactions.delete')->with('journal', $transactionJournal);
}
public function destroy(TransactionJournal $transactionJournal)
{
$transactionJournal->delete();
return Redirect::route('transactions.index');
}
/**
* @param $journalId
*
* @return $this|\Illuminate\View\View
*/
public function edit($journalId)
public function edit(TransactionJournal $journal)
{
// get journal:
$journal = $this->_journal->find($journalId);
// type is useful for display:
$what = strtolower($journal->transactiontype->type);
if ($journal) {
// type is useful for display:
$what = strtolower($journal->transactiontype->type);
// some lists prefilled:
// get accounts with names and id's.
/** @var \Firefly\Storage\Account\AccountRepositoryInterface $accountRepository */
$accountRepository = App::make('Firefly\Storage\Account\AccountRepositoryInterface');
$accounts = $accountRepository->getActiveDefaultAsSelectList();
// some lists prefilled:
$budgets = $this->_budgets->getAsSelectList();
$budgets[0] = '(no budget)';
$accounts = $this->_accounts->getActiveDefaultAsSelectList();
// get budgets as a select list.
/** @var \Firefly\Storage\Budget\BudgetRepositoryInterface $budgetRepository */
$budgetRepository = App::make('Firefly\Storage\Budget\BudgetRepositoryInterface');
$budgets = $budgetRepository->getAsSelectList();
$budgets[0] = '(no budget)';
// data to properly display form:
$data = [
'date' => $journal->date->format('Y-m-d'),
'category' => '',
'budget_id' => 0
];
$category = $journal->categories()->first();
if (!is_null($category)) {
$data['category'] = $category->name;
}
switch ($journal->transactiontype->type) {
case 'Withdrawal':
$data['account_id'] = $journal->transactions[0]->account->id;
$data['beneficiary'] = $journal->transactions[1]->account->name;
$data['amount'] = floatval($journal->transactions[1]->amount);
$budget = $journal->budgets()->first();
if (!is_null($budget)) {
$data['budget_id'] = $budget->id;
}
break;
case 'Deposit':
$data['account_id'] = $journal->transactions[1]->account->id;
$data['beneficiary'] = $journal->transactions[0]->account->name;
$data['amount'] = floatval($journal->transactions[1]->amount);
break;
case 'Transfer':
$data['account_from_id'] = $journal->transactions[1]->account->id;
$data['account_to_id'] = $journal->transactions[0]->account->id;
$data['amount'] = floatval($journal->transactions[1]->amount);
break;
}
return View::make('transactions.edit')->with('journal', $journal)->with('accounts', $accounts)->with(
'what', $what
)->with('budgets', $budgets)->with('data', $data);
// data to properly display form:
$data = [
'date' => $journal->date->format('Y-m-d'),
'category' => '',
'budget_id' => 0
];
$category = $journal->categories()->first();
if (!is_null($category)) {
$data['category'] = $category->name;
}
switch ($journal->transactiontype->type) {
case 'Withdrawal':
$data['account_id'] = $journal->transactions[0]->account->id;
$data['beneficiary'] = $journal->transactions[1]->account->name;
$data['amount'] = floatval($journal->transactions[1]->amount);
$budget = $journal->budgets()->first();
if (!is_null($budget)) {
$data['budget_id'] = $budget->id;
}
break;
case 'Deposit':
$data['account_id'] = $journal->transactions[1]->account->id;
$data['beneficiary'] = $journal->transactions[0]->account->name;
$data['amount'] = floatval($journal->transactions[1]->amount);
break;
case 'Transfer':
$data['account_from_id'] = $journal->transactions[1]->account->id;
$data['account_to_id'] = $journal->transactions[0]->account->id;
$data['amount'] = floatval($journal->transactions[1]->amount);
break;
}
return View::make('error')->with('message', 'Invalid journal');
return View::make('transactions.edit')->with('journal', $journal)->with('accounts', $accounts)->with(
'what', $what
)->with('budgets', $budgets)->with('data', $data);
}
/**
@@ -116,9 +123,9 @@ class TransactionController extends BaseController
*/
public function index()
{
$transactions = $this->_journal->paginate(25);
$journals = $this->_repository->paginate(25);
return View::make('transactions.index')->with('transactions', $transactions);
return View::make('transactions.index')->with('journals', $journals);
}
/**
@@ -128,12 +135,12 @@ class TransactionController extends BaseController
*/
public function show($journalId)
{
$journal = $this->_journal->find($journalId);
if ($journal) {
return View::make('transactions.show')->with('journal', $journal);
}
return View::make('error')->with('message', 'Invalid journal');
// $journal = $this->_journal->find($journalId);
// if ($journal) {
// return View::make('transactions.show')->with('journal', $journal);
// }
//
// return View::make('error')->with('message', 'Invalid journal');
}
/**
@@ -143,137 +150,37 @@ class TransactionController extends BaseController
*/
public function store($what)
{
// $fromAccount and $toAccount are found
// depending on the $what
$fromAccount = null;
$toAccount = null;
switch ($what) {
case 'withdrawal':
$fromAccount = $this->_accounts->find(intval(Input::get('account_id')));
$toAccount = $this->_accounts->createOrFindBeneficiary(Input::get('beneficiary'));
break;
case 'deposit':
$fromAccount = $this->_accounts->createOrFindBeneficiary(Input::get('beneficiary'));
$toAccount = $this->_accounts->find(intval(Input::get('account_id')));
break;
case 'transfer':
$fromAccount = $this->_accounts->find(intval(Input::get('account_from_id')));
$toAccount = $this->_accounts->find(intval(Input::get('account_to_id')));
break;
}
// fall back to cash if necessary:
$fromAccount = is_null($fromAccount) ? $fromAccount = $this->_accounts->getCashAccount() : $fromAccount;
$toAccount = is_null($toAccount) ? $toAccount = $this->_accounts->getCashAccount() : $toAccount;
// create or find category:
$category = $this->_categories->createOrFind(Input::get('category'));
// find budget:
$budget = $this->_budgets->find(intval(Input::get('budget_id')));
// find amount & description:
$description = trim(Input::get('description'));
$amount = floatval(Input::get('amount'));
$date = new \Carbon\Carbon(Input::get('date'));
// create journal
/** @var \TransactionJournal $journal */
try {
$journal = $this->_journal->createSimpleJournal($fromAccount, $toAccount, $description, $amount, $date);
} catch (\Firefly\Exception\FireflyException $e) {
return Redirect::route('transactions.create', $what)->withInput();
}
// attach bud/cat (?)
if (!is_null($budget)) {
$journal->budgets()->save($budget);
}
if (!is_null($category)) {
$journal->categories()->save($category);
}
Session::flash('success', 'Transaction "' . $description . '" saved');
if (Input::get('create') == '1') {
return Redirect::route('transactions.create', $what)->withInput();
$transactionJournal = $this->_repository->store($what, Input::all());
if ($transactionJournal->id) {
Session::flash('success', 'Transaction "' . $transactionJournal->description . '" saved!');
if (Input::get('create') == '1') {
return Redirect::route('transactions.create', [$what])->withInput();
} else {
return Redirect::route('transactions.index');
}
} else {
return Redirect::route('index');
Session::flash('error', 'Could not save transaction: ' . $transactionJournal->errors()->first());
return Redirect::route('transactions.create', [$what])->withInput()->withErrors(
$transactionJournal->errors()
);
}
}
public function update($journalId)
public function update(TransactionJournal $journal)
{
$journal = $this->_repository->update($journal, Input::all());
if ($journal->validate()) {
// has been saved, return to index:
Session::flash('success', 'Transaction updated!');
// get journal:
$journal = $this->_journal->find($journalId);
return Redirect::route('transactions.index');
} else {
Session::flash('error', 'Could not update transaction: ' . $journal->errors()->first());
if ($journal) {
// update basics first:
$journal->description = Input::get('description');
$journal->date = Input::get('date');
$amount = floatval(Input::get('amount'));
// remove previous category, if any:
if (!is_null($journal->categories()->first())) {
$journal->categories()->detach($journal->categories()->first()->id);
}
// remove previous budget, if any:
if (!is_null($journal->budgets()->first())) {
$journal->budgets()->detach($journal->budgets()->first()->id);
}
// get the category:
$category = $this->_categories->findByName(Input::get('category'));
if (!is_null($category)) {
$journal->categories()->attach($category);
}
// update the amounts:
$journal->transactions[0]->amount = $amount * -1;
$journal->transactions[1]->amount = $amount;
// switch on type to properly change things:
switch ($journal->transactiontype->type) {
case 'Withdrawal':
// means transaction[0] is the users account.
$account = $this->_accounts->find(Input::get('account_id'));
$beneficiary = $this->_accounts->findByName(Input::get('beneficiary'));
$journal->transactions[0]->account()->associate($account);
$journal->transactions[1]->account()->associate($beneficiary);
// do budget:
$budget = $this->_budgets->find(Input::get('budget_id'));
$journal->budgets()->attach($budget);
break;
case 'Deposit':
// means transaction[0] is the beneficiary.
$account = $this->_accounts->find(Input::get('account_id'));
$beneficiary = $this->_accounts->findByName(Input::get('beneficiary'));
$journal->transactions[0]->account()->associate($beneficiary);
$journal->transactions[1]->account()->associate($account);
break;
case 'Transfer':
// means transaction[0] is account that sent the money (from).
$fromAccount = $this->_accounts->find(Input::get('account_from_id'));
$toAccount = $this->_accounts->find(Input::get('account_to_id'));
$journal->transactions[0]->account()->associate($fromAccount);
$journal->transactions[1]->account()->associate($toAccount);
break;
default:
throw new \Firefly\Exception\FireflyException('Cannot edit this!');
break;
}
$journal->transactions[0]->save();
$journal->transactions[1]->save();
$journal->save();
return Redirect::route('transactions.edit', $journal->id);
return Redirect::route('transactions.edit', $journal->id)->withInput()->withErrors($journal->errors());
}