From 6a553f77f3f2c74460e206db945aeefcecdefd03 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 21 Oct 2016 21:41:31 +0200 Subject: [PATCH] Large update to fix split journals. --- .../Transaction/SingleController.php | 8 +- .../Transaction/SplitController.php | 362 +++++++----------- app/Models/Transaction.php | 2 +- .../Journal/JournalRepository.php | 181 ++++++++- .../Journal/JournalRepositoryInterface.php | 8 + app/Repositories/Journal/JournalTasker.php | 44 +-- public/js/ff/split/journal/from-store.js | 32 +- resources/views/split/journals/create.twig | 270 ------------- resources/views/transactions/create.twig | 2 +- .../edit-split.twig} | 215 +++++++---- resources/views/transactions/edit.twig | 8 +- routes/web.php | 10 +- 12 files changed, 510 insertions(+), 632 deletions(-) delete mode 100644 resources/views/split/journals/create.twig rename resources/views/{split/journals/edit.twig => transactions/edit-split.twig} (57%) diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index a831e9529e..169de3b707 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -49,7 +49,7 @@ class SingleController extends Controller /** @var BudgetRepositoryInterface */ private $budgets; - + /** @var PiggyBankRepositoryInterface */ private $piggyBanks; @@ -91,7 +91,7 @@ class SingleController extends Controller { $what = strtolower($what); $uploadSize = min(Steam::phpBytes(ini_get('upload_max_filesize')), Steam::phpBytes(ini_get('post_max_size'))); - $assetAccounts = ExpandedForm::makeSelectList($this->accounts->getActiveAccountsByType(['Default account', 'Asset account'])); + $assetAccounts = ExpandedForm::makeSelectList($this->accounts->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET])); $budgets = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets()); $piggyBanks = $this->piggyBanks->getPiggyBanksWithAmount(); $piggies = ExpandedForm::makeSelectListWithEmpty($piggyBanks); @@ -166,10 +166,10 @@ class SingleController extends Controller { $count = $journal->transactions()->count(); if ($count > 2) { - return redirect(route('journal.edit-split', [$journal->id])); + return redirect(route('transactions.edit-split', [$journal->id])); } - $assetAccounts = ExpandedForm::makeSelectList($this->accounts->getAccountsByType(['Default account', 'Asset account'])); + $assetAccounts = ExpandedForm::makeSelectList($this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])); $budgetList = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets()); $piggyBankList = ExpandedForm::makeSelectListWithEmpty($this->piggyBanks->getPiggyBanks()); diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 17f5994d39..8bdda780f8 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -15,19 +15,17 @@ namespace FireflyIII\Http\Controllers\Transaction; use ExpandedForm; -use FireflyIII\Crud\Split\JournalInterface; use FireflyIII\Events\TransactionJournalUpdated; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Http\Requests\SplitJournalFormRequest; -use FireflyIII\Models\Account; -use FireflyIII\Models\Transaction; +use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalTaskerInterface; use Illuminate\Http\Request; -use Illuminate\Support\Collection; -use Log; use Preferences; use Session; use Steam; @@ -42,6 +40,22 @@ use View; */ class SplitController extends Controller { + + /** @var AccountRepositoryInterface */ + private $accounts; + /** @var AttachmentHelperInterface */ + private $attachments; + /** @var BudgetRepositoryInterface */ + private $budgets; + /** @var CurrencyRepositoryInterface */ + private $currencies; + + /** @var JournalTaskerInterface */ + private $tasker; + // + // /** @var PiggyBankRepositoryInterface */ + // private $piggyBanks; + /** * */ @@ -50,47 +64,19 @@ class SplitController extends Controller parent::__construct(); View::share('mainTitleIcon', 'fa-share-alt'); View::share('title', trans('firefly.split-transactions')); - } - /** - * @param TransactionJournal $journal - * - * @return View - */ - public function create(TransactionJournal $journal) - { - $currencyRepository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface'); - $budgetRepository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); - $piggyRepository = app('FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface'); + // some useful repositories: + $this->middleware( + function ($request, $next) { + $this->accounts = app(AccountRepositoryInterface::class); + $this->budgets = app(BudgetRepositoryInterface::class); + $this->tasker = app(JournalTaskerInterface::class); + // $this->piggyBanks = app(PiggyBankRepositoryInterface::class); + $this->attachments = app(AttachmentHelperInterface::class); + $this->currencies = app(CurrencyRepositoryInterface::class); - /** @var AccountRepositoryInterface $accountRepository */ - $accountRepository = app(AccountRepositoryInterface::class); - - $assetAccounts = ExpandedForm::makeSelectList($accountRepository->getAccountsByType(['Default account', 'Asset account'])); - $sessionData = session('journal-data', []); - $uploadSize = min(Steam::phpBytes(ini_get('upload_max_filesize')), Steam::phpBytes(ini_get('post_max_size'))); - $currencies = ExpandedForm::makeSelectList($currencyRepository->get()); - $budgets = ExpandedForm::makeSelectListWithEmpty($budgetRepository->getActiveBudgets()); - $piggyBanks = ExpandedForm::makeSelectListWithEmpty($piggyRepository->getPiggyBanksWithAmount()); - $subTitle = trans('form.add_new_' . $sessionData['what']); - $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data; - $subTitleIcon = 'fa-plus'; - $preFilled = [ - 'what' => $sessionData['what'] ?? 'withdrawal', - 'journal_amount' => $sessionData['amount'] ?? 0, - 'journal_source_account_id' => $sessionData['source_account_id'] ?? 0, - 'journal_source_account_name' => $sessionData['source_account_name'] ?? '', - 'description' => [$journal->description], - 'destination_account_name' => [$sessionData['destination_account_name']], - 'destination_account_id' => [$sessionData['destination_account_id']], - 'amount' => [$sessionData['amount']], - 'budget_id' => [$sessionData['budget_id']], - 'category' => [$sessionData['category']], - ]; - - return view( - 'split.journals.create', - compact('journal', 'piggyBanks', 'subTitle', 'optionalFields', 'subTitleIcon', 'preFilled', 'assetAccounts', 'currencies', 'budgets', 'uploadSize') + return $next($request); + } ); } @@ -102,17 +88,11 @@ class SplitController extends Controller */ public function edit(Request $request, TransactionJournal $journal) { - $currencyRepository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface'); - $budgetRepository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); - - /** @var AccountRepositoryInterface $accountRepository */ - $accountRepository = app(AccountRepositoryInterface::class); - $uploadSize = min(Steam::phpBytes(ini_get('upload_max_filesize')), Steam::phpBytes(ini_get('post_max_size'))); - $currencies = ExpandedForm::makeSelectList($currencyRepository->get()); - $assetAccounts = ExpandedForm::makeSelectList($accountRepository->getAccountsByType(['Default account', 'Asset account'])); + $currencies = ExpandedForm::makeSelectList($this->currencies->get()); + $assetAccounts = ExpandedForm::makeSelectList($this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])); $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data; - $budgets = ExpandedForm::makeSelectListWithEmpty($budgetRepository->getActiveBudgets()); + $budgets = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets()); $preFilled = $this->arrayFromJournal($request, $journal); $subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]); $subTitleIcon = 'fa-pencil'; @@ -127,7 +107,7 @@ class SplitController extends Controller Session::forget('transactions.edit-split.fromUpdate'); return view( - 'split.journals.edit', + 'transactions.edit-split', compact( 'subTitleIcon', 'currencies', 'optionalFields', 'preFilled', 'subTitle', 'amount', 'sourceAccounts', 'uploadSize', 'destinationAccounts', 'assetAccounts', @@ -136,63 +116,32 @@ class SplitController extends Controller ); } - /** - * @param JournalInterface $repository - * @param SplitJournalFormRequest $request - * @param TransactionJournal $journal - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function store(JournalInterface $repository, SplitJournalFormRequest $request, TransactionJournal $journal) - { - $data = $request->getSplitData(); - foreach ($data['transactions'] as $transaction) { - $repository->storeTransaction($journal, $transaction); - } - - $repository->markAsComplete($journal); - - Session::flash('success', strval(trans('firefly.stored_journal', ['description' => e($journal->description)]))); - Preferences::mark(); - - if (intval($request->get('create_another')) === 1) { - // set value so create routine will not overwrite URL: - Session::put('transactions.create.fromStore', true); - - return redirect(route('transactions.create', [$request->input('what')]))->withInput(); - } - - // redirect to previous URL. - return redirect(session('transactions.create.url')); - } /** - * @param TransactionJournal $journal - * @param SplitJournalFormRequest $request - * @param JournalInterface $repository - * @param AttachmentHelperInterface $att + * @param Request $request + * @param JournalRepositoryInterface $repository + * @param TransactionJournal $journal * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function update(TransactionJournal $journal, SplitJournalFormRequest $request, JournalInterface $repository, AttachmentHelperInterface $att) + public function update(Request $request, JournalRepositoryInterface $repository, TransactionJournal $journal) { - $data = $request->getSplitData(); - $journal = $repository->updateJournal($journal, $data); + $data = $this->arrayFromInput($request, $journal); + $journal = $repository->updateSplitJournal($journal, $data); // save attachments: - $att->saveAttachmentsForModel($journal); + $this->attachments->saveAttachmentsForModel($journal); event(new TransactionJournalUpdated($journal)); // update, get events by date and sort DESC // flash messages - if (count($att->getMessages()->get('attachments')) > 0) { - Session::flash('info', $att->getMessages()->get('attachments')); + if (count($this->attachments->getMessages()->get('attachments')) > 0) { + Session::flash('info', $this->attachments->getMessages()->get('attachments')); } - - $type = strtolower($journal->transaction_type_type ?? TransactionJournal::transactionTypeStr($journal)); + $type = strtolower(TransactionJournal::transactionTypeStr($journal)); Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => e($data['journal_description'])]))); Preferences::mark(); @@ -200,7 +149,7 @@ class SplitController extends Controller // set value so edit routine will not overwrite URL: Session::put('transactions.edit-split.fromUpdate', true); - return redirect(route('split.journal.edit', [$journal->id]))->withInput(['return_to_edit' => 1]); + return redirect(route('transactions.edit-split', [$journal->id]))->withInput(['return_to_edit' => 1]); } // redirect to previous URL. @@ -208,6 +157,40 @@ class SplitController extends Controller } + /** + * @param Request $request + * @param TransactionJournal $journal + * + * @return array + */ + private function arrayFromInput(Request $request, TransactionJournal $journal): array + { + $array = [ + 'journal_description' => $request->get('journal_description'), + 'journal_source_account_id' => $request->get('journal_source_account_id'), + 'journal_source_account_name' => $request->get('journal_source_account_name'), + 'journal_destination_account_id' => $request->get('journal_destination_account_id'), + 'transaction_currency_id' => $request->get('transaction_currency_id'), + 'what' => $request->get('what'), + 'date' => $request->get('date'), + // all custom fields: + 'interest_date' => $request->get('interest_date'), + 'book_date' => $request->get('book_date'), + 'process_date' => $request->get('process_date'), + 'due_date' => $request->get('due_date'), + 'payment_date' => $request->get('payment_date'), + 'invoice_date' => $request->get('invoice_date'), + 'internal_reference' => $request->get('internal_reference'), + 'notes' => $request->get('notes'), + 'tags' => explode(',', $request->get('tags')), + + // transactions. + 'transactions' => $this->getTransactionDataFromRequest($request), + ]; + + return $array; + } + /** * @param Request $request * @param TransactionJournal $journal @@ -222,149 +205,80 @@ class SplitController extends Controller 'journal_description' => $request->old('journal_description', $journal->description), 'journal_amount' => TransactionJournal::amountPositive($journal), 'sourceAccounts' => $sourceAccounts, - 'journal_source_account_id' => $sourceAccounts->first()->id, - 'journal_source_account_name' => $sourceAccounts->first()->name, - 'journal_destination_account_id' => $destinationAccounts->first()->id, + 'journal_source_account_id' => $request->old('journal_source_account_id', $sourceAccounts->first()->id), + 'journal_source_account_name' => $request->old('journal_source_account_name', $sourceAccounts->first()->name), + 'journal_destination_account_id' => $request->old('journal_destination_account_id', $destinationAccounts->first()->id), 'transaction_currency_id' => $request->old('transaction_currency_id', $journal->transaction_currency_id), 'destinationAccounts' => $destinationAccounts, 'what' => strtolower(TransactionJournal::transactionTypeStr($journal)), 'date' => $request->old('date', $journal->date), - 'interest_date' => $request->old('interest_date', $journal->interest_date), - 'book_date' => $request->old('book_date', $journal->book_date), - 'process_date' => $request->old('process_date', $journal->process_date), - 'description' => [], - 'source_account_id' => [], - 'source_account_name' => [], - 'destination_account_id' => [], - 'destination_account_name' => [], - 'amount' => [], - 'budget_id' => [], - 'category' => [], + 'tags' => join(',', $journal->tags->pluck('tag')->toArray()), + + // all custom fields: + 'interest_date' => $request->old('interest_date', $journal->getMeta('interest_date')), + 'book_date' => $request->old('book_date', $journal->getMeta('book_date')), + 'process_date' => $request->old('process_date', $journal->getMeta('process_date')), + 'due_date' => $request->old('due_date', $journal->getMeta('due_date')), + 'payment_date' => $request->old('payment_date', $journal->getMeta('payment_date')), + 'invoice_date' => $request->old('invoice_date', $journal->getMeta('invoice_date')), + 'internal_reference' => $request->old('internal_reference', $journal->getMeta('internal_reference')), + 'notes' => $request->old('notes', $journal->getMeta('notes')), + + // transactions. + 'transactions' => $this->getTransactionDataFromJournal($journal), ]; - // number of transactions present in old input: - $previousCount = count($request->old('description')); - - if ($previousCount === 0) { - // build from scratch - $transactions = $this->transactionsFromJournal($request, $journal); - $array['description'] = $transactions['description']; - $array['source_account_id'] = $transactions['source_account_id']; - $array['source_account_name'] = $transactions['source_account_name']; - $array['destination_account_id'] = $transactions['destination_account_id']; - $array['destination_account_name'] = $transactions['destination_account_name']; - $array['amount'] = $transactions['amount']; - $array['budget_id'] = $transactions['budget_id']; - $array['category'] = $transactions['category']; - - return $array; - } - - $index = 0; - while ($index < $previousCount) { - $description = $request->old('description')[$index] ?? ''; - $destinationId = $request->old('destination_account_id')[$index] ?? 0; - $destinationName = $request->old('destination_account_name')[$index] ?? ''; - $sourceId = $request->old('source_account_id')[$index] ?? 0; - $sourceName = $request->old('source_account_name')[$index] ?? ''; - $amount = $request->old('amount')[$index] ?? ''; - $budgetId = $request->old('budget_id')[$index] ?? 0; - $categoryName = $request->old('category')[$index] ?? ''; - - - // any transfer not from the source: - $array['description'][] = $description; - $array['source_account_id'][] = $sourceId; - $array['source_account_name'][] = $sourceName; - $array['destination_account_id'][] = $destinationId; - $array['destination_account_name'][] = $destinationName; - $array['amount'][] = $amount; - $array['budget_id'][] = intval($budgetId); - $array['category'][] = $categoryName; - $index++; - } - return $array; } /** - * @param Request $request * @param TransactionJournal $journal * * @return array */ - private function transactionsFromJournal(Request $request, TransactionJournal $journal): array + private function getTransactionDataFromJournal(TransactionJournal $journal): array { - /** @var Collection $transactions */ - $transactions = $journal->transactions()->get(); - - /* - * Splitted journals always have ONE source OR ONE destination. - * Withdrawals have ONE source (asset account) - * Deposits have ONE destination (asset account) - * Transfers have ONE of both (asset account) - */ - /** @var Account $singular */ - $singular = TransactionJournal::sourceAccountList($journal)->first(); - if ($journal->transactionType->type == TransactionType::DEPOSIT) { - /** @var Account $singular */ - $singular = TransactionJournal::destinationAccountList($journal)->first(); + $transactions = $this->tasker->getTransactionsOverview($journal); + $return = []; + /** @var array $transaction */ + foreach ($transactions as $transaction) { + $return[] = [ + 'description' => $transaction['description'], + 'source_account_id' => $transaction['source_account_id'], + 'source_account_name' => $transaction['source_account_name'], + 'destination_account_id' => $transaction['destination_account_id'], + 'destination_account_name' => $transaction['destination_account_name'], + 'amount' => round($transaction['destination_amount'], 2), + 'budget_id' => $transaction['budget_id'], + 'category' => $transaction['category'], + ]; } - /* - * Loop all transactions. Collect info ONLY from the transaction that is NOT related to - * the singular account. - */ - $index = 0; - $return = [ - 'description' => [], - 'source_account_id' => [], - 'source_account_name' => [], - 'destination_account_id' => [], - 'destination_account_name' => [], - 'amount' => [], - 'budget_id' => [], - 'category' => [], - ]; + return $return; + } - Log::debug('now at transactionsFromJournal'); - - /** - * @var int $current - * @var Transaction $transaction - */ - foreach ($transactions as $current => $transaction) { - $budget = $transaction->budgets()->first(); - $category = $transaction->categories()->first(); - $budgetId = 0; - $categoryName = ''; - if (!is_null($budget)) { - $budgetId = $budget->id; - } - - if (!is_null($category)) { - $categoryName = $category->name; - } - - $budgetId = $request->old('budget_id')[$index] ?? $budgetId; - $categoryName = $request->old('category')[$index] ?? $categoryName; - $amount = $request->old('amount')[$index] ?? $transaction->amount; - $description = $request->old('description')[$index] ?? $transaction->description; - $destinationName = $request->old('destination_account_name')[$index] ?? $transaction->account->name; - $sourceName = $request->old('source_account_name')[$index] ?? $transaction->account->name; - $amount = bccomp($amount, '0') === -1 ? bcmul($amount, '-1') : $amount; - - if ($transaction->account_id !== $singular->id) { - $return['description'][] = $description; - $return['destination_account_id'][] = $transaction->account_id; - $return['destination_account_name'][] = $destinationName; - $return['source_account_name'][] = $sourceName; - $return['amount'][] = $amount; - $return['budget_id'][] = intval($budgetId); - $return['category'][] = $categoryName; - // only add one when "valid" transaction - $index++; - } + /** + * @param Request $request + * + * @return array + */ + private function getTransactionDataFromRequest(Request $request): array + { + $return = []; + $transactions = $request->get('transactions'); + foreach ($transactions as $transaction) { + $return[] = [ + 'description' => $transaction['description'], + 'source_account_id' => $transaction['source_account_id'] ?? 0, + 'source_account_name' => $transaction['source_account_name'] ?? '', + 'destination_account_id' => $transaction['destination_account_id'] ?? 0, + 'destination_account_name' => $transaction['destination_account_name'] ?? '', + 'amount' => round($transaction['amount'] ?? 0, 2), + 'budget_id' => intval($transaction['budget_id']), + 'category' => $transaction['category'] ?? '', + 'user' => auth()->user()->id, // needed for accounts. + 'piggy_bank_id' => $transaction['piggy_bank_id'] ?? 0, + ]; } return $return; diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index d2d82d17b4..2c007aca1a 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -55,7 +55,7 @@ class Transaction extends Model { protected $dates = ['created_at', 'updated_at', 'deleted_at']; - protected $fillable = ['account_id', 'transaction_journal_id', 'description', 'amount']; + protected $fillable = ['account_id', 'transaction_journal_id', 'description', 'amount','identifier']; protected $hidden = ['encrypted']; protected $rules = [ diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index d4cfd695d7..01dfc3f100 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -14,6 +14,7 @@ declare(strict_types = 1); namespace FireflyIII\Repositories\Journal; use DB; +use FireflyIII\Events\TransactionStored; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; @@ -25,6 +26,7 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\User; +use Illuminate\Support\Collection; use Log; /** @@ -251,6 +253,92 @@ class JournalRepository implements JournalRepositoryInterface return $journal; } + /** + * Same as above but for transaction journal with multiple transactions. + * + * @param TransactionJournal $journal + * @param array $data + * + * @return TransactionJournal + */ + public function updateSplitJournal(TransactionJournal $journal, array $data): TransactionJournal + { + // update actual journal: + $journal->transaction_currency_id = $data['transaction_currency_id']; + $journal->description = $data['journal_description']; + $journal->date = $data['date']; + + // unlink all categories: + $journal->categories()->detach(); + $journal->budgets()->detach(); + + // update meta fields: + $result = $journal->save(); + if ($result) { + foreach ($data as $key => $value) { + if (in_array($key, $this->validMetaFields)) { + $journal->setMeta($key, $value); + continue; + } + Log::debug(sprintf('Could not store meta field "%s" with value "%s" for journal #%d', json_encode($key), json_encode($value), $journal->id)); + } + + return $journal; + } + + + // update tags: + if (isset($data['tags']) && is_array($data['tags'])) { + $this->updateTags($journal, $data['tags']); + } + + // delete original transactions, and recreate them. + $journal->transactions()->delete(); + + // store each transaction. + $identifier = 0; + foreach ($data['transactions'] as $transaction) { + Log::debug(sprintf('Split journal update split transaction %d', $identifier)); + $transaction = $this->appendTransactionData($transaction, $data); + $this->storeSplitTransaction($journal, $transaction, $identifier); + $identifier++; + } + + $journal->save(); + + return $journal; + } + + /** + * When the user edits a split journal, each line is missing crucial data: + * + * - Withdrawal lines are missing the source account ID + * - Deposit lines are missing the destination account ID + * - Transfers are missing both. + * + * We need to append the array. + * + * @param array $transaction + * @param array $data + * + * @return array + */ + private function appendTransactionData(array $transaction, array $data): array + { + switch ($data['what']) { + case strtolower(TransactionType::TRANSFER): + case strtolower(TransactionType::WITHDRAWAL): + $transaction['source_account_id'] = intval($data['journal_source_account_id']); + break; + case strtolower(TransactionType::TRANSFER): + case strtolower(TransactionType::DEPOSIT): + $transaction['destination_account_id'] = intval($data['journal_destination_account_id']); + break; + } + + return $transaction; + } + /** * * * Remember: a balancingAct takes at most one expense and one transfer. @@ -291,6 +379,7 @@ class JournalRepository implements JournalRepositoryInterface 'source' => null, 'destination' => null, ]; + Log::debug(sprintf('Going to store accounts for type %s', $type->type)); switch ($type->type) { case TransactionType::WITHDRAWAL: $accounts = $this->storeWithdrawalAccounts($data); @@ -310,13 +399,13 @@ class JournalRepository implements JournalRepositoryInterface } if (is_null($accounts['source'])) { - Log::error('"destination"-account is null, so we cannot continue!', ['data' => $data]); - throw new FireflyException('"destination"-account is null, so we cannot continue!'); + Log::error('"source"-account is null, so we cannot continue!', ['data' => $data]); + throw new FireflyException('"source"-account is null, so we cannot continue!'); } if (is_null($accounts['destination'])) { - Log::error('"source"-account is null, so we cannot continue!', ['data' => $data]); - throw new FireflyException('"source"-account is null, so we cannot continue!'); + Log::error('"destination"-account is null, so we cannot continue!', ['data' => $data]); + throw new FireflyException('"destination"-account is null, so we cannot continue!'); } @@ -337,6 +426,19 @@ class JournalRepository implements JournalRepositoryInterface } } + /** + * @param Transaction $transaction + * @param int $budgetId + */ + private function storeBudgetWithTransaction(Transaction $transaction, int $budgetId) + { + if (intval($budgetId) > 0 && $transaction->transactionJournal->transactionType->type !== TransactionType::TRANSFER) { + /** @var \FireflyIII\Models\Budget $budget */ + $budget = Budget::find($budgetId); + $transaction->budgets()->save($budget); + } + } + /** * @param TransactionJournal $journal * @param string $category @@ -349,6 +451,18 @@ class JournalRepository implements JournalRepositoryInterface } } + /** + * @param Transaction $transaction + * @param string $category + */ + private function storeCategoryWithTransaction(Transaction $transaction, string $category) + { + if (strlen($category) > 0) { + $category = Category::firstOrCreateEncrypted(['name' => $category, 'user_id' => $transaction->transactionJournal->user_id]); + $transaction->categories()->save($category); + } + } + /** * @param array $data * @@ -380,7 +494,61 @@ class JournalRepository implements JournalRepositoryInterface ]; } + /** + * @param TransactionJournal $journal + * @param array $transaction + * @param int $identifier + * + * @return Collection + */ + private function storeSplitTransaction(TransactionJournal $journal, array $transaction, int $identifier): Collection + { + // store source and destination accounts (depends on type) + $accounts = $this->storeAccounts($journal->transactionType, $transaction); + // store transaction one way: + $one = $this->storeTransaction( + [ + 'journal' => $journal, + 'account' => $accounts['source'], + 'amount' => bcmul(strval($transaction['amount']), '-1'), + 'description' => $transaction['description'], + 'category' => null, + 'budget' => null, + 'identifier' => $identifier, + ] + ); + $this->storeCategoryWithTransaction($one, $transaction['category']); + $this->storeBudgetWithTransaction($one, $transaction['budget_id']); + + // and the other way: + $two = $this->storeTransaction( + [ + 'journal' => $journal, + 'account' => $accounts['destination'], + 'amount' => strval($transaction['amount']), + 'description' => $transaction['description'], + 'category' => null, + 'budget' => null, + 'identifier' => $identifier, + ] + ); + $this->storeCategoryWithTransaction($two, $transaction['category']); + $this->storeBudgetWithTransaction($two, $transaction['budget_id']); + + if ($transaction['piggy_bank_id'] > 0) { + $transaction['date'] = $journal->date->format('Y-m-d'); + event(new TransactionStored($transaction)); + } + + return new Collection([$one, $two]); + } + + /** + * @param array $data + * + * @return Transaction + */ private function storeTransaction(array $data): Transaction { /** @var Transaction $transaction */ @@ -393,6 +561,9 @@ class JournalRepository implements JournalRepositoryInterface 'identifier' => $data['identifier'], ] ); + + Log::debug(sprintf('Transaction stored with ID: %s', $transaction->id)); + if (!is_null($data['category'])) { $transaction->categories()->save($data['category']); } @@ -415,7 +586,7 @@ class JournalRepository implements JournalRepositoryInterface $sourceAccount = Account::where('user_id', $this->user->id)->where('id', $data['source_account_id'])->first(['accounts.*']); if (strlen($data['destination_account_name']) > 0) { - $destinationType = AccountType::where('type', 'Expense account')->first(); + $destinationType = AccountType::where('type', AccountType::EXPENSE)->first(); $destinationAccount = Account::firstOrCreateEncrypted( [ 'user_id' => $data['user'], diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 48090345c6..5db74eb818 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -73,4 +73,12 @@ interface JournalRepositoryInterface */ public function update(TransactionJournal $journal, array $data): TransactionJournal; + /** + * @param TransactionJournal $journal + * @param array $data + * + * @return TransactionJournal + */ + public function updateSplitJournal(TransactionJournal $journal, array $data): TransactionJournal; + } diff --git a/app/Repositories/Journal/JournalTasker.php b/app/Repositories/Journal/JournalTasker.php index 669bcda926..cb8fa0a21f 100644 --- a/app/Repositories/Journal/JournalTasker.php +++ b/app/Repositories/Journal/JournalTasker.php @@ -175,12 +175,15 @@ class JournalTasker implements JournalTaskerInterface $join ->on('transactions.transaction_journal_id', '=', 'destination.transaction_journal_id') ->where('transactions.amount', '=', DB::raw('destination.amount * -1')) - ->where('transactions.identifier', '=', DB::raw('destination.identifier')); + ->where('transactions.identifier', '=', DB::raw('destination.identifier')) + ->whereNull('destination.deleted_at'); } ) + ->with(['budgets', 'categories']) ->leftJoin('accounts as source_accounts', 'transactions.account_id', '=', 'source_accounts.id') ->leftJoin('accounts as destination_accounts', 'destination.account_id', '=', 'destination_accounts.id') ->where('transactions.amount', '<', 0) + ->whereNull('transactions.deleted_at') ->get( [ 'transactions.id', @@ -202,6 +205,8 @@ class JournalTasker implements JournalTaskerInterface foreach ($set as $entry) { $sourceBalance = $this->getBalance($entry->id); $destinationBalance = $this->getBalance($entry->destination_id); + $budget = $entry->budgets->first(); + $category = $entry->categories->first(); $transaction = [ 'source_id' => $entry->id, 'source_amount' => $entry->amount, @@ -218,8 +223,11 @@ class JournalTasker implements JournalTaskerInterface intval($entry->destination_account_encrypted) === 1 ? Crypt::decrypt($entry->destination_account_name) : $entry->destination_account_name, 'destination_account_before' => $destinationBalance, 'destination_account_after' => bcadd($destinationBalance, bcmul($entry->amount, '-1')), + 'budget_id' => is_null($budget) ? 0 : $budget->id, + 'category' => is_null($category) ? '' : $category->name, ]; + $transactions[] = $transaction; } @@ -237,40 +245,6 @@ class JournalTasker implements JournalTaskerInterface */ private function getBalance(int $transactionId): string { - /* -select - --- transactions.*, transaction_journals.date, transaction_journals.order, transaction_journals.id, transactions.identifier -sum(transactions.amount) - -from transactions - - -and ( - -- first things first: remove all transaction journals that are newer by selecting only those that are earlier: - or - -- date is 03 but sorted lower: (fucntion 1) - ( - transaction_journals.date = "2016-09-20" - and transaction_journals.order > 2) - or - -- date is 03 and sort is the same but id is higher (func 2) - (transaction_journals.date = "2016-09-20" - and transaction_journals.order = 2 - and transaction_journals.id < 6966 - ) - -- date is 03 and sort is the same, and id is the same but identifier is 1 and not 0.(func 3) - or - (transaction_journals.date = "2016-09-20" - and transaction_journals.order = 2 - and transaction_journals.id = 6966 - and transactions.identifier > 1 - ) -) -- 14048 -and transactions.id != 14048 -- just in case - -order by transaction_journals.date DESC, transaction_journals.order ASC, transaction_journals.id DESC, transactions.identifier ASC - */ // find the transaction first: $transaction = Transaction::find($transactionId); $date = $transaction->transactionJournal->date->format('Y-m-d'); diff --git a/public/js/ff/split/journal/from-store.js b/public/js/ff/split/journal/from-store.js index 5c8b0ca708..e20b1c5aac 100644 --- a/public/js/ff/split/journal/from-store.js +++ b/public/js/ff/split/journal/from-store.js @@ -18,40 +18,58 @@ $(function () { $.getJSON('json/expense-accounts').done(function (data) { destAccounts = data; console.log('destAccounts length is now ' + destAccounts.length); + $('input[name$="destination_account_name]"]').typeahead({source: destAccounts}); }); $.getJSON('json/revenue-accounts').done(function (data) { srcAccounts = data; console.log('srcAccounts length is now ' + srcAccounts.length); + $('input[name$="source_account_name]"]').typeahead({source: srcAccounts}); }); $.getJSON('json/categories').done(function (data) { categories = data; console.log('categories length is now ' + categories.length); + $('input[name$="category]"]').typeahead({source: categories}); }); - $('input[name="amount[]"]').on('input', calculateSum) + $('input[name$="][amount]"]').on('input', calculateSum); + + // add auto complete: + + + + }); function cloneRow() { "use strict"; var source = $('.initial-row').clone(); var count = $('.split-table tbody tr').length + 1; + var index = count - 1; source.removeClass('initial-row'); source.find('.count').text('#' + count); - source.find('input[name="amount[]"]').val("").on('input', calculateSum); + + // get each input, change the name? + $.each(source.find('input, select'), function (i, v) { + var obj = $(v); + var name = obj.attr('name').replace('[0]', '[' + index + ']'); + obj.attr('name', name); + }); + + source.find('input[name$="][amount]"]').val("").on('input', calculateSum); if (destAccounts.length > 0) { console.log('Will be able to extend dest-accounts.'); - source.find('input[name="destination_account_name[]"]').typeahead({source: destAccounts}); + source.find('input[name$="destination_account_name]"]').typeahead({source: destAccounts}); } if (destAccounts.length > 0) { console.log('Will be able to extend src-accounts.'); - source.find('input[name="source_account_name[]"]').typeahead({source: srcAccounts}); + source.find('input[name$="source_account_name]"]').typeahead({source: srcAccounts}); } - if(categories.length > 0) { + if (categories.length > 0) { console.log('Will be able to extend categories.'); - source.find('input[name="category[]"]').typeahead({source: categories}); + source.find('input[name$="category]"]').typeahead({source: categories}); } $('.split-table tbody').append(source); @@ -64,7 +82,7 @@ function cloneRow() { function calculateSum() { "use strict"; var sum = 0; - var set = $('input[name="amount[]"]'); + var set = $('input[name$="][amount]"]'); for (var i = 0; i < set.length; i++) { var current = $(set[i]); sum += (current.val() == "" ? 0 : parseFloat(current.val())); diff --git a/resources/views/split/journals/create.twig b/resources/views/split/journals/create.twig deleted file mode 100644 index 8656bf9870..0000000000 --- a/resources/views/split/journals/create.twig +++ /dev/null @@ -1,270 +0,0 @@ -{% extends "./layout/default.twig" %} - -{% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, preFilled.what) }} -{% endblock %} -{% block content %} -
- - - - - - - - {% if errors.all()|length > 0 %} -
-
-
-
-

{{ 'errors'|_ }}

-
-
-
    - {% for key, err in errors.all() %} -
  • {{ err }}
    • - {% endfor %} -
-
-
-
-
- {% endif %} -
-
-
-
-

{{ 'transaction_data'|_ }}

-
-
- {{ ExpandedForm.text('journal_description', journal.description) }} - {{ ExpandedForm.select('journal_currency_id', currencies, journal.transaction_currency_id) }} - {{ ExpandedForm.staticText('journal_amount', preFilled.journal_amount|formatAmount ) }} - - - - {% if preFilled.what == 'withdrawal' or preFilled.what == 'transfer' %} - {{ ExpandedForm.select('journal_source_account_id', assetAccounts, preFilled.journal_source_account_id) }} - {% endif %} - - - {% if preFilled.what == 'deposit' %} - {{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }} - {% endif %} - - - {% if preFilled.what == 'transfer' %} - {{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }} - {% endif %} -
-
-
-
-
-
-

{{ 'transaction_meta_data'|_ }}

-
-
- {{ ExpandedForm.date('date', journal.date) }} - - {% if optionalFields.interest_date or journal.interest_date %} - - {{ ExpandedForm.date('interest_date', journal.interest_date) }} - {% endif %} - - {% if optionalFields.book_date or journal.book_date %} - - {{ ExpandedForm.date('book_date', journal.book_date) }} - {% endif %} - - {% if optionalFields.process_date or journal.process_date %} - - {{ ExpandedForm.date('process_date', journal.process_date) }} - {% endif %} - - {% if optionalFields.due_date or journal.due_date %} - - {{ ExpandedForm.date('due_date', journal.due_date) }} - {% endif %} - - {% if optionalFields.payment_date or journal.payment_date %} - - {{ ExpandedForm.date('payment_date', journal.payment_date) }} - {% endif %} - - {% if optionalFields.internal_reference or journal.internal_reference %} - - {{ ExpandedForm.text('internal_reference', journal.internal_reference) }} - {% endif %} - - {% if optionalFields.notes or journal.notes %} - - {{ ExpandedForm.textarea('notes', journal.notes) }} - {% endif %} -
-
- -
-
-
-
-
-
-

{{ 'splits'|_ }}

-
-
- - - - - - - - - {% if preFilled.what == 'withdrawal' %} - - {% endif %} - - {% if preFilled.what == 'deposit' %} - - {% endif %} - - - - - - {% if preFilled.what == 'withdrawal' %} - - {% endif %} - - - {% if preFilled.what == 'transfer' %} - - {% endif %} - - - - {% for index, descr in preFilled.description %} - - - - - - {% if preFilled.what == 'withdrawal' %} - - {% endif %} - - - {% if preFilled.what == 'deposit' %} - - {% endif %} - - - - {% if preFilled.what == 'withdrawal' %} - - {% endif %} - - {% if preFilled.what == 'transfer' %} - - {% endif %} - - {% endfor %} - -
{{ trans('list.split_number') }}{{ trans('list.description') }}{{ trans('list.destination') }}{{ trans('list.source') }}{{ trans('list.amount') }}{{ trans('list.budget') }}{{ trans('list.category') }}{{ trans('list.piggy_bank') }}
#{{ loop.index }} - - - - - - - - - - - - - - {{ Form.select('piggy_bank_id[]',piggyBanks, preFilled.piggy_bank_id[index], {class: 'form-control'}) }} -
-

-
- {{ 'add_another_split'|_ }} -

- -
-
-
-
-
- - {% if optionalFields.attachments %} -
-
-
-

{{ 'optionalFields'|_ }}

-
-
- - {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} -
-
-
- {% endif %} - - -
- -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('create','split-transaction') }} -
-
- -
-
-
-
-
- -{% endblock %} -{% block scripts %} - - - - -{% endblock %} -{% block styles %} -{% endblock %} diff --git a/resources/views/transactions/create.twig b/resources/views/transactions/create.twig index fc1dabfcab..78de00ecd4 100644 --- a/resources/views/transactions/create.twig +++ b/resources/views/transactions/create.twig @@ -96,6 +96,7 @@

