kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 12:45:30 +00:00
Code Issues Projects Releases Wiki Activity

Improve code for recurring transactions.

Browse Source
This commit is contained in:
James Cole
2018-06-21 18:57:51 +02:00
parent 7bdd4ddeab
commit 1d162edb59
15 changed files with 431 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Recurring/CreateController.php
View File

@@ -71,7 +71,6 @@ class CreateController extends Controller
*/
public function create(Request $request)
{
// todo create expandedform thing.
$budgets = app('expandedform')->makeSelectListWithEmpty($this->budgets->getActiveBudgets());
$defaultCurrency = app('amount')->getDefaultCurrency();
$tomorrow = new Carbon;
@@ -92,11 +91,12 @@ class CreateController extends Controller
];
// flash some data:
$hasOldInput = null !== $request->old('_token');
$preFilled = [
'first_date' => $tomorrow->format('Y-m-d'),
'transaction_type' => 'withdrawal',
'active' => $request->old('active') ?? true,
'apply_rules' => $request->old('apply_rules') ?? true,
'transaction_type' => $hasOldInput ? $request->old('transaction_type') : 'withdrawal',
'active' => $hasOldInput ? (bool)$request->old('active') : true,
'apply_rules' => $hasOldInput ? (bool)$request->old('apply_rules') : true,
];
$request->session()->flash('preFilled', $preFilled);