{{ trans('firefly.hidden_fields_preferences', {link: route('preferences')})|raw }}

{% endif %} + {% if optionalFields.interest_date or optionalFields.book_date or optionalFields.process_date @@ -136,7 +137,6 @@ {% if optionalFields.invoice_date %} {{ ExpandedForm.date('invoice_date') }} {% endif %} - {% endif %} diff --git a/resources/views/split/journals/edit.twig b/resources/views/transactions/edit-split.twig similarity index 57% rename from resources/views/split/journals/edit.twig rename to resources/views/transactions/edit-split.twig index 69a74a16b7..91488e0936 100644 --- a/resources/views/split/journals/edit.twig +++ b/resources/views/transactions/edit-split.twig @@ -36,73 +36,148 @@

{{ 'transaction_data'|_ }}

- {{ ExpandedForm.text('journal_description', journal.description) }} - {{ ExpandedForm.select('journal_currency_id', currencies, preFilled.transaction_currency_id) }} - {{ ExpandedForm.staticText('journal_amount', preFilled.journal_amount|formatAmount ) }} - - + {# DESCRIPTION IS ALWAYS AVAILABLE #} + {{ ExpandedForm.text('journal_description', journal.description) }} + + {# CURRENCY IS NEW FOR SPLIT JOURNALS #} + {{ ExpandedForm.select('journal_currency_id', currencies, preFilled.transaction_currency_id) }} + + {# show source if withdrawal or transfer #} {% if preFilled.what == 'withdrawal' or preFilled.what == 'transfer' %} {{ ExpandedForm.select('journal_source_account_id', assetAccounts, preFilled.journal_source_account_id) }} {% endif %} - + {# show destination account id, if deposit (is asset): #} {% if preFilled.what == 'deposit' %} {{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }} {% endif %} - + {# show static destination if transfer #} {% if preFilled.what == 'transfer' %} {{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }} {% endif %} + + {# TOTAL AMOUNT IS STATIC TEXT #} + {{ ExpandedForm.staticText('journal_amount', preFilled.journal_amount|formatAmount ) }} + + + {# DATE #} + {{ ExpandedForm.date('date', journal.date) }}
-

{{ 'transaction_meta_data'|_ }}

+

{{ 'optional_field_meta_data'|_ }}

- {{ ExpandedForm.date('date', journal.date) }} + {# NO BUDGET #} + {# NO CATEGORY #} - {% if optionalFields.interest_date or journal.interest_date %} - - {{ ExpandedForm.date('interest_date', journal.interest_date) }} - {% endif %} + {# ALWAYS TAGS #} + {{ ExpandedForm.text('tags', preFilled.tags) }} - {% if optionalFields.book_date or journal.book_date %} - - {{ ExpandedForm.date('book_date', journal.book_date) }} - {% endif %} - - {% if optionalFields.process_date or journal.process_date %} - - {{ ExpandedForm.date('process_date', journal.process_date) }} - {% endif %} - - {% if optionalFields.due_date or journal.due_date %} - - {{ ExpandedForm.date('due_date', journal.due_date) }} - {% endif %} - - {% if optionalFields.payment_date or journal.payment_date %} - - {{ ExpandedForm.date('payment_date', journal.payment_date) }} - {% endif %} - - {% if optionalFields.internal_reference or journal.internal_reference %} - - {{ ExpandedForm.text('internal_reference', journal.internal_reference) }} - {% endif %} - - {% if optionalFields.notes or journal.notes %} - - {{ ExpandedForm.textarea('notes', journal.notes) }} - {% endif %} + {# NO PIGGY BANK #}
+ {# EXPLANATION IF NECESSARY: #} + {% if + not optionalFields.interest_date or + not optionalFields.book_date or + not optionalFields.process_date or + not optionalFields.due_date or + not optionalFields.payment_date or + not optionalFields.invoice_date or + not optionalFields.internal_reference or + not optionalFields.notes or + not optionalFields.attachments %} +

+ {{ trans('firefly.hidden_fields_preferences', {link: route('preferences')})|raw }}

+ {% endif %} + + {# BOX FOR DATES #} + {% if + optionalFields.interest_date or optionalFields.book_date or optionalFields.process_date + or optionalFields.due_date or optionalFields.payment_date + or optionalFields.invoice_date %} +
+
+

{{ 'optional_field_meta_dates'|_ }}

+
+
+ + {# INTEREST DATE #} + {% if optionalFields.interest_date or journal.interest_date %} + {{ ExpandedForm.date('interest_date', journal.interest_date) }} + {% endif %} + + {# BOOK DATE #} + {% if optionalFields.book_date or journal.book_date %} + {{ ExpandedForm.date('book_date', journal.book_date) }} + {% endif %} + + {# PROCESSING DATE #} + {% if optionalFields.process_date or journal.process_date %} + {{ ExpandedForm.date('process_date', journal.process_date) }} + {% endif %} + + {# DUE DATE #} + {% if optionalFields.due_date or journal.due_date %} + {{ ExpandedForm.date('due_date', journal.due_date) }} + {% endif %} + + {# PAYMENT DATE #} + {% if optionalFields.payment_date or journal.payment_date %} + {{ ExpandedForm.date('payment_date', journal.payment_date) }} + {% endif %} + + {# INVOICE DATE #} + {% if optionalFields.invoice_date or journal.invoice_date %} + {{ ExpandedForm.date('invoice_date', journal.invoice_date) }} + {% endif %} +
+
+ {% endif %} + + {# BOX FOR BUSINESS FIELDS #} + {% if optionalFields.internal_reference or optionalFields.notes %} +
+
+

{{ 'optional_field_meta_business'|_ }}

+
+
+ + {# INTERNAL REFERENCE #} + {% if optionalFields.internal_reference or journal.internal_reference %} + {{ ExpandedForm.text('internal_reference', journal.internal_reference) }} + {% endif %} + + {# NOTES #} + {% if optionalFields.notes or journal.notes %} + {{ ExpandedForm.textarea('notes', journal.notes) }} + {% endif %} +
+
+ {% endif %} + + {# BOX FOR ATTACHMENTS #} + {% if optionalFields.attachments %} +
+
+

{{ 'optional_field_attachments'|_ }}

+
+
+ {# ATTACHMENTS #} + {% if optionalFields.attachments %} + {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} + {% endif %} +
+
+ {% endif %} +
@@ -115,39 +190,47 @@ + - + {# withdrawal and deposit have a destination. #} {% if preFilled.what == 'withdrawal' %} {% endif %} + {# DEPOSIT HAS A SOURCE #} {% if preFilled.what == 'deposit' %} {% endif %} - + {# only withdrawal has budget #} {% if preFilled.what == 'withdrawal' %} {% endif %} + + + - {% for index, descr in preFilled.description %} + {% for index, transaction in preFilled.transactions %} + {% if preFilled.what == 'withdrawal' %} {% endif %} @@ -155,22 +238,24 @@ {% if preFilled.what == 'deposit' %} {% endif %} + {% if preFilled.what == 'withdrawal' %} {% endif %} {% endfor %} @@ -189,30 +275,11 @@
{{ 'add_another_split'|_ }}

-
- {% if optionalFields.attachments %} -
-
-
-

{{ 'optionalFields'|_ }}

-
-
- - {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} -
-
-
- {% endif %}
@@ -231,14 +298,16 @@ {% endblock %} +{% block styles %} + +{% endblock %} {% block scripts %} + {% endblock %} -{% block styles %} -{% endblock %} diff --git a/resources/views/transactions/edit.twig b/resources/views/transactions/edit.twig index 03ed04c1ed..3c3b948850 100644 --- a/resources/views/transactions/edit.twig +++ b/resources/views/transactions/edit.twig @@ -33,15 +33,15 @@

{{ 'mandatoryFields'|_ }}

- + {# ALWAYS AVAILABLE #} {{ ExpandedForm.text('description',journal.description) }} - + {# SELECTABLE SOURCE ACCOUNT ONLY FOR WITHDRAWALS AND TRANSFERS #} {% if what == 'transfer' or what == 'withdrawal' %} {{ ExpandedForm.select('source_account_id',assetAccounts, data.source_account_id, {label: trans('form.asset_source_account')}) }} {% endif %} - + {# FREE FORMAT SOURCE ACCOUNT ONLY FOR DEPOSITS #} {% if what == 'deposit' %} {{ ExpandedForm.text('source_account_name',data.source_account_name, {label: trans('form.revenue_account')}) }} {% endif %} @@ -99,8 +99,8 @@ not optionalFields.process_date or not optionalFields.due_date or not optionalFields.payment_date or - not optionalFields.internal_reference or not optionalFields.invoice_date or + not optionalFields.internal_reference or not optionalFields.notes or not optionalFields.attachments %}

diff --git a/routes/web.php b/routes/web.php index b790792436..c22422058d 100755 --- a/routes/web.php +++ b/routes/web.php @@ -363,14 +363,6 @@ Route::group( */ Route::get('/search', ['uses' => 'SearchController@index', 'as' => 'search']); - /** - * Split controller - */ - - Route::get('/transaction/create-split/{unfinishedJournal}', ['uses' => 'Transaction\SplitController@create', 'as' => 'split.journal.create']); - Route::post('/transaction/store-split/{unfinishedJournal}', ['uses' => 'Transaction\SplitController@store', 'as' => 'split.journal.store']); - Route::get('/transaction/edit-split/{tj}', ['uses' => 'Transaction\SplitController@edit', 'as' => 'split.journal.edit']); - Route::post('/transaction/edit-split/{tj}', ['uses' => 'Transaction\SplitController@update', 'as' => 'split.journal.update']); /** * Tag Controller */ @@ -411,6 +403,8 @@ Route::group( Route::post('/transactions/mass-destroy', ['uses' => 'Transaction\MassController@massDestroy', 'as' => 'transactions.mass-destroy']); // split (will be here): + Route::get('/transaction/split/edit/{tj}', ['uses' => 'Transaction\SplitController@edit', 'as' => 'transactions.edit-split']); + Route::post('/transaction/split/update/{tj}', ['uses' => 'Transaction\SplitController@update', 'as' => 'split.journal.update']); /** * POPUP Controllers

  {{ trans('list.split_number') }} {{ trans('list.description') }}{{ trans('list.destination') }}{{ trans('list.source') }}{{ trans('list.amount') }}{{ trans('list.budget') }}{{ trans('list.category') }}
#{{ loop.index }} - + - - - - {% for key, budget in budgets %} @@ -179,7 +264,8 @@ - +