' . strval(trans('firefly.help_may_not_be_your_language')) . '
'; // get backup language content (try English): if (strlen($content) === 0) { $language = 'en_US'; if ($help->inCache($route, $language)) { Log::debug(sprintf('Help text %s was in cache.', $language)); - $content = $help->getFromCache($route, $language); + $content = $notYourLanguage . $help->getFromCache($route, $language); } if (!$help->inCache($route, $language)) { - $content = $help->getFromGithub($language, $route); - $content = '' . strval(trans('firefly.help_may_not_be_your_language')) . '
' . $content; + $content = trim($notYourLanguage . $help->getFromGithub($route, $language)); } } - if (strlen($content) === 0) { + if ($content === $notYourLanguage) { $content = '' . strval(trans('firefly.route_has_no_help')) . '
'; } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 9dbce2de32..7e4cca9547 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Http\Controllers; use Artisan; @@ -17,13 +18,12 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\AccountType; -use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Log; use Preferences; -use Route; use Session; use View; @@ -91,18 +91,18 @@ class HomeController extends Controller public function flush(Request $request) { Preferences::mark(); - $request->session()->forget(['start', 'end','_previous', 'viewRange', 'range', 'is_custom_range']); + $request->session()->forget(['start', 'end', '_previous', 'viewRange', 'range', 'is_custom_range']); Artisan::call('cache:clear'); return redirect(route('index')); } /** - * @param ARI $repository + * @param AccountRepositoryInterface $repository * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View */ - public function index(ARI $repository) + public function index(AccountRepositoryInterface $repository) { $types = config('firefly.accountTypesByIdentifier.asset'); $count = $repository->count($types); diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index ef812a8a1b..325698f720 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; @@ -20,6 +20,7 @@ use FireflyIII\Import\Setup\SetupInterface; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Http\Request; use Illuminate\Http\Response as LaravelResponse; use Log; @@ -87,8 +88,6 @@ class ImportController extends Controller { Log::debug('Now at start of configure()'); if (!$this->jobInCorrectStep($job, 'configure')) { - Log::debug('Job is not in correct state for configure()', ['status' => $job->status]); - return $this->redirectToCorrectStep($job); } @@ -100,8 +99,6 @@ class ImportController extends Controller $subTitleIcon = 'fa-wrench'; return view('import.' . $job->file_type . '.configure', compact('data', 'job', 'subTitle', 'subTitleIcon')); - - } /** @@ -145,8 +142,6 @@ class ImportController extends Controller public function finished(ImportJob $job) { if (!$this->jobInCorrectStep($job, 'finished')) { - Log::debug('Job is not in correct state for finished()', ['status' => $job->status]); - return $this->redirectToCorrectStep($job); } @@ -224,13 +219,13 @@ class ImportController extends Controller /** * Step 4. Save the configuration. * - * @param Request $request - * @param ImportJob $job + * @param Request $request + * @param ImportJobRepositoryInterface $repository + * @param ImportJob $job * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * @throws FireflyException */ - public function postConfigure(Request $request, ImportJob $job) + public function postConfigure(Request $request, ImportJobRepositoryInterface $repository, ImportJob $job) { Log::debug('Now in postConfigure()', ['job' => $job->key]); if (!$this->jobInCorrectStep($job, 'process')) { @@ -245,8 +240,7 @@ class ImportController extends Controller $importer->saveImportConfiguration($data, $files); // update job: - $job->status = 'import_configuration_saved'; - $job->save(); + $repository->updateStatus($job, 'import_configuration_saved'); // return redirect to settings. // this could loop until the user is done. @@ -280,17 +274,15 @@ class ImportController extends Controller * Step 5. Depending on the importer, this will show the user settings to * fill in. * - * @param ImportJob $job + * @param ImportJobRepositoryInterface $repository + * @param ImportJob $job * * @return View - * @throws FireflyException */ - public function settings(ImportJob $job) + public function settings(ImportJobRepositoryInterface $repository, ImportJob $job) { Log::debug('Now in settings()', ['job' => $job->key]); if (!$this->jobInCorrectStep($job, 'settings')) { - Log::debug('Job should not be in settings()'); - return $this->redirectToCorrectStep($job); } Log::debug('Continue in settings()'); @@ -308,8 +300,7 @@ class ImportController extends Controller } Log::debug('Job does NOT require user config.'); - $job->status = 'settings_complete'; - $job->save(); + $repository->updateStatus($job, 'settings_complete'); // if no more settings, save job and continue to process thing. return redirect(route('import.complete', [$job->key])); @@ -350,15 +341,17 @@ class ImportController extends Controller return view('import.status', compact('job', 'subTitle', 'subTitleIcon')); } + /** * This is step 2. It creates an Import Job. Stores the import. * * @param ImportUploadRequest $request * @param ImportJobRepositoryInterface $repository + * @param UserRepositoryInterface $userRepository * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function upload(ImportUploadRequest $request, ImportJobRepositoryInterface $repository) + public function upload(ImportUploadRequest $request, ImportJobRepositoryInterface $repository, UserRepositoryInterface $userRepository) { Log::debug('Now in upload()'); // create import job: @@ -375,7 +368,7 @@ class ImportController extends Controller $disk = Storage::disk('upload'); // user is demo user, replace upload with prepared file. - if (auth()->user()->hasRole('demo')) { + if ($userRepository->hasRole(auth()->user(), 'demo')) { $stubsDisk = Storage::disk('stubs'); $content = $stubsDisk->get('demo-import.csv'); $contentEncrypted = Crypt::encrypt($content); @@ -383,15 +376,14 @@ class ImportController extends Controller Log::debug('Replaced upload with demo file.'); // also set up prepared configuration. - $configuration = json_decode($stubsDisk->get('demo-configuration.json'), true); - $job->configuration = $configuration; - $job->save(); + $configuration = json_decode($stubsDisk->get('demo-configuration.json'), true); + $repository->setConfiguration($job, $configuration); Log::debug('Set configuration for demo user', $configuration); // also flash info Session::flash('info', trans('demo.import-configure-security')); } - if (!auth()->user()->hasRole('demo')) { + if (!$userRepository->hasRole(auth()->user(), 'demo')) { // user is not demo, process original upload: $disk->put($newName, $contentEncrypted); Log::debug('Uploaded file', ['name' => $upload->getClientOriginalName(), 'size' => $upload->getSize(), 'mime' => $upload->getClientMimeType()]); @@ -411,18 +403,15 @@ class ImportController extends Controller $configRaw = $configFileObject->fread($configFileObject->getSize()); $configuration = json_decode($configRaw, true); + // @codeCoverageIgnoreStart if (!is_null($configuration) && is_array($configuration)) { Log::debug('Found configuration', $configuration); - $job->configuration = $configuration; - $job->save(); + $repository->setConfiguration($job, $configuration); } + // @codeCoverageIgnoreEnd } - // if user is demo user, replace config with prepared config: - - return redirect(route('import.configure', [$job->key])); - } /** @@ -440,6 +429,8 @@ class ImportController extends Controller return $job->status === 'import_status_never_started'; case 'settings': case 'store-settings': + Log::debug(sprintf('Job %d with key %s has status %s', $job->id, $job->key, $job->status)); + return $job->status === 'import_configuration_saved'; case 'finished': return $job->status === 'import_complete'; @@ -449,7 +440,7 @@ class ImportController extends Controller return ($job->status === 'settings_complete') || ($job->status === 'import_running'); } - return false; + return false; // @codeCoverageIgnore } @@ -475,7 +466,7 @@ class ImportController extends Controller return $importer; } - throw new FireflyException(sprintf('"%s" is not a valid file type', $type)); + throw new FireflyException(sprintf('"%s" is not a valid file type', $type)); // @codeCoverageIgnore } @@ -507,7 +498,7 @@ class ImportController extends Controller return redirect(route('import.finished', [$job->key])); } - throw new FireflyException('Cannot redirect for job state ' . $job->status); + throw new FireflyException('Cannot redirect for job state ' . $job->status); // @codeCoverageIgnore } } diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 6e63e57a43..e5e7fb0651 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -7,12 +7,17 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; use Amount; use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Http\Request; use Navigation; use Preferences; @@ -25,9 +30,61 @@ use Session; */ class JavascriptController extends Controller { + /** + * @param AccountRepositoryInterface $repository + * @param CurrencyRepositoryInterface $currencyRepository + * + * @return $this + */ + public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository) + { + $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); + $preference = Preferences::get('currencyPreference', config('firefly.default_currency', 'EUR')); + $default = $currencyRepository->findByCode($preference->data); + + $data = ['accounts' => [],]; + + + /** @var Account $account */ + foreach ($accounts as $account) { + $accountId = $account->id; + $currency = intval($account->getMeta('currency_id')); + $currency = $currency === 0 ? $default->id : $currency; + $entry = ['preferredCurrency' => $currency, 'name' => $account->name]; + $data['accounts'][$accountId] = $entry; + } + + + return response() + ->view('javascript.accounts', $data, 200) + ->header('Content-Type', 'text/javascript'); + } /** + * @param CurrencyRepositoryInterface $repository * + * @return $this + */ + public function currencies(CurrencyRepositoryInterface $repository) + { + $currencies = $repository->get(); + $data = ['currencies' => [],]; + /** @var TransactionCurrency $currency */ + foreach ($currencies as $currency) { + $currencyId = $currency->id; + $entry = ['name' => $currency->name, 'code' => $currency->code, 'symbol' => $currency->symbol]; + $data['currencies'][$currencyId] = $entry; + } + + return response() + ->view('javascript.currencies', $data, 200) + ->header('Content-Type', 'text/javascript'); + } + + /** + * @param Request $request + * + * @return \Illuminate\Http\Response */ public function variables(Request $request) { @@ -95,7 +152,7 @@ class JavascriptController extends Controller switch ($viewRange) { default: - throw new FireflyException('The date picker does not yet support "' . $viewRange . '".'); + throw new FireflyException('The date picker does not yet support "' . $viewRange . '".'); // @codeCoverageIgnore case '1D': case 'custom': $format = (string)trans('config.month_and_day'); diff --git a/app/Http/Controllers/Json/ExchangeController.php b/app/Http/Controllers/Json/ExchangeController.php new file mode 100644 index 0000000000..e96cae05e8 --- /dev/null +++ b/app/Http/Controllers/Json/ExchangeController.php @@ -0,0 +1,66 @@ +getExchangeRate($fromCurrency, $toCurrency, $date); + $amount = null; + if (is_null($rate->id)) { + Log::debug(sprintf('No cached exchange rate in database for %s to %s on %s', $fromCurrency->code, $toCurrency->code, $date->format('Y-m-d'))); + $preferred = env('EXCHANGE_RATE_SERVICE', config('firefly.preferred_exchange_service')); + $class = config('firefly.currency_exchange_services.' . $preferred); + /** @var ExchangeRateInterface $object */ + $object = app($class); + $object->setUser(auth()->user()); + $rate = $object->getRate($fromCurrency, $toCurrency, $date); + } + $return = $rate->toArray(); + $return['amount'] = null; + if (!is_null($request->get('amount'))) { + // assume amount is in "from" currency: + $return['amount'] = bcmul($request->get('amount'), strval($rate->rate), 12); + // round to toCurrency decimal places: + $return['amount'] = round($return['amount'], $toCurrency->decimal_places); + } + + return Response::json($return); + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 4d95c51fc9..c8e916e231 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Http\Controllers; use Amount; @@ -17,6 +18,7 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\AccountType; +use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountTaskerInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; @@ -144,7 +146,7 @@ class JsonController extends Controller * @return \Illuminate\Http\JsonResponse * */ - public function boxIn(AccountTaskerInterface $accountTasker, AccountRepositoryInterface $repository) + public function boxIn() { $start = session('start', Carbon::now()->startOfMonth()); $end = session('end', Carbon::now()->endOfMonth()); @@ -155,12 +157,18 @@ class JsonController extends Controller $cache->addProperty($end); $cache->addProperty('box-in'); if ($cache->has()) { - return Response::json($cache->get()); + return Response::json($cache->get()); // @codeCoverageIgnore } - $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]); - $assets = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $amount = $accountTasker->amountInInPeriod($accounts, $assets, $start, $end); - $data = ['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]; + + // try a collector for income: + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end) + ->setTypes([TransactionType::DEPOSIT]) + ->withOpposingAccount(); + + $amount = strval($collector->getJournals()->sum('transaction_amount')); + $data = ['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]; $cache->store($data); return Response::json($data); @@ -172,7 +180,7 @@ class JsonController extends Controller * * @return \Symfony\Component\HttpFoundation\Response */ - public function boxOut(AccountTaskerInterface $accountTasker, AccountRepositoryInterface $repository) + public function boxOut() { $start = session('start', Carbon::now()->startOfMonth()); $end = session('end', Carbon::now()->endOfMonth()); @@ -183,12 +191,16 @@ class JsonController extends Controller $cache->addProperty($end); $cache->addProperty('box-out'); if ($cache->has()) { - return Response::json($cache->get()); + return Response::json($cache->get()); // @codeCoverageIgnore } - $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]); - $assets = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $amount = $accountTasker->amountOutInPeriod($accounts, $assets, $start, $end); + // try a collector for expenses: + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end) + ->setTypes([TransactionType::WITHDRAWAL]) + ->withOpposingAccount(); + $amount = strval($collector->getJournals()->sum('transaction_amount')); $data = ['box' => 'out', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]; $cache->store($data); @@ -287,7 +299,7 @@ class JsonController extends Controller { $pref = Preferences::get('tour', true); if (!$pref) { - throw new FireflyException('Cannot find preference for tour. Exit.'); + throw new FireflyException('Cannot find preference for tour. Exit.'); // @codeCoverageIgnore } $headers = ['main-content', 'sidebar-toggle', 'account-menu', 'budget-menu', 'report-menu', 'transaction-menu', 'option-menu', 'main-content-end']; $steps = []; @@ -329,7 +341,9 @@ class JsonController extends Controller } /** + * @param JournalRepositoryInterface $repository * + * @return \Illuminate\Http\JsonResponse */ public function transactionTypes(JournalRepositoryInterface $repository) { diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index 12a9c396a9..478e5830d6 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Http\Controllers; use Carbon\Carbon; @@ -111,15 +112,15 @@ class NewUserController extends Controller private function createAssetAccount(NewUserFormRequest $request, AccountRepositoryInterface $repository): bool { $assetAccount = [ - 'name' => $request->get('bank_name'), - 'iban' => null, - 'accountType' => 'asset', - 'virtualBalance' => 0, - 'active' => true, - 'accountRole' => 'defaultAsset', - 'openingBalance' => round($request->input('bank_balance'), 12), - 'openingBalanceDate' => new Carbon, - 'openingBalanceCurrency' => intval($request->input('amount_currency_id_bank_balance')), + 'name' => $request->get('bank_name'), + 'iban' => null, + 'accountType' => 'asset', + 'virtualBalance' => 0, + 'active' => true, + 'accountRole' => 'defaultAsset', + 'openingBalance' => round($request->input('bank_balance'), 12), + 'openingBalanceDate' => new Carbon, + 'currency_id' => intval($request->input('amount_currency_id_bank_balance')), ]; $repository->store($assetAccount); @@ -136,15 +137,15 @@ class NewUserController extends Controller private function createSavingsAccount(NewUserFormRequest $request, AccountRepositoryInterface $repository): bool { $savingsAccount = [ - 'name' => $request->get('bank_name') . ' savings account', - 'iban' => null, - 'accountType' => 'asset', - 'virtualBalance' => 0, - 'active' => true, - 'accountRole' => 'savingAsset', - 'openingBalance' => round($request->input('savings_balance'), 12), - 'openingBalanceDate' => new Carbon, - 'openingBalanceCurrency' => intval($request->input('amount_currency_id_savings_balance')), + 'name' => $request->get('bank_name') . ' savings account', + 'iban' => null, + 'accountType' => 'asset', + 'virtualBalance' => 0, + 'active' => true, + 'accountRole' => 'savingAsset', + 'openingBalance' => round($request->input('savings_balance'), 12), + 'openingBalanceDate' => new Carbon, + 'currency_id' => intval($request->input('amount_currency_id_savings_balance')), ]; $repository->store($savingsAccount); diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index b74905c682..052900cba5 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Http\Controllers; use Amount; @@ -209,10 +210,11 @@ class PiggyBankController extends Controller $end = session('end', Carbon::now()->endOfMonth()); $accounts = []; + Log::debug('Looping piggues'); /** @var PiggyBank $piggyBank */ foreach ($piggyBanks as $piggyBank) { - $piggyBank->savedSoFar = $piggyBank->currentRelevantRep()->currentamount; - $piggyBank->percentage = $piggyBank->savedSoFar != 0 ? intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100) : 0; + $piggyBank->savedSoFar = $piggyBank->currentRelevantRep()->currentamount ?? '0'; + $piggyBank->percentage = bccomp('0', $piggyBank->savedSoFar) !== 0 ? intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100) : 0; $piggyBank->leftToSave = bcsub($piggyBank->targetamount, strval($piggyBank->savedSoFar)); $piggyBank->percentage = $piggyBank->percentage > 100 ? 100 : $piggyBank->percentage; @@ -220,7 +222,9 @@ class PiggyBankController extends Controller * Fill account information: */ $account = $piggyBank->account; + $new = false; if (!isset($accounts[$account->id])) { + $new = true; $accounts[$account->id] = [ 'name' => $account->name, 'balance' => Steam::balanceIgnoreVirtual($account, $end), @@ -229,7 +233,8 @@ class PiggyBankController extends Controller 'sumOfTargets' => $piggyBank->targetamount, 'leftToSave' => $piggyBank->leftToSave, ]; - } else { + } + if (isset($accounts[$account->id]) && $new === false) { $accounts[$account->id]['sumOfSaved'] = bcadd($accounts[$account->id]['sumOfSaved'], strval($piggyBank->savedSoFar)); $accounts[$account->id]['sumOfTargets'] = bcadd($accounts[$account->id]['sumOfTargets'], $piggyBank->targetamount); $accounts[$account->id]['leftToSave'] = bcadd($accounts[$account->id]['leftToSave'], $piggyBank->leftToSave); @@ -272,32 +277,16 @@ class PiggyBankController extends Controller public function postAdd(Request $request, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) { $amount = $request->get('amount'); - Log::debug(sprintf('Found amount is %s', $amount)); - /** @var Carbon $date */ - $date = session('end', Carbon::now()->endOfMonth()); - $leftOnAccount = $piggyBank->leftOnAccount($date); - $savedSoFar = strval($piggyBank->currentRelevantRep()->currentamount); - $leftToSave = bcsub($piggyBank->targetamount, $savedSoFar); - $maxAmount = strval(min(round($leftOnAccount, 12), round($leftToSave, 12))); - if (bccomp($amount, $maxAmount) <= 0) { - $repetition = $piggyBank->currentRelevantRep(); - $currentAmount = $repetition->currentamount ?? '0'; - $repetition->currentamount = bcadd($currentAmount, $amount); - $repetition->save(); - - // create event - $repository->createEvent($piggyBank, $amount); - - Session::flash( - 'success', strval(trans('firefly.added_amount_to_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)])) - ); + if ($repository->canAddAmount($piggyBank, $amount)) { + $repository->addAmount($piggyBank, $amount); + Session::flash('success', strval(trans('firefly.added_amount_to_piggy', ['amount' => Amount::format($amount, false), 'name' => $piggyBank->name]))); Preferences::mark(); return redirect(route('piggy-banks.index')); } - Log::error('Cannot add ' . $amount . ' because max amount is ' . $maxAmount . ' (left on account is ' . $leftOnAccount . ')'); + Log::error('Cannot add ' . $amount . ' because canAddAmount returned false.'); Session::flash('error', strval(trans('firefly.cannot_add_amount_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)]))); return redirect(route('piggy-banks.index')); @@ -312,26 +301,19 @@ class PiggyBankController extends Controller */ public function postRemove(Request $request, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) { - $amount = strval(round($request->get('amount'), 12)); - - $savedSoFar = $piggyBank->currentRelevantRep()->currentamount; - - if (bccomp($amount, $savedSoFar) <= 0) { - $repetition = $piggyBank->currentRelevantRep(); - $repetition->currentamount = bcsub($repetition->currentamount, $amount); - $repetition->save(); - - // create event - $repository->createEvent($piggyBank, bcmul($amount, '-1')); - + $amount = $request->get('amount'); + if ($repository->canRemoveAmount($piggyBank, $amount)) { + $repository->removeAmount($piggyBank, $amount); Session::flash( - 'success', strval(trans('firefly.removed_amount_from_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)])) + 'success', strval(trans('firefly.removed_amount_from_piggy', ['amount' => Amount::format($amount, false), 'name' => $piggyBank->name])) ); Preferences::mark(); return redirect(route('piggy-banks.index')); } + $amount = strval(round($request->get('amount'), 12)); + Session::flash('error', strval(trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)]))); return redirect(route('piggy-banks.index')); @@ -391,9 +373,11 @@ class PiggyBankController extends Controller Preferences::mark(); if (intval($request->get('create_another')) === 1) { + // @codeCoverageIgnoreStart Session::put('piggy-banks.create.fromStore', true); return redirect(route('piggy-banks.create'))->withInput(); + // @codeCoverageIgnoreEnd } return redirect($this->getPreviousUri('piggy-banks.edit.uri')); @@ -415,9 +399,11 @@ class PiggyBankController extends Controller Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { + // @codeCoverageIgnoreStart Session::put('piggy-banks.edit.fromUpdate', true); return redirect(route('piggy-banks.edit', [$piggyBank->id])); + // @codeCoverageIgnoreEnd } return redirect($this->getPreviousUri('piggy-banks.edit.uri')); diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index a2f3505923..db70c528aa 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Popup; @@ -17,17 +17,13 @@ namespace FireflyIII\Http\Controllers\Popup; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collection\BalanceLine; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Report\PopupReportInterface; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Support\Binder\AccountList; use Illuminate\Http\Request; -use Illuminate\Support\Collection; use InvalidArgumentException; use Response; use View; @@ -40,6 +36,44 @@ use View; class ReportController extends Controller { + /** @var AccountRepositoryInterface */ + private $accountRepository; + /** @var BudgetRepositoryInterface */ + private $budgetRepository; + /** @var CategoryRepositoryInterface */ + private $categoryRepository; + /** @var PopupReportInterface */ + private $popupHelper; + + + /** + * + */ + public function __construct() + { + parent::__construct(); + $this->middleware( + function ($request, $next) { + + /** @var AccountRepositoryInterface $repository */ + $this->accountRepository = app(AccountRepositoryInterface::class); + + /** @var BudgetRepositoryInterface $repository */ + $this->budgetRepository = app(BudgetRepositoryInterface::class); + + /** @var CategoryRepositoryInterface categoryRepository */ + $this->categoryRepository = app(CategoryRepositoryInterface::class); + + /** @var PopupReportInterface popupHelper */ + $this->popupHelper = app(PopupReportInterface::class); + + return $next($request); + } + ); + + } + + /** * @param Request $request * @@ -59,7 +93,6 @@ class ReportController extends Controller throw new FireflyException('Firefly cannot handle "' . e($attributes['location']) . '" '); case 'budget-spent-amount': $html = $this->budgetSpentAmount($attributes); - break; case 'expense-entry': $html = $this->expenseEntry($attributes); @@ -88,63 +121,26 @@ class ReportController extends Controller */ private function balanceAmount(array $attributes): string { - $role = intval($attributes['role']); - - /** @var BudgetRepositoryInterface $budgetRepository */ - $budgetRepository = app(BudgetRepositoryInterface::class); - $budget = $budgetRepository->find(intval($attributes['budgetId'])); - - /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class); - - $account = $repository->find(intval($attributes['accountId'])); - $types = [TransactionType::WITHDRAWAL]; + $role = intval($attributes['role']); + $budget = $this->budgetRepository->find(intval($attributes['budgetId'])); + $account = $this->accountRepository->find(intval($attributes['accountId'])); switch (true) { case ($role === BalanceLine::ROLE_DEFAULTROLE && !is_null($budget->id)): - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector - ->setAccounts(new Collection([$account])) - ->setRange($attributes['startDate'], $attributes['endDate']) - ->setBudget($budget); - $journals = $collector->getJournals(); - + // normal row with a budget: + $journals = $this->popupHelper->balanceForBudget($budget, $account, $attributes); break; case ($role === BalanceLine::ROLE_DEFAULTROLE && is_null($budget->id)): + // normal row without a budget: + $journals = $this->popupHelper->balanceForNoBudget($account, $attributes); $budget->name = strval(trans('firefly.no_budget')); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector - ->setAccounts(new Collection([$account])) - ->setTypes($types) - ->setRange($attributes['startDate'], $attributes['endDate']) - ->withoutBudget(); - $journals = $collector->getJournals(); break; case ($role === BalanceLine::ROLE_DIFFROLE): - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector - ->setAccounts(new Collection([$account])) - ->setTypes($types) - ->setRange($attributes['startDate'], $attributes['endDate']) - ->withoutBudget(); - $journals = $collector->getJournals(); - + $journals = $this->popupHelper->balanceDifference($account, $attributes); $budget->name = strval(trans('firefly.leftUnbalanced')); - $journals = $journals->filter( - function (Transaction $transaction) { - $tags = $transaction->transactionJournal->tags()->where('tagMode', 'balancingAct')->count(); - if ($tags === 0) { - return true; - } - - return false; - } - ); break; case ($role === BalanceLine::ROLE_TAGROLE): + // row with tag info. throw new FireflyException('Firefly cannot handle this type of info-button (BalanceLine::TagRole)'); } $view = view('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render(); @@ -162,27 +158,8 @@ class ReportController extends Controller */ private function budgetSpentAmount(array $attributes): string { - // need to find the budget - // then search for expenses in the given period - // list them in some table format. - /** @var BudgetRepositoryInterface $repository */ - $repository = app(BudgetRepositoryInterface::class); - $budget = $repository->find(intval($attributes['budgetId'])); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - - $collector - ->setAccounts($attributes['accounts']) - ->setRange($attributes['startDate'], $attributes['endDate']); - - if (is_null($budget->id)) { - $collector->setTypes([TransactionType::WITHDRAWAL])->withoutBudget(); - } - if (!is_null($budget->id)) { - // get all expenses in budget in period: - $collector->setBudget($budget); - } - $journals = $collector->getJournals(); + $budget = $this->budgetRepository->find(intval($attributes['budgetId'])); + $journals = $this->popupHelper->byBudget($budget, $attributes); $view = view('popup.report.budget-spent-amount', compact('journals', 'budget'))->render(); return $view; @@ -198,18 +175,9 @@ class ReportController extends Controller */ private function categoryEntry(array $attributes): string { - /** @var CategoryRepositoryInterface $repository */ - $repository = app(CategoryRepositoryInterface::class); - $category = $repository->find(intval($attributes['categoryId'])); - $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER]; - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAccounts($attributes['accounts'])->setTypes($types) - ->setRange($attributes['startDate'], $attributes['endDate']) - ->setCategory($category); - $journals = $collector->getJournals(); // 7193 - - $view = view('popup.report.category-entry', compact('journals', 'category'))->render(); + $category = $this->categoryRepository->find(intval($attributes['categoryId'])); + $journals = $this->popupHelper->byCategory($category, $attributes); + $view = view('popup.report.category-entry', compact('journals', 'category'))->render(); return $view; } @@ -224,29 +192,9 @@ class ReportController extends Controller */ private function expenseEntry(array $attributes): string { - /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class); - - $account = $repository->find(intval($attributes['accountId'])); - $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER]; - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types); - $journals = $collector->getJournals(); - $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report - - // filter for transfers and withdrawals TO the given $account - $journals = $journals->filter( - function (Transaction $transaction) use ($report) { - // get the destinations: - $sources = TransactionJournal::sourceAccountList($transaction->transactionJournal)->pluck('id')->toArray(); - - // do these intersect with the current list? - return !empty(array_intersect($report, $sources)); - } - ); - - $view = view('popup.report.expense-entry', compact('journals', 'account'))->render(); + $account = $this->accountRepository->find(intval($attributes['accountId'])); + $journals = $this->popupHelper->byExpenses($account, $attributes); + $view = view('popup.report.expense-entry', compact('journals', 'account'))->render(); return $view; } @@ -261,28 +209,9 @@ class ReportController extends Controller */ private function incomeEntry(array $attributes): string { - /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class); - $account = $repository->find(intval($attributes['accountId'])); - $types = [TransactionType::DEPOSIT, TransactionType::TRANSFER]; - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types); - $journals = $collector->getJournals(); - $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report - - // filter the set so the destinations outside of $attributes['accounts'] are not included. - $journals = $journals->filter( - function (Transaction $transaction) use ($report) { - // get the destinations: - $destinations = TransactionJournal::destinationAccountList($transaction->transactionJournal)->pluck('id')->toArray(); - - // do these intersect with the current list? - return !empty(array_intersect($report, $destinations)); - } - ); - - $view = view('popup.report.income-entry', compact('journals', 'account'))->render(); + $account = $this->accountRepository->find(intval($attributes['accountId'])); + $journals = $this->popupHelper->byIncome($account, $attributes); + $view = view('popup.report.income-entry', compact('journals', 'account'))->render(); return $view; } diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 4373d61204..7ef95c1307 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -9,12 +9,14 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Http\Controllers; use FireflyIII\Http\Requests\TokenFormRequest; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Http\Request; use PragmaRX\Google2FA\Contracts\Google2FA; use Preferences; @@ -55,8 +57,7 @@ class PreferencesController extends Controller public function code(Google2FA $google2fa) { $domain = $this->getDomain(); - /** @noinspection PhpMethodParametersCountMismatchInspection */ - $secret = $google2fa->generateSecretKey(32, auth()->user()->id); + $secret = $google2fa->generateSecretKey(16); Session::flash('two-factor-secret', $secret); $image = $google2fa->getQRCodeInline('Firefly III at ' . $domain, auth()->user()->email, $secret, 150); @@ -127,11 +128,13 @@ class PreferencesController extends Controller } /** - * @param Request $request + * @param Request $request + * + * @param UserRepositoryInterface $repository * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function postIndex(Request $request) + public function postIndex(Request $request, UserRepositoryInterface $repository) { // front page accounts $frontPageAccounts = []; @@ -160,16 +163,15 @@ class PreferencesController extends Controller Preferences::set('showDepositsFrontpage', $showDepositsFrontpage); // save page size: + Preferences::set('transactionPageSize', 50); $transactionPageSize = intval($request->get('transactionPageSize')); if ($transactionPageSize > 0 && $transactionPageSize < 1337) { Preferences::set('transactionPageSize', $transactionPageSize); - } else { - Preferences::set('transactionPageSize', 50); } $twoFactorAuthEnabled = false; $hasTwoFactorAuthSecret = false; - if (!auth()->user()->hasRole('demo')) { + if (!$repository->hasRole(auth()->user(), 'demo')) { // two factor auth $twoFactorAuthEnabled = intval($request->get('twoFactorAuthEnabled')); $hasTwoFactorAuthSecret = !is_null(Preferences::get('twoFactorAuthSecret')); diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index e2f7516dd8..780c3038f4 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -9,14 +9,16 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; use FireflyIII\Exceptions\ValidationException; +use FireflyIII\Http\Middleware\IsLimitedUser; use FireflyIII\Http\Requests\DeleteAccountFormRequest; use FireflyIII\Http\Requests\ProfileFormRequest; use FireflyIII\Repositories\User\UserRepositoryInterface; +use FireflyIII\User; use Hash; use Log; use Session; @@ -45,6 +47,8 @@ class ProfileController extends Controller return $next($request); } ); + $this->middleware(IsLimitedUser::class); + } /** @@ -52,16 +56,6 @@ class ProfileController extends Controller */ public function changePassword() { - if (intval(getenv('SANDSTORM')) === 1) { - return view('error')->with('message', strval(trans('firefly.sandstorm_not_available'))); - } - - if (auth()->user()->hasRole('demo')) { - Session::flash('info', strval(trans('firefly.cannot_change_demo'))); - - return redirect(route('profile.index')); - } - $title = auth()->user()->email; $subTitle = strval(trans('firefly.change_your_password')); $subTitleIcon = 'fa-key'; @@ -74,16 +68,6 @@ class ProfileController extends Controller */ public function deleteAccount() { - if (intval(getenv('SANDSTORM')) === 1) { - return view('error')->with('message', strval(trans('firefly.sandstorm_not_available'))); - } - - if (auth()->user()->hasRole('demo')) { - Session::flash('info', strval(trans('firefly.cannot_delete_demo'))); - - return redirect(route('profile.index')); - } - $title = auth()->user()->email; $subTitle = strval(trans('firefly.delete_account')); $subTitleIcon = 'fa-trash'; @@ -111,32 +95,18 @@ class ProfileController extends Controller */ public function postChangePassword(ProfileFormRequest $request, UserRepositoryInterface $repository) { - if (intval(getenv('SANDSTORM')) === 1) { - return view('error')->with('message', strval(trans('firefly.sandstorm_not_available'))); - } - - if (auth()->user()->hasRole('demo')) { - Session::flash('info', strval(trans('firefly.cannot_change_demo'))); - - return redirect(route('profile.index')); - } - - // old, new1, new2 - if (!Hash::check($request->get('current_password'), auth()->user()->password)) { - Session::flash('error', strval(trans('firefly.invalid_current_password'))); - - return redirect(route('profile.change-password')); - } + // the request has already validated both new passwords must be equal. + $current = $request->get('current_password'); + $new = $request->get('new_password'); try { - $this->validatePassword($request->get('current_password'), $request->get('new_password')); + $this->validatePassword(auth()->user(), $current, $new); } catch (ValidationException $e) { Session::flash('error', $e->getMessage()); return redirect(route('profile.change-password')); } - // update the user with the new password. $repository->changePassword(auth()->user(), $request->get('new_password')); Session::flash('success', strval(trans('firefly.password_changed'))); @@ -151,17 +121,6 @@ class ProfileController extends Controller */ public function postDeleteAccount(UserRepositoryInterface $repository, DeleteAccountFormRequest $request) { - if (intval(getenv('SANDSTORM')) === 1) { - return view('error')->with('message', strval(trans('firefly.sandstorm_not_available'))); - } - - if (auth()->user()->hasRole('demo')) { - Session::flash('info', strval(trans('firefly.cannot_delete_demo'))); - - return redirect(route('profile.index')); - } - - // old, new1, new2 if (!Hash::check($request->get('password'), auth()->user()->password)) { Session::flash('error', strval(trans('firefly.invalid_password'))); @@ -181,16 +140,22 @@ class ProfileController extends Controller return redirect(route('index')); } + /** - * @param string $old + * @param User $user + * @param string $current * @param string $new * * @return bool * @throws ValidationException */ - protected function validatePassword(string $old, string $new): bool + protected function validatePassword(User $user, string $current, string $new): bool { - if ($new === $old) { + if (!Hash::check($current, $user->password)) { + throw new ValidationException(strval(trans('firefly.invalid_current_password'))); + } + + if ($current === $new) { throw new ValidationException(strval(trans('firefly.should_change'))); } diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.php index c36c6c7aea..3453b525c5 100644 --- a/app/Http/Controllers/Report/AccountController.php +++ b/app/Http/Controllers/Report/AccountController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; @@ -44,7 +44,7 @@ class AccountController extends Controller $cache->addProperty('account-report'); $cache->addProperty($accounts->pluck('id')->toArray()); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } /** @var AccountTaskerInterface $accountTasker */ diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php index 9dadfa608d..9793f45275 100644 --- a/app/Http/Controllers/Report/BalanceController.php +++ b/app/Http/Controllers/Report/BalanceController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; @@ -47,7 +47,7 @@ class BalanceController extends Controller $cache->addProperty('balance-report'); $cache->addProperty($accounts->pluck('id')->toArray()); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } $balance = $helper->getBalanceReport($accounts, $start, $end); diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php index bc4d026631..b6b4c8bebd 100644 --- a/app/Http/Controllers/Report/BudgetController.php +++ b/app/Http/Controllers/Report/BudgetController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; @@ -49,7 +49,7 @@ class BudgetController extends Controller $cache->addProperty('budget-report'); $cache->addProperty($accounts->pluck('id')->toArray()); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } $budgets = $helper->getBudgetReport($start, $end, $accounts); @@ -76,7 +76,7 @@ class BudgetController extends Controller $cache->addProperty('budget-period-report'); $cache->addProperty($accounts->pluck('id')->toArray()); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } // generate budget report right here. diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index 730deeaece..1528f44460 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; @@ -20,7 +20,6 @@ use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Support\Collection; -use Log; use Navigation; /** @@ -45,9 +44,7 @@ class CategoryController extends Controller $cache->addProperty('category-period-expenses-report'); $cache->addProperty($accounts->pluck('id')->toArray()); if ($cache->has()) { - Log::debug('Return report from cache'); - - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } /** @var CategoryRepositoryInterface $repository */ $repository = app(CategoryRepositoryInterface::class); @@ -79,9 +76,7 @@ class CategoryController extends Controller $cache->addProperty('category-period-income-report'); $cache->addProperty($accounts->pluck('id')->toArray()); if ($cache->has()) { - Log::debug('Return report from cache'); - - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } /** @var CategoryRepositoryInterface $repository */ $repository = app(CategoryRepositoryInterface::class); @@ -114,7 +109,7 @@ class CategoryController extends Controller $cache->addProperty('category-report'); $cache->addProperty($accounts->pluck('id')->toArray()); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } /** @var CategoryRepositoryInterface $repository */ diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php index f1abe0b96e..5081ba6554 100644 --- a/app/Http/Controllers/Report/OperationsController.php +++ b/app/Http/Controllers/Report/OperationsController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; @@ -19,6 +19,7 @@ use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\Account\AccountTaskerInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Support\Collection; @@ -31,13 +32,14 @@ class OperationsController extends Controller { /** - * @param Collection $accounts - * @param Carbon $start - * @param Carbon $end + * @param AccountTaskerInterface $tasker + * @param Collection $accounts + * @param Carbon $start + * @param Carbon $end * * @return mixed|string */ - public function expenses(Collection $accounts, Carbon $start, Carbon $end) + public function expenses(AccountTaskerInterface $tasker, Collection $accounts, Carbon $start, Carbon $end) { // chart properties for cache: $cache = new CacheProperties; @@ -46,9 +48,9 @@ class OperationsController extends Controller $cache->addProperty('expense-report'); $cache->addProperty($accounts->pluck('id')->toArray()); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } - $entries = $this->getExpenseReport($start, $end, $accounts); + $entries = $tasker->getExpenseReport($start, $end, $accounts); $type = 'expense-entry'; $result = view('reports.partials.income-expenses', compact('entries', 'type'))->render(); $cache->store($result); @@ -58,13 +60,14 @@ class OperationsController extends Controller } /** - * @param Collection $accounts - * @param Carbon $start - * @param Carbon $end + * @param AccountTaskerInterface $tasker + * @param Collection $accounts + * @param Carbon $start + * @param Carbon $end * * @return string */ - public function income(Collection $accounts, Carbon $start, Carbon $end) + public function income(AccountTaskerInterface $tasker, Collection $accounts, Carbon $start, Carbon $end) { // chart properties for cache: $cache = new CacheProperties; @@ -73,9 +76,9 @@ class OperationsController extends Controller $cache->addProperty('income-report'); $cache->addProperty($accounts->pluck('id')->toArray()); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } - $entries = $this->getIncomeReport($start, $end, $accounts); + $entries = $tasker->getIncomeReport($start, $end, $accounts); $type = 'income-entry'; $result = view('reports.partials.income-expenses', compact('entries', 'type'))->render(); @@ -86,13 +89,14 @@ class OperationsController extends Controller } /** - * @param Collection $accounts - * @param Carbon $start - * @param Carbon $end + * @param AccountTaskerInterface $tasker + * @param Collection $accounts + * @param Carbon $start + * @param Carbon $end * * @return mixed|string */ - public function operations(Collection $accounts, Carbon $start, Carbon $end) + public function operations(AccountTaskerInterface $tasker, Collection $accounts, Carbon $start, Carbon $end) { // chart properties for cache: $cache = new CacheProperties; @@ -101,11 +105,11 @@ class OperationsController extends Controller $cache->addProperty('inc-exp-report'); $cache->addProperty($accounts->pluck('id')->toArray()); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } - $incomes = $this->getIncomeReport($start, $end, $accounts); - $expenses = $this->getExpenseReport($start, $end, $accounts); + $incomes = $tasker->getIncomeReport($start, $end, $accounts); + $expenses = $tasker->getExpenseReport($start, $end, $accounts); $incomeSum = array_sum( array_map( function ($item) { @@ -129,125 +133,4 @@ class OperationsController extends Controller } - /** - * @param Carbon $start - * @param Carbon $end - * @param Collection $accounts - * - * @return array - */ - private function getExpenseReport(Carbon $start, Carbon $end, Collection $accounts): array - { - // get all expenses for the given accounts in the given period! - // also transfers! - // get all transactions: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAccounts($accounts)->setRange($start, $end); - $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) - ->withOpposingAccount() - ->enableInternalFilter(); - $transactions = $collector->getJournals(); - $transactions = $transactions->filter( - function (Transaction $transaction) { - // return negative amounts only. - if (bccomp($transaction->transaction_amount, '0') === -1) { - return $transaction; - } - - return false; - } - ); - $expenses = $this->groupByOpposing($transactions); - - // sort the result - // Obtain a list of columns - $sum = []; - foreach ($expenses as $accountId => $row) { - $sum[$accountId] = floatval($row['sum']); - } - - array_multisort($sum, SORT_ASC, $expenses); - - return $expenses; - } - - /** - * @param Carbon $start - * @param Carbon $end - * @param Collection $accounts - * - * @return array - */ - private function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): array - { - // get all expenses for the given accounts in the given period! - // also transfers! - // get all transactions: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setAccounts($accounts)->setRange($start, $end); - $collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) - ->withOpposingAccount() - ->enableInternalFilter(); - $transactions = $collector->getJournals(); - $transactions = $transactions->filter( - function (Transaction $transaction) { - // return positive amounts only. - if (bccomp($transaction->transaction_amount, '0') === 1) { - return $transaction; - } - - return false; - } - ); - $income = $this->groupByOpposing($transactions); - - // sort the result - // Obtain a list of columns - $sum = []; - foreach ($income as $accountId => $row) { - $sum[$accountId] = floatval($row['sum']); - } - - array_multisort($sum, SORT_DESC, $income); - - return $income; - } - - /** - * @param Collection $transactions - * - * @return array - */ - private function groupByOpposing(Collection $transactions): array - { - $expenses = []; - // join the result together: - foreach ($transactions as $transaction) { - $opposingId = $transaction->opposing_account_id; - $name = $transaction->opposing_account_name; - if (!isset($expenses[$opposingId])) { - $expenses[$opposingId] = [ - 'id' => $opposingId, - 'name' => $name, - 'sum' => '0', - 'average' => '0', - 'count' => 0, - ]; - } - $expenses[$opposingId]['sum'] = bcadd($expenses[$opposingId]['sum'], $transaction->transaction_amount); - $expenses[$opposingId]['count']++; - } - // do averages: - foreach ($expenses as $key => $entry) { - if ($expenses[$key]['count'] > 1) { - $expenses[$key]['average'] = bcdiv($expenses[$key]['sum'], strval($expenses[$key]['count'])); - } - } - - - return $expenses; - } - } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 5c32e086f9..9b13cc1bb3 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -9,12 +9,11 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; use Carbon\Carbon; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Generator\Report\ReportGeneratorFactory; use FireflyIII\Helpers\Report\ReportHelperInterface; use FireflyIII\Http\Requests\ReportFormRequest; @@ -26,6 +25,7 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Http\RedirectResponse; use Illuminate\Support\Collection; +use Log; use Preferences; use Response; use Session; @@ -48,6 +48,7 @@ class ReportController extends Controller { parent::__construct(); + $this->helper = app(ReportHelperInterface::class); $this->middleware( function ($request, $next) { @@ -55,8 +56,6 @@ class ReportController extends Controller View::share('mainTitleIcon', 'fa-line-chart'); View::share('subTitleIcon', 'fa-calendar'); - $this->helper = app(ReportHelperInterface::class); - return $next($request); } ); @@ -73,7 +72,7 @@ class ReportController extends Controller public function auditReport(Collection $accounts, Carbon $start, Carbon $end) { if ($end < $start) { - return view('error')->with('message', trans('firefly.end_after_start_date')); + return view('error')->with('message', trans('firefly.end_after_start_date')); // @codeCoverageIgnore } if ($start < session('first')) { $start = session('first'); @@ -98,42 +97,6 @@ class ReportController extends Controller } - /** - * @param Collection $accounts - * @param Collection $tags - * @param Carbon $start - * @param Carbon $end - * - * @return string - */ - public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end) - { - if ($end < $start) { - return view('error')->with('message', trans('firefly.end_after_start_date')); - } - if ($start < session('first')) { - $start = session('first'); - } - - View::share( - 'subTitle', trans( - 'firefly.report_tag', - [ - 'start' => $start->formatLocalized($this->monthFormat), - 'end' => $end->formatLocalized($this->monthFormat), - ] - ) - ); - - $generator = ReportGeneratorFactory::reportGenerator('Tag', $start, $end); - $generator->setAccounts($accounts); - $generator->setTags($tags); - $result = $generator->generate(); - - return $result; - - } - /** * @param Collection $accounts * @param Collection $budgets @@ -145,7 +108,7 @@ class ReportController extends Controller public function budgetReport(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end) { if ($end < $start) { - return view('error')->with('message', trans('firefly.end_after_start_date')); + return view('error')->with('message', trans('firefly.end_after_start_date')); // @codeCoverageIgnore } if ($start < session('first')) { $start = session('first'); @@ -181,7 +144,7 @@ class ReportController extends Controller public function categoryReport(Collection $accounts, Collection $categories, Carbon $start, Carbon $end) { if ($end < $start) { - return view('error')->with('message', trans('firefly.end_after_start_date')); + return view('error')->with('message', trans('firefly.end_after_start_date')); // @codeCoverageIgnore } if ($start < session('first')) { $start = session('first'); @@ -287,10 +250,9 @@ class ReportController extends Controller /** * @param ReportFormRequest $request * - * @return RedirectResponse - * @throws FireflyException + * @return RedirectResponse|\Illuminate\Routing\Redirector */ - public function postIndex(ReportFormRequest $request): RedirectResponse + public function postIndex(ReportFormRequest $request) { // report type: $reportType = $request->get('report_type'); @@ -300,8 +262,10 @@ class ReportController extends Controller $categories = join(',', $request->getCategoryList()->pluck('id')->toArray()); $budgets = join(',', $request->getBudgetList()->pluck('id')->toArray()); $tags = join(',', $request->getTagList()->pluck('tag')->toArray()); + $uri = route('reports.index'); if ($request->getAccountList()->count() === 0) { + Log::debug('Account count is zero'); Session::flash('error', trans('firefly.select_more_than_one_account')); return redirect(route('reports.index')); @@ -329,14 +293,7 @@ class ReportController extends Controller return view('error')->with('message', trans('firefly.end_after_start_date')); } - // lower threshold - if ($start < session('first')) { - $start = session('first'); - } - switch ($reportType) { - default: - throw new FireflyException(sprintf('Firefly does not support the "%s"-report yet.', $reportType)); case 'category': $uri = route('reports.report.category', [$accounts, $categories, $start, $end]); break; @@ -357,6 +314,42 @@ class ReportController extends Controller return redirect($uri); } + /** + * @param Collection $accounts + * @param Collection $tags + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end) + { + if ($end < $start) { + return view('error')->with('message', trans('firefly.end_after_start_date')); // @codeCoverageIgnore + } + if ($start < session('first')) { + $start = session('first'); + } + + View::share( + 'subTitle', trans( + 'firefly.report_tag', + [ + 'start' => $start->formatLocalized($this->monthFormat), + 'end' => $end->formatLocalized($this->monthFormat), + ] + ) + ); + + $generator = ReportGeneratorFactory::reportGenerator('Tag', $start, $end); + $generator->setAccounts($accounts); + $generator->setTags($tags); + $result = $generator->generate(); + + return $result; + + } + /** * @return string */ diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index e20830a819..a7247b7705 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; @@ -255,10 +255,11 @@ class RuleController extends Controller Preferences::mark(); if (intval($request->get('create_another')) === 1) { - // set value so create routine will not overwrite URL: + // @codeCoverageIgnoreStart Session::put('rules.create.fromStore', true); return redirect(route('rules.create', [$ruleGroup]))->withInput(); + // @codeCoverageIgnoreEnd } return redirect($this->getPreviousUri('rules.create.uri')); @@ -340,10 +341,11 @@ class RuleController extends Controller Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { - // set value so edit routine will not overwrite URL: + // @codeCoverageIgnoreStart Session::put('rules.edit.fromUpdate', true); return redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]); + // @codeCoverageIgnoreEnd } return redirect($this->getPreviousUri('rules.edit.uri')); @@ -473,7 +475,7 @@ class RuleController extends Controller $actions[] = view( 'rules.partials.action', [ - 'oldTrigger' => $entry, + 'oldAction' => $entry, 'oldValue' => $request->old('rule-action-value')[$index], 'oldChecked' => $checked, 'count' => $count, @@ -530,7 +532,8 @@ class RuleController extends Controller ]; if (is_array($data['rule-triggers'])) { foreach ($data['rule-triggers'] as $index => $triggerType) { - $triggers[] = [ + $data['rule-trigger-stop'][$index] = $data['rule-trigger-stop'][$index] ?? 0; + $triggers[] = [ 'type' => $triggerType, 'value' => $data['rule-trigger-values'][$index], 'stopProcessing' => intval($data['rule-trigger-stop'][$index]) === 1 ? true : false, diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index e0bc8b7476..12f9a0bb58 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; @@ -217,10 +217,11 @@ class RuleGroupController extends Controller Preferences::mark(); if (intval($request->get('create_another')) === 1) { - // set value so create routine will not overwrite URL: + // @codeCoverageIgnoreStart Session::put('rule-groups.create.fromStore', true); return redirect(route('rule-groups.create'))->withInput(); + // @codeCoverageIgnoreEnd } return redirect($this->getPreviousUri('rule-groups.create.uri')); @@ -261,10 +262,11 @@ class RuleGroupController extends Controller Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { - // set value so edit routine will not overwrite URL: + // @codeCoverageIgnoreStart Session::put('rule-groups.edit.fromUpdate', true); return redirect(route('rule-groups.edit', [$ruleGroup->id]))->withInput(['return_to_edit' => 1]); + // @codeCoverageIgnoreEnd } // redirect to previous URL. diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 4b47777c62..f014f8325a 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -9,12 +9,14 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; use FireflyIII\Support\Search\SearchInterface; use Illuminate\Http\Request; +use Illuminate\Support\Collection; +use View; /** * Class SearchController @@ -30,44 +32,66 @@ class SearchController extends Controller { parent::__construct(); + $this->middleware( + function ($request, $next) { + View::share('mainTitleIcon', 'fa-search'); + View::share('title', trans('firefly.search')); + + return $next($request); + } + ); + } /** - * Results always come in the form of an array [results, count, fullCount] - * * @param Request $request * @param SearchInterface $searcher * - * @return $this + * @return View */ public function index(Request $request, SearchInterface $searcher) { - $minSearchLen = 1; - $subTitle = null; - $query = null; - $result = []; - $title = trans('firefly.search'); - $limit = 20; - $mainTitleIcon = 'fa-search'; + // yes, hard coded values: + $minSearchLen = 1; + $limit = 20; - // set limit for search: - $searcher->setLimit($limit); + // ui stuff: + $subTitle = ''; + + // query stuff + $query = null; + $result = []; + $rawQuery = $request->get('q'); + $hasModifiers = true; + $modifiers = []; if (!is_null($request->get('q')) && strlen($request->get('q')) >= $minSearchLen) { - $query = trim(strtolower($request->get('q'))); - $words = explode(' ', $query); - $subTitle = trans('firefly.search_results_for', ['query' => $query]); + // parse query, find modifiers: + // set limit for search + $searcher->setLimit($limit); + $searcher->parseQuery($request->get('q')); - $transactions = $searcher->searchTransactions($words); - $accounts = $searcher->searchAccounts($words); - $categories = $searcher->searchCategories($words); - $budgets = $searcher->searchBudgets($words); - $tags = $searcher->searchTags($words); - $result = ['transactions' => $transactions, 'accounts' => $accounts, 'categories' => $categories, 'budgets' => $budgets, 'tags' => $tags]; + $transactions = $searcher->searchTransactions(); + $accounts = new Collection; + $categories = new Collection; + $tags = new Collection; + $budgets = new Collection; + + // no special search thing? + if (!$searcher->hasModifiers()) { + $hasModifiers = false; + $accounts = $searcher->searchAccounts(); + $categories = $searcher->searchCategories(); + $budgets = $searcher->searchBudgets(); + $tags = $searcher->searchTags(); + } + $query = $searcher->getWordsAsString(); + $subTitle = trans('firefly.search_results_for', ['query' => $query]); + $result = ['transactions' => $transactions, 'accounts' => $accounts, 'categories' => $categories, 'budgets' => $budgets, 'tags' => $tags]; } - return view('search.index', compact('title', 'subTitle', 'limit', 'mainTitleIcon', 'query', 'result')); + return view('search.index', compact('rawQuery', 'hasModifiers', 'modifiers', 'subTitle', 'limit', 'query', 'result')); } } diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index bdb3160ea7..fa94a1b612 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -9,20 +9,19 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; use Carbon\Carbon; -use Exception; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Requests\TagFormRequest; use FireflyIII\Models\Tag; -use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; use Illuminate\Support\Collection; +use Log; use Navigation; use Preferences; use Session; @@ -141,11 +140,13 @@ class TagController extends Controller } /** - * @param Tag $tag + * @param Tag $tag + * + * @param TagRepositoryInterface $repository * * @return View */ - public function edit(Tag $tag) + public function edit(Tag $tag, TagRepositoryInterface $repository) { $subTitle = trans('firefly.edit_tag', ['tag' => $tag->tag]); $subTitleIcon = 'fa-tag'; @@ -159,8 +160,8 @@ class TagController extends Controller /* * Can this tag become another type? */ - $allowAdvance = Tag::tagAllowAdvance($tag); - $allowToBalancingAct = Tag::tagAllowBalancing($tag); + $allowAdvance = $repository->tagAllowAdvance($tag); + $allowToBalancingAct = $repository->tagAllowBalancing($tag); // edit tag options: if ($allowAdvance === false) { @@ -183,25 +184,27 @@ class TagController extends Controller } /** + * @param TagRepositoryInterface $repository * + * @return View */ - public function index() + public function index(TagRepositoryInterface $repository) { $title = 'Tags'; $mainTitleIcon = 'fa-tags'; $types = ['nothing', 'balancingAct', 'advancePayment']; + $count = $repository->count(); // loop each types and get the tags, group them by year. $collection = []; foreach ($types as $type) { /** @var Collection $tags */ - $tags = auth()->user()->tags()->where('tagMode', $type)->orderBy('date', 'ASC')->get(); + $tags = $repository->getByType($type); $tags = $tags->sortBy( function (Tag $tag) { $date = !is_null($tag->date) ? $tag->date->format('Ymd') : '000000'; - return strtolower($date . $tag->tag); } ); @@ -216,58 +219,96 @@ class TagController extends Controller } } - return view('tags.index', compact('title', 'mainTitleIcon', 'types', 'collection')); + return view('tags.index', compact('title', 'mainTitleIcon', 'types', 'collection', 'count')); } /** - * @param Request $request - * @param JournalCollectorInterface $collector - * @param Tag $tag + * @param Request $request + * @param TagRepositoryInterface $repository + * @param Tag $tag + * @param string $moment * * @return View */ - public function show(Request $request, JournalCollectorInterface $collector, Tag $tag, string $moment = '') + public function show(Request $request, TagRepositoryInterface $repository, Tag $tag, string $moment = '') { - $range = Preferences::get('viewRange', '1M')->data; - $start = new Carbon; - $end = new Carbon; - - if (strlen($moment) > 0) { - try { - $start = new Carbon($moment); - $end = Navigation::endOfPeriod($start, $range); - } catch (Exception $e) { - $start = Navigation::startOfPeriod($this->repository->firstUseDate($tag), $range); - $end = Navigation::startOfPeriod($this->repository->lastUseDate($tag), $range); - } - } - if (strlen($moment) === 0) { - $start = clone session('start', Carbon::now()->startOfMonth()); - $end = clone session('end', Carbon::now()->endOfMonth()); - } - + // default values: $subTitle = $tag->tag; $subTitleIcon = 'fa-tag'; - $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); + $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); - $periods = $this->getPeriodOverview($tag); + $count = 0; + $loop = 0; + $range = Preferences::get('viewRange', '1M')->data; + $start = null; + $end = null; + $periods = new Collection; + $apiKey = env('GOOGLE_MAPS_API_KEY', ''); + $sum = '0'; - // use collector: - $collector->setAllAssetAccounts() - ->setLimit($pageSize)->setPage($page)->setTag($tag) - ->withBudgetInformation()->withCategoryInformation()->setRange($start, $end); - $journals = $collector->getPaginatedJournals(); - $journals->setPath('tags/show/' . $tag->id); - $sum = $journals->sum( - function (Transaction $transaction) { - return $transaction->transaction_amount; + // prep for "all" view. + if ($moment === 'all') { + $subTitle = trans('firefly.all_journals_for_tag', ['tag' => $tag->tag]); + $start = $repository->firstUseDate($tag); + $end = new Carbon; + $sum = $repository->sumOfTag($tag); + } + + // prep for "specific date" view. + if (strlen($moment) > 0 && $moment !== 'all') { + $start = new Carbon($moment); + $end = Navigation::endOfPeriod($start, $range); + $subTitle = trans( + 'firefly.journals_in_period_for_tag', + ['tag' => $tag->tag, + 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + $periods = $this->getPeriodOverview($tag); + $sum = $repository->sumOfTag($tag, $start, $end); + } + + // prep for current period + if (strlen($moment) === 0) { + $start = clone session('start', Navigation::startOfPeriod(new Carbon, $range)); + $end = clone session('end', Navigation::endOfPeriod(new Carbon, $range)); + $periods = $this->getPeriodOverview($tag); + $subTitle = trans( + 'firefly.journals_in_period_for_tag', + ['tag' => $tag->tag, 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } + // grab journals, but be prepared to jump a period back to get the right ones: + Log::info('Now at tag loop start.'); + while ($count === 0 && $loop < 3) { + $loop++; + Log::info('Count is zero, search for journals.'); + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount() + ->setTag($tag)->withBudgetInformation()->withCategoryInformation(); + $journals = $collector->getPaginatedJournals(); + $journals->setPath('tags/show/' . $tag->id); + $count = $journals->getCollection()->count(); + if ($count === 0) { + $start->subDay(); + $start = Navigation::startOfPeriod($start, $range); + $end = Navigation::endOfPeriod($start, $range); + Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d'))); } - ); + } - return view('tags.show', compact('tag', 'periods', 'subTitle', 'subTitleIcon', 'journals', 'sum', 'start', 'end')); + if ($moment != 'all' && $loop > 1) { + $subTitle = trans( + 'firefly.journals_in_period_for_tag', + ['tag' => $tag->tag, 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } + + return view('tags.show', compact('apiKey', 'tag', 'periods', 'subTitle', 'subTitleIcon', 'journals', 'sum', 'start', 'end', 'moment')); } + /** * @param TagFormRequest $request * @@ -282,10 +323,11 @@ class TagController extends Controller Preferences::mark(); if (intval($request->get('create_another')) === 1) { - // set value so create routine will not overwrite URL: + // @codeCoverageIgnoreStart Session::put('tags.create.fromStore', true); return redirect(route('tags.create'))->withInput(); + // @codeCoverageIgnoreEnd } return redirect($this->getPreviousUri('tags.create.uri')); @@ -307,10 +349,11 @@ class TagController extends Controller Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { - // set value so edit routine will not overwrite URL: + // @codeCoverageIgnoreStart Session::put('tags.edit.fromUpdate', true); return redirect(route('tags.edit', [$tag->id]))->withInput(['return_to_edit' => 1]); + // @codeCoverageIgnoreEnd } // redirect to previous URL. @@ -336,7 +379,7 @@ class TagController extends Controller $cache->addProperty($tag->id); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } $collection = new Collection; @@ -347,11 +390,11 @@ class TagController extends Controller // get expenses and what-not in this period and this tag. $arr = [ - 'date_string' => $end->format('Y-m-d'), - 'date_name' => Navigation::periodShow($end, $range), - 'date' => $end, - 'spent' => $this->repository->spentInperiod($tag, $end, $currentEnd), - 'earned' => $this->repository->earnedInperiod($tag, $end, $currentEnd), + 'string' => $end->format('Y-m-d'), + 'name' => Navigation::periodShow($end, $range), + 'date' => clone $end, + 'spent' => $this->repository->spentInperiod($tag, $end, $currentEnd), + 'earned' => $this->repository->earnedInperiod($tag, $end, $currentEnd), ]; $collection->push($arr); diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index 3fb1e41de7..8853a3dbaa 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; @@ -64,11 +64,13 @@ class ConvertController extends Controller */ public function index(TransactionType $destinationType, TransactionJournal $journal) { + // @codeCoverageIgnoreStart if ($this->isOpeningBalance($journal)) { return $this->redirectToAccount($journal); } + // @codeCoverageIgnoreEnd - $positiveAmount = TransactionJournal::amountPositive($journal); + $positiveAmount = $journal->amountPositive(); $assetAccounts = ExpandedForm::makeSelectList($this->accounts->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET])); $sourceType = $journal->transactionType; $subTitle = trans('firefly.convert_to_' . $destinationType->type, ['description' => $journal->description]); @@ -89,8 +91,8 @@ class ConvertController extends Controller } // get source and destination account: - $sourceAccount = TransactionJournal::sourceAccountList($journal)->first(); - $destinationAccount = TransactionJournal::destinationAccountList($journal)->first(); + $sourceAccount = $journal->sourceAccountList()->first(); + $destinationAccount = $journal->destinationAccountList()->first(); return view( 'transactions.convert', @@ -117,20 +119,20 @@ class ConvertController extends Controller */ public function postIndex(Request $request, JournalRepositoryInterface $repository, TransactionType $destinationType, TransactionJournal $journal) { + // @codeCoverageIgnoreStart if ($this->isOpeningBalance($journal)) { return $this->redirectToAccount($journal); } + // @codeCoverageIgnoreEnd $data = $request->all(); - // cannot convert to its own type. if ($journal->transactionType->type === $destinationType->type) { Session::flash('error', trans('firefly.convert_is_already_type_' . $destinationType->type)); return redirect(route('transactions.show', [$journal->id])); } - // cannot convert split. if ($journal->transactions()->count() > 2) { Session::flash('error', trans('firefly.cannot_convert_split_journl')); @@ -165,13 +167,13 @@ class ConvertController extends Controller { /** @var AccountRepositoryInterface $accountRepository */ $accountRepository = app(AccountRepositoryInterface::class); - $sourceAccount = TransactionJournal::sourceAccountList($journal)->first(); - $destinationAccount = TransactionJournal::destinationAccountList($journal)->first(); + $sourceAccount = $journal->sourceAccountList()->first(); + $destinationAccount = $journal->destinationAccountList()->first(); $sourceType = $journal->transactionType; $joined = $sourceType->type . '-' . $destinationType->type; switch ($joined) { default: - throw new FireflyException('Cannot handle ' . $joined); + throw new FireflyException('Cannot handle ' . $joined); // @codeCoverageIgnore case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: // one $destination = $sourceAccount; break; @@ -180,6 +182,12 @@ class ConvertController extends Controller break; case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL: // three case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: // five + if ($data['destination_account_expense'] === '') { + // destination is a cash account. + $destination = $accountRepository->getCashAccount(); + + return $destination; + } $data = [ 'name' => $data['destination_account_expense'], 'accountType' => 'expense', @@ -210,15 +218,23 @@ class ConvertController extends Controller { /** @var AccountRepositoryInterface $accountRepository */ $accountRepository = app(AccountRepositoryInterface::class); - $sourceAccount = TransactionJournal::sourceAccountList($journal)->first(); - $destinationAccount = TransactionJournal::destinationAccountList($journal)->first(); + $sourceAccount = $journal->sourceAccountList()->first(); + $destinationAccount = $journal->destinationAccountList()->first(); $sourceType = $journal->transactionType; $joined = $sourceType->type . '-' . $destinationType->type; switch ($joined) { default: - throw new FireflyException('Cannot handle ' . $joined); + throw new FireflyException('Cannot handle ' . $joined); // @codeCoverageIgnore case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: // one case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: // six + + if ($data['source_account_revenue'] === '') { + // destination is a cash account. + $destination = $accountRepository->getCashAccount(); + + return $destination; + } + $data = [ 'name' => $data['source_account_revenue'], 'accountType' => 'revenue', diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 5a61b060f4..285a73f3e9 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -9,18 +9,18 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; use Carbon\Carbon; -use ExpandedForm; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\MassDeleteJournalRequest; use FireflyIII\Http\Requests\MassEditJournalRequest; use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; use Preferences; @@ -118,8 +118,13 @@ class MassController extends Controller $subTitle = trans('firefly.mass_edit_journals'); /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class); - $accountList = ExpandedForm::makeSelectList($repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])); + $repository = app(AccountRepositoryInterface::class); + $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); + + // get budgets + /** @var BudgetRepositoryInterface $budgetRepository */ + $budgetRepository = app(BudgetRepositoryInterface::class); + $budgets = $budgetRepository->getBudgets(); // skip transactions that have multiple destinations // or multiple sources: @@ -130,8 +135,8 @@ class MassController extends Controller * @var TransactionJournal $journal */ foreach ($journals as $index => $journal) { - $sources = TransactionJournal::sourceAccountList($journal); - $destinations = TransactionJournal::destinationAccountList($journal); + $sources = $journal->sourceAccountList($journal); + $destinations = $journal->destinationAccountList($journal); if ($sources->count() > 1) { $messages[] = trans('firefly.cannot_edit_multiple_source', ['description' => $journal->description, 'id' => $journal->id]); continue; @@ -144,7 +149,7 @@ class MassController extends Controller $filtered->push($journal); } - if (count($messages)) { + if (count($messages) > 0) { Session::flash('info', $messages); } @@ -156,9 +161,9 @@ class MassController extends Controller // set some values to be used in the edit routine: $filtered->each( function (TransactionJournal $journal) { - $journal->amount = TransactionJournal::amountPositive($journal); - $sources = TransactionJournal::sourceAccountList($journal); - $destinations = TransactionJournal::destinationAccountList($journal); + $journal->amount = $journal->amountPositive(); + $sources = $journal->sourceAccountList(); + $destinations = $journal->destinationAccountList(); $journal->transaction_count = $journal->transactions()->count(); if (!is_null($sources->first())) { $journal->source_account_id = $sources->first()->id; @@ -177,7 +182,7 @@ class MassController extends Controller $journals = $filtered; - return view('transactions.mass.edit', compact('journals', 'subTitle', 'accountList')); + return view('transactions.mass.edit', compact('journals', 'subTitle', 'accounts', 'budgets')); } /** @@ -195,12 +200,12 @@ class MassController extends Controller $journal = $repository->find(intval($journalId)); if ($journal) { // get optional fields: - $what = strtolower(TransactionJournal::transactionTypeStr($journal)); + $what = strtolower($journal->transactionTypeStr()); $sourceAccountId = $request->get('source_account_id')[$journal->id] ?? 0; $sourceAccountName = $request->get('source_account_name')[$journal->id] ?? ''; $destAccountId = $request->get('destination_account_id')[$journal->id] ?? 0; $destAccountName = $request->get('destination_account_name')[$journal->id] ?? ''; - $budgetId = $journal->budgets->first() ? $journal->budgets->first()->id : 0; + $budgetId = $request->get('budget_id')[$journal->id] ?? 0; $category = $request->get('category')[$journal->id]; $tags = $journal->tags->pluck('tag')->toArray(); @@ -214,12 +219,12 @@ class MassController extends Controller 'destination_account_id' => intval($destAccountId), 'destination_account_name' => $destAccountName, 'amount' => round($request->get('amount')[$journal->id], 12), - 'currency_id' => intval($request->get('amount_currency_id_amount_' . $journal->id)), + 'currency_id' => $journal->transaction_currency_id, 'date' => new Carbon($request->get('date')[$journal->id]), 'interest_date' => $journal->interest_date, 'book_date' => $journal->book_date, 'process_date' => $journal->process_date, - 'budget_id' => $budgetId, + 'budget_id' => intval($budgetId), 'category' => $category, 'tags' => $tags, diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 4a70121724..27c7cdba77 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; @@ -25,6 +25,7 @@ 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\PiggyBank\PiggyBankRepositoryInterface; use Log; @@ -48,7 +49,8 @@ class SingleController extends Controller /** @var BudgetRepositoryInterface */ private $budgets; - + /** @var CurrencyRepositoryInterface */ + private $currency; /** @var PiggyBankRepositoryInterface */ private $piggyBanks; @@ -71,6 +73,7 @@ class SingleController extends Controller $this->budgets = app(BudgetRepositoryInterface::class); $this->piggyBanks = app(PiggyBankRepositoryInterface::class); $this->attachments = app(AttachmentHelperInterface::class); + $this->currency = app(CurrencyRepositoryInterface::class); View::share('title', trans('firefly.transactions')); View::share('mainTitleIcon', 'fa-repeat'); @@ -83,8 +86,8 @@ class SingleController extends Controller public function cloneTransaction(TransactionJournal $journal) { - $source = TransactionJournal::sourceAccountList($journal)->first(); - $destination = TransactionJournal::destinationAccountList($journal)->first(); + $source = $journal->sourceAccountList()->first(); + $destination = $journal->destinationAccountList()->first(); $budget = $journal->budgets()->first(); $budgetId = is_null($budget) ? 0 : $budget->id; $category = $journal->categories()->first(); @@ -98,7 +101,7 @@ class SingleController extends Controller 'source_account_name' => $source->name, 'destination_account_id' => $destination->id, 'destination_account_name' => $destination->name, - 'amount' => TransactionJournal::amountPositive($journal), + 'amount' => $journal->amountPositive(), 'date' => $journal->date->format('Y-m-d'), 'budget_id' => $budgetId, 'category' => $categoryName, @@ -162,9 +165,12 @@ class SingleController extends Controller */ public function delete(TransactionJournal $journal) { + // Covered by another controller's tests + // @codeCoverageIgnoreStart if ($this->isOpeningBalance($journal)) { return $this->redirectToAccount($journal); } + // @codeCoverageIgnoreEnd $what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type); $subTitle = trans('firefly.delete_' . $what, ['description' => $journal->description]); @@ -187,10 +193,12 @@ class SingleController extends Controller */ public function destroy(JournalRepositoryInterface $repository, TransactionJournal $transactionJournal) { + // @codeCoverageIgnoreStart if ($this->isOpeningBalance($transactionJournal)) { return $this->redirectToAccount($transactionJournal); } - $type = TransactionJournal::transactionTypeStr($transactionJournal); + // @codeCoverageIgnoreEnd + $type = $transactionJournal->transactionTypeStr(); Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => e($transactionJournal->description)]))); $repository->delete($transactionJournal); @@ -207,9 +215,11 @@ class SingleController extends Controller */ public function edit(TransactionJournal $journal) { + // @codeCoverageIgnoreStart if ($this->isOpeningBalance($journal)) { return $this->redirectToAccount($journal); } + // @codeCoverageIgnoreEnd $count = $journal->transactions()->count(); @@ -217,40 +227,54 @@ class SingleController extends Controller return redirect(route('transactions.split.edit', [$journal->id])); } - $what = strtolower(TransactionJournal::transactionTypeStr($journal)); + $what = strtolower($journal->transactionTypeStr()); $assetAccounts = ExpandedForm::makeSelectList($this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])); $budgetList = ExpandedForm::makeSelectListWithEmpty($this->budgets->getBudgets()); // view related code $subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]); - // journal related code - $sourceAccounts = TransactionJournal::sourceAccountList($journal); - $destinationAccounts = TransactionJournal::destinationAccountList($journal); + $sourceAccounts = $journal->sourceAccountList(); + $destinationAccounts = $journal->destinationAccountList(); $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data; $preFilled = [ - 'date' => TransactionJournal::dateAsString($journal), - 'interest_date' => TransactionJournal::dateAsString($journal, 'interest_date'), - 'book_date' => TransactionJournal::dateAsString($journal, 'book_date'), - 'process_date' => TransactionJournal::dateAsString($journal, 'process_date'), - 'category' => TransactionJournal::categoryAsString($journal), - 'budget_id' => TransactionJournal::budgetId($journal), + 'date' => $journal->dateAsString(), + 'interest_date' => $journal->dateAsString('interest_date'), + 'book_date' => $journal->dateAsString('book_date'), + 'process_date' => $journal->dateAsString('process_date'), + 'category' => $journal->categoryAsString(), + 'budget_id' => $journal->budgetId(), 'tags' => join(',', $journal->tags->pluck('tag')->toArray()), 'source_account_id' => $sourceAccounts->first()->id, 'source_account_name' => $sourceAccounts->first()->edit_name, 'destination_account_id' => $destinationAccounts->first()->id, 'destination_account_name' => $destinationAccounts->first()->edit_name, - 'amount' => TransactionJournal::amountPositive($journal), + 'amount' => $journal->amountPositive(), + 'currency' => $journal->transactionCurrency, // new custom fields: - 'due_date' => TransactionJournal::dateAsString($journal, 'due_date'), - 'payment_date' => TransactionJournal::dateAsString($journal, 'payment_date'), - 'invoice_date' => TransactionJournal::dateAsString($journal, 'invoice_date'), + 'due_date' => $journal->dateAsString('due_date'), + 'payment_date' => $journal->dateAsString('payment_date'), + 'invoice_date' => $journal->dateAsString('invoice_date'), 'interal_reference' => $journal->getMeta('internal_reference'), 'notes' => $journal->getMeta('notes'), + + // exchange rate fields + 'native_amount' => $journal->amountPositive(), + 'native_currency' => $journal->transactionCurrency, ]; + // if user has entered a foreign currency, update some fields + $foreignCurrencyId = intval($journal->getMeta('foreign_currency_id')); + if ($foreignCurrencyId > 0) { + // update some fields in pre-filled. + // @codeCoverageIgnoreStart + $preFilled['amount'] = $journal->getMeta('foreign_amount'); + $preFilled['currency'] = $this->currency->find(intval($journal->getMeta('foreign_currency_id'))); + // @codeCoverageIgnoreEnd + } + if ($journal->isWithdrawal() && $destinationAccounts->first()->accountType->type == AccountType::CASH) { $preFilled['destination_account_name'] = ''; } @@ -313,22 +337,20 @@ class SingleController extends Controller Session::flash('success', strval(trans('firefly.stored_journal', ['description' => e($journal->description)]))); Preferences::mark(); + // @codeCoverageIgnoreStart if ($createAnother === true) { - // set value so create routine will not overwrite URL: Session::put('transactions.create.fromStore', true); return redirect(route('transactions.create', [$request->input('what')]))->withInput(); } if ($doSplit === true) { - // redirect to edit screen: return redirect(route('transactions.split.edit', [$journal->id])); } + // @codeCoverageIgnoreEnd - // redirect to previous URL. return redirect($this->getPreviousUri('transactions.create.uri')); - } /** @@ -340,9 +362,11 @@ class SingleController extends Controller */ public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal) { + // @codeCoverageIgnoreStart if ($this->isOpeningBalance($journal)) { return $this->redirectToAccount($journal); } + // @codeCoverageIgnoreEnd $data = $request->getJournalData(); $journal = $repository->update($journal, $data); @@ -350,31 +374,29 @@ class SingleController extends Controller $files = $request->hasFile('attachments') ? $request->file('attachments') : null; $this->attachments->saveAttachmentsForModel($journal, $files); - // flash errors + // @codeCoverageIgnoreStart if (count($this->attachments->getErrors()->get('attachments')) > 0) { Session::flash('error', $this->attachments->getErrors()->get('attachments')); } - // flash messages if (count($this->attachments->getMessages()->get('attachments')) > 0) { Session::flash('info', $this->attachments->getMessages()->get('attachments')); } + // @codeCoverageIgnoreEnd event(new UpdatedTransactionJournal($journal)); // update, get events by date and sort DESC - $type = strtolower(TransactionJournal::transactionTypeStr($journal)); + $type = strtolower($journal->transactionTypeStr()); Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => e($data['description'])]))); Preferences::mark(); - // if wishes to split: - - + // @codeCoverageIgnoreStart if (intval($request->get('return_to_edit')) === 1) { - // set value so edit routine will not overwrite URL: Session::put('transactions.edit.fromUpdate', true); return redirect(route('transactions.edit', [$journal->id]))->withInput(['return_to_edit' => 1]); } + // @codeCoverageIgnoreEnd // redirect to previous URL. return redirect($this->getPreviousUri('transactions.edit.uri')); diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index e667cb5f1b..c587129811 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; @@ -141,25 +141,27 @@ class SplitController extends Controller $files = $request->hasFile('attachments') ? $request->file('attachments') : null; // save attachments: $this->attachments->saveAttachmentsForModel($journal, $files); - event(new UpdatedTransactionJournal($journal)); - // update, get events by date and sort DESC // flash messages + // @codeCoverageIgnoreStart if (count($this->attachments->getMessages()->get('attachments')) > 0) { Session::flash('info', $this->attachments->getMessages()->get('attachments')); } + // @codeCoverageIgnoreEnd - $type = strtolower(TransactionJournal::transactionTypeStr($journal)); + $type = strtolower($journal->transactionTypeStr()); Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => e($data['journal_description'])]))); Preferences::mark(); + // @codeCoverageIgnoreStart if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: Session::put('transactions.edit-split.fromUpdate', true); return redirect(route('transactions.split.edit', [$journal->id]))->withInput(['return_to_edit' => 1]); } + // @codeCoverageIgnoreEnd // redirect to previous URL. return redirect($this->getPreviousUri('transactions.edit-split.uri')); @@ -207,18 +209,18 @@ class SplitController extends Controller */ private function arrayFromJournal(Request $request, TransactionJournal $journal): array { - $sourceAccounts = TransactionJournal::sourceAccountList($journal); - $destinationAccounts = TransactionJournal::destinationAccountList($journal); + $sourceAccounts = $journal->sourceAccountList(); + $destinationAccounts = $journal->destinationAccountList(); $array = [ 'journal_description' => $request->old('journal_description', $journal->description), - 'journal_amount' => TransactionJournal::amountPositive($journal), + 'journal_amount' => $journal->amountPositive(), 'sourceAccounts' => $sourceAccounts, '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), 'currency_id' => $request->old('currency_id', $journal->transaction_currency_id), 'destinationAccounts' => $destinationAccounts, - 'what' => strtolower(TransactionJournal::transactionTypeStr($journal)), + 'what' => strtolower($journal->transactionTypeStr()), 'date' => $request->old('date', $journal->date), 'tags' => join(',', $journal->tags->pluck('tag')->toArray()), @@ -263,8 +265,8 @@ class SplitController extends Controller // set initial category and/or budget: if (count($transactions) === 1 && $index === 0) { - $set['budget_id'] = TransactionJournal::budgetId($journal); - $set['category'] = TransactionJournal::categoryAsString($journal); + $set['budget_id'] = $journal->budgetId(); + $set['category'] = $journal->categoryAsString(); } $return[] = $set; diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index b0ef6013ab..1e838c5dec 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -9,21 +9,26 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalTaskerInterface; +use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Log; use Navigation; use Preferences; use Response; +use Steam; use View; /** @@ -57,112 +62,81 @@ class TransactionController extends Controller * @param JournalRepositoryInterface $repository * @param string $what * + * @param string $moment + * * @return View */ - public function index(Request $request, JournalRepositoryInterface $repository, string $what) + public function index(Request $request, JournalRepositoryInterface $repository, string $what, string $moment = '') { - $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); + // default values: $subTitleIcon = config('firefly.transactionIconsByWhat.' . $what); $types = config('firefly.transactionTypesByWhat.' . $what); - $subTitle = trans('firefly.title_' . $what); + $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); + $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); + $count = 0; + $loop = 0; $range = Preferences::get('viewRange', '1M')->data; - $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); - // to make sure we only grab a subset, based on the current date (in session): - $start = session('start', Navigation::startOfPeriod(new Carbon, $range)); - $end = session('end', Navigation::endOfPeriod(new Carbon, $range)); + $start = null; + $end = null; + $periods = new Collection; - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->setRange($start, $end)->withBudgetInformation() - ->withCategoryInformation(); - $collector->withOpposingAccount(); - $collector->disableInternalFilter(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath('transactions/' . $what); - - unset($start, $end); - - // then also show a list of periods where the user can click on, based on the - // user's range and the oldest journal the user has: - $first = $repository->first(); - $blockStart = is_null($first->id) ? new Carbon : $first->date; - $blockStart = Navigation::startOfPeriod($blockStart, $range); - $blockEnd = Navigation::endOfX(new Carbon, $range); - $entries = new Collection; - - while ($blockEnd >= $blockStart) { - Log::debug(sprintf('Now at blockEnd: %s', $blockEnd->format('Y-m-d'))); - $blockEnd = Navigation::startOfPeriod($blockEnd, $range); - $dateStr = $blockEnd->format('Y-m-d'); - $dateName = Navigation::periodShow($blockEnd, $range); - $entries->push([$dateStr, $dateName]); - $blockEnd = Navigation::subtractPeriod($blockEnd, $range, 1); + // prep for "all" view. + if ($moment === 'all') { + $subTitle = trans('firefly.all_' . $what); + $first = $repository->first(); + $start = $first->date ?? new Carbon; + $end = new Carbon; } - return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals', 'entries')); + // prep for "specific date" view. + if (strlen($moment) > 0 && $moment !== 'all') { + $start = new Carbon($moment); + $end = Navigation::endOfPeriod($start, $range); + $subTitle = trans( + 'firefly.title_' . $what . '_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + $periods = $this->getPeriodOverview($what); + } - } + // prep for current period + if (strlen($moment) === 0) { + $start = clone session('start', Navigation::startOfPeriod(new Carbon, $range)); + $end = clone session('end', Navigation::endOfPeriod(new Carbon, $range)); + $periods = $this->getPeriodOverview($what); + $subTitle = trans( + 'firefly.title_' . $what . '_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } + // grab journals, but be prepared to jump a period back to get the right ones: + Log::info('Now at transaction loop start.'); + while ($count === 0 && $loop < 3) { + $loop++; + Log::info('Count is zero, search for journals.'); + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes($types)->setLimit($pageSize)->setPage($page)->withOpposingAccount(); + $collector->removeFilter(InternalTransferFilter::class); + $journals = $collector->getPaginatedJournals(); + $journals->setPath('/transactions/' . $what); + $count = $journals->getCollection()->count(); + if ($count === 0) { + $start->subDay(); + $start = Navigation::startOfPeriod($start, $range); + $end = Navigation::endOfPeriod($start, $range); + Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d'))); + } + } - /** - * @param Request $request - * @param string $what - * - * @return View - */ - public function indexAll(Request $request, string $what) - { - $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); - $subTitleIcon = config('firefly.transactionIconsByWhat.' . $what); - $types = config('firefly.transactionTypesByWhat.' . $what); - $subTitle = sprintf('%s (%s)', trans('firefly.title_' . $what), strtolower(trans('firefly.everything'))); - $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); + if ($moment != 'all' && $loop > 1) { + $subTitle = trans( + 'firefly.title_' . $what . '_between', + ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] + ); + } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->withBudgetInformation()->withCategoryInformation(); - $collector->withOpposingAccount(); - $collector->disableInternalFilter(); - - $journals = $collector->getPaginatedJournals(); - $journals->setPath('transactions/' . $what . '/all'); - - return view('transactions.index-all', compact('subTitle', 'what', 'subTitleIcon', 'journals')); - - } - - /** - * @param Request $request - * @param string $what - * - * @param string $date - * - * @return View - */ - public function indexByDate(Request $request, string $what, string $date) - { - $carbon = new Carbon($date); - $range = Preferences::get('viewRange', '1M')->data; - $start = Navigation::startOfPeriod($carbon, $range); - $end = Navigation::endOfPeriod($carbon, $range); - $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); - $subTitleIcon = config('firefly.transactionIconsByWhat.' . $what); - $types = config('firefly.transactionTypesByWhat.' . $what); - $subTitle = trans('firefly.title_' . $what) . ' (' . Navigation::periodShow($carbon, $range) . ')'; - $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); - - Log::debug(sprintf('Transaction index by date will show between %s and %s', $start->format('Y-m-d'), $end->format('Y-m-d'))); - - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); - $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts(); - $collector->setRange($start, $end)->withBudgetInformation()->withCategoryInformation(); - $collector->withOpposingAccount(); - $collector->disableInternalFilter(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath('transactions/' . $what . '/' . $date); - - return view('transactions.index-date', compact('subTitle', 'what', 'subTitleIcon', 'journals', 'carbon')); + return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals', 'periods', 'start', 'end', 'moment')); } @@ -181,10 +155,9 @@ class TransactionController extends Controller $ids = array_unique($ids); foreach ($ids as $id) { $journal = $repository->find(intval($id)); - if ($journal && $journal->date->format('Y-m-d') == $date->format('Y-m-d')) { - $journal->order = $order; + if ($journal && $journal->date->isSameDay($date)) { + $repository->setOrder($journal, $order); $order++; - $journal->save(); } } } @@ -206,14 +179,99 @@ class TransactionController extends Controller return $this->redirectToAccount($journal); } - $events = $tasker->getPiggyBankEvents($journal); - $transactions = $tasker->getTransactionsOverview($journal); - $what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type); - $subTitle = trans('firefly.' . $what) . ' "' . e($journal->description) . '"'; + $events = $tasker->getPiggyBankEvents($journal); + $transactions = $tasker->getTransactionsOverview($journal); + $what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type); + $subTitle = trans('firefly.' . $what) . ' "' . e($journal->description) . '"'; + $foreignCurrency = null; - return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions')); + if ($journal->hasMeta('foreign_currency_id')) { + // @codeCoverageIgnoreStart + /** @var CurrencyRepositoryInterface $repository */ + $repository = app(CurrencyRepositoryInterface::class); + $foreignCurrency = $repository->find(intval($journal->getMeta('foreign_currency_id'))); + // @codeCoverageIgnoreEnd + } + + return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'foreignCurrency')); } + /** + * @param string $what + * + * @return Collection + * @throws FireflyException + */ + private function getPeriodOverview(string $what): Collection + { + $repository = app(JournalRepositoryInterface::class); + $first = $repository->first(); + $start = $first->date ?? new Carbon; + $range = Preferences::get('viewRange', '1M')->data; + $start = Navigation::startOfPeriod($start, $range); + $end = Navigation::endOfX(new Carbon, $range); + $entries = new Collection; + $types = config('firefly.transactionTypesByWhat.' . $what); + + // properties for cache + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty($what); + $cache->addProperty('transaction-list-entries'); + + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + + Log::debug(sprintf('Going to get period expenses and incomes between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d'))); + while ($end >= $start) { + Log::debug('Loop start!'); + $end = Navigation::startOfPeriod($end, $range); + $currentEnd = Navigation::endOfPeriod($end, $range); + + // count journals without budget in this period: + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withOpposingAccount()->setTypes($types); + $collector->removeFilter(InternalTransferFilter::class); + $set = $collector->getJournals(); + $sum = $set->sum('transaction_amount'); + $journals = $set->count(); + $dateStr = $end->format('Y-m-d'); + $dateName = Navigation::periodShow($end, $range); + $array = [ + 'string' => $dateStr, + 'name' => $dateName, + 'count' => $journals, + 'spent' => 0, + 'earned' => 0, + 'transferred' => 0, + 'date' => clone $end, + ]; + Log::debug(sprintf('What is %s', $what)); + switch ($what) { + case 'withdrawal': + $array['spent'] = $sum; + break; + case 'deposit': + $array['earned'] = $sum; + break; + case 'transfers': + case 'transfer': + $array['transferred'] = Steam::positive($sum); + break; + + } + $entries->push($array); + $end = Navigation::subtractPeriod($end, $range, 1); + } + Log::debug('End of loop'); + $cache->store($entries); + + return $entries; + } + } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 289a6924d1..5224ad8579 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http; diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 529546437d..5733cb1c1a 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/AuthenticateTwoFactor.php b/app/Http/Middleware/AuthenticateTwoFactor.php index 4f9f1f5542..625f55ba23 100644 --- a/app/Http/Middleware/AuthenticateTwoFactor.php +++ b/app/Http/Middleware/AuthenticateTwoFactor.php @@ -9,13 +9,15 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; use Closure; +use Cookie; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Log; use Preferences; use Session; @@ -55,8 +57,13 @@ class AuthenticateTwoFactor } $is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data; $has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret')); - $is2faAuthed = Session::get('twofactor-authenticated'); + + // grab 2auth information from cookie, not from session. + $is2faAuthed = Cookie::get('twoFactorAuthenticated') === 'true'; + if ($is2faEnabled && $has2faSecret && !$is2faAuthed) { + Log::debug('Does not seem to be 2 factor authed, redirect.'); + return redirect(route('two-factor.index')); } diff --git a/app/Http/Middleware/Binder.php b/app/Http/Middleware/Binder.php index 79cf3267fd..52ac1c10ab 100644 --- a/app/Http/Middleware/Binder.php +++ b/app/Http/Middleware/Binder.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index 6475f4f6da..85188c9c17 100644 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/IsAdmin.php b/app/Http/Middleware/IsAdmin.php index 823be2f20d..a8e82710dc 100644 --- a/app/Http/Middleware/IsAdmin.php +++ b/app/Http/Middleware/IsAdmin.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/IsLimitedUser.php b/app/Http/Middleware/IsLimitedUser.php new file mode 100644 index 0000000000..6b22eccda8 --- /dev/null +++ b/app/Http/Middleware/IsLimitedUser.php @@ -0,0 +1,61 @@ +guest()) { + if ($request->ajax()) { + return response('Unauthorized.', 401); + } + + return redirect()->guest('login'); + } + /** @var User $user */ + $user = auth()->user(); + if ($user->hasRole('demo')) { + Session::flash('warning', strval(trans('firefly.not_available_demo_user'))); + + return redirect(route('index')); + } + + if (intval(getenv('SANDSTORM')) === 1) { + Session::flash('warning', strval(trans('firefly.sandstorm_not_available'))); + + return redirect(route('index')); + } + + return $next($request); + } +} diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index fdf5322a4d..025478e7df 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; @@ -17,7 +17,6 @@ use Amount; use App; use Carbon\Carbon; use Closure; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Contracts\Auth\Guard; use Illuminate\Http\Request; diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index e7cf7f3bcf..e2ba0517f2 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php index 43cc865dc7..1320204959 100644 --- a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php +++ b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php @@ -9,14 +9,15 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; use Closure; +use Cookie; use Illuminate\Support\Facades\Auth; use Preferences; -use Session; + /** * Class RedirectIfTwoFactorAuthenticated @@ -40,7 +41,10 @@ class RedirectIfTwoFactorAuthenticated $is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data; $has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret')); - $is2faAuthed = Session::get('twofactor-authenticated'); + + // grab 2auth information from cookie + $is2faAuthed = Cookie::get('twoFactorAuthenticated') === 'true'; + if ($is2faEnabled && $has2faSecret && $is2faAuthed) { return redirect('/'); } diff --git a/app/Http/Middleware/Sandstorm.php b/app/Http/Middleware/Sandstorm.php index 92225ceef5..a9ba75bd09 100644 --- a/app/Http/Middleware/Sandstorm.php +++ b/app/Http/Middleware/Sandstorm.php @@ -7,12 +7,14 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; use Auth; use Closure; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Illuminate\Http\Request; use View; @@ -33,6 +35,7 @@ class Sandstorm * @param string|null $guard * * @return mixed + * @throws FireflyException */ public function handle(Request $request, Closure $next, $guard = null) { @@ -45,27 +48,55 @@ class Sandstorm // we're in sandstorm! is user a guest? if (Auth::guard($guard)->guest()) { - $userId = strval($request->header('X-Sandstorm-User-Id')); - if (strlen($userId) > 0) { - // find user? - $email = $userId . '@firefly'; - $user = User::whereEmail($email)->first(); - if (is_null($user)) { - $user = User::create( - [ - 'email' => $email, - 'password' => str_random(16), - ] - ); + /** @var UserRepositoryInterface $repository */ + $repository = app(UserRepositoryInterface::class); + $userId = strval($request->header('X-Sandstorm-User-Id')); + $count = $repository->count(); - } - - - // login user: + // if there already is one user in this instance, we assume this is + // the "main" user. Firefly's nature does not allow other users to + // access the same data so we have no choice but to simply login + // the new user to the same account and just forget about Bob and Alice + // and any other differences there may be between these users. + if ($count === 1 && strlen($userId) > 0) { + // login as first user user. + $user = User::first(); Auth::guard($guard)->login($user); - } else { - echo 'user id no length, guest?'; - exit; + View::share('SANDSTORM_ANON', false); + + return $next($request); + } + + if ($count === 1 && strlen($userId) === 0) { + // login but indicate anonymous + $user = User::first(); + Auth::guard($guard)->login($user); + View::share('SANDSTORM_ANON', true); + + return $next($request); + } + + if ($count === 0 && strlen($userId) > 0) { + // create new user. + $email = $userId . '@firefly'; + /** @var User $user */ + $user = User::create( + [ + 'email' => $email, + 'password' => str_random(16), + ] + ); + Auth::guard($guard)->login($user); + + return $next($request); + } + + if ($count === 0 && strlen($userId) === 0) { + throw new FireflyException('The first visit to a new Firefly III administration cannot be by a guest user.'); + } + + if ($count > 1) { + throw new FireflyException('Your Firefly III installation has more than one user, which is weird.'); } } diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php index ba6c518a08..c419b0e8c3 100644 --- a/app/Http/Middleware/StartFireflySession.php +++ b/app/Http/Middleware/StartFireflySession.php @@ -7,14 +7,13 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; use Illuminate\Http\Request; use Illuminate\Session\Middleware\StartSession; use Illuminate\Session\SessionManager; -use Log; /** * Class StartFireflySession diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 11ec0455c9..98ded14137 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -8,13 +8,14 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; +use Carbon\Carbon; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier; use Symfony\Component\HttpFoundation\Cookie; -use Carbon\Carbon; + /** * Class VerifyCsrfToken * @@ -35,8 +36,9 @@ class VerifyCsrfToken extends BaseVerifier /** * Add the CSRF token to the response cookies. * - * @param \Illuminate\Http\Request $request - * @param \Symfony\Component\HttpFoundation\Response $response + * @param \Illuminate\Http\Request $request + * @param \Symfony\Component\HttpFoundation\Response $response + * * @return \Symfony\Component\HttpFoundation\Response */ protected function addCookieToResponse($request, $response) diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php index cadf22b600..90b8eb760d 100644 --- a/app/Http/Requests/AccountFormRequest.php +++ b/app/Http/Requests/AccountFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; @@ -43,14 +43,12 @@ class AccountFormRequest extends Request 'accountType' => $this->string('what'), 'currency_id' => $this->integer('currency_id'), 'virtualBalance' => $this->float('virtualBalance'), - 'virtualBalanceCurrency' => $this->integer('amount_currency_id_virtualBalance'), 'iban' => $this->string('iban'), 'BIC' => $this->string('BIC'), 'accountNumber' => $this->string('accountNumber'), 'accountRole' => $this->string('accountRole'), 'openingBalance' => $this->float('openingBalance'), 'openingBalanceDate' => $this->date('openingBalanceDate'), - 'openingBalanceCurrency' => $this->integer('amount_currency_id_openingBalance'), 'ccType' => $this->string('ccType'), 'ccMonthlyPaymentDate' => $this->string('ccMonthlyPaymentDate'), ]; diff --git a/app/Http/Requests/AttachmentFormRequest.php b/app/Http/Requests/AttachmentFormRequest.php index 6f7608bc46..30d2fe6d2b 100644 --- a/app/Http/Requests/AttachmentFormRequest.php +++ b/app/Http/Requests/AttachmentFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/BillFormRequest.php b/app/Http/Requests/BillFormRequest.php index 992542eca1..1dbe2d707b 100644 --- a/app/Http/Requests/BillFormRequest.php +++ b/app/Http/Requests/BillFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; @@ -58,7 +58,7 @@ class BillFormRequest extends Request $nameRule = 'required|between:1,255|uniqueObjectForUser:bills,name'; $matchRule = 'required|between:1,255|uniqueObjectForUser:bills,match'; if (intval($this->get('id')) > 0) { - $nameRule .= ',' . intval($this->get('id')); + $nameRule .= ',' . intval($this->get('id')); $matchRule .= ',' . intval($this->get('id')); } diff --git a/app/Http/Requests/BudgetFormRequest.php b/app/Http/Requests/BudgetFormRequest.php index c7d9d0de63..5c6f1ce537 100644 --- a/app/Http/Requests/BudgetFormRequest.php +++ b/app/Http/Requests/BudgetFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/BudgetIncomeRequest.php b/app/Http/Requests/BudgetIncomeRequest.php index e8c2c93e39..8af316dd48 100644 --- a/app/Http/Requests/BudgetIncomeRequest.php +++ b/app/Http/Requests/BudgetIncomeRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php index b7b5e94a5e..9fb1942d20 100644 --- a/app/Http/Requests/CategoryFormRequest.php +++ b/app/Http/Requests/CategoryFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/ConfigurationRequest.php b/app/Http/Requests/ConfigurationRequest.php index 452e613e73..15cfe56a43 100644 --- a/app/Http/Requests/ConfigurationRequest.php +++ b/app/Http/Requests/ConfigurationRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/CurrencyFormRequest.php b/app/Http/Requests/CurrencyFormRequest.php index 0449f9b4ab..6a779665e5 100644 --- a/app/Http/Requests/CurrencyFormRequest.php +++ b/app/Http/Requests/CurrencyFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/DeleteAccountFormRequest.php b/app/Http/Requests/DeleteAccountFormRequest.php index 9586af3767..b3dd484d7e 100644 --- a/app/Http/Requests/DeleteAccountFormRequest.php +++ b/app/Http/Requests/DeleteAccountFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/ExportFormRequest.php b/app/Http/Requests/ExportFormRequest.php index 028a3246cf..16a5638302 100644 --- a/app/Http/Requests/ExportFormRequest.php +++ b/app/Http/Requests/ExportFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/ImportUploadRequest.php b/app/Http/Requests/ImportUploadRequest.php index 62e4f117d8..93065bcada 100644 --- a/app/Http/Requests/ImportUploadRequest.php +++ b/app/Http/Requests/ImportUploadRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php index 62dc5656d2..12d35d8617 100644 --- a/app/Http/Requests/JournalFormRequest.php +++ b/app/Http/Requests/JournalFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; @@ -67,6 +67,11 @@ class JournalFormRequest extends Request 'destination_account_name' => $this->string('destination_account_name'), 'piggy_bank_id' => $this->integer('piggy_bank_id'), + // native amount and stuff like that: + 'native_amount' => $this->float('native_amount'), + 'source_amount' => $this->float('source_amount'), + 'destination_amount' => $this->float('destination_amount'), + ]; return $data; @@ -101,6 +106,11 @@ class JournalFormRequest extends Request 'destination_account_id' => 'numeric|belongsToUser:accounts,id', 'destination_account_name' => 'between:1,255', 'piggy_bank_id' => 'between:1,255', + + // foreign currency amounts + 'native_amount' => 'numeric|more:0', + 'source_amount' => 'numeric|more:0', + 'destination_amount' => 'numeric|more:0', ]; // some rules get an upgrade depending on the type of data: diff --git a/app/Http/Requests/MassDeleteJournalRequest.php b/app/Http/Requests/MassDeleteJournalRequest.php index 13283012d1..004f4aa4ed 100644 --- a/app/Http/Requests/MassDeleteJournalRequest.php +++ b/app/Http/Requests/MassDeleteJournalRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/MassEditJournalRequest.php b/app/Http/Requests/MassEditJournalRequest.php index 03ae6ae6f7..7067d34e05 100644 --- a/app/Http/Requests/MassEditJournalRequest.php +++ b/app/Http/Requests/MassEditJournalRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/NewUserFormRequest.php b/app/Http/Requests/NewUserFormRequest.php index b8627cffa2..b5ef0fd040 100644 --- a/app/Http/Requests/NewUserFormRequest.php +++ b/app/Http/Requests/NewUserFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php index ba969dcf64..c2d9f7f9e5 100644 --- a/app/Http/Requests/PiggyBankFormRequest.php +++ b/app/Http/Requests/PiggyBankFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/ProfileFormRequest.php b/app/Http/Requests/ProfileFormRequest.php index 02bce0c99c..fe1ac7bf93 100644 --- a/app/Http/Requests/ProfileFormRequest.php +++ b/app/Http/Requests/ProfileFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php index 02a5f5c8e5..db8b5fbe74 100644 --- a/app/Http/Requests/ReportFormRequest.php +++ b/app/Http/Requests/ReportFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index e73b17ac60..16e77bad4a 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; @@ -87,7 +87,7 @@ class Request extends FormRequest */ protected function string(string $field): string { - $string = $this->get($field) ?? ''; + $string = $this->get($field) ?? ''; $search = [ "\u{0001}", // start of heading "\u{0002}", // start of text diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index 6295bd9e3f..8206b53264 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index 7d2250882f..4e94676e23 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/SelectTransactionsRequest.php b/app/Http/Requests/SelectTransactionsRequest.php index 097089ff79..5b85dd3b26 100644 --- a/app/Http/Requests/SelectTransactionsRequest.php +++ b/app/Http/Requests/SelectTransactionsRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php index 3d82027c6b..2c1fab0dac 100644 --- a/app/Http/Requests/SplitJournalFormRequest.php +++ b/app/Http/Requests/SplitJournalFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php index 544b53c0b0..d61e5cb8d9 100644 --- a/app/Http/Requests/TagFormRequest.php +++ b/app/Http/Requests/TagFormRequest.php @@ -9,10 +9,10 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Http\Requests; -use Carbon\Carbon; use FireflyIII\Repositories\Tag\TagRepositoryInterface; /** @@ -46,11 +46,10 @@ class TagFormRequest extends Request $longitude = null; $zoomLevel = null; } - $date = $this->get('date') ?? ''; $data = [ 'tag' => $this->string('tag'), - 'date' => $this->date($date), + 'date' => $this->date('date'), 'description' => $this->string('description'), 'latitude' => $latitude, 'longitude' => $longitude, diff --git a/app/Http/Requests/TestRuleFormRequest.php b/app/Http/Requests/TestRuleFormRequest.php index df76fd08a3..c2d3bd8c61 100644 --- a/app/Http/Requests/TestRuleFormRequest.php +++ b/app/Http/Requests/TestRuleFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/TokenFormRequest.php b/app/Http/Requests/TokenFormRequest.php index 4c90a2539f..8e30d3eaa7 100644 --- a/app/Http/Requests/TokenFormRequest.php +++ b/app/Http/Requests/TokenFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.php index 436e3c9d33..08a7076038 100644 --- a/app/Http/Requests/UserFormRequest.php +++ b/app/Http/Requests/UserFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; @@ -37,7 +37,7 @@ class UserFormRequest extends Request { return [ 'email' => $this->string('email'), - 'blocked' => $this->integer('blocked'), + 'blocked' => $this->integer('blocked') === 1, 'blocked_code' => $this->string('blocked_code'), 'password' => $this->string('password'), ]; @@ -50,7 +50,7 @@ class UserFormRequest extends Request { return [ 'id' => 'required|exists:users,id', - 'email' => 'required', + 'email' => 'email|required', 'password' => 'confirmed', 'blocked_code' => 'between:0,30', 'blocked' => 'between:0,1|numeric', diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 05bf0acb56..1b98afd9b4 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); use Carbon\Carbon; use DaveJamesMiller\Breadcrumbs\Generator as BreadCrumbGenerator; use FireflyIII\Exceptions\FireflyException; @@ -67,42 +67,31 @@ Breadcrumbs::register( ); Breadcrumbs::register( - 'accounts.show', function (BreadCrumbGenerator $breadcrumbs, Account $account) { + 'accounts.show', function (BreadCrumbGenerator $breadcrumbs, Account $account, string $moment, Carbon $start, Carbon $end) { $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); $breadcrumbs->parent('accounts.index', $what); $breadcrumbs->push($account->name, route('accounts.show', [$account->id])); + + // push when is all: + if ($moment === 'all') { + $breadcrumbs->push(trans('firefly.everything'), route('accounts.show', [$account->id, 'all'])); + } + // when is specific period or when empty: + if ($moment !== 'all') { + $title = trans( + 'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] + ); + $breadcrumbs->push($title, route('accounts.show', [$account->id, $moment, $start, $end])); + } + } ); -Breadcrumbs::register( - 'accounts.show.date', function (BreadCrumbGenerator $breadcrumbs, Account $account, Carbon $start, Carbon $end) { - - $startString = $start->formatLocalized(strval(trans('config.month_and_day'))); - $endString = $end->formatLocalized(strval(trans('config.month_and_day'))); - $title = sprintf('%s (%s)', $account->name, trans('firefly.from_to', ['start' => $startString, 'end' => $endString])); - - $breadcrumbs->parent('accounts.show', $account); - $breadcrumbs->push($title, route('accounts.show.date', [$account->id, $start->format('Y-m-d')])); -} -); - -Breadcrumbs::register( - 'accounts.show.all', function (BreadCrumbGenerator $breadcrumbs, Account $account, Carbon $start, Carbon $end) { - - $startString = $start->formatLocalized(strval(trans('config.month_and_day'))); - $endString = $end->formatLocalized(strval(trans('config.month_and_day'))); - $title = sprintf('%s (%s)', $account->name, trans('firefly.from_to', ['start' => $startString, 'end' => $endString])); - - $breadcrumbs->parent('accounts.show', $account); - $breadcrumbs->push($title, route('accounts.show.all', [$account->id, $start->format('Y-m-d')])); -} -); - - Breadcrumbs::register( 'accounts.delete', function (BreadCrumbGenerator $breadcrumbs, Account $account) { - $breadcrumbs->parent('accounts.show', $account); + $breadcrumbs->parent('accounts.show', $account, '', new Carbon, new Carbon); $breadcrumbs->push(trans('firefly.delete_account', ['name' => e($account->name)]), route('accounts.delete', [$account->id])); } ); @@ -110,7 +99,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'accounts.edit', function (BreadCrumbGenerator $breadcrumbs, Account $account) { - $breadcrumbs->parent('accounts.show', $account); + $breadcrumbs->parent('accounts.show', $account, '', new Carbon, new Carbon); $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); $breadcrumbs->push(trans('firefly.edit_' . $what . '_account', ['name' => e($account->name)]), route('accounts.edit', [$account->id])); @@ -260,9 +249,24 @@ Breadcrumbs::register( ); Breadcrumbs::register( - 'budgets.no-budget', function (BreadCrumbGenerator $breadcrumbs, $subTitle) { + 'budgets.no-budget', function (BreadCrumbGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) { $breadcrumbs->parent('budgets.index'); - $breadcrumbs->push($subTitle, route('budgets.no-budget')); + $breadcrumbs->push(trans('firefly.journals_without_budget'), route('budgets.no-budget')); + + // push when is all: + if ($moment === 'all') { + $breadcrumbs->push(trans('firefly.everything'), route('budgets.no-budget', ['all'])); + } + // when is specific period: + if ($moment !== 'all') { + $title = trans( + 'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] + ); + $breadcrumbs->push($title, route('budgets.no-budget', [$moment])); + } + + } ); @@ -270,6 +274,7 @@ Breadcrumbs::register( 'budgets.show', function (BreadCrumbGenerator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push(e($budget->name), route('budgets.show', [$budget->id])); + $breadcrumbs->push(trans('firefly.everything'), route('budgets.show', [$budget->id])); } ); @@ -279,11 +284,8 @@ Breadcrumbs::register( $breadcrumbs->push(e($budget->name), route('budgets.show', [$budget->id])); $title = trans( - 'firefly.budget_in_period_breadcrumb', [ - 'name' => $budget->name, - 'start' => $budgetLimit->start_date->formatLocalized(strval(trans('config.month_and_day'))), - 'end' => $budgetLimit->end_date->formatLocalized(strval(trans('config.month_and_day'))), - ] + 'firefly.between_dates_breadcrumb', ['start' => $budgetLimit->start_date->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $budgetLimit->end_date->formatLocalized(strval(trans('config.month_and_day'))),] ); $breadcrumbs->push( @@ -310,52 +312,61 @@ Breadcrumbs::register( Breadcrumbs::register( 'categories.edit', function (BreadCrumbGenerator $breadcrumbs, Category $category) { - $breadcrumbs->parent('categories.show', $category); + $breadcrumbs->parent('categories.show', $category, '', new Carbon, new Carbon); $breadcrumbs->push(trans('firefly.edit_category', ['name' => e($category->name)]), route('categories.edit', [$category->id])); } ); Breadcrumbs::register( 'categories.delete', function (BreadCrumbGenerator $breadcrumbs, Category $category) { - $breadcrumbs->parent('categories.show', $category); + $breadcrumbs->parent('categories.show', $category, '', new Carbon, new Carbon); $breadcrumbs->push(trans('firefly.delete_category', ['name' => e($category->name)]), route('categories.delete', [$category->id])); } ); Breadcrumbs::register( - 'categories.show', function (BreadCrumbGenerator $breadcrumbs, Category $category) { - $breadcrumbs->parent('categories.index'); - $breadcrumbs->push(e($category->name), route('categories.show', [$category->id])); + 'categories.show', function (BreadCrumbGenerator $breadcrumbs, Category $category, string $moment, Carbon $start, Carbon $end) { + $breadcrumbs->parent('categories.index'); + $breadcrumbs->push($category->name, route('categories.show', [$category->id])); + + // push when is all: + if ($moment === 'all') { + $breadcrumbs->push(trans('firefly.everything'), route('categories.show', [$category->id, 'all'])); + } + // when is specific period: + if ($moment !== 'all') { + $title = trans( + 'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] + ); + $breadcrumbs->push($title, route('categories.show', [$category->id, $moment])); + } } ); + Breadcrumbs::register( - 'categories.show.all', function (BreadCrumbGenerator $breadcrumbs, Category $category) { + 'categories.no-category', function (BreadCrumbGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) { $breadcrumbs->parent('categories.index'); - $breadcrumbs->push(e($category->name) . '(' . strtolower(trans('firefly.all_periods')) . ')', route('categories.show.all', [$category->id])); + $breadcrumbs->push(trans('firefly.journals_without_category'), route('categories.no-category')); + + // push when is all: + if ($moment === 'all') { + $breadcrumbs->push(trans('firefly.everything'), route('categories.no-category', ['all'])); + } + // when is specific period: + if ($moment !== 'all') { + $title = trans( + 'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] + ); + $breadcrumbs->push($title, route('categories.no-category', [$moment])); + } + } ); -Breadcrumbs::register( - 'categories.show.date', function (BreadCrumbGenerator $breadcrumbs, Category $category, Carbon $date) { - - // get current period preference. - $range = Preferences::get('viewRange', '1M')->data; - - $breadcrumbs->parent('categories.index'); - $breadcrumbs->push(e($category->name), route('categories.show', [$category->id])); - $breadcrumbs->push(Navigation::periodShow($date, $range), route('categories.show.date', [$category->id, $date->format('Y-m-d')])); - -} -); - -Breadcrumbs::register( - 'categories.no-category', function (BreadCrumbGenerator $breadcrumbs, $subTitle) { - $breadcrumbs->parent('categories.index'); - $breadcrumbs->push($subTitle, route('categories.no-category')); -} -); /** * CURRENCIES @@ -556,6 +567,19 @@ Breadcrumbs::register( } ); +Breadcrumbs::register( + 'reports.report.tag', function (BreadCrumbGenerator $breadcrumbs, string $accountIds, string $tagTags, Carbon $start, Carbon $end) { + $breadcrumbs->parent('reports.index'); + + $monthFormat = (string)trans('config.month_and_day'); + $startString = $start->formatLocalized($monthFormat); + $endString = $end->formatLocalized($monthFormat); + $title = (string)trans('firefly.report_tag', ['start' => $startString, 'end' => $endString]); + + $breadcrumbs->push($title, route('reports.report.tag', [$accountIds, $tagTags, $start->format('Ymd'), $end->format('Ymd')])); +} +); + Breadcrumbs::register( 'reports.report.category', function (BreadCrumbGenerator $breadcrumbs, string $accountIds, string $categoryIds, Carbon $start, Carbon $end) { $breadcrumbs->parent('reports.index'); @@ -686,23 +710,33 @@ Breadcrumbs::register( Breadcrumbs::register( 'tags.edit', function (BreadCrumbGenerator $breadcrumbs, Tag $tag) { - $breadcrumbs->parent('tags.show', $tag); + $breadcrumbs->parent('tags.show', $tag, '', new Carbon, new Carbon); $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => e($tag->tag)]), route('tags.edit', [$tag->id])); } ); Breadcrumbs::register( 'tags.delete', function (BreadCrumbGenerator $breadcrumbs, Tag $tag) { - $breadcrumbs->parent('tags.show', $tag); + $breadcrumbs->parent('tags.show', $tag, '', new Carbon, new Carbon); $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]), route('tags.delete', [$tag->id])); } ); Breadcrumbs::register( - 'tags.show', function (BreadCrumbGenerator $breadcrumbs, Tag $tag) { + 'tags.show', function (BreadCrumbGenerator $breadcrumbs, Tag $tag, string $moment, Carbon $start, Carbon $end) { $breadcrumbs->parent('tags.index'); - $breadcrumbs->push(e($tag->tag), route('tags.show', [$tag->id])); + $breadcrumbs->push(e($tag->tag), route('tags.show', [$tag->id], $moment)); + if ($moment === 'all') { + $breadcrumbs->push(trans('firefly.everything'), route('tags.show', [$tag->id], $moment)); + } + if ($moment !== 'all') { + $title = trans( + 'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] + ); + $breadcrumbs->push($title, route('tags.show', [$tag->id], $moment)); + } } ); @@ -710,36 +744,30 @@ Breadcrumbs::register( * TRANSACTIONS */ Breadcrumbs::register( - 'transactions.index', function (BreadCrumbGenerator $breadcrumbs, string $what) { + 'transactions.index', function (BreadCrumbGenerator $breadcrumbs, string $what, string $moment = '', Carbon $start, Carbon $end) { + + $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what])); -} -); + if ($moment === 'all') { + $breadcrumbs->push(trans('firefly.everything'), route('transactions.index', [$what, 'all'])); + } -Breadcrumbs::register( - 'transactions.index.all', function (BreadCrumbGenerator $breadcrumbs, string $what) { - $breadcrumbs->parent('transactions.index', $what); + // when is specific period: + if ($moment !== 'all') { + $title = trans( + 'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))), + 'end' => $end->formatLocalized(strval(trans('config.month_and_day')))] + ); + $breadcrumbs->push($title, route('transactions.index', [$what, $moment])); + } - $title = sprintf('%s (%s)', trans('breadcrumbs.' . $what . '_list'), strtolower(trans('firefly.everything'))); - - $breadcrumbs->push($title, route('transactions.index.all', [$what])); -} -); - -Breadcrumbs::register( - 'transactions.index.date', function (BreadCrumbGenerator $breadcrumbs, string $what, Carbon $date) { - $breadcrumbs->parent('transactions.index', $what); - - $range = Preferences::get('viewRange', '1M')->data; - $title = trans('breadcrumbs.' . $what . '_list') . ' (' . Navigation::periodShow($date, $range) . ')'; - - $breadcrumbs->push($title, route('transactions.index.date', [$what, $date->format('Y-m-d')])); } ); Breadcrumbs::register( 'transactions.create', function (BreadCrumbGenerator $breadcrumbs, string $what) { - $breadcrumbs->parent('transactions.index', $what); + $breadcrumbs->parent('transactions.index', $what, '', new Carbon, new Carbon); $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('transactions.create', [$what])); } ); @@ -761,7 +789,7 @@ Breadcrumbs::register( 'transactions.show', function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) { $what = strtolower($journal->transactionType->type); - $breadcrumbs->parent('transactions.index', $what); + $breadcrumbs->parent('transactions.index', $what, '', new Carbon, new Carbon); $breadcrumbs->push($journal->description, route('transactions.show', [$journal->id])); } ); @@ -783,10 +811,16 @@ Breadcrumbs::register( Breadcrumbs::register( 'transactions.mass.edit', function (BreadCrumbGenerator $breadcrumbs, Collection $journals) { - $journalIds = $journals->pluck('id')->toArray(); - $what = strtolower($journals->first()->transactionType->type); - $breadcrumbs->parent('transactions.index', $what); - $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', $journalIds)); + if ($journals->count() > 0) { + $journalIds = $journals->pluck('id')->toArray(); + $what = strtolower($journals->first()->transactionType->type); + $breadcrumbs->parent('transactions.index', $what, '', new Carbon, new Carbon); + $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', $journalIds)); + + return; + } + + $breadcrumbs->parent('index'); } ); @@ -795,7 +829,7 @@ Breadcrumbs::register( $journalIds = $journals->pluck('id')->toArray(); $what = strtolower($journals->first()->transactionType->type); - $breadcrumbs->parent('transactions.index', $what); + $breadcrumbs->parent('transactions.index', $what, '', new Carbon, new Carbon); $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.delete', $journalIds)); } ); diff --git a/app/Import/Converter/AccountId.php b/app/Import/Converter/AccountId.php index 4c07790fa5..88161515ab 100644 --- a/app/Import/Converter/AccountId.php +++ b/app/Import/Converter/AccountId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/Amount.php b/app/Import/Converter/Amount.php index ab0fceb6b7..c7840e397c 100644 --- a/app/Import/Converter/Amount.php +++ b/app/Import/Converter/Amount.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/AssetAccountIban.php b/app/Import/Converter/AssetAccountIban.php index d2336c282d..f98bef6110 100644 --- a/app/Import/Converter/AssetAccountIban.php +++ b/app/Import/Converter/AssetAccountIban.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/AssetAccountName.php b/app/Import/Converter/AssetAccountName.php index 8618d52f2d..8355c3b056 100644 --- a/app/Import/Converter/AssetAccountName.php +++ b/app/Import/Converter/AssetAccountName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/AssetAccountNumber.php b/app/Import/Converter/AssetAccountNumber.php index d389492c91..880b4d3061 100644 --- a/app/Import/Converter/AssetAccountNumber.php +++ b/app/Import/Converter/AssetAccountNumber.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/BasicConverter.php b/app/Import/Converter/BasicConverter.php index 91183ba936..49fba30f0d 100644 --- a/app/Import/Converter/BasicConverter.php +++ b/app/Import/Converter/BasicConverter.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/BillId.php b/app/Import/Converter/BillId.php index cb20e4c7c9..11c91d6536 100644 --- a/app/Import/Converter/BillId.php +++ b/app/Import/Converter/BillId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/BillName.php b/app/Import/Converter/BillName.php index 3d2dbe9a71..2ba4ad2761 100644 --- a/app/Import/Converter/BillName.php +++ b/app/Import/Converter/BillName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/BudgetId.php b/app/Import/Converter/BudgetId.php index cf709c0beb..ea74b8302f 100644 --- a/app/Import/Converter/BudgetId.php +++ b/app/Import/Converter/BudgetId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/BudgetName.php b/app/Import/Converter/BudgetName.php index 7ecd85530c..5d36a109ac 100644 --- a/app/Import/Converter/BudgetName.php +++ b/app/Import/Converter/BudgetName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CategoryId.php b/app/Import/Converter/CategoryId.php index 2544a61597..4b5cd4e6af 100644 --- a/app/Import/Converter/CategoryId.php +++ b/app/Import/Converter/CategoryId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CategoryName.php b/app/Import/Converter/CategoryName.php index f8af2414b1..fcd52413cc 100644 --- a/app/Import/Converter/CategoryName.php +++ b/app/Import/Converter/CategoryName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/ConverterInterface.php b/app/Import/Converter/ConverterInterface.php index 0cc0137a05..f5c27a2746 100644 --- a/app/Import/Converter/ConverterInterface.php +++ b/app/Import/Converter/ConverterInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CurrencyCode.php b/app/Import/Converter/CurrencyCode.php index f78433ddf3..1afa778292 100644 --- a/app/Import/Converter/CurrencyCode.php +++ b/app/Import/Converter/CurrencyCode.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CurrencyId.php b/app/Import/Converter/CurrencyId.php index 299cde1bf3..d3b74da000 100644 --- a/app/Import/Converter/CurrencyId.php +++ b/app/Import/Converter/CurrencyId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CurrencyName.php b/app/Import/Converter/CurrencyName.php index 71af377582..f68ec043a1 100644 --- a/app/Import/Converter/CurrencyName.php +++ b/app/Import/Converter/CurrencyName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CurrencySymbol.php b/app/Import/Converter/CurrencySymbol.php index 27ed50dd48..a40b06af40 100644 --- a/app/Import/Converter/CurrencySymbol.php +++ b/app/Import/Converter/CurrencySymbol.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/Date.php b/app/Import/Converter/Date.php index e4b6cbb0e9..b799aed9e7 100644 --- a/app/Import/Converter/Date.php +++ b/app/Import/Converter/Date.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/Description.php b/app/Import/Converter/Description.php index b9c3bdf807..9eb507acb8 100644 --- a/app/Import/Converter/Description.php +++ b/app/Import/Converter/Description.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/ExternalId.php b/app/Import/Converter/ExternalId.php index 344e793be4..feb2e8c3d1 100644 --- a/app/Import/Converter/ExternalId.php +++ b/app/Import/Converter/ExternalId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/INGDebetCredit.php b/app/Import/Converter/INGDebetCredit.php index 1640e76d0c..80650257ae 100644 --- a/app/Import/Converter/INGDebetCredit.php +++ b/app/Import/Converter/INGDebetCredit.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/Ignore.php b/app/Import/Converter/Ignore.php index 88f1c2c889..ac619bac3a 100644 --- a/app/Import/Converter/Ignore.php +++ b/app/Import/Converter/Ignore.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/OpposingAccountIban.php b/app/Import/Converter/OpposingAccountIban.php index ee8b40747c..ce01993ea5 100644 --- a/app/Import/Converter/OpposingAccountIban.php +++ b/app/Import/Converter/OpposingAccountIban.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/OpposingAccountName.php b/app/Import/Converter/OpposingAccountName.php index fa51245fd6..90a959408c 100644 --- a/app/Import/Converter/OpposingAccountName.php +++ b/app/Import/Converter/OpposingAccountName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/OpposingAccountNumber.php b/app/Import/Converter/OpposingAccountNumber.php index d513a88ae0..8ede15ed85 100644 --- a/app/Import/Converter/OpposingAccountNumber.php +++ b/app/Import/Converter/OpposingAccountNumber.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/RabobankDebetCredit.php b/app/Import/Converter/RabobankDebetCredit.php index dfa8363e2a..9b3e89314d 100644 --- a/app/Import/Converter/RabobankDebetCredit.php +++ b/app/Import/Converter/RabobankDebetCredit.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/TagSplit.php b/app/Import/Converter/TagSplit.php index d93074b7d0..f5ebd034af 100644 --- a/app/Import/Converter/TagSplit.php +++ b/app/Import/Converter/TagSplit.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/TagsComma.php b/app/Import/Converter/TagsComma.php index e9fbbaeecd..93e13698f0 100644 --- a/app/Import/Converter/TagsComma.php +++ b/app/Import/Converter/TagsComma.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/TagsSpace.php b/app/Import/Converter/TagsSpace.php index 3c437bd94b..ae9635a8b7 100644 --- a/app/Import/Converter/TagsSpace.php +++ b/app/Import/Converter/TagsSpace.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/ImportEntry.php b/app/Import/ImportEntry.php index fba65e99d4..43ecf7b445 100644 --- a/app/Import/ImportEntry.php +++ b/app/Import/ImportEntry.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import; @@ -215,7 +215,7 @@ class ImportEntry */ private function setAppendableString(string $field, string $value) { - $value = trim($value); + $value = trim($value); $this->fields[$field] .= ' ' . $value; } diff --git a/app/Import/ImportProcedure.php b/app/Import/ImportProcedure.php index 991c5addcd..9150010dae 100644 --- a/app/Import/ImportProcedure.php +++ b/app/Import/ImportProcedure.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import; diff --git a/app/Import/ImportProcedureInterface.php b/app/Import/ImportProcedureInterface.php index 22a519aa95..ca2c6ff5da 100644 --- a/app/Import/ImportProcedureInterface.php +++ b/app/Import/ImportProcedureInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import; diff --git a/app/Import/ImportStorage.php b/app/Import/ImportStorage.php index ec68385e0d..2d5524fcec 100644 --- a/app/Import/ImportStorage.php +++ b/app/Import/ImportStorage.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import; @@ -162,7 +162,7 @@ class ImportStorage /** @var TagRepositoryInterface $repository */ $repository = app(TagRepositoryInterface::class); $repository->setUser($this->user); - $data = [ + $data = [ 'tag' => trans('firefly.import_with_key', ['key' => $this->job->key]), 'date' => new Carbon, 'description' => null, @@ -171,7 +171,7 @@ class ImportStorage 'zoomLevel' => null, 'tagMode' => 'nothing', ]; - $tag = $repository->store($data); + $tag = $repository->store($data); return $tag; } diff --git a/app/Import/ImportValidator.php b/app/Import/ImportValidator.php index 9a5a254151..3a3a373b2b 100644 --- a/app/Import/ImportValidator.php +++ b/app/Import/ImportValidator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import; diff --git a/app/Import/Importer/CsvImporter.php b/app/Import/Importer/CsvImporter.php index 0cc869fcd4..99f8c62a97 100644 --- a/app/Import/Importer/CsvImporter.php +++ b/app/Import/Importer/CsvImporter.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Importer; diff --git a/app/Import/Importer/ImporterInterface.php b/app/Import/Importer/ImporterInterface.php index 9994faa205..06c18bd793 100644 --- a/app/Import/Importer/ImporterInterface.php +++ b/app/Import/Importer/ImporterInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Importer; diff --git a/app/Import/Logging/CommandHandler.php b/app/Import/Logging/CommandHandler.php index 56813cd2ad..b87830469d 100644 --- a/app/Import/Logging/CommandHandler.php +++ b/app/Import/Logging/CommandHandler.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Logging; diff --git a/app/Import/Mapper/AssetAccountIbans.php b/app/Import/Mapper/AssetAccountIbans.php index e5ff5b8016..e94f502cbb 100644 --- a/app/Import/Mapper/AssetAccountIbans.php +++ b/app/Import/Mapper/AssetAccountIbans.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/AssetAccounts.php b/app/Import/Mapper/AssetAccounts.php index dc6032dc7a..8335bea7e4 100644 --- a/app/Import/Mapper/AssetAccounts.php +++ b/app/Import/Mapper/AssetAccounts.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/Bills.php b/app/Import/Mapper/Bills.php index 2fddb31e4e..57d60b3013 100644 --- a/app/Import/Mapper/Bills.php +++ b/app/Import/Mapper/Bills.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/Budgets.php b/app/Import/Mapper/Budgets.php index b566568d25..37276ddcc0 100644 --- a/app/Import/Mapper/Budgets.php +++ b/app/Import/Mapper/Budgets.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/Categories.php b/app/Import/Mapper/Categories.php index 6e66964040..5144a06a41 100644 --- a/app/Import/Mapper/Categories.php +++ b/app/Import/Mapper/Categories.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/MapperInterface.php b/app/Import/Mapper/MapperInterface.php index c80b71fa26..237780d502 100644 --- a/app/Import/Mapper/MapperInterface.php +++ b/app/Import/Mapper/MapperInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/OpposingAccountIbans.php b/app/Import/Mapper/OpposingAccountIbans.php index dd2a3261ca..bcf3372e10 100644 --- a/app/Import/Mapper/OpposingAccountIbans.php +++ b/app/Import/Mapper/OpposingAccountIbans.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/OpposingAccounts.php b/app/Import/Mapper/OpposingAccounts.php index 8fbc20768e..fd2d86a5bb 100644 --- a/app/Import/Mapper/OpposingAccounts.php +++ b/app/Import/Mapper/OpposingAccounts.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/Tags.php b/app/Import/Mapper/Tags.php index ac8daa8f77..e549fd90ef 100644 --- a/app/Import/Mapper/Tags.php +++ b/app/Import/Mapper/Tags.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/TransactionCurrencies.php b/app/Import/Mapper/TransactionCurrencies.php index f5e157c5a3..d24f083b0f 100644 --- a/app/Import/Mapper/TransactionCurrencies.php +++ b/app/Import/Mapper/TransactionCurrencies.php @@ -9,11 +9,11 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; -use FireflyIII\Models\TransactionCurrency as TC; +use FireflyIII\Models\TransactionCurrency; /** * Class TransactionCurrencies @@ -28,7 +28,7 @@ class TransactionCurrencies implements MapperInterface */ public function getMap(): array { - $currencies = TC::get(); + $currencies = TransactionCurrency::get(); $list = []; foreach ($currencies as $currency) { $list[$currency->id] = $currency->name . ' (' . $currency->code . ')'; diff --git a/app/Import/MapperPreProcess/PreProcessorInterface.php b/app/Import/MapperPreProcess/PreProcessorInterface.php index 9c0c8a213f..7631ea7a79 100644 --- a/app/Import/MapperPreProcess/PreProcessorInterface.php +++ b/app/Import/MapperPreProcess/PreProcessorInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\MapperPreProcess; diff --git a/app/Import/MapperPreProcess/TagsComma.php b/app/Import/MapperPreProcess/TagsComma.php index ec2ed1013d..71ae03a2f4 100644 --- a/app/Import/MapperPreProcess/TagsComma.php +++ b/app/Import/MapperPreProcess/TagsComma.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\MapperPreProcess; diff --git a/app/Import/MapperPreProcess/TagsSpace.php b/app/Import/MapperPreProcess/TagsSpace.php index bd3c18b660..7b588802be 100644 --- a/app/Import/MapperPreProcess/TagsSpace.php +++ b/app/Import/MapperPreProcess/TagsSpace.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\MapperPreProcess; diff --git a/app/Import/Setup/CsvSetup.php b/app/Import/Setup/CsvSetup.php index 3d0fc10ed3..51ccedb338 100644 --- a/app/Import/Setup/CsvSetup.php +++ b/app/Import/Setup/CsvSetup.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Setup; @@ -182,8 +182,8 @@ class CsvSetup implements SetupInterface { /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); - $importId = $data['csv_import_account'] ?? 0; - $account = $repository->find(intval($importId)); + $importId = $data['csv_import_account'] ?? 0; + $account = $repository->find(intval($importId)); $hasHeaders = isset($data['has_headers']) && intval($data['has_headers']) === 1 ? true : false; $config = $this->job->configuration; diff --git a/app/Import/Setup/SetupInterface.php b/app/Import/Setup/SetupInterface.php index 995292b52f..cffae80eba 100644 --- a/app/Import/Setup/SetupInterface.php +++ b/app/Import/Setup/SetupInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Setup; diff --git a/app/Import/Specifics/AbnAmroDescription.php b/app/Import/Specifics/AbnAmroDescription.php index 4931e6b327..b0eebd0904 100644 --- a/app/Import/Specifics/AbnAmroDescription.php +++ b/app/Import/Specifics/AbnAmroDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Specifics; diff --git a/app/Import/Specifics/IngDescription.php b/app/Import/Specifics/IngDescription.php index aa03ff06d1..c421d45d2d 100644 --- a/app/Import/Specifics/IngDescription.php +++ b/app/Import/Specifics/IngDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Specifics; diff --git a/app/Import/Specifics/PresidentsChoice.php b/app/Import/Specifics/PresidentsChoice.php index c359edacf8..0f462f00d2 100644 --- a/app/Import/Specifics/PresidentsChoice.php +++ b/app/Import/Specifics/PresidentsChoice.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Specifics; diff --git a/app/Import/Specifics/RabobankDescription.php b/app/Import/Specifics/RabobankDescription.php index 59ff2abb53..ec92580f74 100644 --- a/app/Import/Specifics/RabobankDescription.php +++ b/app/Import/Specifics/RabobankDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Specifics; diff --git a/app/Import/Specifics/SpecificInterface.php b/app/Import/Specifics/SpecificInterface.php index 56a11b9f6b..d7f9186d81 100644 --- a/app/Import/Specifics/SpecificInterface.php +++ b/app/Import/Specifics/SpecificInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Specifics; diff --git a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php index 0ac899ffcb..417895ab40 100644 --- a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php +++ b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Jobs; diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php index 92fa2f3246..d4688b9ec3 100644 --- a/app/Jobs/Job.php +++ b/app/Jobs/Job.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Jobs; diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php index 44e1ec89b5..05de2aca0a 100644 --- a/app/Jobs/MailError.php +++ b/app/Jobs/MailError.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Jobs; diff --git a/app/Mail/RegisteredUser.php b/app/Mail/RegisteredUser.php new file mode 100644 index 0000000000..f48ddfe6d5 --- /dev/null +++ b/app/Mail/RegisteredUser.php @@ -0,0 +1,37 @@ +address = $address; + $this->ip = $ip; + } + + /** + * Build the message. + * + * @return $this + */ + public function build() + { + return $this->view('emails.registered-html')->text('emails.registered-text')->subject('Welcome to Firefly III!'); + } +} diff --git a/app/Mail/RequestedNewPassword.php b/app/Mail/RequestedNewPassword.php new file mode 100644 index 0000000000..b97a47c50f --- /dev/null +++ b/app/Mail/RequestedNewPassword.php @@ -0,0 +1,38 @@ +url = $url; + $this->ip = $ip; + } + + /** + * Build the message. + * + * @return $this + */ + public function build() + { + return $this->view('emails.password-html')->text('emails.password-text')->subject('Your password reset request'); + } +} diff --git a/app/Models/Account.php b/app/Models/Account.php index 11b337ba10..cfef7e34af 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; @@ -211,6 +211,26 @@ class Account extends Model return $value; } + /** + * Returns the opening balance + * + * @return TransactionJournal + * @throws FireflyException + */ + public function getOpeningBalance(): TransactionJournal + { + $journal = TransactionJournal::sortCorrectly() + ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') + ->where('transactions.account_id', $this->id) + ->transactionTypes([TransactionType::OPENING_BALANCE]) + ->first(['transaction_journals.*']); + if (is_null($journal)) { + return new TransactionJournal; + } + + return $journal; + } + /** * Returns the amount of the opening balance for this account. * diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 48953f09d5..ecad235ce1 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 3efa588ada..6d6a62eddd 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; @@ -48,6 +48,7 @@ class AccountType extends Model protected $dates = ['created_at', 'updated_at']; // + /** * @return HasMany */ diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 36599f3d6b..ddca8ad0d1 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index d51d8b0418..ae3f69ddab 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 54a7429746..4a858720e5 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 504802e05a..d5f71f21ee 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; @@ -44,7 +44,7 @@ class Budget extends Model 'encrypted' => 'boolean', ]; /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at']; + protected $dates = ['created_at', 'updated_at', 'deleted_at']; protected $fillable = ['user_id', 'name', 'active']; protected $hidden = ['encrypted']; protected $rules = ['name' => 'required|between:1,200',]; diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index a6c2b68f97..edd2c9c776 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Category.php b/app/Models/Category.php index 50349e9b44..fd7241702f 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index b5edf6aced..102e2d28fa 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/CurrencyExchangeRate.php b/app/Models/CurrencyExchangeRate.php new file mode 100644 index 0000000000..2c7d12558c --- /dev/null +++ b/app/Models/CurrencyExchangeRate.php @@ -0,0 +1,53 @@ +belongsTo(TransactionCurrency::class, 'from_currency_id'); + } + + /** + * @return BelongsTo + */ + public function toCurrency(): BelongsTo + { + return $this->belongsTo(TransactionCurrency::class, 'to_currency_id'); + } + + /** + * @return BelongsTo + */ + public function user(): BelongsTo + { + return $this->belongsTo(User::class); + } + +} \ No newline at end of file diff --git a/app/Models/ExportJob.php b/app/Models/ExportJob.php index a0eb58cfed..89f2e4554b 100644 --- a/app/Models/ExportJob.php +++ b/app/Models/ExportJob.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php index b8a7bd27c3..66dfc167eb 100644 --- a/app/Models/ImportJob.php +++ b/app/Models/ImportJob.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; @@ -71,8 +71,8 @@ class ImportJob extends Model */ public function addStepsDone(int $count) { - $status = $this->extended_status; - $status['steps_done'] += $count; + $status = $this->extended_status; + $status['steps_done'] += $count; $this->extended_status = $status; $this->save(); @@ -83,7 +83,7 @@ class ImportJob extends Model */ public function addTotalSteps(int $count) { - $status = $this->extended_status; + $status = $this->extended_status; $status['total_steps'] += $count; $this->extended_status = $status; $this->save(); diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index d4f5b5f3dc..f59d63f48e 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -9,14 +9,13 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * Class LimitRepetition @@ -42,26 +41,6 @@ class LimitRepetition extends Model protected $dates = ['created_at', 'updated_at', 'startdate', 'enddate']; protected $hidden = ['amount_encrypted']; - /** - * @param $value - * - * @return mixed - */ - public static function routeBinder($value) - { - if (auth()->check()) { - $object = self::where('limit_repetitions.id', $value) - ->leftJoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id') - ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') - ->where('budgets.user_id', auth()->user()->id) - ->first(['limit_repetitions.*']); - if ($object) { - return $object; - } - } - throw new NotFoundHttpException; - } - /** * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ diff --git a/app/Models/Note.php b/app/Models/Note.php index 55ee792ce9..96423130a1 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index d5b2b00187..e648623ba4 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -9,13 +9,14 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; use Carbon\Carbon; use Crypt; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; use Steam; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -67,7 +68,7 @@ class PiggyBank extends Model /** * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function account() + public function account(): BelongsTo { return $this->belongsTo('FireflyIII\Models\Account'); } @@ -108,6 +109,31 @@ class PiggyBank extends Model return $value; } + /** + * @return string + */ + public function getSuggestedMonthlyAmount(): string + { + $savePerMonth = '0'; + if ($this->targetdate && $this->currentRelevantRep()->currentamount < $this->targetamount) { + $now = Carbon::now(); + $diffInMonths = $now->diffInMonths($this->targetdate, false); + $remainingAmount = bcsub($this->targetamount, $this->currentRelevantRep()->currentamount); + + // more than 1 month to go and still need money to save: + if ($diffInMonths > 0 && bccomp($remainingAmount, '0') === 1) { + $savePerMonth = bcdiv($remainingAmount, strval($diffInMonths)); + } + + // less than 1 month to go but still need money to save: + if ($diffInMonths === 0 && bccomp($remainingAmount, '0') === 1) { + $savePerMonth = $remainingAmount; + } + } + + return $savePerMonth; + } + /** * * @param Carbon $date diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index a84383100d..6e14a9096f 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 00c8221582..56b5b2f12b 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Preference.php b/app/Models/Preference.php index f5a81dd909..7b7922b4e0 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Role.php b/app/Models/Role.php index 5f1a7c33e9..bdb617438f 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Models; diff --git a/app/Models/Rule.php b/app/Models/Rule.php index ad3db4309c..28637d2893 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index 8817a108dc..5848086595 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index 98cbdc0889..8ab7f6a117 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index 048d1c94fc..eea8821f1d 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 769ea2c5af..30018b5e87 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -9,12 +9,12 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; use Crypt; -use FireflyIII\Support\Models\TagSupport; +use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Watson\Validating\ValidatingTrait; @@ -24,8 +24,10 @@ use Watson\Validating\ValidatingTrait; * * @package FireflyIII\Models */ -class Tag extends TagSupport +class Tag extends Model { + use ValidatingTrait, SoftDeletes; + /** * The attributes that should be casted to native types. * @@ -44,7 +46,6 @@ class Tag extends TagSupport protected $fillable = ['user_id', 'tag', 'date', 'description', 'longitude', 'latitude', 'zoomLevel', 'tagMode']; protected $rules = ['tag' => 'required|between:1,200',]; - use ValidatingTrait, SoftDeletes; /** * @param array $fields @@ -103,7 +104,7 @@ class Tag extends TagSupport $sum = '0'; /** @var TransactionJournal $journal */ foreach ($tag->transactionjournals as $journal) { - bcadd($sum, TransactionJournal::amount($journal)); + bcadd($sum, $journal->amount()); } return $sum; diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 70061c8072..ef5deeadcd 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 0a63b24329..4cbc278fa5 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 1808955271..53506bc61d 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -9,15 +9,16 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; use Carbon\Carbon; use Crypt; use FireflyIII\Support\CacheProperties; -use FireflyIII\Support\Models\TransactionJournalSupport; +use FireflyIII\Support\Models\TransactionJournalTrait; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; +use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Log; @@ -30,9 +31,9 @@ use Watson\Validating\ValidatingTrait; * * @package FireflyIII\Models */ -class TransactionJournal extends TransactionJournalSupport +class TransactionJournal extends Model { - use SoftDeletes, ValidatingTrait; + use SoftDeletes, ValidatingTrait, TransactionJournalTrait; /** * The attributes that should be casted to native types. @@ -169,7 +170,7 @@ class TransactionJournal extends TransactionJournalSupport $cache->addProperty($name); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } Log::debug(sprintf('Looking for journal #%d meta field "%s".', $this->id, $name)); diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index a3f6ec92ba..82c4f9214d 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index aceffbd8fb..2a075913ac 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Providers/AccountServiceProvider.php b/app/Providers/AccountServiceProvider.php index 3035731adb..a06860a156 100644 --- a/app/Providers/AccountServiceProvider.php +++ b/app/Providers/AccountServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index d8dd3843f5..0458f6077b 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; @@ -39,7 +39,7 @@ class AppServiceProvider extends ServiceProvider // force https urls if (env('APP_FORCE_SSL', false)) { - URL::forceSchema('https'); + URL::forceScheme('https'); } } diff --git a/app/Providers/AttachmentServiceProvider.php b/app/Providers/AttachmentServiceProvider.php index c9f3a9d48d..5acae3ff5b 100644 --- a/app/Providers/AttachmentServiceProvider.php +++ b/app/Providers/AttachmentServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index c46b897aa5..9e209b3a5c 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/BillServiceProvider.php b/app/Providers/BillServiceProvider.php index a07e8e37ff..2ac479114d 100644 --- a/app/Providers/BillServiceProvider.php +++ b/app/Providers/BillServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 76858e1e64..daecc1d29f 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/BudgetServiceProvider.php b/app/Providers/BudgetServiceProvider.php index df87739ea6..8a67417d74 100644 --- a/app/Providers/BudgetServiceProvider.php +++ b/app/Providers/BudgetServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/CategoryServiceProvider.php b/app/Providers/CategoryServiceProvider.php index bdac9c91f1..7b997a99c6 100644 --- a/app/Providers/CategoryServiceProvider.php +++ b/app/Providers/CategoryServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/CurrencyServiceProvider.php b/app/Providers/CurrencyServiceProvider.php index bfdf535c70..bdcc925234 100644 --- a/app/Providers/CurrencyServiceProvider.php +++ b/app/Providers/CurrencyServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 215fc5978e..e1e1e4de4e 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; @@ -56,12 +56,6 @@ class EventServiceProvider extends ServiceProvider 'FireflyIII\Handlers\Events\UpdatedJournalEventHandler@scanBills', 'FireflyIII\Handlers\Events\UpdatedJournalEventHandler@processRules', ], - - // LARAVEL EVENTS: - 'Illuminate\Auth\Events\Logout' => - [ - 'FireflyIII\Handlers\Events\UserEventHandler@logoutUser', - ], ]; /** diff --git a/app/Providers/ExportJobServiceProvider.php b/app/Providers/ExportJobServiceProvider.php index 6850f417b5..b98e433f8e 100644 --- a/app/Providers/ExportJobServiceProvider.php +++ b/app/Providers/ExportJobServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index 2ef97e48d2..ef4890bb7f 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; @@ -29,6 +29,8 @@ use FireflyIII\Helpers\Report\BalanceReportHelper; use FireflyIII\Helpers\Report\BalanceReportHelperInterface; use FireflyIII\Helpers\Report\BudgetReportHelper; use FireflyIII\Helpers\Report\BudgetReportHelperInterface; +use FireflyIII\Helpers\Report\PopupReport; +use FireflyIII\Helpers\Report\PopupReportInterface; use FireflyIII\Helpers\Report\ReportHelper; use FireflyIII\Helpers\Report\ReportHelperInterface; use FireflyIII\Import\ImportProcedure; @@ -41,6 +43,7 @@ use FireflyIII\Support\FireflyConfig; use FireflyIII\Support\Navigation; use FireflyIII\Support\Preferences; use FireflyIII\Support\Steam; +use FireflyIII\Support\Twig\Account; use FireflyIII\Support\Twig\General; use FireflyIII\Support\Twig\Journal; use FireflyIII\Support\Twig\PiggyBank; @@ -52,6 +55,7 @@ use Illuminate\Support\ServiceProvider; use Twig; use TwigBridge\Extension\Loader\Functions; use Validator; +use Illuminate\Foundation\Application; /** * Class FireflyServiceProvider @@ -75,6 +79,7 @@ class FireflyServiceProvider extends ServiceProvider Twig::addExtension(new Translation); Twig::addExtension(new Transaction); Twig::addExtension(new Rule); + Twig::addExtension(new Account); } /** @@ -119,17 +124,30 @@ class FireflyServiceProvider extends ServiceProvider $this->app->bind(GeneratorInterface::class, ChartJsGenerator::class); // chart builder - $this->app->bind(MetaPieChartInterface::class, MetaPieChart::class); + $this->app->bind( + MetaPieChartInterface::class, + function (Application $app) { + /** @var MetaPieChart $chart */ + $chart = app(MetaPieChart::class); + if ($app->auth->check()) { + $chart->setUser(auth()->user()); + } + + return $chart; + } + ); // other generators - $this->app->bind(ProcessorInterface::class,Processor::class); - $this->app->bind(ImportProcedureInterface::class,ImportProcedure::class); + $this->app->bind(ProcessorInterface::class, Processor::class); + $this->app->bind(ImportProcedureInterface::class, ImportProcedure::class); $this->app->bind(UserRepositoryInterface::class, UserRepository::class); $this->app->bind(AttachmentHelperInterface::class, AttachmentHelper::class); + // more generators: + $this->app->bind(PopupReportInterface::class, PopupReport::class); $this->app->bind(HelpInterface::class, Help::class); $this->app->bind(ReportHelperInterface::class, ReportHelper::class); - $this->app->bind(FiscalHelperInterface::class,FiscalHelper::class); + $this->app->bind(FiscalHelperInterface::class, FiscalHelper::class); $this->app->bind(BalanceReportHelperInterface::class, BalanceReportHelper::class); $this->app->bind(BudgetReportHelperInterface::class, BudgetReportHelper::class); } diff --git a/app/Providers/FireflySessionProvider.php b/app/Providers/FireflySessionProvider.php index 47dfb1bfe7..f2db3f80cd 100644 --- a/app/Providers/FireflySessionProvider.php +++ b/app/Providers/FireflySessionProvider.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/JournalServiceProvider.php b/app/Providers/JournalServiceProvider.php index b44c11b760..42ff742255 100644 --- a/app/Providers/JournalServiceProvider.php +++ b/app/Providers/JournalServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; @@ -62,7 +62,7 @@ class JournalServiceProvider extends ServiceProvider if ($app->auth->check()) { $collector->setUser(auth()->user()); } - $collector->startQuery(); + return $collector; } diff --git a/app/Providers/LogServiceProvider.php b/app/Providers/LogServiceProvider.php index dc742d6b80..97d4afab5a 100644 --- a/app/Providers/LogServiceProvider.php +++ b/app/Providers/LogServiceProvider.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/PiggyBankServiceProvider.php b/app/Providers/PiggyBankServiceProvider.php index fb1aaf7d5f..a3594b80b7 100644 --- a/app/Providers/PiggyBankServiceProvider.php +++ b/app/Providers/PiggyBankServiceProvider.php @@ -9,12 +9,11 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Repositories\PiggyBank\PiggyBankRepository; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Foundation\Application; @@ -53,6 +52,7 @@ class PiggyBankServiceProvider extends ServiceProvider if ($app->auth->check()) { $repository->setUser(auth()->user()); } + return $repository; } ); diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index f8f1240557..b704a42cc4 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/RuleGroupServiceProvider.php b/app/Providers/RuleGroupServiceProvider.php index 0a3c8db599..d67e67d458 100644 --- a/app/Providers/RuleGroupServiceProvider.php +++ b/app/Providers/RuleGroupServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/RuleServiceProvider.php b/app/Providers/RuleServiceProvider.php index 5d694411b3..cefdd3b263 100644 --- a/app/Providers/RuleServiceProvider.php +++ b/app/Providers/RuleServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; @@ -51,6 +51,7 @@ class RuleServiceProvider extends ServiceProvider if ($app->auth->check()) { $repository->setUser(auth()->user()); } + return $repository; } ); diff --git a/app/Providers/SearchServiceProvider.php b/app/Providers/SearchServiceProvider.php index 18d5b48c6e..4a3e712cf8 100644 --- a/app/Providers/SearchServiceProvider.php +++ b/app/Providers/SearchServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/TagServiceProvider.php b/app/Providers/TagServiceProvider.php index b5daa36c6c..b0f7d84a82 100644 --- a/app/Providers/TagServiceProvider.php +++ b/app/Providers/TagServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 26ba26b6ea..423efcd23e 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Account; @@ -250,6 +250,19 @@ class AccountRepository implements AccountRepositoryInterface return $result; } + /** + * @return Account + */ + public function getCashAccount(): Account + { + $type = AccountType::where('type', AccountType::CASH)->first(); + $account = Account::firstOrCreateEncrypted( + ['user_id' => $this->user->id, 'account_type_id' => $type->id, 'name' => 'Cash account', 'active' => 1] + ); + + return $account; + } + /** * Returns the date of the very last transaction in this account. * @@ -455,13 +468,15 @@ class AccountRepository implements AccountRepositoryInterface { $amount = $data['openingBalance']; $name = $data['name']; + $currencyId = $data['currency_id']; $opposing = $this->storeOpposingAccount($name); $transactionType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first(); - $journal = TransactionJournal::create( + /** @var TransactionJournal $journal */ + $journal = TransactionJournal::create( [ 'user_id' => $this->user->id, 'transaction_type_id' => $transactionType->id, - 'transaction_currency_id' => $data['openingBalanceCurrency'], + 'transaction_currency_id' => $currencyId, 'description' => 'Initial balance for "' . $account->name . '"', 'completed' => true, 'date' => $data['openingBalanceDate'], @@ -529,12 +544,8 @@ class AccountRepository implements AccountRepositoryInterface } // opening balance data? update it! if (!is_null($openingBalance->id)) { - $date = $data['openingBalanceDate']; - $amount = $data['openingBalance']; - Log::debug('Opening balance journal found, update journal.'); - - $this->updateOpeningBalanceJournal($account, $openingBalance, $date, $amount); + $this->updateOpeningBalanceJournal($account, $openingBalance, $data); return true; } @@ -588,15 +599,19 @@ class AccountRepository implements AccountRepositoryInterface /** * @param Account $account * @param TransactionJournal $journal - * @param Carbon $date - * @param float $amount + * @param array $data * * @return bool */ - protected function updateOpeningBalanceJournal(Account $account, TransactionJournal $journal, Carbon $date, float $amount): bool + protected function updateOpeningBalanceJournal(Account $account, TransactionJournal $journal, array $data): bool { + $date = $data['openingBalanceDate']; + $amount = $data['openingBalance']; + $currencyId = intval($data['currency_id']); + // update date: - $journal->date = $date; + $journal->date = $date; + $journal->transaction_currency_id = $currencyId; $journal->save(); // update transactions: /** @var Transaction $transaction */ @@ -623,9 +638,7 @@ class AccountRepository implements AccountRepositoryInterface */ protected function validOpeningBalanceData(array $data): bool { - if (isset($data['openingBalance']) - && isset($data['openingBalanceDate']) - && isset($data['openingBalanceCurrency']) + if (isset($data['openingBalance']) && isset($data['openingBalanceDate']) && bccomp(strval($data['openingBalance']), '0') !== 0 ) { Log::debug('Array has valid opening balance data.'); diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index b0ab9b738b..e444fcada0 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Account; @@ -36,6 +36,11 @@ interface AccountRepositoryInterface */ public function count(array $types): int; + /** + * @return Account + */ + public function getCashAccount(): Account; + /** * Moved here from account CRUD. * @@ -137,4 +142,12 @@ interface AccountRepositoryInterface */ public function store(array $data): Account; + /** + * @param Account $account + * @param array $data + * + * @return Account + */ + public function update(Account $account, array $data): Account; + } diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index e5c81eb211..ce2e437880 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -9,14 +9,15 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Account; use Carbon\Carbon; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Transaction; +use FireflyIII\Models\TransactionType; use FireflyIII\User; -use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; use Log; use Steam; @@ -31,64 +32,6 @@ class AccountTasker implements AccountTaskerInterface /** @var User */ private $user; - /** - * @see self::amountInPeriod - * - * @param Collection $accounts - * @param Collection $excluded - * @param Carbon $start - * @param Carbon $end - * - * @return string - */ - public function amountInInPeriod(Collection $accounts, Collection $excluded, Carbon $start, Carbon $end): string - { - $idList = [ - 'accounts' => $accounts->pluck('id')->toArray(), - 'exclude' => $excluded->pluck('id')->toArray(), - ]; - - Log::debug( - 'Now calling amountInInPeriod.', - ['accounts' => $idList['accounts'], 'excluded' => $idList['exclude'], - 'start' => $start->format('Y-m-d'), - 'end' => $end->format('Y-m-d'), - ] - ); - - return $this->amountInPeriod($idList, $start, $end, true); - - } - - /** - * @see self::amountInPeriod - * - * @param Collection $accounts - * @param Collection $excluded - * @param Carbon $start - * @param Carbon $end - * - * @return string - */ - public function amountOutInPeriod(Collection $accounts, Collection $excluded, Carbon $start, Carbon $end): string - { - $idList = [ - 'accounts' => $accounts->pluck('id')->toArray(), - 'exclude' => $excluded->pluck('id')->toArray(), - ]; - - Log::debug( - 'Now calling amountOutInPeriod.', - ['accounts' => $idList['accounts'], 'excluded' => $idList['exclude'], - 'start' => $start->format('Y-m-d'), - 'end' => $end->format('Y-m-d'), - ] - ); - - return $this->amountInPeriod($idList, $start, $end, false); - - } - /** * @param Collection $accounts * @param Carbon $start @@ -126,13 +69,13 @@ class AccountTasker implements AccountTaskerInterface ]; // get first journal date: - $first = $repository->oldestJournal($account); - Log::debug(sprintf('Date of first journal for %s is %s', $account->name, $first->date->format('Y-m-d'))); + $first = $repository->oldestJournal($account); $entry['start_balance'] = $startSet[$account->id] ?? '0'; $entry['end_balance'] = $endSet[$account->id] ?? '0'; // first journal exists, and is on start, then this is the actual opening balance: if (!is_null($first->id) && $first->date->isSameDay($start)) { + Log::debug(sprintf('Date of first journal for %s is %s', $account->name, $first->date->format('Y-m-d'))); $entry['start_balance'] = $first->transactions()->where('account_id', $account->id)->first()->amount; Log::debug(sprintf('Account %s was opened on %s, so opening balance is %f', $account->name, $start->format('Y-m-d'), $entry['start_balance'])); } @@ -147,6 +90,90 @@ class AccountTasker implements AccountTaskerInterface return $return; } + /** + * @param Carbon $start + * @param Carbon $end + * @param Collection $accounts + * + * @return array + */ + public function getExpenseReport(Carbon $start, Carbon $end, Collection $accounts): array + { + // get all expenses for the given accounts in the given period! + // also transfers! + // get all transactions: + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAccounts($accounts)->setRange($start, $end); + $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) + ->withOpposingAccount(); + $transactions = $collector->getJournals(); + $transactions = $transactions->filter( + function (Transaction $transaction) { + // return negative amounts only. + if (bccomp($transaction->transaction_amount, '0') === -1) { + return $transaction; + } + + return false; + } + ); + $expenses = $this->groupByOpposing($transactions); + + // sort the result + // Obtain a list of columns + $sum = []; + foreach ($expenses as $accountId => $row) { + $sum[$accountId] = floatval($row['sum']); + } + + array_multisort($sum, SORT_ASC, $expenses); + + return $expenses; + } + + /** + * @param Carbon $start + * @param Carbon $end + * @param Collection $accounts + * + * @return array + */ + public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): array + { + // get all expenses for the given accounts in the given period! + // also transfers! + // get all transactions: + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setAccounts($accounts)->setRange($start, $end); + $collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) + ->withOpposingAccount(); + $transactions = $collector->getJournals(); + $transactions = $transactions->filter( + function (Transaction $transaction) { + // return positive amounts only. + if (bccomp($transaction->transaction_amount, '0') === 1) { + return $transaction; + } + + return false; + } + ); + $income = $this->groupByOpposing($transactions); + + // sort the result + // Obtain a list of columns + $sum = []; + foreach ($income as $accountId => $row) { + $sum[$accountId] = floatval($row['sum']); + } + + array_multisort($sum, SORT_DESC, $income); + + return $income; + } + /** * @param User $user */ @@ -156,62 +183,37 @@ class AccountTasker implements AccountTaskerInterface } /** - * Will return how much money has been going out (ie. spent) by the given account(s). - * Alternatively, will return how much money has been coming in (ie. earned) by the given accounts. + * @param Collection $transactions * - * Enter $incoming=true for any money coming in (income) - * Enter $incoming=false for any money going out (expenses) - * - * This means any money going out or in. You can also submit accounts to exclude, - * so transfers between accounts are not included. - * - * As a general rule: - * - * - Asset accounts should return both expenses and earnings. But could return 0. - * - Expense accounts (where money is spent) should only return earnings (the account gets money). - * - Revenue accounts (where money comes from) should only return expenses (they spend money). - * - * - * - * @param array $accounts - * @param Carbon $start - * @param Carbon $end - * @param bool $incoming - * - * @return string + * @return array */ - protected function amountInPeriod(array $accounts, Carbon $start, Carbon $end, bool $incoming): string + private function groupByOpposing(Collection $transactions): array { - $joinModifier = $incoming ? '<' : '>'; - $selection = $incoming ? '>' : '<'; - - $query = Transaction::distinct() - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->leftJoin( - 'transactions as other_side', function (JoinClause $join) use ($joinModifier) { - $join->on('transaction_journals.id', '=', 'other_side.transaction_journal_id')->where('other_side.amount', $joinModifier, 0); - } - ) - ->where('transaction_journals.date', '>=', $start->format('Y-m-d')) - ->where('transaction_journals.date', '<=', $end->format('Y-m-d')) - ->where('transaction_journals.user_id', $this->user->id) - ->whereNull('transactions.deleted_at') - ->whereNull('transaction_journals.deleted_at') - ->whereIn('transactions.account_id', $accounts['accounts']) - ->where('transactions.amount', $selection, 0); - if (count($accounts['exclude']) > 0) { - $query->whereNotIn('other_side.account_id', $accounts['exclude']); + $expenses = []; + // join the result together: + foreach ($transactions as $transaction) { + $opposingId = $transaction->opposing_account_id; + $name = $transaction->opposing_account_name; + if (!isset($expenses[$opposingId])) { + $expenses[$opposingId] = [ + 'id' => $opposingId, + 'name' => $name, + 'sum' => '0', + 'average' => '0', + 'count' => 0, + ]; + } + $expenses[$opposingId]['sum'] = bcadd($expenses[$opposingId]['sum'], $transaction->transaction_amount); + $expenses[$opposingId]['count']++; + } + // do averages: + foreach ($expenses as $key => $entry) { + if ($expenses[$key]['count'] > 1) { + $expenses[$key]['average'] = bcdiv($expenses[$key]['sum'], strval($expenses[$key]['count'])); + } } - $result = $query->get(['transactions.id', 'transactions.amount']); - $sum = strval($result->sum('amount')); - if (strlen($sum) === 0) { - Log::debug('Sum is empty.'); - $sum = '0'; - } - Log::debug(sprintf('Result is %s', $sum)); - return $sum; + return $expenses; } - } diff --git a/app/Repositories/Account/AccountTaskerInterface.php b/app/Repositories/Account/AccountTaskerInterface.php index 4ea5be74ef..af04994f1c 100644 --- a/app/Repositories/Account/AccountTaskerInterface.php +++ b/app/Repositories/Account/AccountTaskerInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Account; @@ -24,30 +24,6 @@ use Illuminate\Support\Collection; */ interface AccountTaskerInterface { - /** - * @param Collection $accounts - * @param Collection $excluded - * @param Carbon $start - * @param Carbon $end - * - * @see AccountTasker::amountInPeriod() - * - * @return string - */ - public function amountInInPeriod(Collection $accounts, Collection $excluded, Carbon $start, Carbon $end): string; - - /** - * @param Collection $accounts - * @param Collection $excluded - * @param Carbon $start - * @param Carbon $end - * - * @see AccountTasker::amountInPeriod() - * - * @return string - */ - public function amountOutInPeriod(Collection $accounts, Collection $excluded, Carbon $start, Carbon $end): string; - /** * @param Collection $accounts * @param Carbon $start @@ -57,6 +33,24 @@ interface AccountTaskerInterface */ public function getAccountReport(Collection $accounts, Carbon $start, Carbon $end): array; + /** + * @param Carbon $start + * @param Carbon $end + * @param Collection $accounts + * + * @return array + */ + public function getExpenseReport(Carbon $start, Carbon $end, Collection $accounts): array; + + /** + * @param Carbon $start + * @param Carbon $end + * @param Collection $accounts + * + * @return array + */ + public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): array; + /** * @param User $user */ diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 79a481e4ab..b7c174b103 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Attachment; diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index cc7cb887f8..caeb3af8b8 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Attachment; diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 545a29fb96..43599dc820 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Bill; @@ -251,7 +251,7 @@ class BillRepository implements BillRepositoryInterface $count = strval($journals->count()); /** @var TransactionJournal $journal */ foreach ($journals as $journal) { - $sum = bcadd($sum, TransactionJournal::amountPositive($journal)); + $sum = bcadd($sum, $journal->amountPositive()); } $avg = '0'; if ($journals->count() > 0) { @@ -370,7 +370,7 @@ class BillRepository implements BillRepositoryInterface $count = strval($journals->count()); /** @var TransactionJournal $journal */ foreach ($journals as $journal) { - $sum = bcadd($sum, TransactionJournal::amountPositive($journal)); + $sum = bcadd($sum, $journal->amountPositive()); } $avg = '0'; if ($journals->count() > 0) { @@ -396,7 +396,7 @@ class BillRepository implements BillRepositoryInterface $cache->addProperty('nextDateMatch'); $cache->addProperty($date); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } // find the most recent date for this bill NOT in the future. Cache this date: $start = clone $bill->date; @@ -433,7 +433,7 @@ class BillRepository implements BillRepositoryInterface $cache->addProperty('nextExpectedMatch'); $cache->addProperty($date); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } // find the most recent date for this bill NOT in the future. Cache this date: $start = clone $bill->date; @@ -478,15 +478,15 @@ class BillRepository implements BillRepositoryInterface if (false === $journal->isWithdrawal()) { return false; } - $destinationAccounts = TransactionJournal::destinationAccountList($journal); - $sourceAccounts = TransactionJournal::sourceAccountList($journal); + $destinationAccounts = $journal->destinationAccountList(); + $sourceAccounts = $journal->sourceAccountList(); $matches = explode(',', $bill->match); $description = strtolower($journal->description) . ' '; - $description .= strtolower(join(' ', $destinationAccounts->pluck('name')->toArray())); - $description .= strtolower(join(' ', $sourceAccounts->pluck('name')->toArray())); + $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); + $amountMatch = $this->doAmountMatch($journal->amountPositive(), $bill->amount_min, $bill->amount_max); /* @@ -525,8 +525,7 @@ class BillRepository implements BillRepositoryInterface */ public function store(array $data): Bill { - - + /** @var Bill $bill */ $bill = Bill::create( [ 'name' => $data['name'], diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index 2e07d12d93..4fc31cf2d6 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Bill; diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 9b4f985390..8754c70ca8 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Budget; diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 906a4827ae..eb522deb77 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Budget; diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index bed2d5847f..bef618f634 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Category; @@ -109,30 +109,28 @@ class CategoryRepository implements CategoryRepositoryInterface */ public function firstUseDate(Category $category): Carbon { - $first = null; + $first = new Carbon; /** @var TransactionJournal $firstJournal */ $firstJournal = $category->transactionJournals()->orderBy('date', 'ASC')->first(['transaction_journals.date']); - if ($firstJournal) { + // if transaction journal exists and date is before $first, then + // new date: + if (!is_null($firstJournal) && $firstJournal->date->lessThanOrEqualTo($first)) { $first = $firstJournal->date; } + // check transactions: $firstTransaction = $category->transactions() ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->orderBy('transaction_journals.date', 'ASC')->first(['transaction_journals.date']); - // both exist, the one that is earliest "wins". - if (!is_null($firstTransaction) && !is_null($first) && Carbon::parse($firstTransaction->date)->lt($first)) { - $first = $firstTransaction->date; + // transaction exists, and date is before $first, this date becomes first. + if (!is_null($firstTransaction) && Carbon::parse($firstTransaction->date)->lessThanOrEqualTo($first)) { + $first = new Carbon($firstTransaction->date); } - if (is_null($first)) { - return new Carbon('1900-01-01'); - } - - return $first; } @@ -230,8 +228,7 @@ class CategoryRepository implements CategoryRepositoryInterface $collector = app(JournalCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end); $collector->setCategories($categories)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) - ->withOpposingAccount() - ->enableInternalFilter(); + ->withOpposingAccount(); $transactions = $collector->getJournals(); // loop transactions: @@ -262,7 +259,7 @@ class CategoryRepository implements CategoryRepositoryInterface /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end)->withOpposingAccount(); - $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])->enableInternalFilter(); + $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]); $collector->withoutCategory(); $transactions = $collector->getJournals(); $result = [ @@ -314,8 +311,7 @@ class CategoryRepository implements CategoryRepositoryInterface $collector = app(JournalCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end); $collector->setCategories($categories)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) - ->withOpposingAccount() - ->enableInternalFilter(); + ->withOpposingAccount(); $transactions = $collector->getJournals(); // loop transactions: @@ -347,7 +343,7 @@ class CategoryRepository implements CategoryRepositoryInterface /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end)->withOpposingAccount(); - $collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])->enableInternalFilter(); + $collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]); $collector->withoutCategory(); $transactions = $collector->getJournals(); $result = [ diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index 9e89a78f50..c85568f0a6 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Category; diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index bb1444d73c..6e0ae64ae7 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -9,15 +9,18 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Currency; +use Carbon\Carbon; +use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Models\Preference; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; use Illuminate\Support\Collection; +use Log; use Preferences; /** @@ -30,14 +33,6 @@ class CurrencyRepository implements CurrencyRepositoryInterface /** @var User */ private $user; - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } - /** * @param TransactionCurrency $currency * @@ -121,7 +116,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface */ public function findByCode(string $currencyCode): TransactionCurrency { - $currency = TransactionCurrency::whereCode($currencyCode)->first(); + $currency = TransactionCurrency::where('code', $currencyCode)->first(); if (is_null($currency)) { $currency = new TransactionCurrency; } @@ -178,7 +173,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface */ public function getCurrencyByPreference(Preference $preference): TransactionCurrency { - $preferred = TransactionCurrency::whereCode($preference->data)->first(); + $preferred = TransactionCurrency::where('code', $preference->data)->first(); if (is_null($preferred)) { $preferred = TransactionCurrency::first(); } @@ -186,6 +181,46 @@ class CurrencyRepository implements CurrencyRepositoryInterface return $preferred; } + /** + * @param TransactionCurrency $fromCurrency + * @param TransactionCurrency $toCurrency + * @param Carbon $date + * + * @return CurrencyExchangeRate + */ + public function getExchangeRate(TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date): CurrencyExchangeRate + { + if ($fromCurrency->id === $toCurrency->id) { + $rate = new CurrencyExchangeRate; + $rate->rate = 1; + $rate->id = 0; + + return $rate; + } + + $rate = $this->user->currencyExchangeRates() + ->where('from_currency_id', $fromCurrency->id) + ->where('to_currency_id', $toCurrency->id) + ->where('date', $date->format('Y-m-d'))->first(); + if (!is_null($rate)) { + Log::debug(sprintf('Found cached exchange rate in database for %s to %s on %s', $fromCurrency->code, $toCurrency->code, $date->format('Y-m-d'))); + + return $rate; + } + + return new CurrencyExchangeRate; + + + } + + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param array $data * @@ -193,6 +228,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface */ public function store(array $data): TransactionCurrency { + /** @var TransactionCurrency $currency */ $currency = TransactionCurrency::create( [ 'name' => $data['name'], diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index 63eb9bf0b5..6c2ccdd61b 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -9,11 +9,13 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Currency; +use Carbon\Carbon; +use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Models\Preference; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; @@ -95,6 +97,15 @@ interface CurrencyRepositoryInterface */ public function getCurrencyByPreference(Preference $preference): TransactionCurrency; + /** + * @param TransactionCurrency $fromCurrency + * @param TransactionCurrency $toCurrency + * @param Carbon $date + * + * @return CurrencyExchangeRate + */ + public function getExchangeRate(TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date): CurrencyExchangeRate; + /** * @param User $user */ diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index aa956f901e..a0eb52fc86 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\ExportJob; diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php index 7e93663ea5..9f610bc7c2 100644 --- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php +++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\ExportJob; diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index 0eec759e5b..6af984a06c 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\ImportJob; @@ -86,6 +86,20 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $result; } + /** + * @param ImportJob $job + * @param array $configuration + * + * @return ImportJob + */ + public function setConfiguration(ImportJob $job, array $configuration): ImportJob + { + $job->configuration = $configuration; + $job->save(); + + return $job; + } + /** * @param User $user */ @@ -93,4 +107,18 @@ class ImportJobRepository implements ImportJobRepositoryInterface { $this->user = $user; } + + /** + * @param ImportJob $job + * @param string $status + * + * @return ImportJob + */ + public function updateStatus(ImportJob $job, string $status): ImportJob + { + $job->status = $status; + $job->save(); + + return $job; + } } diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php index 5bb2149fbe..5bdf636d42 100644 --- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php +++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\ImportJob; @@ -37,8 +37,24 @@ interface ImportJobRepositoryInterface */ public function findByKey(string $key): ImportJob; + /** + * @param ImportJob $job + * @param array $configuration + * + * @return ImportJob + */ + public function setConfiguration(ImportJob $job, array $configuration): ImportJob; + /** * @param User $user */ public function setUser(User $user); + + /** + * @param ImportJob $job + * @param string $status + * + * @return ImportJob + */ + public function updateStatus(ImportJob $job, string $status): ImportJob; } diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 12ce898ff1..98ab2dafb5 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Journal; @@ -41,15 +41,10 @@ class JournalRepository implements JournalRepositoryInterface private $user; /** @var array */ - private $validMetaFields = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date', 'internal_reference', 'notes']; - - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } + private $validMetaFields + = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date', 'internal_reference', 'notes', 'foreign_amount', + 'foreign_currency_id', + ]; /** * @param TransactionJournal $journal @@ -143,6 +138,38 @@ class JournalRepository implements JournalRepositoryInterface return TransactionType::orderBy('type', 'ASC')->get(); } + /** + * @param TransactionJournal $journal + * + * @return bool + */ + public function isTransfer(TransactionJournal $journal): bool + { + return $journal->transactionType->type === TransactionType::TRANSFER; + } + + /** + * @param TransactionJournal $journal + * @param int $order + * + * @return bool + */ + public function setOrder(TransactionJournal $journal, int $order): bool + { + $journal->order = $order; + $journal->save(); + + return true; + } + + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param array $data * @@ -151,12 +178,17 @@ class JournalRepository implements JournalRepositoryInterface public function store(array $data): TransactionJournal { // find transaction type. + /** @var TransactionType $transactionType */ $transactionType = TransactionType::where('type', ucfirst($data['what']))->first(); + $accounts = $this->storeAccounts($transactionType, $data); + $data = $this->verifyNativeAmount($data, $accounts); + $currencyId = $data['currency_id']; + $amount = strval($data['amount']); $journal = new TransactionJournal( [ 'user_id' => $this->user->id, 'transaction_type_id' => $transactionType->id, - 'transaction_currency_id' => $data['currency_id'], + 'transaction_currency_id' => $currencyId, 'description' => $data['description'], 'completed' => 0, 'date' => $data['date'], @@ -167,13 +199,13 @@ class JournalRepository implements JournalRepositoryInterface // store stuff: $this->storeCategoryWithJournal($journal, $data['category']); $this->storeBudgetWithJournal($journal, $data['budget_id']); - $accounts = $this->storeAccounts($transactionType, $data); + // store two transactions: $one = [ 'journal' => $journal, 'account' => $accounts['source'], - 'amount' => bcmul(strval($data['amount']), '-1'), + 'amount' => bcmul($amount, '-1'), 'description' => null, 'category' => null, 'budget' => null, @@ -184,7 +216,7 @@ class JournalRepository implements JournalRepositoryInterface $two = [ 'journal' => $journal, 'account' => $accounts['destination'], - 'amount' => $data['amount'], + 'amount' => $amount, 'description' => null, 'category' => null, 'budget' => null, @@ -222,10 +254,22 @@ class JournalRepository implements JournalRepositoryInterface */ public function update(TransactionJournal $journal, array $data): TransactionJournal { + // update actual journal: - $journal->transaction_currency_id = $data['currency_id']; - $journal->description = $data['description']; - $journal->date = $data['date']; + $journal->description = $data['description']; + $journal->date = $data['date']; + $accounts = $this->storeAccounts($journal->transactionType, $data); + $amount = strval($data['amount']); + + if ($data['currency_id'] !== $journal->transaction_currency_id) { + // user has entered amount in foreign currency. + // amount in "our" currency is $data['exchanged_amount']: + $amount = strval($data['exchanged_amount']); + // other values must be stored as well: + $data['original_amount'] = $data['amount']; + $data['original_currency_id'] = $data['currency_id']; + + } // unlink all categories, recreate them: $journal->categories()->detach(); @@ -233,12 +277,9 @@ class JournalRepository implements JournalRepositoryInterface $this->storeCategoryWithJournal($journal, $data['category']); $this->storeBudgetWithJournal($journal, $data['budget_id']); - $accounts = $this->storeAccounts($journal->transactionType, $data); - $sourceAmount = bcmul(strval($data['amount']), '-1'); - $this->updateSourceTransaction($journal, $accounts['source'], $sourceAmount); // negative because source loses money. - $amount = strval($data['amount']); + $this->updateSourceTransaction($journal, $accounts['source'], bcmul($amount, '-1')); // negative because source loses money. $this->updateDestinationTransaction($journal, $accounts['destination'], $amount); // positive because destination gets money. $journal->save(); @@ -731,4 +772,56 @@ class JournalRepository implements JournalRepositoryInterface return true; } + + /** + * This method checks the data array and the given accounts to verify that the native amount, currency + * and possible the foreign currency and amount are properly saved. + * + * @param array $data + * @param array $accounts + * + * @return array + * @throws FireflyException + */ + private function verifyNativeAmount(array $data, array $accounts): array + { + /** @var TransactionType $transactionType */ + $transactionType = TransactionType::where('type', ucfirst($data['what']))->first(); + $submittedCurrencyId = $data['currency_id']; + + // which account to check for what the native currency is? + $check = 'source'; + if ($transactionType->type === TransactionType::DEPOSIT) { + $check = 'destination'; + } + switch ($transactionType->type) { + case TransactionType::DEPOSIT: + case TransactionType::WITHDRAWAL: + // continue: + $nativeCurrencyId = intval($accounts[$check]->getMeta('currency_id')); + + // does not match? Then user has submitted amount in a foreign currency: + if ($nativeCurrencyId !== $submittedCurrencyId) { + // store amount and submitted currency in "foreign currency" fields: + $data['foreign_amount'] = $data['amount']; + $data['foreign_currency_id'] = $submittedCurrencyId; + + // overrule the amount and currency ID fields to be the original again: + $data['amount'] = strval($data['native_amount']); + $data['currency_id'] = $nativeCurrencyId; + } + break; + case TransactionType::TRANSFER: + // source gets the original amount. + $data['amount'] = strval($data['source_amount']); + $data['currency_id'] = intval($accounts['source']->getMeta('currency_id')); + $data['foreign_amount'] = strval($data['destination_amount']); + $data['foreign_currency_id'] = intval($accounts['destination']->getMeta('currency_id')); + break; + default: + throw new FireflyException(sprintf('Cannot handle %s in verifyNativeAmount()', $transactionType->type)); + } + + return $data; + } } diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index f1f5438ad4..028f2d52d7 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Journal; @@ -27,6 +27,7 @@ use Illuminate\Support\MessageBag; */ interface JournalRepositoryInterface { + /** * @param TransactionJournal $journal * @param TransactionType $type @@ -67,6 +68,21 @@ interface JournalRepositoryInterface */ public function getTransactionTypes(): Collection; + /** + * @param TransactionJournal $journal + * + * @return bool + */ + public function isTransfer(TransactionJournal $journal): bool; + + /** + * @param TransactionJournal $journal + * @param int $order + * + * @return bool + */ + public function setOrder(TransactionJournal $journal, int $order): bool; + /** * @param User $user */ diff --git a/app/Repositories/Journal/JournalTasker.php b/app/Repositories/Journal/JournalTasker.php index c0424242c8..b56abe0db8 100644 --- a/app/Repositories/Journal/JournalTasker.php +++ b/app/Repositories/Journal/JournalTasker.php @@ -9,11 +9,10 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Journal; -use Crypt; use DB; use FireflyIII\Models\AccountType; use FireflyIII\Models\PiggyBankEvent; @@ -23,6 +22,7 @@ use FireflyIII\User; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; +use Steam; /** * Class JournalTasker @@ -113,7 +113,7 @@ class JournalTasker implements JournalTaskerInterface 'source_amount' => $entry->amount, 'description' => $entry->description, 'source_account_id' => $entry->account_id, - 'source_account_name' => intval($entry->account_encrypted) === 1 ? Crypt::decrypt($entry->account_name) : $entry->account_name, + 'source_account_name' => Steam::decrypt(intval($entry->account_encrypted), $entry->account_name), 'source_account_type' => $entry->account_type, 'source_account_before' => $sourceBalance, 'source_account_after' => bcadd($sourceBalance, $entry->amount), @@ -121,8 +121,7 @@ class JournalTasker implements JournalTaskerInterface 'destination_amount' => bcmul($entry->amount, '-1'), 'destination_account_id' => $entry->destination_account_id, 'destination_account_type' => $entry->destination_account_type, - 'destination_account_name' => - intval($entry->destination_account_encrypted) === 1 ? Crypt::decrypt($entry->destination_account_name) : $entry->destination_account_name, + 'destination_account_name' => Steam::decrypt(intval($entry->destination_account_encrypted), $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, diff --git a/app/Repositories/Journal/JournalTaskerInterface.php b/app/Repositories/Journal/JournalTaskerInterface.php index 1273f69c3a..bb2aa688c9 100644 --- a/app/Repositories/Journal/JournalTaskerInterface.php +++ b/app/Repositories/Journal/JournalTaskerInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Journal; diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 1f14467a5b..e721c71b63 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\PiggyBank; @@ -18,8 +18,11 @@ use Carbon\Carbon; use FireflyIII\Models\Note; use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBankEvent; +use FireflyIII\Models\PiggyBankRepetition; +use FireflyIII\Models\TransactionJournal; use FireflyIII\User; use Illuminate\Support\Collection; +use Log; /** * Class PiggyBankRepository @@ -32,6 +35,69 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface /** @var User */ private $user; + /** + * @param PiggyBank $piggyBank + * @param string $amount + * + * @return bool + */ + public function addAmount(PiggyBank $piggyBank, string $amount): bool + { + $repetition = $piggyBank->currentRelevantRep(); + $currentAmount = $repetition->currentamount ?? '0'; + $repetition->currentamount = bcadd($currentAmount, $amount); + $repetition->save(); + + // create event + $this->createEvent($piggyBank, $amount); + + return true; + } + + /** + * @param PiggyBankRepetition $repetition + * @param string $amount + * + * @return string + */ + public function addAmountToRepetition(PiggyBankRepetition $repetition, string $amount): string + { + $newAmount = bcadd($repetition->currentamount, $amount); + $repetition->currentamount = $newAmount; + $repetition->save(); + + return $newAmount; + } + + /** + * @param PiggyBank $piggyBank + * @param string $amount + * + * @return bool + */ + public function canAddAmount(PiggyBank $piggyBank, string $amount): bool + { + $leftOnAccount = $piggyBank->leftOnAccount(new Carbon); + $savedSoFar = strval($piggyBank->currentRelevantRep()->currentamount); + $leftToSave = bcsub($piggyBank->targetamount, $savedSoFar); + $maxAmount = strval(min(round($leftOnAccount, 12), round($leftToSave, 12))); + + return bccomp($amount, $maxAmount) <= 0; + } + + /** + * @param PiggyBank $piggyBank + * @param string $amount + * + * @return bool + */ + public function canRemoveAmount(PiggyBank $piggyBank, string $amount): bool + { + $savedSoFar = $piggyBank->currentRelevantRep()->currentamount; + + return bccomp($amount, $savedSoFar) <= 0; + } + /** * @param PiggyBank $piggyBank * @param string $amount @@ -40,11 +106,29 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface */ public function createEvent(PiggyBank $piggyBank, string $amount): PiggyBankEvent { + /** @var PiggyBankEvent $event */ $event = PiggyBankEvent::create(['date' => Carbon::now(), 'amount' => $amount, 'piggy_bank_id' => $piggyBank->id]); return $event; } + /** + * @param PiggyBank $piggyBank + * @param string $amount + * @param TransactionJournal $journal + * + * @return PiggyBankEvent + */ + public function createEventWithJournal(PiggyBank $piggyBank, string $amount, TransactionJournal $journal): PiggyBankEvent + { + /** @var PiggyBankEvent $event */ + $event = PiggyBankEvent::create( + ['piggy_bank_id' => $piggyBank->id, 'transaction_journal_id' => $journal->id, 'date' => $journal->date, 'amount' => $amount] + ); + + return $event; + } + /** * @param PiggyBank $piggyBank * @@ -83,6 +167,53 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface return $piggyBank->piggyBankEvents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->get(); } + /** + * Used for connecting to a piggy bank. + * + * @param PiggyBank $piggyBank + * @param PiggyBankRepetition $repetition + * @param TransactionJournal $journal + * + * @return string + */ + public function getExactAmount(PiggyBank $piggyBank, PiggyBankRepetition $repetition, TransactionJournal $journal): string + { + $amount = $journal->amountPositive(); + $sources = $journal->sourceAccountList()->pluck('id')->toArray(); + $room = bcsub(strval($piggyBank->targetamount), strval($repetition->currentamount)); + $compare = bcmul($repetition->currentamount, '-1'); + + Log::debug(sprintf('Will add/remove %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name)); + + // if piggy account matches source account, the amount is positive + if (in_array($piggyBank->account_id, $sources)) { + $amount = bcmul($amount, '-1'); + Log::debug(sprintf('Account #%d is the source, so will remove amount from piggy bank.', $piggyBank->account_id)); + } + + + // if the amount is positive, make sure it fits in piggy bank: + if (bccomp($amount, '0') === 1 && bccomp($room, $amount) === -1) { + // amount is positive and $room is smaller than $amount + Log::debug(sprintf('Room in piggy bank for extra money is %f', $room)); + Log::debug(sprintf('There is NO room to add %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name)); + Log::debug(sprintf('New amount is %f', $room)); + + return $room; + } + + // amount is negative and $currentamount is smaller than $amount + if (bccomp($amount, '0') === -1 && bccomp($compare, $amount) === 1) { + Log::debug(sprintf('Max amount to remove is %f', $repetition->currentamount)); + Log::debug(sprintf('Cannot remove %f from piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name)); + Log::debug(sprintf('New amount is %f', $compare)); + + return $compare; + } + + return $amount; + } + /** * @return int */ @@ -118,6 +249,40 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface return $set; } + /** + * @param PiggyBank $piggyBank + * @param Carbon $date + * + * @return PiggyBankRepetition + */ + public function getRepetition(PiggyBank $piggyBank, Carbon $date): PiggyBankRepetition + { + $repetition = $piggyBank->piggyBankRepetitions()->relevantOnDate($date)->first(); + if (is_null($repetition)) { + return new PiggyBankRepetition; + } + + return $repetition; + } + + /** + * @param PiggyBank $piggyBank + * @param string $amount + * + * @return bool + */ + public function removeAmount(PiggyBank $piggyBank, string $amount): bool + { + $repetition = $piggyBank->currentRelevantRep(); + $repetition->currentamount = bcsub($repetition->currentamount, $amount); + $repetition->save(); + + // create event + $this->createEvent($piggyBank, bcmul($amount, '-1')); + + return true; + } + /** * Set all piggy banks to order 0. * @@ -173,7 +338,8 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface public function store(array $data): PiggyBank { $data['order'] = $this->getMaxOrder() + 1; - $piggyBank = PiggyBank::create($data); + /** @var PiggyBank $piggyBank */ + $piggyBank = PiggyBank::create($data); $this->updateNote($piggyBank, $data['note']); diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php index a2da326d86..0592d75e3b 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php @@ -9,12 +9,15 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\PiggyBank; +use Carbon\Carbon; use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBankEvent; +use FireflyIII\Models\PiggyBankRepetition; +use FireflyIII\Models\TransactionJournal; use FireflyIII\User; use Illuminate\Support\Collection; @@ -25,6 +28,37 @@ use Illuminate\Support\Collection; */ interface PiggyBankRepositoryInterface { + /** + * @param PiggyBank $piggyBank + * @param string $amount + * + * @return bool + */ + public function addAmount(PiggyBank $piggyBank, string $amount): bool; + + /** + * @param PiggyBankRepetition $repetition + * @param string $amount + * + * @return string + */ + public function addAmountToRepetition(PiggyBankRepetition $repetition, string $amount): string; + + /** + * @param PiggyBank $piggyBank + * @param string $amount + * + * @return bool + */ + public function canAddAmount(PiggyBank $piggyBank, string $amount): bool; + + /** + * @param PiggyBank $piggyBank + * @param string $amount + * + * @return bool + */ + public function canRemoveAmount(PiggyBank $piggyBank, string $amount): bool; /** * Create a new event. @@ -36,6 +70,15 @@ interface PiggyBankRepositoryInterface */ public function createEvent(PiggyBank $piggyBank, string $amount): PiggyBankEvent; + /** + * @param PiggyBank $piggyBank + * @param string $amount + * @param TransactionJournal $journal + * + * @return PiggyBankEvent + */ + public function createEventWithJournal(PiggyBank $piggyBank, string $amount, TransactionJournal $journal): PiggyBankEvent; + /** * Destroy piggy bank. * @@ -61,6 +104,17 @@ interface PiggyBankRepositoryInterface */ public function getEvents(PiggyBank $piggyBank): Collection; + /** + * Used for connecting to a piggy bank. + * + * @param PiggyBank $piggyBank + * @param PiggyBankRepetition $repetition + * @param TransactionJournal $journal + * + * @return string + */ + public function getExactAmount(PiggyBank $piggyBank, PiggyBankRepetition $repetition, TransactionJournal $journal): string; + /** * Highest order of all piggy banks. * @@ -82,6 +136,22 @@ interface PiggyBankRepositoryInterface */ public function getPiggyBanksWithAmount(): Collection; + /** + * @param PiggyBank $piggyBank + * @param Carbon $date + * + * @return PiggyBankRepetition + */ + public function getRepetition(PiggyBank $piggyBank, Carbon $date): PiggyBankRepetition; + + /** + * @param PiggyBank $piggyBank + * @param string $amount + * + * @return bool + */ + public function removeAmount(PiggyBank $piggyBank, string $amount): bool; + /** * Set all piggy banks to order 0. * diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 7e0487be63..47a848427c 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Rule; diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php index 6ca1456214..13fc6c3382 100644 --- a/app/Repositories/Rule/RuleRepositoryInterface.php +++ b/app/Repositories/Rule/RuleRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Rule; diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index e413987334..cee3e353ef 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\RuleGroup; @@ -30,14 +30,6 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface /** @var User */ private $user; - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } - /** * @return int */ @@ -100,6 +92,46 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface return $this->user->ruleGroups()->orderBy('order', 'ASC')->get(); } + /** + * @param User $user + * + * @return Collection + */ + public function getActiveGroups(User $user): Collection + { + return $user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get(['rule_groups.*']); + } + + /** + * @param RuleGroup $group + * + * @return Collection + */ + public function getActiveStoreRules(RuleGroup $group): Collection + { + return $group->rules() + ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id') + ->where('rule_triggers.trigger_type', 'user_action') + ->where('rule_triggers.trigger_value', 'store-journal') + ->where('rules.active', 1) + ->get(['rules.*']); + } + + /** + * @param RuleGroup $group + * + * @return Collection + */ + public function getActiveUpdateRules(RuleGroup $group): Collection + { + return $group->rules() + ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id') + ->where('rule_triggers.trigger_type', 'user_action') + ->where('rule_triggers.trigger_value', 'update-journal') + ->where('rules.active', 1) + ->get(['rules.*']); + } + /** * @return int */ @@ -228,6 +260,14 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param array $data * diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php index c365fca704..bb8bb8217d 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php +++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\RuleGroup; @@ -53,6 +53,27 @@ interface RuleGroupRepositoryInterface */ public function get(): Collection; + /** + * @param User $user + * + * @return Collection + */ + public function getActiveGroups(User $user): Collection; + + /** + * @param RuleGroup $group + * + * @return Collection + */ + public function getActiveStoreRules(RuleGroup $group): Collection; + + /** + * @param RuleGroup $group + * + * @return Collection + */ + public function getActiveUpdateRules(RuleGroup $group): Collection; + /** * @return int */ diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 9f91816252..63ee5b408b 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Tag; @@ -34,14 +34,6 @@ class TagRepository implements TagRepositoryInterface /** @var User */ private $user; - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } - /** * * @param TransactionJournal $journal @@ -76,6 +68,14 @@ class TagRepository implements TagRepositoryInterface return false; } + /** + * @return int + */ + public function count(): int + { + return $this->user->tags()->count(); + } + /** * @param Tag $tag * @@ -88,6 +88,25 @@ class TagRepository implements TagRepositoryInterface return true; } + /** + * @param Tag $tag + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function earnedInPeriod(Tag $tag, Carbon $start, Carbon $end): string + { + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); + $collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAllAssetAccounts()->setTag($tag); + $set = $collector->getJournals(); + $sum = strval($set->sum('transaction_amount')); + + return $sum; + } + /** * @param int $tagId * @@ -152,6 +171,16 @@ class TagRepository implements TagRepositoryInterface return $tags; } + /** + * @param string $type + * + * @return Collection + */ + public function getByType(string $type): Collection + { + return $this->user->tags()->where('tagMode', $type)->orderBy('date', 'ASC')->get(); + } + /** * @param Tag $tag * @@ -167,6 +196,33 @@ class TagRepository implements TagRepositoryInterface return new Carbon; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + + /** + * @param Tag $tag + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function spentInPeriod(Tag $tag, Carbon $start, Carbon $end): string + { + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); + $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAllAssetAccounts()->setTag($tag); + $set = $collector->getJournals(); + $sum = strval($set->sum('transaction_amount')); + + return $sum; + } + /** * @param array $data * @@ -190,6 +246,95 @@ class TagRepository implements TagRepositoryInterface } + /** + * @param Tag $tag + * @param Carbon|null $start + * @param Carbon|null $end + * + * @return string + */ + public function sumOfTag(Tag $tag, Carbon $start = null, Carbon $end = null): string + { + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + + if (!is_null($start) && !is_null($end)) { + $collector->setRange($start, $end); + } + + $collector->setAllAssetAccounts()->setTag($tag); + $sum = $collector->getJournals()->sum('transaction_amount'); + + return strval($sum); + } + + /** + * Can a tag become an advance payment? + * + * @param Tag $tag + * + * @return bool + */ + public function tagAllowAdvance(Tag $tag): bool + { + /* + * If this tag is a balancing act, and it contains transfers, it cannot be + * changed to an advancePayment. + */ + + if ($tag->tagMode == 'balancingAct' || $tag->tagMode == 'nothing') { + foreach ($tag->transactionjournals as $journal) { + if ($journal->isTransfer()) { + return false; + } + } + } + + /* + * If this tag contains more than one expenses, it cannot become an advance payment. + */ + $count = 0; + foreach ($tag->transactionjournals as $journal) { + if ($journal->isWithdrawal()) { + $count++; + } + } + if ($count > 1) { + return false; + } + + return true; + } + + /** + * Can a tag become a balancing act? + * + * @param Tag $tag + * + * @return bool + */ + public function tagAllowBalancing(Tag $tag): bool + { + /* + * If has more than two transactions already, cannot become a balancing act: + */ + if ($tag->transactionjournals->count() > 2) { + return false; + } + + /* + * If any transaction is a deposit, cannot become a balancing act. + */ + foreach ($tag->transactionjournals as $journal) { + if ($journal->isDeposit()) { + return false; + } + } + + return true; + + } + /** * @param Tag $tag * @param array $data @@ -319,8 +464,8 @@ class TagRepository implements TagRepositoryInterface */ private function matchAll(TransactionJournal $journal, Tag $tag): bool { - $journalSources = join(',', array_unique(TransactionJournal::sourceAccountList($journal)->pluck('id')->toArray())); - $journalDestinations = join(',', array_unique(TransactionJournal::destinationAccountList($journal)->pluck('id')->toArray())); + $journalSources = join(',', array_unique($journal->sourceAccountList()->pluck('id')->toArray())); + $journalDestinations = join(',', array_unique($journal->destinationAccountList()->pluck('id')->toArray())); $match = true; $journals = $tag->transactionJournals()->get(['transaction_journals.*']); @@ -331,8 +476,8 @@ class TagRepository implements TagRepositoryInterface Log::debug(sprintf('Now existingcomparing new journal #%d to existing journal #%d', $journal->id, $existing->id)); // $checkAccount is the source_account for a withdrawal // $checkAccount is the destination_account for a deposit - $existingSources = join(',', array_unique(TransactionJournal::sourceAccountList($existing)->pluck('id')->toArray())); - $existingDestinations = join(',', array_unique(TransactionJournal::destinationAccountList($existing)->pluck('id')->toArray())); + $existingSources = join(',', array_unique($existing->sourceAccountList()->pluck('id')->toArray())); + $existingDestinations = join(',', array_unique($existing->destinationAccountList()->pluck('id')->toArray())); if ($existing->isWithdrawal() && $existingSources !== $journalDestinations) { /* @@ -383,42 +528,4 @@ class TagRepository implements TagRepositoryInterface return false; } - - /** - * @param Tag $tag - * @param Carbon $start - * @param Carbon $end - * - * @return string - */ - public function earnedInPeriod(Tag $tag, Carbon $start, Carbon $end): string - { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setUser($this->user); - $collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAllAssetAccounts()->setTag($tag); - $set = $collector->getJournals(); - $sum = strval($set->sum('transaction_amount')); - - return $sum; - } - - /** - * @param Tag $tag - * @param Carbon $start - * @param Carbon $end - * - * @return string - */ - public function spentInPeriod(Tag $tag, Carbon $start, Carbon $end): string - { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setUser($this->user); - $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAllAssetAccounts()->setTag($tag); - $set = $collector->getJournals(); - $sum = strval($set->sum('transaction_amount')); - - return $sum; - } } diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index b360e7d436..a97ff00c98 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Tag; @@ -27,6 +27,7 @@ use Illuminate\Support\Collection; */ interface TagRepositoryInterface { + /** * This method will connect a journal with a tag. * @@ -37,6 +38,11 @@ interface TagRepositoryInterface */ public function connect(TransactionJournal $journal, Tag $tag): bool; + /** + * @return int + */ + public function count(): int; + /** * This method destroys a tag. * @@ -83,6 +89,13 @@ interface TagRepositoryInterface */ public function get(): Collection; + /** + * @param string $type + * + * @return Collection + */ + public function getByType(string $type): Collection; + /** * @param Tag $tag * @@ -113,6 +126,29 @@ interface TagRepositoryInterface */ public function store(array $data): Tag; + /** + * @param Tag $tag + * @param Carbon|null $start + * @param Carbon|null $end + * + * @return string + */ + public function sumOfTag(Tag $tag, Carbon $start = null, Carbon $end = null): string; + + /** + * @param Tag $tag + * + * @return bool + */ + public function tagAllowAdvance(Tag $tag): bool; + + /** + * @param Tag $tag + * + * @return bool + */ + public function tagAllowBalancing(Tag $tag): bool; + /** * Update a tag. * diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index ec2a6c7442..ae31df83c9 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\User; @@ -66,6 +66,23 @@ class UserRepository implements UserRepositoryInterface return true; } + /** + * @param User $user + * @param bool $isBlocked + * @param string $code + * + * @return bool + */ + public function changeStatus(User $user, bool $isBlocked, string $code): bool + { + // change blocked status and code: + $user->blocked = $isBlocked; + $user->blocked_code = $code; + $user->save(); + + return true; + } + /** * @return int */ @@ -147,4 +164,15 @@ class UserRepository implements UserRepositoryInterface return $return; } + + /** + * @param User $user + * @param string $role + * + * @return bool + */ + public function hasRole(User $user, string $role): bool + { + return $user->hasRole($role); + } } diff --git a/app/Repositories/User/UserRepositoryInterface.php b/app/Repositories/User/UserRepositoryInterface.php index 9e2bb096b3..118ecf4a84 100644 --- a/app/Repositories/User/UserRepositoryInterface.php +++ b/app/Repositories/User/UserRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\User; @@ -50,6 +50,15 @@ interface UserRepositoryInterface */ public function changePassword(User $user, string $password); + /** + * @param User $user + * @param bool $isBlocked + * @param string $code + * + * @return bool + */ + public function changeStatus(User $user, bool $isBlocked, string $code): bool; + /** * Returns a count of all users. * @@ -79,4 +88,12 @@ interface UserRepositoryInterface * @return array */ public function getUserData(User $user): array; + + /** + * @param User $user + * @param string $role + * + * @return bool + */ + public function hasRole(User $user, string $role): bool; } diff --git a/app/Rules/Actions/ActionInterface.php b/app/Rules/Actions/ActionInterface.php index 0c66106d7f..7d8696f047 100644 --- a/app/Rules/Actions/ActionInterface.php +++ b/app/Rules/Actions/ActionInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/AddTag.php b/app/Rules/Actions/AddTag.php index 8dc7cb17a2..38560c83aa 100644 --- a/app/Rules/Actions/AddTag.php +++ b/app/Rules/Actions/AddTag.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/AppendDescription.php b/app/Rules/Actions/AppendDescription.php index 4169399773..0bca1c7397 100644 --- a/app/Rules/Actions/AppendDescription.php +++ b/app/Rules/Actions/AppendDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/ClearBudget.php b/app/Rules/Actions/ClearBudget.php index fc29eb4aae..4f029089ac 100644 --- a/app/Rules/Actions/ClearBudget.php +++ b/app/Rules/Actions/ClearBudget.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/ClearCategory.php b/app/Rules/Actions/ClearCategory.php index d60afcf77a..6eea4ce560 100644 --- a/app/Rules/Actions/ClearCategory.php +++ b/app/Rules/Actions/ClearCategory.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/PrependDescription.php b/app/Rules/Actions/PrependDescription.php index 7e734873ee..a59b5e6172 100644 --- a/app/Rules/Actions/PrependDescription.php +++ b/app/Rules/Actions/PrependDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/RemoveAllTags.php b/app/Rules/Actions/RemoveAllTags.php index 66ddbc4810..32290d7a70 100644 --- a/app/Rules/Actions/RemoveAllTags.php +++ b/app/Rules/Actions/RemoveAllTags.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/RemoveTag.php b/app/Rules/Actions/RemoveTag.php index c002c1ff21..ca9912f5f0 100644 --- a/app/Rules/Actions/RemoveTag.php +++ b/app/Rules/Actions/RemoveTag.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/SetBudget.php b/app/Rules/Actions/SetBudget.php index e9f8c1fae9..62b530b8c8 100644 --- a/app/Rules/Actions/SetBudget.php +++ b/app/Rules/Actions/SetBudget.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; @@ -52,9 +52,9 @@ class SetBudget implements ActionInterface /** @var BudgetRepositoryInterface $repository */ $repository = app(BudgetRepositoryInterface::class); $repository->setUser($journal->user); - $search = $this->action->action_value; - $budgets = $repository->getActiveBudgets(); - $budget = $budgets->filter( + $search = $this->action->action_value; + $budgets = $repository->getActiveBudgets(); + $budget = $budgets->filter( function (Budget $current) use ($search) { return $current->name == $search; } diff --git a/app/Rules/Actions/SetCategory.php b/app/Rules/Actions/SetCategory.php index ff6e79fb66..8b1953db5d 100644 --- a/app/Rules/Actions/SetCategory.php +++ b/app/Rules/Actions/SetCategory.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/SetDescription.php b/app/Rules/Actions/SetDescription.php index 8be7339f03..fd882f405d 100644 --- a/app/Rules/Actions/SetDescription.php +++ b/app/Rules/Actions/SetDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/SetDestinationAccount.php b/app/Rules/Actions/SetDestinationAccount.php index 25677e546b..00249b2660 100644 --- a/app/Rules/Actions/SetDestinationAccount.php +++ b/app/Rules/Actions/SetDestinationAccount.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; @@ -62,7 +62,7 @@ class SetDestinationAccount implements ActionInterface $this->journal = $journal; $this->repository = app(AccountRepositoryInterface::class); $this->repository->setUser($journal->user); - $count = $journal->transactions()->count(); + $count = $journal->transactions()->count(); if ($count > 2) { Log::error(sprintf('Cannot change destination account of journal #%d because it is a split journal.', $journal->id)); diff --git a/app/Rules/Actions/SetSourceAccount.php b/app/Rules/Actions/SetSourceAccount.php index fc8067856c..f651f0fbe1 100644 --- a/app/Rules/Actions/SetSourceAccount.php +++ b/app/Rules/Actions/SetSourceAccount.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; @@ -62,7 +62,7 @@ class SetSourceAccount implements ActionInterface $this->journal = $journal; $this->repository = app(AccountRepositoryInterface::class); $this->repository->setUser($journal->user); - $count = $journal->transactions()->count(); + $count = $journal->transactions()->count(); if ($count > 2) { Log::error(sprintf('Cannot change source account of journal #%d because it is a split journal.', $journal->id)); diff --git a/app/Rules/Factory/ActionFactory.php b/app/Rules/Factory/ActionFactory.php index 9bbdb7468d..16d33605e3 100644 --- a/app/Rules/Factory/ActionFactory.php +++ b/app/Rules/Factory/ActionFactory.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Factory; diff --git a/app/Rules/Factory/TriggerFactory.php b/app/Rules/Factory/TriggerFactory.php index 9f1f76498e..9f98560f0f 100644 --- a/app/Rules/Factory/TriggerFactory.php +++ b/app/Rules/Factory/TriggerFactory.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Factory; @@ -45,8 +45,9 @@ class TriggerFactory $triggerType = $trigger->trigger_type; /** @var AbstractTrigger $class */ - $class = self::getTriggerClass($triggerType); - $obj = $class::makeFromTriggerValue($trigger->trigger_value); + $class = self::getTriggerClass($triggerType); + $obj = $class::makeFromTriggerValue($trigger->trigger_value); + $obj->stopProcessing = $trigger->stop_processing; Log::debug(sprintf('self::getTriggerClass("%s") = "%s"', $triggerType, $class)); Log::debug(sprintf('%s::makeFromTriggerValue(%s) = object of class "%s"', $class, $trigger->trigger_value, get_class($obj))); diff --git a/app/Rules/Processor.php b/app/Rules/Processor.php index 9b0daf0ae9..579521af61 100644 --- a/app/Rules/Processor.php +++ b/app/Rules/Processor.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules; @@ -69,6 +69,7 @@ final class Processor $triggerSet = $rule->ruleTriggers()->orderBy('order', 'ASC')->get(); /** @var RuleTrigger $trigger */ foreach ($triggerSet as $trigger) { + Log::debug(sprintf('Push trigger %d', $trigger->id)); $self->triggers->push(TriggerFactory::getTrigger($trigger)); } $self->actions = $rule->ruleActions()->orderBy('order', 'ASC')->get(); diff --git a/app/Rules/TransactionMatcher.php b/app/Rules/TransactionMatcher.php index 5241e4f84c..090d3553ba 100644 --- a/app/Rules/TransactionMatcher.php +++ b/app/Rules/TransactionMatcher.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules; diff --git a/app/Rules/Triggers/AbstractTrigger.php b/app/Rules/Triggers/AbstractTrigger.php index 0fd9a3bfd8..b008a1b91c 100644 --- a/app/Rules/Triggers/AbstractTrigger.php +++ b/app/Rules/Triggers/AbstractTrigger.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -75,7 +75,6 @@ class AbstractTrigger } - /** * @param RuleTrigger $trigger * @param TransactionJournal $journal diff --git a/app/Rules/Triggers/AmountExactly.php b/app/Rules/Triggers/AmountExactly.php index e7984deb02..d160f8495e 100644 --- a/app/Rules/Triggers/AmountExactly.php +++ b/app/Rules/Triggers/AmountExactly.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -58,7 +58,7 @@ final class AmountExactly extends AbstractTrigger implements TriggerInterface */ public function triggered(TransactionJournal $journal): bool { - $amount = $journal->destination_amount ?? TransactionJournal::amountPositive($journal); + $amount = $journal->destination_amount ?? $journal->amountPositive(); $compare = $this->triggerValue; $result = bccomp($amount, $compare); if ($result === 0) { diff --git a/app/Rules/Triggers/AmountLess.php b/app/Rules/Triggers/AmountLess.php index 1c856c6796..433ccb2491 100644 --- a/app/Rules/Triggers/AmountLess.php +++ b/app/Rules/Triggers/AmountLess.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -58,7 +58,7 @@ final class AmountLess extends AbstractTrigger implements TriggerInterface */ public function triggered(TransactionJournal $journal): bool { - $amount = $journal->destination_amount ?? TransactionJournal::amountPositive($journal); + $amount = $journal->destination_amount ?? $journal->amountPositive(); $compare = $this->triggerValue; $result = bccomp($amount, $compare); if ($result === -1) { diff --git a/app/Rules/Triggers/AmountMore.php b/app/Rules/Triggers/AmountMore.php index d8a7ce1643..8a7f1544b6 100644 --- a/app/Rules/Triggers/AmountMore.php +++ b/app/Rules/Triggers/AmountMore.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -64,7 +64,7 @@ final class AmountMore extends AbstractTrigger implements TriggerInterface */ public function triggered(TransactionJournal $journal): bool { - $amount = $journal->destination_amount ?? TransactionJournal::amountPositive($journal); + $amount = $journal->destination_amount ?? $journal->amountPositive(); $compare = $this->triggerValue; $result = bccomp($amount, $compare); if ($result === 1) { diff --git a/app/Rules/Triggers/BudgetIs.php b/app/Rules/Triggers/BudgetIs.php index fa444f3ffc..ecc2d01b92 100644 --- a/app/Rules/Triggers/BudgetIs.php +++ b/app/Rules/Triggers/BudgetIs.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/CategoryIs.php b/app/Rules/Triggers/CategoryIs.php index 28dcddb086..caf39abaaf 100644 --- a/app/Rules/Triggers/CategoryIs.php +++ b/app/Rules/Triggers/CategoryIs.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/DescriptionContains.php b/app/Rules/Triggers/DescriptionContains.php index d805d0ea10..45fbf08205 100644 --- a/app/Rules/Triggers/DescriptionContains.php +++ b/app/Rules/Triggers/DescriptionContains.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/DescriptionEnds.php b/app/Rules/Triggers/DescriptionEnds.php index ee01fb975f..31c8d269ea 100644 --- a/app/Rules/Triggers/DescriptionEnds.php +++ b/app/Rules/Triggers/DescriptionEnds.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/DescriptionIs.php b/app/Rules/Triggers/DescriptionIs.php index 385c17decc..de471e5dc7 100644 --- a/app/Rules/Triggers/DescriptionIs.php +++ b/app/Rules/Triggers/DescriptionIs.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/DescriptionStarts.php b/app/Rules/Triggers/DescriptionStarts.php index 9e412db938..6bb9232fc3 100644 --- a/app/Rules/Triggers/DescriptionStarts.php +++ b/app/Rules/Triggers/DescriptionStarts.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/FromAccountContains.php b/app/Rules/Triggers/FromAccountContains.php index 1b8241ef7b..54fef61b20 100644 --- a/app/Rules/Triggers/FromAccountContains.php +++ b/app/Rules/Triggers/FromAccountContains.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -66,7 +66,7 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf $fromAccountName = ''; /** @var Account $account */ - foreach (TransactionJournal::sourceAccountList($journal) as $account) { + foreach ($journal->sourceAccountList() as $account) { $fromAccountName .= strtolower($account->name); } diff --git a/app/Rules/Triggers/FromAccountEnds.php b/app/Rules/Triggers/FromAccountEnds.php index 54afb67808..6121bb9580 100644 --- a/app/Rules/Triggers/FromAccountEnds.php +++ b/app/Rules/Triggers/FromAccountEnds.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -66,7 +66,7 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface $name = ''; /** @var Account $account */ - foreach (TransactionJournal::sourceAccountList($journal) as $account) { + foreach ($journal->sourceAccountList() as $account) { $name .= strtolower($account->name); } diff --git a/app/Rules/Triggers/FromAccountIs.php b/app/Rules/Triggers/FromAccountIs.php index c3f494d48c..06339eb331 100644 --- a/app/Rules/Triggers/FromAccountIs.php +++ b/app/Rules/Triggers/FromAccountIs.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -61,7 +61,7 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface $name = ''; /** @var Account $account */ - foreach (TransactionJournal::sourceAccountList($journal) as $account) { + foreach ($journal->sourceAccountList() as $account) { $name .= strtolower($account->name); } diff --git a/app/Rules/Triggers/FromAccountStarts.php b/app/Rules/Triggers/FromAccountStarts.php index f32ce2b545..52ab178289 100644 --- a/app/Rules/Triggers/FromAccountStarts.php +++ b/app/Rules/Triggers/FromAccountStarts.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -66,7 +66,7 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac $name = ''; /** @var Account $account */ - foreach (TransactionJournal::sourceAccountList($journal) as $account) { + foreach ($journal->sourceAccountList() as $account) { $name .= strtolower($account->name); } diff --git a/app/Rules/Triggers/HasAttachment.php b/app/Rules/Triggers/HasAttachment.php new file mode 100644 index 0000000000..4fc3bd720f --- /dev/null +++ b/app/Rules/Triggers/HasAttachment.php @@ -0,0 +1,61 @@ +triggerValue); + $attachments = $journal->attachments()->count(); + if ($attachments >= $minimum) { + return true; + } + + return false; + } +} \ No newline at end of file diff --git a/app/Rules/Triggers/TagIs.php b/app/Rules/Triggers/TagIs.php index 684d806760..9ea19ac2ed 100644 --- a/app/Rules/Triggers/TagIs.php +++ b/app/Rules/Triggers/TagIs.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/ToAccountContains.php b/app/Rules/Triggers/ToAccountContains.php index d80c9ab4d5..96eeb960e8 100644 --- a/app/Rules/Triggers/ToAccountContains.php +++ b/app/Rules/Triggers/ToAccountContains.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -66,7 +66,7 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac $toAccountName = ''; /** @var Account $account */ - foreach (TransactionJournal::destinationAccountList($journal) as $account) { + foreach ($journal->destinationAccountList() as $account) { $toAccountName .= strtolower($account->name); } diff --git a/app/Rules/Triggers/ToAccountEnds.php b/app/Rules/Triggers/ToAccountEnds.php index f4fd676422..ff5f470618 100644 --- a/app/Rules/Triggers/ToAccountEnds.php +++ b/app/Rules/Triggers/ToAccountEnds.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -66,7 +66,7 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface $toAccountName = ''; /** @var Account $account */ - foreach (TransactionJournal::destinationAccountList($journal) as $account) { + foreach ($journal->destinationAccountList() as $account) { $toAccountName .= strtolower($account->name); } diff --git a/app/Rules/Triggers/ToAccountIs.php b/app/Rules/Triggers/ToAccountIs.php index 0a2fdd8ca9..fffb334153 100644 --- a/app/Rules/Triggers/ToAccountIs.php +++ b/app/Rules/Triggers/ToAccountIs.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -66,7 +66,7 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface $toAccountName = ''; /** @var Account $account */ - foreach (TransactionJournal::destinationAccountList($journal) as $account) { + foreach ($journal->destinationAccountList() as $account) { $toAccountName .= strtolower($account->name); } diff --git a/app/Rules/Triggers/ToAccountStarts.php b/app/Rules/Triggers/ToAccountStarts.php index f5f162c283..05eebbe028 100644 --- a/app/Rules/Triggers/ToAccountStarts.php +++ b/app/Rules/Triggers/ToAccountStarts.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; @@ -66,7 +66,7 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface $toAccountName = ''; /** @var Account $account */ - foreach (TransactionJournal::destinationAccountList($journal) as $account) { + foreach ($journal->destinationAccountList() as $account) { $toAccountName .= strtolower($account->name); } diff --git a/app/Rules/Triggers/TransactionType.php b/app/Rules/Triggers/TransactionType.php index 691a16ff9d..e6f220ffce 100644 --- a/app/Rules/Triggers/TransactionType.php +++ b/app/Rules/Triggers/TransactionType.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/TriggerInterface.php b/app/Rules/Triggers/TriggerInterface.php index df05a331b6..ac58021ddc 100644 --- a/app/Rules/Triggers/TriggerInterface.php +++ b/app/Rules/Triggers/TriggerInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/UserAction.php b/app/Rules/Triggers/UserAction.php index 576ddfe6aa..fb4d6508c6 100644 --- a/app/Rules/Triggers/UserAction.php +++ b/app/Rules/Triggers/UserAction.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Services/Currency/ExchangeRateInterface.php b/app/Services/Currency/ExchangeRateInterface.php new file mode 100644 index 0000000000..a37133db9a --- /dev/null +++ b/app/Services/Currency/ExchangeRateInterface.php @@ -0,0 +1,38 @@ +format('Y-m-d'), $fromCurrency->code, $toCurrency->code); + $result = Requests::get($uri); + $rate = 1.0; + $content = null; + if ($result->status_code !== 200) { + Log::error(sprintf('Something went wrong. Received error code %d and body "%s" from FixerIO.', $result->status_code, $result->body)); + } + // get rate from body: + if ($result->status_code === 200) { + $content = json_decode($result->body, true); + } + if (!is_null($content)) { + $code = $toCurrency->code; + $rate = isset($content['rates'][$code]) ? $content['rates'][$code] : '1'; + } + + // create new currency exchange rate object: + $exchangeRate = new CurrencyExchangeRate; + $exchangeRate->user()->associate($this->user); + $exchangeRate->fromCurrency()->associate($fromCurrency); + $exchangeRate->toCurrency()->associate($toCurrency); + $exchangeRate->date = $date; + $exchangeRate->rate = $rate; + $exchangeRate->save(); + + return $exchangeRate; + } + + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } +} \ No newline at end of file diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 9434352b80..32e42cf3bb 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -9,15 +9,15 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; use Illuminate\Support\Collection; -use Log; use Preferences as Prefs; /** @@ -97,7 +97,6 @@ class Amount // alternative is currency before amount $format = $pos_a . $pos_b . '%s' . $pos_c . $space . $pos_d . '%v' . $pos_e; } - Log::debug(sprintf('Final format: "%s"', $format)); return $format; } @@ -130,7 +129,7 @@ class Amount setlocale(LC_MONETARY, $locale); $float = round($amount, 12); $info = localeconv(); - $formatted = number_format($float, $format->decimal_places, $info['mon_decimal_point'], $info['mon_thousands_sep']); + $formatted = number_format($float, intval($format->decimal_places), $info['mon_decimal_point'], $info['mon_thousands_sep']); // some complicated switches to format the amount correctly: $precedes = $amount < 0 ? $info['n_cs_precedes'] : $info['p_cs_precedes']; @@ -171,7 +170,7 @@ class Amount */ public function formatByCode(string $currencyCode, string $amount, bool $coloured = true): string { - $currency = TransactionCurrency::whereCode($currencyCode)->first(); + $currency = TransactionCurrency::where('code', $currencyCode)->first(); return $this->formatAnything($currency, $amount, $coloured); } @@ -187,7 +186,7 @@ class Amount { $currency = $journal->transactionCurrency; - return $this->formatAnything($currency, TransactionJournal::amount($journal), $coloured); + return $this->formatAnything($currency, $journal->amount(), $coloured); } /** @@ -220,11 +219,11 @@ class Amount $cache = new CacheProperties; $cache->addProperty('getCurrencyCode'); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } else { $currencyPreference = Prefs::get('currencyPreference', config('firefly.default_currency', 'EUR')); - $currency = TransactionCurrency::whereCode($currencyPreference->data)->first(); + $currency = TransactionCurrency::where('code', $currencyPreference->data)->first(); if ($currency) { $cache->store($currency->code); @@ -245,10 +244,10 @@ class Amount $cache = new CacheProperties; $cache->addProperty('getCurrencySymbol'); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } else { $currencyPreference = Prefs::get('currencyPreference', config('firefly.default_currency', 'EUR')); - $currency = TransactionCurrency::whereCode($currencyPreference->data)->first(); + $currency = TransactionCurrency::where('code', $currencyPreference->data)->first(); $cache->store($currency->symbol); @@ -257,17 +256,21 @@ class Amount } /** - * @return \FireflyIII\Models\TransactionCurrency + * @return TransactionCurrency + * @throws FireflyException */ public function getDefaultCurrency(): TransactionCurrency { $cache = new CacheProperties; $cache->addProperty('getDefaultCurrency'); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } $currencyPreference = Prefs::get('currencyPreference', config('firefly.default_currency', 'EUR')); - $currency = TransactionCurrency::whereCode($currencyPreference->data)->first(); + $currency = TransactionCurrency::where('code', $currencyPreference->data)->first(); + if (is_null($currency)) { + throw new FireflyException(sprintf('No currency found with code "%s"', $currencyPreference->data)); + } $cache->store($currency); return $currency; diff --git a/app/Support/Binder/AccountList.php b/app/Support/Binder/AccountList.php index da684a089f..8bd5210d17 100644 --- a/app/Support/Binder/AccountList.php +++ b/app/Support/Binder/AccountList.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/BinderInterface.php b/app/Support/Binder/BinderInterface.php index f75ae11ee6..6d8313686b 100644 --- a/app/Support/Binder/BinderInterface.php +++ b/app/Support/Binder/BinderInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/BudgetList.php b/app/Support/Binder/BudgetList.php index eb617a0ac3..299206e16b 100644 --- a/app/Support/Binder/BudgetList.php +++ b/app/Support/Binder/BudgetList.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/CategoryList.php b/app/Support/Binder/CategoryList.php index 852ac1e396..4bd60aedef 100644 --- a/app/Support/Binder/CategoryList.php +++ b/app/Support/Binder/CategoryList.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/CurrencyCode.php b/app/Support/Binder/CurrencyCode.php new file mode 100644 index 0000000000..4616ce5ef2 --- /dev/null +++ b/app/Support/Binder/CurrencyCode.php @@ -0,0 +1,39 @@ +first(); + if (!is_null($currency)) { + return $currency; + } + throw new NotFoundHttpException; + } +} \ No newline at end of file diff --git a/app/Support/Binder/Date.php b/app/Support/Binder/Date.php index be03cc14d2..73dba325e1 100644 --- a/app/Support/Binder/Date.php +++ b/app/Support/Binder/Date.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/JournalList.php b/app/Support/Binder/JournalList.php index b36af5149c..cc31681323 100644 --- a/app/Support/Binder/JournalList.php +++ b/app/Support/Binder/JournalList.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; @@ -39,7 +39,13 @@ class JournalList implements BinderInterface $object = TransactionJournal::whereIn('transaction_journals.id', $ids) ->expanded() ->where('transaction_journals.user_id', auth()->user()->id) - ->get(TransactionJournal::queryFields()); + ->get( + [ + 'transaction_journals.*', + 'transaction_types.type AS transaction_type_type', + 'transaction_currencies.code AS transaction_currency_code', + ] + ); if ($object->count() > 0) { return $object; diff --git a/app/Support/Binder/TagList.php b/app/Support/Binder/TagList.php index b1c42bb4c8..3acc8f4195 100644 --- a/app/Support/Binder/TagList.php +++ b/app/Support/Binder/TagList.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/UnfinishedJournal.php b/app/Support/Binder/UnfinishedJournal.php index 607f442e46..799a152743 100644 --- a/app/Support/Binder/UnfinishedJournal.php +++ b/app/Support/Binder/UnfinishedJournal.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.php index b8e493d134..555fe427b0 100644 --- a/app/Support/CacheProperties.php +++ b/app/Support/CacheProperties.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/ChartColour.php b/app/Support/ChartColour.php index c04b75b28e..eeb6ef6bfb 100644 --- a/app/Support/ChartColour.php +++ b/app/Support/ChartColour.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/Domain.php b/app/Support/Domain.php index 427bd4628c..8c04fceb9f 100644 --- a/app/Support/Domain.php +++ b/app/Support/Domain.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/Events/BillScanner.php b/app/Support/Events/BillScanner.php index 7d1d362783..dc2ed7a7d1 100644 --- a/app/Support/Events/BillScanner.php +++ b/app/Support/Events/BillScanner.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Events; diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index 85b85fd5d2..dab2ed286d 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; @@ -40,6 +40,8 @@ class ExpandedForm */ public function amount(string $name, $value = null, array $options = []): string { + $options['min'] = '0.01'; + return $this->currencyField($name, 'amount', $value, $options); } @@ -52,6 +54,8 @@ class ExpandedForm */ public function amountSmall(string $name, $value = null, array $options = []): string { + $options['min'] = '0.01'; + return $this->currencyField($name, 'amount-small', $value, $options); } @@ -261,6 +265,67 @@ class ExpandedForm return $html; } + /** + * @param string $name + * @param null $value + * @param array $options + * + * @return string + */ + public function nonSelectableAmount(string $name, $value = null, array $options = []): string + { + $label = $this->label($name, $options); + $options = $this->expandOptionArray($name, $label, $options); + $classes = $this->getHolderClasses($name); + $value = $this->fillFieldValue($name, $value); + $options['step'] = 'any'; + $options['min'] = '0.01'; + $selectedCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency(); + unset($options['currency']); + unset($options['placeholder']); + + // make sure value is formatted nicely: + if (!is_null($value) && $value !== '') { + $value = round($value, $selectedCurrency->decimal_places); + } + + + $html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render(); + + return $html; + } + + + /** + * @param string $name + * @param null $value + * @param array $options + * + * @return string + */ + public function nonSelectableBalance(string $name, $value = null, array $options = []): string + { + $label = $this->label($name, $options); + $options = $this->expandOptionArray($name, $label, $options); + $classes = $this->getHolderClasses($name); + $value = $this->fillFieldValue($name, $value); + $options['step'] = 'any'; + $selectedCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency(); + unset($options['currency']); + unset($options['placeholder']); + + // make sure value is formatted nicely: + if (!is_null($value) && $value !== '') { + $decimals = $selectedCurrency->decimal_places ?? 2; + $value = round($value, $decimals); + } + + + $html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render(); + + return $html; + } + /** * @param $type * @param $name diff --git a/app/Support/Facades/Amount.php b/app/Support/Facades/Amount.php index b7a4d53304..4a3df176a6 100644 --- a/app/Support/Facades/Amount.php +++ b/app/Support/Facades/Amount.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/Facades/ExpandedForm.php b/app/Support/Facades/ExpandedForm.php index fe6afa5af9..59f2e973ef 100644 --- a/app/Support/Facades/ExpandedForm.php +++ b/app/Support/Facades/ExpandedForm.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/Facades/FireflyConfig.php b/app/Support/Facades/FireflyConfig.php index 8a1a5ff617..4fcc685c95 100644 --- a/app/Support/Facades/FireflyConfig.php +++ b/app/Support/Facades/FireflyConfig.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/Facades/Navigation.php b/app/Support/Facades/Navigation.php index b59fce49fb..10ed3eb3b4 100644 --- a/app/Support/Facades/Navigation.php +++ b/app/Support/Facades/Navigation.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/Facades/Preferences.php b/app/Support/Facades/Preferences.php index d0155f6375..59b83dec80 100644 --- a/app/Support/Facades/Preferences.php +++ b/app/Support/Facades/Preferences.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/Facades/Steam.php b/app/Support/Facades/Steam.php index da00e57317..c8b78622c5 100644 --- a/app/Support/Facades/Steam.php +++ b/app/Support/Facades/Steam.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php index 743dc40c2a..68f2323396 100644 --- a/app/Support/FireflyConfig.php +++ b/app/Support/FireflyConfig.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/Models/TagSupport.php b/app/Support/Models/TagSupport.php deleted file mode 100644 index f053ef42cf..0000000000 --- a/app/Support/Models/TagSupport.php +++ /dev/null @@ -1,93 +0,0 @@ -tagMode == 'balancingAct' || $tag->tagMode == 'nothing') { - foreach ($tag->transactionjournals as $journal) { - if ($journal->isTransfer()) { - return false; - } - } - } - - /* - * If this tag contains more than one expenses, it cannot become an advance payment. - */ - $count = 0; - foreach ($tag->transactionjournals as $journal) { - if ($journal->isWithdrawal()) { - $count++; - } - } - if ($count > 1) { - return false; - } - - return true; - } - - /** - * Can a tag become a balancing act? - * - * @param Tag $tag - * - * @return bool - */ - public static function tagAllowBalancing(Tag $tag): bool - { - /* - * If has more than two transactions already, cannot become a balancing act: - */ - if ($tag->transactionjournals->count() > 2) { - return false; - } - - /* - * If any transaction is a deposit, cannot become a balancing act. - */ - foreach ($tag->transactionjournals as $journal) { - if ($journal->isDeposit()) { - return false; - } - } - - return true; - - } - -} diff --git a/app/Support/Models/TransactionJournalSupport.php b/app/Support/Models/TransactionJournalSupport.php deleted file mode 100644 index 513fec2623..0000000000 --- a/app/Support/Models/TransactionJournalSupport.php +++ /dev/null @@ -1,309 +0,0 @@ -addProperty($journal->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('amount'); - if ($cache->has()) { - return $cache->get(); - } - - // saves on queries: - $amount = $journal->transactions()->where('amount', '>', 0)->get()->sum('amount'); - - if ($journal->isWithdrawal()) { - $amount = $amount * -1; - } - $amount = strval($amount); - $cache->store($amount); - - return $amount; - } - - /** - * @param TransactionJournal $journal - * - * @return string - */ - public static function amountPositive(TransactionJournal $journal): string - { - $cache = new CacheProperties; - $cache->addProperty($journal->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('amount-positive'); - if ($cache->has()) { - return $cache->get(); - } - - // saves on queries: - $amount = $journal->transactions()->where('amount', '>', 0)->get()->sum('amount'); - - $amount = strval($amount); - $cache->store($amount); - - return $amount; - } - - /** - * @param TransactionJournal $journal - * - * @return int - */ - public static function budgetId(TransactionJournal $journal): int - { - $budget = $journal->budgets()->first(); - if (!is_null($budget)) { - return $budget->id; - } - - return 0; - } - - /** - * @param TransactionJournal $journal - * - * @return string - */ - public static function categoryAsString(TransactionJournal $journal): string - { - $category = $journal->categories()->first(); - if (!is_null($category)) { - return $category->name; - } - - return ''; - } - - /** - * @param TransactionJournal $journal - * @param string $dateField - * - * @return string - */ - public static function dateAsString(TransactionJournal $journal, string $dateField = ''): string - { - if ($dateField === '') { - return $journal->date->format('Y-m-d'); - } - if (!is_null($journal->$dateField) && $journal->$dateField instanceof Carbon) { - // make field NULL - $carbon = clone $journal->$dateField; - $journal->$dateField = null; - $journal->save(); - - // create meta entry - $journal->setMeta($dateField, $carbon); - - // return that one instead. - return $carbon->format('Y-m-d'); - } - $metaField = $journal->getMeta($dateField); - if (!is_null($metaField)) { - $carbon = new Carbon($metaField); - - return $carbon->format('Y-m-d'); - } - - return ''; - - - } - - /** - * @param TransactionJournal $journal - * - * @return Collection - */ - public static function destinationAccountList(TransactionJournal $journal): Collection - { - $cache = new CacheProperties; - $cache->addProperty($journal->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('destination-account-list'); - if ($cache->has()) { - return $cache->get(); - } - $transactions = $journal->transactions()->where('amount', '>', 0)->orderBy('transactions.account_id')->with('account')->get(); - $list = new Collection; - /** @var Transaction $t */ - foreach ($transactions as $t) { - $list->push($t->account); - } - $cache->store($list); - - return $list; - } - - /** - * @param TransactionJournal $journal - * - * @return Collection - */ - public static function destinationTransactionList(TransactionJournal $journal): Collection - { - $cache = new CacheProperties; - $cache->addProperty($journal->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('destination-transaction-list'); - if ($cache->has()) { - return $cache->get(); - } - $list = $journal->transactions()->where('amount', '>', 0)->with('account')->get(); - $cache->store($list); - - return $list; - } - - /** - * @param Builder $query - * @param string $table - * - * @return bool - */ - public static function isJoined(Builder $query, string $table): bool - { - $joins = $query->getQuery()->joins; - if (is_null($joins)) { - return false; - } - foreach ($joins as $join) { - if ($join->table === $table) { - return true; - } - } - - return false; - } - - /** - * @param TransactionJournal $journal - * - * @return int - */ - public static function piggyBankId(TransactionJournal $journal): int - { - if ($journal->piggyBankEvents()->count() > 0) { - return $journal->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id; - } - - return 0; - } - - /** - * @return array - */ - public static function queryFields(): array - { - return [ - 'transaction_journals.*', - 'transaction_types.type AS transaction_type_type', // the other field is called "transaction_type_id" so this is pretty consistent. - 'transaction_currencies.code AS transaction_currency_code', - ]; - } - - /** - * @param TransactionJournal $journal - * - * @return Collection - */ - public static function sourceAccountList(TransactionJournal $journal): Collection - { - $cache = new CacheProperties; - $cache->addProperty($journal->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('source-account-list'); - if ($cache->has()) { - return $cache->get(); - } - $transactions = $journal->transactions()->where('amount', '<', 0)->orderBy('transactions.account_id')->with('account')->get(); - $list = new Collection; - /** @var Transaction $t */ - foreach ($transactions as $t) { - $list->push($t->account); - } - $cache->store($list); - - return $list; - } - - /** - * @param TransactionJournal $journal - * - * @return Collection - */ - public static function sourceTransactionList(TransactionJournal $journal): Collection - { - $cache = new CacheProperties; - $cache->addProperty($journal->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('source-transaction-list'); - if ($cache->has()) { - return $cache->get(); - } - $list = $journal->transactions()->where('amount', '<', 0)->with('account')->get(); - $cache->store($list); - - return $list; - } - - /** - * @param TransactionJournal $journal - * - * @return string - */ - public static function transactionTypeStr(TransactionJournal $journal): string - { - $cache = new CacheProperties; - $cache->addProperty($journal->id); - $cache->addProperty('transaction-journal'); - $cache->addProperty('type-string'); - if ($cache->has()) { - return $cache->get(); - } - - $typeStr = $journal->transaction_type_type ?? $journal->transactionType->type; - $cache->store($typeStr); - - return $typeStr; - } -} diff --git a/app/Support/Models/TransactionJournalTrait.php b/app/Support/Models/TransactionJournalTrait.php new file mode 100644 index 0000000000..c9cea3ec49 --- /dev/null +++ b/app/Support/Models/TransactionJournalTrait.php @@ -0,0 +1,276 @@ +addProperty($this->id); + $cache->addProperty('transaction-journal'); + $cache->addProperty('amount'); + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + + // saves on queries: + $amount = $this->transactions()->where('amount', '>', 0)->get()->sum('amount'); + + if ($this->isWithdrawal()) { + $amount = $amount * -1; + } + $amount = strval($amount); + $cache->store($amount); + + return $amount; + } + + /** + * @return string + */ + public function amountPositive(): string + { + $cache = new CacheProperties; + $cache->addProperty($this->id); + $cache->addProperty('transaction-journal'); + $cache->addProperty('amount-positive'); + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + + // saves on queries: + $amount = $this->transactions()->where('amount', '>', 0)->get()->sum('amount'); + + $amount = strval($amount); + $cache->store($amount); + + return $amount; + } + + /** + * @return int + */ + public function budgetId(): int + { + $budget = $this->budgets()->first(); + if (!is_null($budget)) { + return $budget->id; + } + + return 0; + } + + /** + * @return string + */ + public function categoryAsString(): string + { + $category = $this->categories()->first(); + if (!is_null($category)) { + return $category->name; + } + + return ''; + } + + /** + * @param string $dateField + * + * @return string + */ + public function dateAsString(string $dateField = ''): string + { + if ($dateField === '') { + return $this->date->format('Y-m-d'); + } + if (!is_null($this->$dateField) && $this->$dateField instanceof Carbon) { + // make field NULL + $carbon = clone $this->$dateField; + $this->$dateField = null; + $this->save(); + + // create meta entry + $this->setMeta($dateField, $carbon); + + // return that one instead. + return $carbon->format('Y-m-d'); + } + $metaField = $this->getMeta($dateField); + if (!is_null($metaField)) { + $carbon = new Carbon($metaField); + + return $carbon->format('Y-m-d'); + } + + return ''; + + + } + + /** + * @return Collection + */ + public function destinationAccountList(): Collection + { + $cache = new CacheProperties; + $cache->addProperty($this->id); + $cache->addProperty('transaction-journal'); + $cache->addProperty('destination-account-list'); + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + $transactions = $this->transactions()->where('amount', '>', 0)->orderBy('transactions.account_id')->with('account')->get(); + $list = new Collection; + /** @var Transaction $t */ + foreach ($transactions as $t) { + $list->push($t->account); + } + $list = $list->unique('id'); + $cache->store($list); + + return $list; + } + + /** + * @return Collection + */ + public function destinationTransactionList(): Collection + { + $cache = new CacheProperties; + $cache->addProperty($this->id); + $cache->addProperty('transaction-journal'); + $cache->addProperty('destination-transaction-list'); + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + $list = $this->transactions()->where('amount', '>', 0)->with('account')->get(); + $cache->store($list); + + return $list; + } + + /** + * @param Builder $query + * @param string $table + * + * @return bool + */ + public function isJoined(Builder $query, string $table): bool + { + $joins = $query->getQuery()->joins; + if (is_null($joins)) { + return false; + } + foreach ($joins as $join) { + if ($join->table === $table) { + return true; + } + } + + return false; + } + + /** + * @return int + */ + public function piggyBankId(): int + { + if ($this->piggyBankEvents()->count() > 0) { + return $this->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id; + } + + return 0; + } + + /** + * @return Collection + */ + public function sourceAccountList(): Collection + { + $cache = new CacheProperties; + $cache->addProperty($this->id); + $cache->addProperty('transaction-journal'); + $cache->addProperty('source-account-list'); + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + $transactions = $this->transactions()->where('amount', '<', 0)->orderBy('transactions.account_id')->with('account')->get(); + $list = new Collection; + /** @var Transaction $t */ + foreach ($transactions as $t) { + $list->push($t->account); + } + $list = $list->unique('id'); + $cache->store($list); + + return $list; + } + + /** + * @return Collection + */ + public function sourceTransactionList(): Collection + { + $cache = new CacheProperties; + $cache->addProperty($this->id); + $cache->addProperty('transaction-journal'); + $cache->addProperty('source-transaction-list'); + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + $list = $this->transactions()->where('amount', '<', 0)->with('account')->get(); + $cache->store($list); + + return $list; + } + + /** + * @return string + */ + public function transactionTypeStr(): string + { + $cache = new CacheProperties; + $cache->addProperty($this->id); + $cache->addProperty('transaction-journal'); + $cache->addProperty('type-string'); + if ($cache->has()) { + return $cache->get(); // @codeCoverageIgnore + } + + $typeStr = $this->transaction_type_type ?? $this->transactionType->type; + $cache->store($typeStr); + + return $typeStr; + } +} diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index cbdeafbabc..dc28a613db 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; @@ -72,7 +72,7 @@ class Navigation * @return \Carbon\Carbon * @throws FireflyException */ - public function endOfPeriod(Carbon $end, string $repeatFreq): Carbon + public function endOfPeriod(\Carbon\Carbon $end, string $repeatFreq): Carbon { $currentEnd = clone $end; diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index 999b8847ef..743a6444e1 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; @@ -118,9 +118,13 @@ class Preferences */ public function lastActivity(): string { - $preference = $this->get('lastActivity', microtime())->data; + $lastActivity = microtime(); + $preference = $this->get('lastActivity', microtime()); + if (!is_null($preference)) { + $lastActivity = $preference->data; + } - return md5($preference); + return md5($lastActivity); } /** diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php new file mode 100644 index 0000000000..18e94d3aff --- /dev/null +++ b/app/Support/Search/Modifier.php @@ -0,0 +1,211 @@ +transaction_amount); + + $compare = bccomp($amount, $transactionAmount); + Log::debug(sprintf('%s vs %s is %d', $amount, $transactionAmount, $compare)); + + return $compare === $expected; + } + + public static function apply(array $modifier, Transaction $transaction): bool + { + switch ($modifier['type']) { + default: + throw new FireflyException(sprintf('Search modifier "%s" is not (yet) supported. Sorry!', $modifier['type'])); + case 'amount': + case 'amount_is': + $res = self::amountCompare($transaction, $modifier['value'], 0); + Log::debug(sprintf('Amount is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'amount_min': + case 'amount_less': + $res = self::amountCompare($transaction, $modifier['value'], 1); + Log::debug(sprintf('Amount less than %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'amount_max': + case 'amount_more': + $res = self::amountCompare($transaction, $modifier['value'], -1); + Log::debug(sprintf('Amount more than %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'source': + $res = self::stringCompare($transaction->account_name, $modifier['value']); + Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'destination': + $res = self::stringCompare($transaction->opposing_account_name, $modifier['value']); + Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'category': + $res = self::category($transaction, $modifier['value']); + Log::debug(sprintf('Category is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'budget': + $res = self::budget($transaction, $modifier['value']); + Log::debug(sprintf('Budget is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'bill': + $res = self::stringCompare(strval($transaction->bill_name), $modifier['value']); + Log::debug(sprintf('Bill is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'type': + $res = self::stringCompare($transaction->transaction_type_type, $modifier['value']); + Log::debug(sprintf('Transaction type is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'date': + case 'on': + $res = self::sameDate($transaction->date, $modifier['value']); + Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'date_before': + case 'before': + $res = self::dateBefore($transaction->date, $modifier['value']); + Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'date_after': + case 'after': + $res = self::dateAfter($transaction->date, $modifier['value']); + Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true))); + break; + } + + return $res; + } + + /** + * @param Carbon $date + * @param string $compare + * + * @return bool + */ + public static function dateAfter(Carbon $date, string $compare): bool + { + try { + $compareDate = new Carbon($compare); + } catch (Exception $e) { + return false; + } + + return $date->greaterThanOrEqualTo($compareDate); + } + + /** + * @param Carbon $date + * @param string $compare + * + * @return bool + */ + public static function dateBefore(Carbon $date, string $compare): bool + { + try { + $compareDate = new Carbon($compare); + } catch (Exception $e) { + return false; + } + + return $date->lessThanOrEqualTo($compareDate); + } + + /** + * @param Carbon $date + * @param string $compare + * + * @return bool + */ + public static function sameDate(Carbon $date, string $compare): bool + { + try { + $compareDate = new Carbon($compare); + } catch (Exception $e) { + return false; + } + + return $compareDate->isSameDay($date); + } + + /** + * @param string $haystack + * @param string $needle + * + * @return bool + */ + public static function stringCompare(string $haystack, string $needle): bool + { + $res = !(strpos(strtolower($haystack), strtolower($needle)) === false); + Log::debug(sprintf('"%s" is in "%s"? %s', $needle, $haystack, var_export($res, true))); + + return $res; + + } + + /** + * @param Transaction $transaction + * @param string $search + * + * @return bool + */ + private static function budget(Transaction $transaction, string $search): bool + { + $journalBudget = ''; + if (!is_null($transaction->transaction_journal_budget_name)) { + $journalBudget = Steam::decrypt(intval($transaction->transaction_journal_budget_encrypted), $transaction->transaction_journal_budget_name); + } + $transactionBudget = ''; + if (!is_null($transaction->transaction_budget_name)) { + $journalBudget = Steam::decrypt(intval($transaction->transaction_budget_encrypted), $transaction->transaction_budget_name); + } + + return self::stringCompare($journalBudget, $search) || self::stringCompare($transactionBudget, $search); + } + + /** + * @param Transaction $transaction + * @param string $search + * + * @return bool + */ + private static function category(Transaction $transaction, string $search): bool + { + $journalCategory = ''; + if (!is_null($transaction->transaction_journal_category_name)) { + $journalCategory = Steam::decrypt(intval($transaction->transaction_journal_category_encrypted), $transaction->transaction_journal_category_name); + } + $transactionCategory = ''; + if (!is_null($transaction->transaction_category_name)) { + $journalCategory = Steam::decrypt(intval($transaction->transaction_category_encrypted), $transaction->transaction_category_name); + } + + return self::stringCompare($journalCategory, $search) || self::stringCompare($transactionCategory, $search); + } +} \ No newline at end of file diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index b37af85daa..4b9ffacb31 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -9,12 +9,14 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Search; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Budget; @@ -34,19 +36,74 @@ class Search implements SearchInterface { /** @var int */ private $limit = 100; + /** @var Collection */ + private $modifiers; + /** @var string */ + private $originalQuery = ''; /** @var User */ private $user; + /** @var array */ + private $validModifiers = []; + /** @var array */ + private $words = []; + + /** + * Search constructor. + */ + public function __construct() + { + $this->modifiers = new Collection; + $this->validModifiers = config('firefly.search_modifiers'); + } + + /** + * @return string + */ + public function getWordsAsString(): string + { + $string = join(' ', $this->words); + if (strlen($string) === 0) { + return is_string($this->originalQuery) ? $this->originalQuery : ''; + } + + return $string; + } + + /** + * @return bool + */ + public function hasModifiers(): bool + { + return $this->modifiers->count() > 0; + } + + /** + * @param string $query + */ + public function parseQuery(string $query) + { + $filteredQuery = $query; + $this->originalQuery = $query; + $pattern = '/[a-z_]*:[0-9a-z-.]*/i'; + $matches = []; + preg_match_all($pattern, $query, $matches); + + foreach ($matches[0] as $match) { + $this->extractModifier($match); + $filteredQuery = str_replace($match, '', $filteredQuery); + } + $filteredQuery = trim(str_replace(['"', "'"], '', $filteredQuery)); + if (strlen($filteredQuery) > 0) { + $this->words = array_map('trim', explode(' ', $filteredQuery)); + } + } /** - * The search will assume that the user does not have so many accounts - * that this search should be paginated. - * - * @param array $words - * * @return Collection */ - public function searchAccounts(array $words): Collection + public function searchAccounts(): Collection { + $words = $this->words; $accounts = $this->user->accounts() ->accountTypeIn([AccountType::DEFAULT, AccountType::ASSET, AccountType::EXPENSE, AccountType::REVENUE, AccountType::BENEFICIARY]) ->get(['accounts.*']); @@ -67,14 +124,13 @@ class Search implements SearchInterface } /** - * @param array $words - * * @return Collection */ - public function searchBudgets(array $words): Collection + public function searchBudgets(): Collection { /** @var Collection $set */ - $set = auth()->user()->budgets()->get(); + $set = auth()->user()->budgets()->get(); + $words = $this->words; /** @var Collection $result */ $result = $set->filter( function (Budget $budget) use ($words) { @@ -92,14 +148,11 @@ class Search implements SearchInterface } /** - * Search assumes the user does not have that many categories. So no paginated search. - * - * @param array $words - * * @return Collection */ - public function searchCategories(array $words): Collection + public function searchCategories(): Collection { + $words = $this->words; $categories = $this->user->categories()->get(); /** @var Collection $result */ $result = $categories->filter( @@ -117,15 +170,12 @@ class Search implements SearchInterface } /** - * - * @param array $words - * * @return Collection */ - public function searchTags(array $words): Collection + public function searchTags(): Collection { - $tags = $this->user->tags()->get(); - + $words = $this->words; + $tags = $this->user->tags()->get(); /** @var Collection $result */ $result = $tags->filter( function (Tag $tag) use ($words) { @@ -142,11 +192,9 @@ class Search implements SearchInterface } /** - * @param array $words - * * @return Collection */ - public function searchTransactions(array $words): Collection + public function searchTransactions(): Collection { $pageSize = 100; $processed = 0; @@ -157,19 +205,20 @@ class Search implements SearchInterface $collector = app(JournalCollectorInterface::class); $collector->setUser($this->user); $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page); - $set = $collector->getPaginatedJournals(); + if ($this->hasModifiers()) { + $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); + } + $collector->removeFilter(InternalTransferFilter::class); + $set = $collector->getPaginatedJournals()->getCollection(); + $words = $this->words; + Log::debug(sprintf('Found %d journals to check. ', $set->count())); // Filter transactions that match the given triggers. $filtered = $set->filter( function (Transaction $transaction) use ($words) { - // check descr of journal: - if ($this->strpos_arr(strtolower(strval($transaction->description)), $words)) { - return $transaction; - } - // check descr of transaction - if ($this->strpos_arr(strtolower(strval($transaction->transaction_description)), $words)) { + if ($this->matchModifiers($transaction)) { return $transaction; } @@ -221,6 +270,54 @@ class Search implements SearchInterface $this->user = $user; } + /** + * @param string $string + */ + private function extractModifier(string $string) + { + $parts = explode(':', $string); + if (count($parts) === 2 && strlen(trim(strval($parts[0]))) > 0 && strlen(trim(strval($parts[1])))) { + $type = trim(strval($parts[0])); + $value = trim(strval($parts[1])); + if (in_array($type, $this->validModifiers)) { + // filter for valid type + $this->modifiers->push(['type' => $type, 'value' => $value,]); + } + } + } + + /** + * @param Transaction $transaction + * + * @return bool + * @throws FireflyException + */ + private function matchModifiers(Transaction $transaction): bool + { + Log::debug(sprintf('Now at transaction #%d', $transaction->id)); + // first "modifier" is always the text of the search: + // check descr of journal: + if (count($this->words) > 0 + && !$this->strpos_arr(strtolower(strval($transaction->description)), $this->words) + && !$this->strpos_arr(strtolower(strval($transaction->transaction_description)), $this->words) + ) { + Log::debug('Description does not match', $this->words); + + return false; + } + + // then a for-each and a switch for every possible other thingie. + foreach ($this->modifiers as $modifier) { + $res = Modifier::apply($modifier, $transaction); + if ($res === false) { + return $res; + } + } + + return true; + + } + /** * @param string $haystack * @param array $needle diff --git a/app/Support/Search/SearchInterface.php b/app/Support/Search/SearchInterface.php index ed9c3c6c88..a06ea95d27 100644 --- a/app/Support/Search/SearchInterface.php +++ b/app/Support/Search/SearchInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Search; @@ -24,43 +24,52 @@ use Illuminate\Support\Collection; interface SearchInterface { /** - * @param array $words - * + * @return string + */ + public function getWordsAsString(): string; + + /** + * @return bool + */ + public function hasModifiers(): bool; + + /** + * @param string $query + */ + public function parseQuery(string $query); + + /** * @return Collection */ - public function searchAccounts(array $words): Collection; + public function searchAccounts(): Collection; + + /** + * @return Collection + */ + public function searchBudgets(): Collection; + + /** + * @return Collection + */ + public function searchCategories(): Collection; + + /** + * @return Collection + */ + public function searchTags(): Collection; + + /** + * @return Collection + */ + public function searchTransactions(): Collection; + + /** + * @param int $limit + */ + public function setLimit(int $limit); /** * @param User $user */ public function setUser(User $user); - - /** - * @param array $words - * - * @return Collection - */ - public function searchBudgets(array $words): Collection; - - /** - * @param array $words - * - * @return Collection - */ - public function searchCategories(array $words): Collection; - - /** - * - * @param array $words - * - * @return Collection - */ - public function searchTags(array $words): Collection; - - /** - * @param array $words - * - * @return Collection - */ - public function searchTransactions(array $words): Collection; } diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 870b55566c..3b5a27ad0d 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -9,11 +9,12 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; use Carbon\Carbon; +use Crypt; use DB; use FireflyIII\Models\Account; use FireflyIII\Models\Transaction; @@ -42,7 +43,7 @@ class Steam $cache->addProperty('balance'); $cache->addProperty($date); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } $balance = strval( @@ -73,7 +74,7 @@ class Steam $cache->addProperty('balance-no-virtual'); $cache->addProperty($date); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } $balance = strval( @@ -107,7 +108,7 @@ class Steam $cache->addProperty($start); $cache->addProperty($end); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } $balances = []; @@ -157,7 +158,7 @@ class Steam $cache->addProperty('balances'); $cache->addProperty($date); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } $balances = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') @@ -180,6 +181,21 @@ class Steam return $result; } + /** + * @param int $isEncrypted + * @param $value + * + * @return string + */ + public function decrypt(int $isEncrypted, string $value) + { + if ($isEncrypted === 1) { + return Crypt::decrypt($value); + } + + return $value; + } + /** * @param array $accounts * diff --git a/app/Support/Twig/Account.php b/app/Support/Twig/Account.php new file mode 100644 index 0000000000..d2a5520505 --- /dev/null +++ b/app/Support/Twig/Account.php @@ -0,0 +1,63 @@ +formatAmountByAccount(), + ]; + + } + + /** + * Will return "active" when a part of the route matches the argument. + * ie. "accounts" will match "accounts.index". + * + * @return Twig_SimpleFunction + */ + protected function formatAmountByAccount(): Twig_SimpleFunction + { + return new Twig_SimpleFunction( + 'formatAmountByAccount', function (AccountModel $account, string $amount, bool $coloured = true): string { + $currencyId = intval($account->getMeta('currency_id')); + if ($currencyId === 0) { + // Format using default currency: + return AmountFacade::format($amount, $coloured); + } + $currency = TransactionCurrency::find($currencyId); + + return AmountFacade::formatAnything($currency, $amount, $coloured); + }, ['is_safe' => ['html']] + ); + } + + +} \ No newline at end of file diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index 5d339960fa..5db0ba95f6 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; @@ -310,7 +310,7 @@ class General extends Twig_Extension { return new Twig_SimpleFunction( 'getAmount', function (TransactionJournal $journal): string { - return TransactionJournal::amount($journal); + return $journal->amount(); } ); } diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php index 757264a240..d3c0f314e5 100644 --- a/app/Support/Twig/Journal.php +++ b/app/Support/Twig/Journal.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; @@ -44,10 +44,10 @@ class Journal extends Twig_Extension $cache->addProperty('transaction-journal'); $cache->addProperty('destination-account-string'); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } - $list = TransactionJournal::destinationAccountList($journal); + $list = $journal->destinationAccountList(); $array = []; /** @var Account $entry */ foreach ($list as $entry) { @@ -116,10 +116,10 @@ class Journal extends Twig_Extension $cache->addProperty('transaction-journal'); $cache->addProperty('source-account-string'); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } - $list = TransactionJournal::sourceAccountList($journal); + $list = $journal->sourceAccountList(); $array = []; /** @var Account $entry */ foreach ($list as $entry) { @@ -152,7 +152,7 @@ class Journal extends Twig_Extension $cache->addProperty('transaction-journal'); $cache->addProperty('budget-string'); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } @@ -189,7 +189,7 @@ class Journal extends Twig_Extension $cache->addProperty('transaction-journal'); $cache->addProperty('category-string'); if ($cache->has()) { - return $cache->get(); + return $cache->get(); // @codeCoverageIgnore } $categories = []; // get all categories for the journal itself (easy): diff --git a/app/Support/Twig/PiggyBank.php b/app/Support/Twig/PiggyBank.php index 8a11fb546e..01ab696171 100644 --- a/app/Support/Twig/PiggyBank.php +++ b/app/Support/Twig/PiggyBank.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; @@ -39,6 +39,12 @@ class PiggyBank extends Twig_Extension } ); + $functions[] = new Twig_SimpleFunction( + 'suggestedMonthlyAmount', function (PB $piggyBank) { + return $piggyBank->getSuggestedMonthlyAmount(); + } + ); + return $functions; } diff --git a/app/Support/Twig/Rule.php b/app/Support/Twig/Rule.php index 630cddc408..2503cec452 100644 --- a/app/Support/Twig/Rule.php +++ b/app/Support/Twig/Rule.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; diff --git a/app/Support/Twig/Transaction.php b/app/Support/Twig/Transaction.php index 5285a8ee90..d4b8e84850 100644 --- a/app/Support/Twig/Transaction.php +++ b/app/Support/Twig/Transaction.php @@ -9,16 +9,16 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; use Amount; -use Crypt; use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction as TransactionModel; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionType; +use Steam; use Twig_Extension; use Twig_SimpleFilter; use Twig_SimpleFunction; @@ -195,7 +195,7 @@ class Transaction extends Twig_Extension return new Twig_SimpleFunction( 'transactionDestinationAccount', function (TransactionModel $transaction): string { - $name = intval($transaction->account_encrypted) === 1 ? Crypt::decrypt($transaction->account_name) : $transaction->account_name; + $name = Steam::decrypt(intval($transaction->account_encrypted), $transaction->account_name); $id = intval($transaction->account_id); $type = $transaction->account_type; @@ -204,7 +204,7 @@ class Transaction extends Twig_Extension $name = $transaction->opposing_account_name; $id = intval($transaction->opposing_account_id); - $type = intval($transaction->opposing_account_type); + $type = $transaction->opposing_account_type; } // Find the opposing account and use that one: @@ -217,7 +217,7 @@ class Transaction extends Twig_Extension ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') ->first(['transactions.account_id', 'accounts.encrypted', 'accounts.name', 'account_types.type']); - $name = intval($other->encrypted) === 1 ? Crypt::decrypt($other->name) : $other->name; + $name = Steam::decrypt(intval($other->encrypted), $other->name); $id = $other->account_id; $type = $other->type; } @@ -269,7 +269,7 @@ class Transaction extends Twig_Extension 'transactionSourceAccount', function (TransactionModel $transaction): string { // if the amount is negative, assume that the current account (the one in $transaction) is indeed the source account. - $name = intval($transaction->account_encrypted) === 1 ? Crypt::decrypt($transaction->account_name) : $transaction->account_name; + $name = Steam::decrypt(intval($transaction->account_encrypted), $transaction->account_name); $id = intval($transaction->account_id); $type = $transaction->account_type; @@ -278,7 +278,7 @@ class Transaction extends Twig_Extension $name = $transaction->opposing_account_name; $id = intval($transaction->opposing_account_id); - $type = intval($transaction->opposing_account_type); + $type = $transaction->opposing_account_type; } // Find the opposing account and use that one: if (bccomp($transaction->transaction_amount, '0') === 1 && is_null($transaction->opposing_account_id)) { @@ -289,7 +289,7 @@ class Transaction extends Twig_Extension ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') ->first(['transactions.account_id', 'accounts.encrypted', 'accounts.name', 'account_types.type']); - $name = intval($other->encrypted) === 1 ? Crypt::decrypt($other->name) : $other->name; + $name = Steam::decrypt(intval($other->encrypted), $other->name); $id = $other->account_id; $type = $other->type; } @@ -337,21 +337,6 @@ class Transaction extends Twig_Extension ); } - /** - * @param int $isEncrypted - * @param string $value - * - * @return string - */ - private function encrypted(int $isEncrypted, string $value): string - { - if ($isEncrypted === 1) { - return Crypt::decrypt($value); - } - - return $value; - } - /** * @param TransactionModel $transaction * @@ -361,14 +346,14 @@ class Transaction extends Twig_Extension { // journal has a budget: if (isset($transaction->transaction_journal_budget_id)) { - $name = $this->encrypted(intval($transaction->transaction_journal_budget_encrypted), $transaction->transaction_journal_budget_name); + $name = Steam::decrypt(intval($transaction->transaction_journal_budget_encrypted), $transaction->transaction_journal_budget_name); return sprintf('%s', route('budgets.show', [$transaction->transaction_journal_budget_id]), $name, $name); } // transaction has a budget if (isset($transaction->transaction_budget_id)) { - $name = $this->encrypted(intval($transaction->transaction_budget_encrypted), $transaction->transaction_budget_name); + $name = Steam::decrypt(intval($transaction->transaction_budget_encrypted), $transaction->transaction_budget_name); return sprintf('%s', route('budgets.show', [$transaction->transaction_budget_id]), $name, $name); } @@ -400,14 +385,14 @@ class Transaction extends Twig_Extension { // journal has a category: if (isset($transaction->transaction_journal_category_id)) { - $name = $this->encrypted(intval($transaction->transaction_journal_category_encrypted), $transaction->transaction_journal_category_name); + $name = Steam::decrypt(intval($transaction->transaction_journal_category_encrypted), $transaction->transaction_journal_category_name); return sprintf('%s', route('categories.show', [$transaction->transaction_journal_category_id]), $name, $name); } // transaction has a category: if (isset($transaction->transaction_category_id)) { - $name = $this->encrypted(intval($transaction->transaction_category_encrypted), $transaction->transaction_category_name); + $name = Steam::decrypt(intval($transaction->transaction_category_encrypted), $transaction->transaction_category_name); return sprintf('%s', route('categories.show', [$transaction->transaction_category_id]), $name, $name); } diff --git a/app/Support/Twig/Translation.php b/app/Support/Twig/Translation.php index cb84f85c8e..a01b616bd6 100644 --- a/app/Support/Twig/Translation.php +++ b/app/Support/Twig/Translation.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; diff --git a/app/User.php b/app/User.php index 06a150ef49..f5ee28f920 100644 --- a/app/User.php +++ b/app/User.php @@ -9,12 +9,13 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII; use FireflyIII\Events\RequestedNewPassword; +use FireflyIII\Models\CurrencyExchangeRate; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasManyThrough; @@ -119,6 +120,14 @@ class User extends Authenticatable return $this->hasMany('FireflyIII\Models\Category'); } + /** + * @return HasMany + */ + public function currencyExchangeRates(): HasMany + { + return $this->hasMany(CurrencyExchangeRate::class); + } + /** * @return HasMany */ diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index f38a164993..cf4b60c3f9 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Validation; @@ -29,7 +29,6 @@ use Google2FA; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Contracts\Translation\Translator; use Illuminate\Validation\Validator; -use Session; /** * Class FireflyValidator @@ -66,7 +65,7 @@ class FireflyValidator extends Validator return false; } - $secret = Session::get('two-factor-secret'); + $secret = session('two-factor-secret'); return Google2FA::verifyKey($secret, $value); } diff --git a/composer.json b/composer.json index aa09eb9b44..0286006772 100755 --- a/composer.json +++ b/composer.json @@ -48,6 +48,10 @@ "require": { "php": ">=7.0.0", "ext-intl": "*", + "ext-bcmath": "*", + "ext-mbstring": "*", + "ext-curl": "*", + "ext-zip": "*", "laravel/framework": "5.4.*", "davejamesmiller/laravel-breadcrumbs": "3.*", "watson/validating": "3.*", @@ -68,7 +72,8 @@ "symfony/css-selector": "3.1.*", "symfony/dom-crawler": "3.1.*", "barryvdh/laravel-debugbar": "2.*", - "barryvdh/laravel-ide-helper": "2.*" + "barryvdh/laravel-ide-helper": "2.*", + "satooshi/php-coveralls": "^1.0" }, "autoload": { "classmap": [ @@ -88,7 +93,7 @@ "php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], "post-create-project-cmd": [ - "php artisan key:generate" + "php artisan key:generate --force" ], "post-install-cmd": [ "Illuminate\\Foundation\\ComposerScripts::postInstall", @@ -101,6 +106,9 @@ "php artisan firefly:verify", "php artisan firefly:instructions update", "php artisan optimize" + ], + "compile": [ + "php artisan migrate:refresh --seed --force" ] }, "config": { diff --git a/composer.lock b/composer.lock index d7fca941ad..5363e7571a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "254ffef07304b93679b48182a179123f", + "content-hash": "3570b1bf4768d7a7db0667317e82c668", "packages": [ { "name": "bacon/bacon-qr-code", @@ -153,16 +153,16 @@ }, { "name": "doctrine/annotations", - "version": "v1.3.1", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "bd4461328621bde0ae6b1b2675fbc6aca4ceb558" + "reference": "54cacc9b81758b14e3ce750f205a393d52339e97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/bd4461328621bde0ae6b1b2675fbc6aca4ceb558", - "reference": "bd4461328621bde0ae6b1b2675fbc6aca4ceb558", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97", + "reference": "54cacc9b81758b14e3ce750f205a393d52339e97", "shasum": "" }, "require": { @@ -171,7 +171,7 @@ }, "require-dev": { "doctrine/cache": "1.*", - "phpunit/phpunit": "^5.6.1" + "phpunit/phpunit": "^5.7" }, "type": "library", "extra": { @@ -217,7 +217,7 @@ "docblock", "parser" ], - "time": "2016-12-30T15:59:45+00:00" + "time": "2017-02-24T16:22:25+00:00" }, { "name": "doctrine/cache", @@ -623,16 +623,16 @@ }, { "name": "erusev/parsedown", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb" + "reference": "1bf24f7334fe16c88bf9d467863309ceaf285b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/20ff8bbb57205368b4b42d094642a3e52dac85fb", - "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/1bf24f7334fe16c88bf9d467863309ceaf285b01", + "reference": "1bf24f7334fe16c88bf9d467863309ceaf285b01", "shasum": "" }, "require": { @@ -661,20 +661,20 @@ "markdown", "parser" ], - "time": "2016-11-02T15:56:58+00:00" + "time": "2017-03-29T16:04:15+00:00" }, { "name": "laravel/framework", - "version": "v5.4.12", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "707f32d32dce58232f7a860e0a1d62caf6f9dbfc" + "reference": "2ed668f96d1a6ca42f50d5c87ee9ceecfc0a6eee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/707f32d32dce58232f7a860e0a1d62caf6f9dbfc", - "reference": "707f32d32dce58232f7a860e0a1d62caf6f9dbfc", + "url": "https://api.github.com/repos/laravel/framework/zipball/2ed668f96d1a6ca42f50d5c87ee9ceecfc0a6eee", + "reference": "2ed668f96d1a6ca42f50d5c87ee9ceecfc0a6eee", "shasum": "" }, "require": { @@ -790,7 +790,7 @@ "framework", "laravel" ], - "time": "2017-02-15T14:31:32+00:00" + "time": "2017-04-28T15:40:01+00:00" }, { "name": "laravelcollective/html", @@ -917,16 +917,16 @@ }, { "name": "league/csv", - "version": "8.2.0", + "version": "8.2.1", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "ef7eef710810c8bd0cf9371582ccd0123ff96d4b" + "reference": "43fd8b022815a0758d85e925dd92a43fe0d41bb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/ef7eef710810c8bd0cf9371582ccd0123ff96d4b", - "reference": "ef7eef710810c8bd0cf9371582ccd0123ff96d4b", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/43fd8b022815a0758d85e925dd92a43fe0d41bb4", + "reference": "43fd8b022815a0758d85e925dd92a43fe0d41bb4", "shasum": "" }, "require": { @@ -970,20 +970,20 @@ "read", "write" ], - "time": "2017-01-25T13:32:07+00:00" + "time": "2017-02-23T08:25:03+00:00" }, { "name": "league/flysystem", - "version": "1.0.35", + "version": "1.0.40", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062" + "reference": "3828f0b24e2c1918bb362d57a53205d6dc8fde61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dda7f3ab94158a002d9846a97dc18ebfb7acc062", - "reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3828f0b24e2c1918bb362d57a53205d6dc8fde61", + "reference": "3828f0b24e2c1918bb362d57a53205d6dc8fde61", "shasum": "" }, "require": { @@ -1005,12 +1005,12 @@ "league/flysystem-azure": "Allows you to use Windows Azure Blob storage", "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching", "league/flysystem-copy": "Allows you to use Copy.com storage", - "league/flysystem-dropbox": "Allows you to use Dropbox storage", "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem", "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files", "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib", "league/flysystem-webdav": "Allows you to use WebDAV storage", - "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter" + "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter", + "spatie/flysystem-dropbox": "Allows you to use Dropbox storage" }, "type": "library", "extra": { @@ -1053,20 +1053,20 @@ "sftp", "storage" ], - "time": "2017-02-09T11:33:58+00:00" + "time": "2017-04-28T10:15:08+00:00" }, { "name": "monolog/monolog", - "version": "1.22.0", + "version": "1.22.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "bad29cb8d18ab0315e6c477751418a82c850d558" + "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558", - "reference": "bad29cb8d18ab0315e6c477751418a82c850d558", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1e044bc4b34e91743943479f1be7a1d5eb93add0", + "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0", "shasum": "" }, "require": { @@ -1131,7 +1131,7 @@ "logging", "psr-3" ], - "time": "2016-11-26T00:15:39+00:00" + "time": "2017-03-13T07:08:03+00:00" }, { "name": "mtdowling/cron-expression", @@ -1232,16 +1232,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.4", + "version": "v2.0.10", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e" + "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e", - "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d", + "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d", "shasum": "" }, "require": { @@ -1276,7 +1276,7 @@ "pseudorandom", "random" ], - "time": "2016-11-07T23:38:38+00:00" + "time": "2017-03-13T16:27:32+00:00" }, { "name": "pragmarx/google2fa", @@ -1388,30 +1388,30 @@ }, { "name": "ramsey/uuid", - "version": "3.5.2", + "version": "3.6.1", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "5677cfe02397dd6b58c861870dfaa5d9007d3954" + "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/5677cfe02397dd6b58c861870dfaa5d9007d3954", - "reference": "5677cfe02397dd6b58c861870dfaa5d9007d3954", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e", + "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e", "shasum": "" }, "require": { "paragonie/random_compat": "^1.0|^2.0", - "php": ">=5.4" + "php": "^5.4 || ^7.0" }, "replace": { "rhumsaa/uuid": "self.version" }, "require-dev": { "apigen/apigen": "^4.1", - "codeception/aspect-mock": "1.0.0", + "codeception/aspect-mock": "^1.0 | ^2.0", "doctrine/annotations": "~1.2.0", - "goaop/framework": "1.0.0-alpha.2", + "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1", "ircmaxell/random-lib": "^1.1", "jakub-onderka/php-parallel-lint": "^0.9.0", "mockery/mockery": "^0.9.4", @@ -1466,7 +1466,7 @@ "identifier", "uuid" ], - "time": "2016-11-22T19:21:44+00:00" + "time": "2017-03-26T20:37:53+00:00" }, { "name": "rcrowe/twigbridge", @@ -1583,16 +1583,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.6", + "version": "v5.4.7", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e" + "reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e", - "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4", + "reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4", "shasum": "" }, "require": { @@ -1633,20 +1633,20 @@ "mail", "mailer" ], - "time": "2017-02-13T07:52:53+00:00" + "time": "2017-04-20T17:32:18+00:00" }, { "name": "symfony/console", - "version": "v3.2.3", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936" + "reference": "a7a17e0c6c3c4d70a211f80782e4b90ddadeaa38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/7a8405a9fc175f87fed8a3c40856b0d866d61936", - "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936", + "url": "https://api.github.com/repos/symfony/console/zipball/a7a17e0c6c3c4d70a211f80782e4b90ddadeaa38", + "reference": "a7a17e0c6c3c4d70a211f80782e4b90ddadeaa38", "shasum": "" }, "require": { @@ -1696,7 +1696,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-02-06T12:04:21+00:00" + "time": "2017-04-26T01:39:17+00:00" }, { "name": "symfony/css-selector", @@ -1753,16 +1753,16 @@ }, { "name": "symfony/debug", - "version": "v3.2.3", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477" + "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/b4d9818f127c60ce21ed62c395da7df868dc8477", - "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477", + "url": "https://api.github.com/repos/symfony/debug/zipball/fd6eeee656a5a7b384d56f1072243fe1c0e81686", + "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686", "shasum": "" }, "require": { @@ -1806,31 +1806,31 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-01-28T02:37:08+00:00" + "time": "2017-04-19T20:17:50+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.2.3", + "version": "v2.8.20", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6" + "reference": "7fc8e2b4118ff316550596357325dfd92a51f531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9137eb3a3328e413212826d63eeeb0217836e2b6", - "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7fc8e2b4118ff316550596357325dfd92a51f531", + "reference": "7fc8e2b4118ff316550596357325dfd92a51f531", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=5.3.9" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0" + "symfony/config": "^2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0" }, "suggest": { "symfony/dependency-injection": "", @@ -1839,7 +1839,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -1866,20 +1866,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:32:22+00:00" + "time": "2017-04-26T16:56:54+00:00" }, { "name": "symfony/finder", - "version": "v3.2.3", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "8c71141cae8e2957946b403cc71a67213c0380d6" + "reference": "9cf076f8f492f4b1ffac40aae9c2d287b4ca6930" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6", - "reference": "8c71141cae8e2957946b403cc71a67213c0380d6", + "url": "https://api.github.com/repos/symfony/finder/zipball/9cf076f8f492f4b1ffac40aae9c2d287b4ca6930", + "reference": "9cf076f8f492f4b1ffac40aae9c2d287b4ca6930", "shasum": "" }, "require": { @@ -1915,20 +1915,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:32:22+00:00" + "time": "2017-04-12T14:13:17+00:00" }, { "name": "symfony/http-foundation", - "version": "v3.2.3", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e192b04de44aa1ed0e39d6793f7e06f5e0b672a0" + "reference": "9de6add7f731e5af7f5b2e9c0da365e43383ebef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e192b04de44aa1ed0e39d6793f7e06f5e0b672a0", - "reference": "e192b04de44aa1ed0e39d6793f7e06f5e0b672a0", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9de6add7f731e5af7f5b2e9c0da365e43383ebef", + "reference": "9de6add7f731e5af7f5b2e9c0da365e43383ebef", "shasum": "" }, "require": { @@ -1968,20 +1968,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-02-02T13:47:35+00:00" + "time": "2017-05-01T14:55:58+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.2.3", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "96443239baf674b143604fb87cb27cb01672ab77" + "reference": "46e8b209abab55c072c47d72d5cd1d62c0585e05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/96443239baf674b143604fb87cb27cb01672ab77", - "reference": "96443239baf674b143604fb87cb27cb01672ab77", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/46e8b209abab55c072c47d72d5cd1d62c0585e05", + "reference": "46e8b209abab55c072c47d72d5cd1d62c0585e05", "shasum": "" }, "require": { @@ -2050,7 +2050,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-02-06T13:15:19+00:00" + "time": "2017-05-01T17:46:48+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -2221,16 +2221,16 @@ }, { "name": "symfony/process", - "version": "v3.2.3", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "32646a7cf53f3956c76dcb5c82555224ae321858" + "reference": "999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/32646a7cf53f3956c76dcb5c82555224ae321858", - "reference": "32646a7cf53f3956c76dcb5c82555224ae321858", + "url": "https://api.github.com/repos/symfony/process/zipball/999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0", + "reference": "999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0", "shasum": "" }, "require": { @@ -2266,20 +2266,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-02-03T12:11:38+00:00" + "time": "2017-04-12T14:13:17+00:00" }, { "name": "symfony/routing", - "version": "v3.2.3", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "af464432c177dbcdbb32295113b7627500331f2d" + "reference": "5029745d6d463585e8b487dbc83d6333f408853a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/af464432c177dbcdbb32295113b7627500331f2d", - "reference": "af464432c177dbcdbb32295113b7627500331f2d", + "url": "https://api.github.com/repos/symfony/routing/zipball/5029745d6d463585e8b487dbc83d6333f408853a", + "reference": "5029745d6d463585e8b487dbc83d6333f408853a", "shasum": "" }, "require": { @@ -2341,20 +2341,20 @@ "uri", "url" ], - "time": "2017-01-28T02:37:08+00:00" + "time": "2017-04-12T14:13:17+00:00" }, { "name": "symfony/translation", - "version": "v3.2.3", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5" + "reference": "f4a04d2df710f81515df576b2de06bdeee518b83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/ca032cc56976d88b85e7386b17020bc6dc95dbc5", - "reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5", + "url": "https://api.github.com/repos/symfony/translation/zipball/f4a04d2df710f81515df576b2de06bdeee518b83", + "reference": "f4a04d2df710f81515df576b2de06bdeee518b83", "shasum": "" }, "require": { @@ -2367,7 +2367,7 @@ "require-dev": { "psr/log": "~1.0", "symfony/config": "~2.8|~3.0", - "symfony/intl": "~2.8|~3.0", + "symfony/intl": "^2.8.18|^3.2.5", "symfony/yaml": "~2.8|~3.0" }, "suggest": { @@ -2405,30 +2405,35 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:06:35+00:00" + "time": "2017-04-12T14:13:17+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.2.3", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511" + "reference": "fa47963ac7979ddbd42b2d646d1b056bddbf7bb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5bb4435a03a4f05c211f4a9a8ee2756965924511", - "reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/fa47963ac7979ddbd42b2d646d1b056bddbf7bb8", + "reference": "fa47963ac7979ddbd42b2d646d1b056bddbf7bb8", "shasum": "" }, "require": { "php": ">=5.5.9", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + }, "require-dev": { + "ext-iconv": "*", "twig/twig": "~1.20|~2.0" }, "suggest": { + "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", "ext-symfony_debug": "" }, "type": "library", @@ -2468,7 +2473,7 @@ "debug", "dump" ], - "time": "2017-01-24T12:58:58+00:00" + "time": "2017-05-01T14:55:58+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -2736,16 +2741,16 @@ }, { "name": "barryvdh/laravel-ide-helper", - "version": "v2.3.0", + "version": "v2.3.2", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "555d3e37009bdb78f5d8bcea6eb8a816529a5cfa" + "reference": "e82de98cef0d6597b1b686be0b5813a3a4bb53c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/555d3e37009bdb78f5d8bcea6eb8a816529a5cfa", - "reference": "555d3e37009bdb78f5d8bcea6eb8a816529a5cfa", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/e82de98cef0d6597b1b686be0b5813a3a4bb53c5", + "reference": "e82de98cef0d6597b1b686be0b5813a3a4bb53c5", "shasum": "" }, "require": { @@ -2768,7 +2773,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -2798,7 +2803,7 @@ "phpstorm", "sublime" ], - "time": "2017-02-13T19:20:12+00:00" + "time": "2017-02-22T12:27:33+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -2951,6 +2956,102 @@ ], "time": "2016-04-29T12:21:54+00:00" }, + { + "name": "guzzle/guzzle", + "version": "v3.9.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle3.git", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=5.3.3", + "symfony/event-dispatcher": "~2.1" + }, + "replace": { + "guzzle/batch": "self.version", + "guzzle/cache": "self.version", + "guzzle/common": "self.version", + "guzzle/http": "self.version", + "guzzle/inflection": "self.version", + "guzzle/iterator": "self.version", + "guzzle/log": "self.version", + "guzzle/parser": "self.version", + "guzzle/plugin": "self.version", + "guzzle/plugin-async": "self.version", + "guzzle/plugin-backoff": "self.version", + "guzzle/plugin-cache": "self.version", + "guzzle/plugin-cookie": "self.version", + "guzzle/plugin-curlauth": "self.version", + "guzzle/plugin-error-response": "self.version", + "guzzle/plugin-history": "self.version", + "guzzle/plugin-log": "self.version", + "guzzle/plugin-md5": "self.version", + "guzzle/plugin-mock": "self.version", + "guzzle/plugin-oauth": "self.version", + "guzzle/service": "self.version", + "guzzle/stream": "self.version" + }, + "require-dev": { + "doctrine/cache": "~1.3", + "monolog/monolog": "~1.0", + "phpunit/phpunit": "3.7.*", + "psr/log": "~1.0", + "symfony/class-loader": "~2.1", + "zendframework/zend-cache": "2.*,<2.3", + "zendframework/zend-log": "2.*,<2.3" + }, + "suggest": { + "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.9-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle": "src/", + "Guzzle\\Tests": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Guzzle Community", + "homepage": "https://github.com/guzzle/guzzle/contributors" + } + ], + "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "abandoned": "guzzlehttp/guzzle", + "time": "2015-03-18T18:23:50+00:00" + }, { "name": "hamcrest/hamcrest-php", "version": "v1.2.2", @@ -3059,16 +3160,16 @@ }, { "name": "mockery/mockery", - "version": "0.9.8", + "version": "0.9.9", "source": { "type": "git", - "url": "https://github.com/padraic/mockery.git", - "reference": "1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855" + "url": "https://github.com/mockery/mockery.git", + "reference": "6fdb61243844dc924071d3404bb23994ea0b6856" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/padraic/mockery/zipball/1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855", - "reference": "1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855", + "url": "https://api.github.com/repos/mockery/mockery/zipball/6fdb61243844dc924071d3404bb23994ea0b6856", + "reference": "6fdb61243844dc924071d3404bb23994ea0b6856", "shasum": "" }, "require": { @@ -3120,20 +3221,20 @@ "test double", "testing" ], - "time": "2017-02-09T13:29:38+00:00" + "time": "2017-02-28T12:52:32+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe" + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe", - "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102", "shasum": "" }, "require": { @@ -3162,7 +3263,7 @@ "object", "object graph" ], - "time": "2017-01-26T22:05:40+00:00" + "time": "2017-04-12T18:52:22+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -3312,27 +3413,27 @@ }, { "name": "phpspec/prophecy", - "version": "v1.6.2", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "6c52c2722f8460122f96f86346600e1077ce22cb" + "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb", - "reference": "6c52c2722f8460122f96f86346600e1077ce22cb", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", + "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", - "sebastian/comparator": "^1.1", - "sebastian/recursion-context": "^1.0|^2.0" + "sebastian/comparator": "^1.1|^2.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { - "phpspec/phpspec": "^2.0", + "phpspec/phpspec": "^2.5|^3.2", "phpunit/phpunit": "^4.8 || ^5.6.5" }, "type": "library", @@ -3371,39 +3472,39 @@ "spy", "stub" ], - "time": "2016-11-21T14:58:47+00:00" + "time": "2017-03-02T20:05:34+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "4.0.5", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "c19cfc7cbb0e9338d8c469c7eedecc2a428b0971" + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c19cfc7cbb0e9338d8c469c7eedecc2a428b0971", - "reference": "c19cfc7cbb0e9338d8c469c7eedecc2a428b0971", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", "shasum": "" }, "require": { + "ext-dom": "*", + "ext-xmlwriter": "*", "php": "^5.6 || ^7.0", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.2", - "phpunit/php-token-stream": "^1.4.2", - "sebastian/code-unit-reverse-lookup": "~1.0", + "phpunit/php-file-iterator": "^1.3", + "phpunit/php-text-template": "^1.2", + "phpunit/php-token-stream": "^1.4.2 || ^2.0", + "sebastian/code-unit-reverse-lookup": "^1.0", "sebastian/environment": "^1.3.2 || ^2.0", - "sebastian/version": "~1.0|~2.0" + "sebastian/version": "^1.0 || ^2.0" }, "require-dev": { - "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "^5.4" + "ext-xdebug": "^2.1.4", + "phpunit/phpunit": "^5.7" }, "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.4.0", - "ext-xmlwriter": "*" + "ext-xdebug": "^2.5.1" }, "type": "library", "extra": { @@ -3434,7 +3535,7 @@ "testing", "xunit" ], - "time": "2017-01-20T15:06:43+00:00" + "time": "2017-04-02T07:44:40+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3526,25 +3627,30 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.8", + "version": "1.0.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4|~5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -3566,20 +3672,20 @@ "keywords": [ "timer" ], - "time": "2016-05-12T18:03:57+00:00" + "time": "2017-02-26T11:10:40+00:00" }, { "name": "phpunit/php-token-stream", - "version": "1.4.9", + "version": "1.4.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b" + "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b", - "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7", + "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7", "shasum": "" }, "require": { @@ -3615,20 +3721,20 @@ "keywords": [ "tokenizer" ], - "time": "2016-11-15T14:06:22+00:00" + "time": "2017-02-27T10:12:30+00:00" }, { "name": "phpunit/phpunit", - "version": "5.7.13", + "version": "5.7.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34" + "reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60ebeed87a35ea46fd7f7d8029df2d6f013ebb34", - "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/69c4f49ff376af2692bad9cebd883d17ebaa98a1", + "reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1", "shasum": "" }, "require": { @@ -3652,7 +3758,7 @@ "sebastian/global-state": "^1.1", "sebastian/object-enumerator": "~2.0", "sebastian/resource-operations": "~1.0", - "sebastian/version": "~1.0|~2.0", + "sebastian/version": "~1.0.3|~2.0", "symfony/yaml": "~2.1|~3.0" }, "conflict": { @@ -3697,7 +3803,7 @@ "testing", "xunit" ], - "time": "2017-02-10T09:05:10+00:00" + "time": "2017-04-03T02:22:27+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -3759,24 +3865,82 @@ "time": "2016-12-08T20:27:08+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.0", + "name": "satooshi/php-coveralls", + "version": "v1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe" + "url": "https://github.com/satooshi/php-coveralls.git", + "reference": "da51d304fe8622bf9a6da39a8446e7afd432115c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe", - "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe", + "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/da51d304fe8622bf9a6da39a8446e7afd432115c", + "reference": "da51d304fe8622bf9a6da39a8446e7afd432115c", "shasum": "" }, "require": { - "php": ">=5.6" + "ext-json": "*", + "ext-simplexml": "*", + "guzzle/guzzle": "^2.8|^3.0", + "php": ">=5.3.3", + "psr/log": "^1.0", + "symfony/config": "^2.1|^3.0", + "symfony/console": "^2.1|^3.0", + "symfony/stopwatch": "^2.0|^3.0", + "symfony/yaml": "^2.0|^3.0" + }, + "suggest": { + "symfony/http-kernel": "Allows Symfony integration" + }, + "bin": [ + "bin/coveralls" + ], + "type": "library", + "autoload": { + "psr-4": { + "Satooshi\\": "src/Satooshi/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kitamura Satoshi", + "email": "with.no.parachute@gmail.com", + "homepage": "https://www.facebook.com/satooshi.jp" + } + ], + "description": "PHP client library for Coveralls API", + "homepage": "https://github.com/satooshi/php-coveralls", + "keywords": [ + "ci", + "coverage", + "github", + "test" + ], + "time": "2016-01-20T17:35:46+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~5" + "phpunit/phpunit": "^5.7 || ^6.0" }, "type": "library", "extra": { @@ -3801,7 +3965,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2016-02-13T06:45:14+00:00" + "time": "2017-03-04T06:30:41+00:00" }, { "name": "sebastian/comparator", @@ -4089,16 +4253,16 @@ }, { "name": "sebastian/object-enumerator", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35" + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35", - "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", "shasum": "" }, "require": { @@ -4131,7 +4295,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2016-11-19T07:35:10+00:00" + "time": "2017-02-18T15:18:39+00:00" }, { "name": "sebastian/recursion-context", @@ -4273,16 +4437,16 @@ }, { "name": "symfony/class-loader", - "version": "v3.2.3", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "2847d56f518ad5721bf85aa9174b3aa3fd12aa03" + "reference": "fc4c04bfd17130a9dccfded9578353f311967da7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/2847d56f518ad5721bf85aa9174b3aa3fd12aa03", - "reference": "2847d56f518ad5721bf85aa9174b3aa3fd12aa03", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/fc4c04bfd17130a9dccfded9578353f311967da7", + "reference": "fc4c04bfd17130a9dccfded9578353f311967da7", "shasum": "" }, "require": { @@ -4325,7 +4489,63 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:06:35+00:00" + "time": "2017-04-12T14:13:17+00:00" + }, + { + "name": "symfony/config", + "version": "v3.2.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "e5533fcc0b3dd377626153b2852707878f363728" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/e5533fcc0b3dd377626153b2852707878f363728", + "reference": "e5533fcc0b3dd377626153b2852707878f363728", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/filesystem": "~2.8|~3.0" + }, + "require-dev": { + "symfony/yaml": "~3.0" + }, + "suggest": { + "symfony/yaml": "To use the yaml reference dumper" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Config Component", + "homepage": "https://symfony.com", + "time": "2017-04-12T14:13:17+00:00" }, { "name": "symfony/dom-crawler", @@ -4384,17 +4604,115 @@ "time": "2017-01-21T17:13:55+00:00" }, { - "name": "symfony/yaml", - "version": "v3.2.3", + "name": "symfony/filesystem", + "version": "v3.2.8", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b" + "url": "https://github.com/symfony/filesystem.git", + "reference": "040651db13cf061827a460cc10f6e36a445c45b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e1718c6bf57e1efbb8793ada951584b2ab27775b", - "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/040651db13cf061827a460cc10f6e36a445c45b4", + "reference": "040651db13cf061827a460cc10f6e36a445c45b4", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "https://symfony.com", + "time": "2017-04-12T14:13:17+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v3.2.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "5a0105afb670dbd38f521105c444de1b8e10cfe3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5a0105afb670dbd38f521105c444de1b8e10cfe3", + "reference": "5a0105afb670dbd38f521105c444de1b8e10cfe3", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "https://symfony.com", + "time": "2017-04-12T14:13:17+00:00" + }, + { + "name": "symfony/yaml", + "version": "v3.2.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/acec26fcf7f3031e094e910b94b002fa53d4e4d6", + "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6", "shasum": "" }, "require": { @@ -4436,7 +4754,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:06:35+00:00" + "time": "2017-05-01T14:55:58+00:00" }, { "name": "webmozart/assert", @@ -4496,7 +4814,11 @@ "prefer-lowest": false, "platform": { "php": ">=7.0.0", - "ext-intl": "*" + "ext-intl": "*", + "ext-bcmath": "*", + "ext-mbstring": "*", + "ext-curl": "*", + "ext-zip": "*" }, "platform-dev": [] } diff --git a/config/app.php b/config/app.php index f92541fb61..1f0172e6b5 100644 --- a/config/app.php +++ b/config/app.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ 'name' => 'Firefly III', @@ -21,7 +21,7 @@ return [ 'fallback_locale' => 'en_US', 'key' => env('APP_KEY'), 'cipher' => 'AES-256-CBC', - 'log' => env('APP_LOG', 'daily'), + 'log' => env('APP_LOG', 'errorlog'), 'log_level' => env('APP_LOG_LEVEL', 'info'), 'providers' => [ @@ -70,7 +70,7 @@ return [ //Barryvdh\Debugbar\ServiceProvider::class, DaveJamesMiller\Breadcrumbs\ServiceProvider::class, TwigBridge\ServiceProvider::class, - 'PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider', + PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class, /* * More service providers. @@ -125,7 +125,7 @@ return [ 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, - 'Twig' => 'TwigBridge\Facade\Twig', + 'Twig' => TwigBridge\Facade\Twig::class, 'Form' => Collective\Html\FormFacade::class, 'Html' => Collective\Html\HtmlFacade::class, 'Breadcrumbs' => 'DaveJamesMiller\Breadcrumbs\Facade', @@ -137,7 +137,7 @@ return [ 'ExpandedForm' => 'FireflyIII\Support\Facades\ExpandedForm', 'Entrust' => 'Zizaco\Entrust\EntrustFacade', 'Input' => 'Illuminate\Support\Facades\Input', - 'Google2FA' => 'PragmaRX\Google2FA\Vendor\Laravel\Facade', + 'Google2FA' => PragmaRX\Google2FA\Vendor\Laravel\Facade::class, ], ]; diff --git a/config/auth.php b/config/auth.php index 55a6840414..9145ce8641 100644 --- a/config/auth.php +++ b/config/auth.php @@ -10,32 +10,32 @@ */ return [ - 'defaults' => [ - 'guard' => 'web', + 'defaults' => [ + 'guard' => 'web', 'passwords' => 'users', ], - 'guards' => [ + 'guards' => [ 'web' => [ - 'driver' => 'session', + 'driver' => 'session', 'provider' => 'users', ], 'api' => [ - 'driver' => 'token', + 'driver' => 'token', 'provider' => 'users', ], ], 'providers' => [ 'users' => [ 'driver' => 'eloquent', - 'model' => FireflyIII\User::class, + 'model' => FireflyIII\User::class, ], ], 'passwords' => [ 'users' => [ 'provider' => 'users', - 'table' => 'password_resets', - 'expire' => 120, + 'table' => 'password_resets', + 'expire' => 120, ], ], diff --git a/config/broadcasting.php b/config/broadcasting.php index 8100899690..b165564840 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -40,17 +40,17 @@ return [ 'connections' => [ 'pusher' => [ - 'driver' => 'pusher', - 'key' => env('PUSHER_KEY'), - 'secret' => env('PUSHER_SECRET'), - 'app_id' => env('PUSHER_APP_ID'), + 'driver' => 'pusher', + 'key' => env('PUSHER_KEY'), + 'secret' => env('PUSHER_SECRET'), + 'app_id' => env('PUSHER_APP_ID'), 'options' => [ // ], ], 'redis' => [ - 'driver' => 'redis', + 'driver' => 'redis', 'connection' => 'default', ], diff --git a/config/csv.php b/config/csv.php index 0cd7e1183f..5da40e41e0 100644 --- a/config/csv.php +++ b/config/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/config/database.php b/config/database.php index 451ffd9741..f9b37b8c01 100644 --- a/config/database.php +++ b/config/database.php @@ -9,10 +9,25 @@ * See the LICENSE file for details. */ +// for heroku: +$databaseUrl = getenv('DATABASE_URL'); +$host = ''; +$username = ''; +$password = ''; +$database = ''; + +if (!($databaseUrl === false)) { + $options = parse_url($databaseUrl); + $host = $options['host']; + $username = $options['user']; + $password = $options['pass']; + $database = substr($options['path'], 1); +} + return [ 'fetch' => PDO::FETCH_OBJ, - 'default' => env('DB_CONNECTION', 'mysql'), + 'default' => env('DB_CONNECTION', 'pgsql'), 'connections' => [ 'sqlite' => [ 'driver' => 'sqlite', @@ -36,11 +51,11 @@ return [ 'pgsql' => [ 'driver' => 'pgsql', - 'host' => env('DB_HOST', 'localhost'), + 'host' => env('DB_HOST', $host), 'port' => env('DB_PORT', '5432'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), + 'database' => env('DB_DATABASE', $database), + 'username' => env('DB_USERNAME', $username), + 'password' => env('DB_PASSWORD', $password), 'charset' => 'utf8', 'prefix' => '', 'schema' => 'public', diff --git a/config/firefly.php b/config/firefly.php index 5ffebe0c43..cb76de0723 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); /* * DO NOT EDIT THIS FILE. IT IS AUTO GENERATED. @@ -18,34 +18,29 @@ declare(strict_types = 1); */ return [ - 'configuration' => [ + 'configuration' => [ 'single_user_mode' => true, 'is_demo_site' => false, ], - 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), - 'chart' => 'chartjs', - 'version' => '4.3.4', - 'csv_import_enabled' => true, - 'maxUploadSize' => 5242880, - 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], - 'resend_confirmation' => 3600, - 'confirmation_age' => 14400, // four hours - 'list_length' => 10, - - 'export_formats' => [ + 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), + 'version' => '4.4.3', + 'maxUploadSize' => 5242880, + 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], + 'list_length' => 10, + 'export_formats' => [ 'csv' => 'FireflyIII\Export\Exporter\CsvExporter', ], - 'import_formats' => [ + 'import_formats' => [ 'csv' => 'FireflyIII\Import\Importer\CsvImporter', ], - 'default_export_format' => 'csv', - 'default_import_format' => 'csv', - 'bill_periods' => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], - 'accountRoles' => ['defaultAsset', 'sharedAsset', 'savingAsset', 'ccAsset',], - 'ccTypes' => [ + 'default_export_format' => 'csv', + 'default_import_format' => 'csv', + 'bill_periods' => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], + 'accountRoles' => ['defaultAsset', 'sharedAsset', 'savingAsset', 'ccAsset',], + 'ccTypes' => [ 'monthlyFull' => 'Full payment every month', ], - 'range_to_repeat_freq' => [ + 'range_to_repeat_freq' => [ '1D' => 'weekly', '1W' => 'weekly', '1M' => 'monthly', @@ -54,14 +49,14 @@ return [ '1Y' => 'yearly', 'custom' => 'custom', ], - 'subTitlesByIdentifier' => + 'subTitlesByIdentifier' => [ 'asset' => 'Asset accounts', 'expense' => 'Expense accounts', 'revenue' => 'Revenue accounts', 'cash' => 'Cash accounts', ], - 'subIconsByIdentifier' => + 'subIconsByIdentifier' => [ 'asset' => 'fa-money', 'Asset account' => 'fa-money', @@ -75,14 +70,14 @@ return [ 'import' => 'fa-download', 'Import account' => 'fa-download', ], - 'accountTypesByIdentifier' => + 'accountTypesByIdentifier' => [ 'asset' => ['Default account', 'Asset account'], 'expense' => ['Expense account', 'Beneficiary account'], 'revenue' => ['Revenue account'], 'import' => ['Import account'], ], - 'accountTypeByIdentifier' => + 'accountTypeByIdentifier' => [ 'asset' => 'Asset account', 'expense' => 'Expense account', @@ -91,7 +86,7 @@ return [ 'initial' => 'Initial balance account', 'import' => 'Import account', ], - 'shortNamesByFullName' => + 'shortNamesByFullName' => [ 'Default account' => 'asset', 'Asset account' => 'asset', @@ -101,20 +96,17 @@ return [ 'Revenue account' => 'revenue', 'Cash account' => 'cash', ], - 'languages' => [ + 'languages' => [ 'de_DE' => ['name_locale' => 'Deutsch', 'name_english' => 'German', 'complete' => true], 'en_US' => ['name_locale' => 'English', 'name_english' => 'English', 'complete' => true], - 'es_ES' => ['name_locale' => 'Español', 'name_english' => 'Spanish', 'complete' => false], 'fr_FR' => ['name_locale' => 'Français', 'name_english' => 'French', 'complete' => false], - 'hr_HR' => ['name_locale' => 'hrvatski', 'name_english' => 'Croatian', 'complete' => false], 'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch', 'complete' => true], 'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish ', 'complete' => false], 'pt_BR' => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portuguese (Brazil)', 'complete' => true], - 'ru-RU' => ['name_locale' => 'Russian', 'name_english' => 'Russian', 'complete' => false], - 'zh-HK' => ['name_locale' => '繁體中文（香港）', 'name_english' => 'Chinese Traditional, Hong Kong', 'complete' => false], + 'sl-SI' => ['name_locale' => 'Slovenščina', 'name_english' => 'Slovenian', 'complete' => false], 'zh-TW' => ['name_locale' => '正體中文', 'name_english' => 'Chinese Traditional', 'complete' => false], ], - 'transactionTypesByWhat' => [ + 'transactionTypesByWhat' => [ 'expenses' => ['Withdrawal'], 'withdrawal' => ['Withdrawal'], 'revenue' => ['Deposit'], @@ -122,7 +114,7 @@ return [ 'transfer' => ['Transfer'], 'transfers' => ['Transfer'], ], - 'transactionIconsByWhat' => [ + 'transactionIconsByWhat' => [ 'expenses' => 'fa-long-arrow-left', 'withdrawal' => 'fa-long-arrow-left', 'revenue' => 'fa-long-arrow-right', @@ -131,7 +123,7 @@ return [ 'transfers' => 'fa-exchange', ], - 'bindables' => [ + 'bindables' => [ 'account' => 'FireflyIII\Models\Account', 'attachment' => 'FireflyIII\Models\Attachment', 'bill' => 'FireflyIII\Models\Bill', @@ -139,6 +131,8 @@ return [ 'category' => 'FireflyIII\Models\Category', 'transaction_type' => 'FireflyIII\Models\TransactionType', 'currency' => 'FireflyIII\Models\TransactionCurrency', + 'fromCurrencyCode' => 'FireflyIII\Support\Binder\CurrencyCode', + 'toCurrencyCode' => 'FireflyIII\Support\Binder\CurrencyCode', 'limitrepetition' => 'FireflyIII\Models\LimitRepetition', 'budgetlimit' => 'FireflyIII\Models\BudgetLimit', 'piggyBank' => 'FireflyIII\Models\PiggyBank', @@ -156,8 +150,9 @@ return [ 'tagList' => 'FireflyIII\Support\Binder\TagList', 'start_date' => 'FireflyIII\Support\Binder\Date', 'end_date' => 'FireflyIII\Support\Binder\Date', + 'date' => 'FireflyIII\Support\Binder\Date', ], - 'rule-triggers' => [ + 'rule-triggers' => [ 'user_action' => 'FireflyIII\Rules\Triggers\UserAction', 'from_account_starts' => 'FireflyIII\Rules\Triggers\FromAccountStarts', 'from_account_ends' => 'FireflyIII\Rules\Triggers\FromAccountEnds', @@ -178,8 +173,9 @@ return [ 'category_is' => 'FireflyIII\Rules\Triggers\CategoryIs', 'budget_is' => 'FireflyIII\Rules\Triggers\BudgetIs', 'tag_is' => 'FireflyIII\Rules\Triggers\TagIs', + 'has_attachments' => 'FireflyIII\Rules\Triggers\HasAttachment', ], - 'rule-actions' => [ + 'rule-actions' => [ 'set_category' => 'FireflyIII\Rules\Actions\SetCategory', 'clear_category' => 'FireflyIII\Rules\Actions\ClearCategory', 'set_budget' => 'FireflyIII\Rules\Actions\SetBudget', @@ -194,7 +190,7 @@ return [ 'set_source_account' => 'FireflyIII\Rules\Actions\SetSourceAccount', 'set_destination_account' => 'FireflyIII\Rules\Actions\SetDestinationAccount', ], - 'rule-actions-text' => [ + 'rule-actions-text' => [ 'set_category', 'set_budget', 'add_tag', @@ -203,10 +199,18 @@ return [ 'append_description', 'prepend_description', ], - 'test-triggers' => [ + 'test-triggers' => [ 'limit' => 10, 'range' => 200, ], - 'default_currency' => 'EUR', - 'default_language' => 'en_US', + 'default_currency' => 'EUR', + 'default_language' => 'en_US', + 'search_modifiers' => ['amount_is', 'amount', 'amount_max', 'amount_min', 'amount_less', 'amount_more', 'source', 'destination', 'category', + 'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after'], + // tag notes has_attachments + 'currency_exchange_services' => [ + 'fixerio' => 'FireflyIII\Services\Currency\FixerIO', + ], + 'preferred_exchange_service' => 'fixerio', + ]; diff --git a/config/queue.php b/config/queue.php index 664188021f..c50e7c2a44 100644 --- a/config/queue.php +++ b/config/queue.php @@ -44,32 +44,32 @@ return [ ], 'database' => [ - 'driver' => 'database', - 'table' => 'jobs', - 'queue' => 'default', + 'driver' => 'database', + 'table' => 'jobs', + 'queue' => 'default', 'retry_after' => 90, ], 'beanstalkd' => [ - 'driver' => 'beanstalkd', - 'host' => 'localhost', - 'queue' => 'default', + 'driver' => 'beanstalkd', + 'host' => 'localhost', + 'queue' => 'default', 'retry_after' => 90, ], 'sqs' => [ 'driver' => 'sqs', - 'key' => 'your-public-key', + 'key' => 'your-public-key', 'secret' => 'your-secret-key', 'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id', - 'queue' => 'your-queue-name', + 'queue' => 'your-queue-name', 'region' => 'us-east-1', ], 'redis' => [ - 'driver' => 'redis', - 'connection' => 'default', - 'queue' => 'default', + 'driver' => 'redis', + 'connection' => 'default', + 'queue' => 'default', 'retry_after' => 90, ], @@ -88,7 +88,7 @@ return [ 'failed' => [ 'database' => env('DB_CONNECTION', 'mysql'), - 'table' => 'failed_jobs', + 'table' => 'failed_jobs', ], ]; diff --git a/config/services.php b/config/services.php index 5990b52c66..1176da0214 100644 --- a/config/services.php +++ b/config/services.php @@ -29,7 +29,7 @@ return [ ], 'ses' => [ - 'key' => env('SES_KEY'), + 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', ], @@ -39,8 +39,8 @@ return [ ], 'stripe' => [ - 'model' => FireflyIII\User::class, - 'key' => env('STRIPE_KEY'), + 'model' => FireflyIII\User::class, + 'key' => env('STRIPE_KEY'), 'secret' => env('STRIPE_SECRET'), ], diff --git a/config/session.php b/config/session.php index f5af7f0fdc..4a635d2321 100644 --- a/config/session.php +++ b/config/session.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/config/twigbridge.php b/config/twigbridge.php index dc51e30651..095c342c9c 100644 --- a/config/twigbridge.php +++ b/config/twigbridge.php @@ -159,7 +159,7 @@ return [ 'ExpandedForm' => [ 'is_safe' => [ 'date', 'text', 'select', 'balance', 'optionsList', 'checkbox', 'amount', 'tags', 'integer', 'textarea', 'location', - 'multiRadio', 'file', 'multiCheckbox', 'staticText', 'amountSmall', 'password', + 'multiRadio', 'file', 'multiCheckbox', 'staticText', 'amountSmall', 'password', 'nonSelectableBalance', 'nonSelectableAmount', ], ], 'Form' => [ diff --git a/config/upgrade.php b/config/upgrade.php index 199596e690..58c0ad66bd 100644 --- a/config/upgrade.php +++ b/config/upgrade.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ 'text' => [ diff --git a/config/view.php b/config/view.php index 9d4930f213..bb60cc6e7e 100644 --- a/config/view.php +++ b/config/view.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 8a65c4ee73..283a342b20 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -8,7 +8,10 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + +use Carbon\Carbon; + /* |-------------------------------------------------------------------------- @@ -32,3 +35,206 @@ $factory->define( ]; } ); + +$factory->define( + FireflyIII\Models\CurrencyExchangeRate::class, function (Faker\Generator $faker) { + + return [ + 'user_id' => 1, + 'from_currency_id' => 1, + 'to_currency_id' => 2, + 'date' => '2017-01-01', + 'rate' => '1.5', + 'user_rate' => null, + ]; +} +); + +$factory->define( + FireflyIII\Models\TransactionCurrency::class, function (Faker\Generator $faker) { + + return [ + 'name' => $faker->words(1, true), + 'code' => 'ABC', + 'symbol' => 'x', + ]; +} +); + +$factory->define( + FireflyIII\Models\ImportJob::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->numberBetween(1, 100), + 'user_id' => 1, + 'key' => $faker->words(1, true), + 'file_type' => 'csv', + 'status' => 'import_status_never_started', + 'configuration' => null, + 'extended_status' => [ + 'total_steps' => 0, + 'steps_done' => 0, + 'import_count' => 0, + 'importTag' => 0, + 'errors' => [], + ], + ]; +} +); + + +$factory->define( + FireflyIII\Models\TransactionJournal::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->unique()->numberBetween(1000, 10000), + 'user_id' => 1, + 'transaction_type_id' => 1, + 'bill_id' => null, + 'transaction_currency_id' => 1, + 'description' => $faker->words(3, true), + 'date' => '2017-01-01', + 'interest_date' => null, + 'book_date' => null, + 'process_date' => null, + 'order' => 0, + 'tag_count' => 0, + 'encrypted' => 0, + 'completed' => 1, + ]; +} +); + +$factory->define( + FireflyIII\Models\Bill::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->numberBetween(1, 10), + 'user_id' => 1, + 'name' => $faker->words(3, true), + 'match' => $faker->words(3, true), + 'amount_min' => '100.00', + 'amount_max' => '100.00', + 'date' => '2017-01-01', + 'repeat_freq' => 'monthly', + 'skip' => 0, + 'automatch' => 1, + 'name_encrypted' => 0, + 'match_encrypted' => 0, + ]; +} +); + +$factory->define( + FireflyIII\Models\PiggyBankRepetition::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->unique()->numberBetween(100, 10000), + 'piggy_bank_id' => $faker->numberBetween(1, 10), + 'startdate' => '2017-01-01', + 'targetdate' => '2020-01-01', + 'currentamount' => 10, + ]; +} +); + +$factory->define( + FireflyIII\Models\PiggyBank::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->unique()->numberBetween(100, 10000), + 'account_id' => $faker->numberBetween(1, 10), + 'name' => $faker->words(3, true), + 'target_amount' => '1000.00', + 'startdate' => '2017-01-01', + 'order' => 1, + 'active' => 1, + 'encrypted' => 0, + ]; +} +); + +$factory->define( + FireflyIII\Models\Tag::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->unique()->numberBetween(200, 10000), + 'user_id' => 1, + 'tagMode' => 'nothing', + 'tag' => $faker->words(1, true), + ]; +} +); + +$factory->define( + FireflyIII\Models\Category::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->numberBetween(1, 10), + 'name' => $faker->words(3, true), + ]; +} +); + +$factory->define( + FireflyIII\Models\Budget::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->numberBetween(1, 10), + 'name' => $faker->words(3, true), + ]; +} +); + +$factory->define( + FireflyIII\Models\PiggyBankEvent::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->numberBetween(1, 10), + 'piggy_bank_id' => $faker->numberBetween(1, 10), + 'transaction_journal_id' => $faker->numberBetween(1, 10), + 'date' => $faker->date('Y-m-d'), + 'amount' => '100', + ]; +} +); + +$factory->define( + FireflyIII\Models\BudgetLimit::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->numberBetween(1, 10), + 'start_date' => '2017-01-01', + 'end_date' => '2017-01-31', + 'amount' => '300', + 'budget_id' => $faker->numberBetween(1, 6), + + ]; +} +); + +$factory->define( + FireflyIII\Models\Account::class, function (Faker\Generator $faker) { + return [ + 'id' => $faker->unique()->numberBetween(1000, 10000), + 'name' => $faker->words(3, true), + 'account_type_id' => 1, + ]; +} +); + +$factory->define( + FireflyIII\Models\Transaction::class, function (Faker\Generator $faker) { + return [ + 'transaction_amount' => strval($faker->randomFloat(2, -100, 100)), + 'destination_amount' => strval($faker->randomFloat(2, -100, 100)), + 'opposing_account_id' => $faker->numberBetween(1, 10), + 'source_account_id' => $faker->numberBetween(1, 10), + 'opposing_account_name' => $faker->words(3, true), + 'description' => $faker->words(3, true), + 'source_account_name' => $faker->words(3, true), + 'destination_account_id' => $faker->numberBetween(1, 10), + 'date' => new Carbon, + 'destination_account_name' => $faker->words(3, true), + 'amount' => strval($faker->randomFloat(2, -100, 100)), + 'budget_id' => 0, + 'category' => $faker->words(3, true), + 'transaction_journal_id' => $faker->numberBetween(1, 10), + 'journal_id' => $faker->numberBetween(1, 10), + 'transaction_currency_code' => 'EUR', + 'transaction_type_type' => 'Withdrawal', + 'account_encrypted' => 0, + 'account_name' => 'Some name', + ]; +} +); \ No newline at end of file diff --git a/database/migrations/2016_06_16_000000_create_support_tables.php b/database/migrations/2016_06_16_000000_create_support_tables.php index 6d0234802c..cd16910972 100644 --- a/database/migrations/2016_06_16_000000_create_support_tables.php +++ b/database/migrations/2016_06_16_000000_create_support_tables.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; @@ -76,6 +76,23 @@ class CreateSupportTables extends Migration } } + private function createConfigurationTable() + { + if (!Schema::hasTable('configuration')) { + Schema::create( + 'configuration', function (Blueprint $table) { + + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->string('name', 50); + $table->text('data'); + $table->unique(['name']); + } + ); + } + } + /** * */ @@ -99,23 +116,6 @@ class CreateSupportTables extends Migration } } - private function createConfigurationTable() - { - if (!Schema::hasTable('configuration')) { - Schema::create( - 'configuration', function (Blueprint $table) { - - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->string('name', 50); - $table->text('data'); - $table->unique(['name']); - } - ); - } - } - /** * */ diff --git a/database/migrations/2016_06_16_000001_create_users_table.php b/database/migrations/2016_06_16_000001_create_users_table.php index 0120a485ed..563fbd1584 100644 --- a/database/migrations/2016_06_16_000001_create_users_table.php +++ b/database/migrations/2016_06_16_000001_create_users_table.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; @@ -18,6 +18,14 @@ use Illuminate\Database\Schema\Blueprint; */ class CreateUsersTable extends Migration { + /** + * Reverse the migrations. + */ + public function down() + { + Schema::drop('users'); + } + /** * Run the migrations. * @@ -40,12 +48,4 @@ class CreateUsersTable extends Migration ); } } - - /** - * Reverse the migrations. - */ - public function down() - { - Schema::drop('users'); - } } diff --git a/database/migrations/2016_06_16_000002_create_main_tables.php b/database/migrations/2016_06_16_000002_create_main_tables.php index 1090bcb05f..0f5fe8d4e4 100644 --- a/database/migrations/2016_06_16_000002_create_main_tables.php +++ b/database/migrations/2016_06_16_000002_create_main_tables.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; diff --git a/database/migrations/2016_08_25_091522_changes_for_3101.php b/database/migrations/2016_08_25_091522_changes_for_3101.php index 9d0e38a548..b317ef163c 100644 --- a/database/migrations/2016_08_25_091522_changes_for_3101.php +++ b/database/migrations/2016_08_25_091522_changes_for_3101.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; diff --git a/database/migrations/2016_09_12_121359_fix_nullables.php b/database/migrations/2016_09_12_121359_fix_nullables.php index 54033eac70..ba037d328b 100644 --- a/database/migrations/2016_09_12_121359_fix_nullables.php +++ b/database/migrations/2016_09_12_121359_fix_nullables.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; diff --git a/database/migrations/2016_12_28_203205_changes_for_v431.php b/database/migrations/2016_12_28_203205_changes_for_v431.php index 310ccac5a8..2411bfe498 100644 --- a/database/migrations/2016_12_28_203205_changes_for_v431.php +++ b/database/migrations/2016_12_28_203205_changes_for_v431.php @@ -42,13 +42,6 @@ class ChangesForV431 extends Migration } ); - // change field "start_date" to "startdate" -// Schema::table( -// 'budget_limits', function (Blueprint $table) { -// $table->renameColumn('startdate', 'start_date'); -// } -// ); - } /** diff --git a/database/migrations/2017_04_13_163623_changes_for_v440.php b/database/migrations/2017_04_13_163623_changes_for_v440.php new file mode 100644 index 0000000000..e19755c515 --- /dev/null +++ b/database/migrations/2017_04_13_163623_changes_for_v440.php @@ -0,0 +1,58 @@ +increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('user_id', false, true); + $table->integer('from_currency_id', false, true); + $table->integer('to_currency_id', false, true); + $table->date('date'); + $table->decimal('rate', 22, 12); + $table->decimal('user_rate', 22, 12)->nullable(); + + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + $table->foreign('from_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade'); + $table->foreign('to_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade'); + } + ); + } + // + Schema::table( + 'transactions', function (Blueprint $table) { + $table->integer('transaction_currency_id', false, true)->after('description')->nullable(); + $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('set null'); + } + ); + + } +} diff --git a/database/seeds/AccountTypeSeeder.php b/database/seeds/AccountTypeSeeder.php index 64422f3a5d..e98b6b8db7 100644 --- a/database/seeds/AccountTypeSeeder.php +++ b/database/seeds/AccountTypeSeeder.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); use FireflyIII\Models\AccountType; use Illuminate\Database\Seeder; @@ -21,8 +21,6 @@ class AccountTypeSeeder extends Seeder { public function run() { - DB::table('account_types')->delete(); - AccountType::create(['type' => 'Default account']); AccountType::create(['type' => 'Cash account']); AccountType::create(['type' => 'Asset account']); @@ -31,6 +29,7 @@ class AccountTypeSeeder extends Seeder AccountType::create(['type' => 'Initial balance account']); AccountType::create(['type' => 'Beneficiary account']); AccountType::create(['type' => 'Import account']); + AccountType::create(['type' => 'Loan']); } diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index a92b556f6a..504c129e47 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); use Illuminate\Database\Seeder; diff --git a/database/seeds/PermissionSeeder.php b/database/seeds/PermissionSeeder.php index 2916470354..94b3e48afa 100644 --- a/database/seeds/PermissionSeeder.php +++ b/database/seeds/PermissionSeeder.php @@ -9,8 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); - +declare(strict_types=1); use FireflyIII\Models\Role; @@ -29,10 +28,10 @@ class PermissionSeeder extends Seeder $owner->description = 'User runs this instance of FF3'; // optional $owner->save(); - $demo = new Role; - $demo->name ='demo'; + $demo = new Role; + $demo->name = 'demo'; $demo->display_name = 'Demo User'; - $demo->description = 'User is a demo user'; + $demo->description = 'User is a demo user'; $demo->save(); } diff --git a/database/seeds/TransactionCurrencySeeder.php b/database/seeds/TransactionCurrencySeeder.php index f1204569a3..8f51c69cd1 100644 --- a/database/seeds/TransactionCurrencySeeder.php +++ b/database/seeds/TransactionCurrencySeeder.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); use FireflyIII\Models\TransactionCurrency; use Illuminate\Database\Seeder; @@ -21,8 +21,6 @@ class TransactionCurrencySeeder extends Seeder { public function run() { - DB::table('transaction_currencies')->delete(); - TransactionCurrency::create(['code' => 'EUR', 'name' => 'Euro', 'symbol' => '€', 'decimal_places' => 2]); TransactionCurrency::create(['code' => 'USD', 'name' => 'US Dollar', 'symbol' => '$', 'decimal_places' => 2]); TransactionCurrency::create(['code' => 'HUF', 'name' => 'Hungarian forint', 'symbol' => 'Ft', 'decimal_places' => 2]); diff --git a/database/seeds/TransactionTypeSeeder.php b/database/seeds/TransactionTypeSeeder.php index 690d333aba..6c1a709bb3 100644 --- a/database/seeds/TransactionTypeSeeder.php +++ b/database/seeds/TransactionTypeSeeder.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); use FireflyIII\Models\TransactionType; use Illuminate\Database\Seeder; @@ -21,9 +21,6 @@ class TransactionTypeSeeder extends Seeder { public function run() { - - DB::table('transaction_types')->delete(); - TransactionType::create(['type' => TransactionType::WITHDRAWAL]); TransactionType::create(['type' => TransactionType::DEPOSIT]); TransactionType::create(['type' => TransactionType::TRANSFER]); diff --git a/nginx_app.conf b/nginx_app.conf new file mode 100644 index 0000000000..b0a4d0ee32 --- /dev/null +++ b/nginx_app.conf @@ -0,0 +1,7 @@ +location / { + try_files $uri @rewriteapp; +} + +location @rewriteapp { + rewrite ^(.*)$ /index.php$1 last; +} \ No newline at end of file diff --git a/phpunit.coverage.specific.xml b/phpunit.coverage.specific.xml new file mode 100755 index 0000000000..0a42b9d726 --- /dev/null +++ b/phpunit.coverage.specific.xml @@ -0,0 +1,51 @@ + + + +:site_owner. This email address can be set in the .env file.',
- 'block_code_bounced' => 'Email message(s) bounced',
- 'block_code_expired' => 'Demo account expired',
- 'no_block_code' => 'No reason for block or user not blocked',
+ 'administration' => 'Administration',
+ 'user_administration' => 'User administration',
+ 'list_all_users' => 'All users',
+ 'all_users' => 'All users',
+ 'instance_configuration' => 'Configuration',
+ 'firefly_instance_configuration' => 'Configuration options for Firefly III',
+ 'setting_single_user_mode' => 'Single user mode',
+ 'setting_single_user_mode_explain' => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
+ 'store_configuration' => 'Store configuration',
+ 'single_user_administration' => 'User administration for :email',
+ 'edit_user' => 'Edit user :email',
+ 'hidden_fields_preferences' => 'Not all fields are visible right now. You must enable them in your settings.',
+ 'user_data_information' => 'User data',
+ 'user_information' => 'User information',
+ 'total_size' => 'total size',
+ 'budget_or_budgets' => 'budget(s)',
+ 'budgets_with_limits' => 'budget(s) with configured amount',
+ 'rule_or_rules' => 'rule(s)',
+ 'rulegroup_or_groups' => 'rule group(s)',
+ 'setting_must_confirm_account' => 'Account confirmation',
+ 'setting_must_confirm_account_explain' => 'When this setting is enabled, users must activate their account before it can be used.',
+ 'configuration_updated' => 'The configuration has been updated',
+ 'setting_is_demo_site' => 'Demo site',
+ 'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+ 'setting_send_email_notifications' => 'Send email notifications',
+ 'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
+ 'block_code_bounced' => 'Email message(s) bounced',
+ 'block_code_expired' => 'Demo account expired',
+ 'no_block_code' => 'No reason for block or user not blocked',
// split a transaction:
- 'transaction_meta_data' => 'Transaction meta-data',
- 'transaction_dates' => 'Transaction dates',
- 'splits' => 'Splits',
- 'split_title_withdrawal' => 'Split your new withdrawal',
- 'split_intro_one_withdrawal' => 'Firefly supports the "splitting" of a withdrawal.',
- 'split_intro_two_withdrawal' => 'It means that the amount of money you\'ve spent is divided between several destination expense accounts, budgets or categories.',
- 'split_intro_three_withdrawal' => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
- 'split_table_intro_withdrawal' => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_withdrawal' => 'Store splitted withdrawal',
- 'update_splitted_withdrawal' => 'Update splitted withdrawal',
- 'split_title_deposit' => 'Split your new deposit',
- 'split_intro_one_deposit' => 'Firefly supports the "splitting" of a deposit.',
- 'split_intro_two_deposit' => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
- 'split_intro_three_deposit' => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
- 'split_table_intro_deposit' => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_deposit' => 'Store splitted deposit',
- 'split_title_transfer' => 'Split your new transfer',
- 'split_intro_one_transfer' => 'Firefly supports the "splitting" of a transfer.',
- 'split_intro_two_transfer' => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
- 'split_intro_three_transfer' => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
- 'split_table_intro_transfer' => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_transfer' => 'Store splitted transfer',
- 'add_another_split' => 'Add another split',
- 'split-transactions' => 'Split transactions',
- 'split-new-transaction' => 'Split a new transaction',
- 'do_split' => 'Do a split',
- 'split_this_withdrawal' => 'Split this withdrawal',
- 'split_this_deposit' => 'Split this deposit',
- 'split_this_transfer' => 'Split this transfer',
- 'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
- 'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
- 'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
+ 'transaction_meta_data' => 'Transaction meta-data',
+ 'transaction_dates' => 'Transaction dates',
+ 'splits' => 'Splits',
+ 'split_title_withdrawal' => 'Split your new withdrawal',
+ 'split_intro_one_withdrawal' => 'Firefly supports the "splitting" of a withdrawal.',
+ 'split_intro_two_withdrawal' => 'It means that the amount of money you\'ve spent is divided between several destination expense accounts, budgets or categories.',
+ 'split_intro_three_withdrawal' => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
+ 'split_table_intro_withdrawal' => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
+ 'store_splitted_withdrawal' => 'Store splitted withdrawal',
+ 'update_splitted_withdrawal' => 'Update splitted withdrawal',
+ 'split_title_deposit' => 'Split your new deposit',
+ 'split_intro_one_deposit' => 'Firefly supports the "splitting" of a deposit.',
+ 'split_intro_two_deposit' => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
+ 'split_intro_three_deposit' => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
+ 'split_table_intro_deposit' => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
+ 'store_splitted_deposit' => 'Store splitted deposit',
+ 'split_title_transfer' => 'Split your new transfer',
+ 'split_intro_one_transfer' => 'Firefly supports the "splitting" of a transfer.',
+ 'split_intro_two_transfer' => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
+ 'split_intro_three_transfer' => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
+ 'split_table_intro_transfer' => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
+ 'store_splitted_transfer' => 'Store splitted transfer',
+ 'add_another_split' => 'Add another split',
+ 'split-transactions' => 'Split transactions',
+ 'split-new-transaction' => 'Split a new transaction',
+ 'do_split' => 'Do a split',
+ 'split_this_withdrawal' => 'Split this withdrawal',
+ 'split_this_deposit' => 'Split this deposit',
+ 'split_this_transfer' => 'Split this transfer',
+ 'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
+ 'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+ 'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
// import
- 'configuration_file_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file.',
- 'import_data_index' => 'Index',
- 'import_file_type_csv' => 'CSV (comma separated values)',
- 'import_file_type_help' => 'Select the type of file you will upload',
- 'import_start' => 'Start the import',
- 'configure_import' => 'Further configure your import',
- 'import_finish_configuration' => 'Finish configuration',
- 'settings_for_import' => 'Settings',
- 'import_status' => 'Import status',
- 'import_status_text' => 'The import is currently running, or will start momentarily.',
- 'import_complete' => 'Import configuration complete!',
- 'import_complete_text' => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
- 'import_download_config' => 'Download configuration',
- 'import_start_import' => 'Start import',
- 'import_data' => 'Import data',
- 'import_data_full' => 'Import data into Firefly III',
- 'import' => 'Import',
- 'import_file_help' => 'Select your file',
- 'import_status_settings_complete' => 'The import is ready to start.',
- 'import_status_import_complete' => 'The import has completed.',
- 'import_status_import_running' => 'The import is currently running. Please be patient.',
- 'import_status_header' => 'Import status and progress',
- 'import_status_errors' => 'Import errors',
- 'import_status_report' => 'Import report',
- 'import_finished' => 'Import has finished',
- 'import_error_single' => 'An error has occured during the import.',
- 'import_error_multi' => 'Some errors occured during the import.',
- 'import_error_fatal' => 'There was an error during the import routine. Please check the log files. The error seems to be:',
- 'import_error_timeout' => 'The import seems to have timed out. If this error persists, please import your data using the console command.',
- 'import_double' => 'Row #:row: This row has been imported before, and is stored in :description.',
- 'import_finished_all' => 'The import has finished. Please check out the results below.',
- 'import_with_key' => 'Import with key \':key\'',
- 'import_share_configuration' => 'Please consider downloading your configuration and sharing it at the import configuration center. This will allow other users of Firefly III to import their files more easily.',
- 'import_finished_report' => 'The import has finished. Please note any errors in the block above this line. All transactions imported during this particular session have been tagged, and you can check them out below. ',
- 'import_finished_link' => 'The transactions imported can be found in tag :tag.',
- 'need_at_least_one_account' => 'You need at least one asset account to be able to create piggy banks',
- 'see_help_top_right' => 'For more information, please check out the help pages using the icon in the top right corner of the page.',
- 'bread_crumb_import_complete' => 'Import ":key" complete',
- 'bread_crumb_configure_import' => 'Configure import ":key"',
- 'bread_crumb_import_finished' => 'Import ":key" finished',
- 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.',
- 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
- 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
+ 'configuration_file_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file.',
+ 'import_data_index' => 'Index',
+ 'import_file_type_csv' => 'CSV (comma separated values)',
+ 'import_file_type_help' => 'Select the type of file you will upload',
+ 'import_start' => 'Start the import',
+ 'configure_import' => 'Further configure your import',
+ 'import_finish_configuration' => 'Finish configuration',
+ 'settings_for_import' => 'Settings',
+ 'import_status' => 'Import status',
+ 'import_status_text' => 'The import is currently running, or will start momentarily.',
+ 'import_complete' => 'Import configuration complete!',
+ 'import_complete_text' => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
+ 'import_download_config' => 'Download configuration',
+ 'import_start_import' => 'Start import',
+ 'import_data' => 'Import data',
+ 'import_data_full' => 'Import data into Firefly III',
+ 'import' => 'Import',
+ 'import_file_help' => 'Select your file',
+ 'import_status_settings_complete' => 'The import is ready to start.',
+ 'import_status_import_complete' => 'The import has completed.',
+ 'import_status_import_running' => 'The import is currently running. Please be patient.',
+ 'import_status_header' => 'Import status and progress',
+ 'import_status_errors' => 'Import errors',
+ 'import_status_report' => 'Import report',
+ 'import_finished' => 'Import has finished',
+ 'import_error_single' => 'An error has occured during the import.',
+ 'import_error_multi' => 'Some errors occured during the import.',
+ 'import_error_fatal' => 'There was an error during the import routine. Please check the log files. The error seems to be:',
+ 'import_error_timeout' => 'The import seems to have timed out. If this error persists, please import your data using the console command.',
+ 'import_double' => 'Row #:row: This row has been imported before, and is stored in :description.',
+ 'import_finished_all' => 'The import has finished. Please check out the results below.',
+ 'import_with_key' => 'Import with key \':key\'',
+ 'import_share_configuration' => 'Please consider downloading your configuration and sharing it at the import configuration center. This will allow other users of Firefly III to import their files more easily.',
+ 'import_finished_report' => 'The import has finished. Please note any errors in the block above this line. All transactions imported during this particular session have been tagged, and you can check them out below. ',
+ 'import_finished_link' => 'The transactions imported can be found in tag :tag.',
+ 'need_at_least_one_account' => 'You need at least one asset account to be able to create piggy banks',
+ 'see_help_top_right' => 'For more information, please check out the help pages using the icon in the top right corner of the page.',
+ 'bread_crumb_import_complete' => 'Import ":key" complete',
+ 'bread_crumb_configure_import' => 'Configure import ":key"',
+ 'bread_crumb_import_finished' => 'Import ":key" finished',
+ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.',
+ 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
+ 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
// sandstorm.io errors and messages:
- 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
+ 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
+
+ // empty lists? no objects? instructions:
+ 'no_transactions_in_period' => 'There are no transactions in this period.',
+ 'no_accounts_title_asset' => 'Let\'s create an asset account!',
+ 'no_accounts_intro_asset' => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
+ 'no_accounts_imperative_asset' => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
+ 'no_accounts_create_asset' => 'Create an asset account',
+ 'no_accounts_title_expense' => 'Let\'s create an expense account!',
+ 'no_accounts_intro_expense' => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
+ 'no_accounts_imperative_expense' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+ 'no_accounts_create_expense' => 'Create an expense account',
+ 'no_accounts_title_revenue' => 'Let\'s create a revenue account!',
+ 'no_accounts_intro_revenue' => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
+ 'no_accounts_imperative_revenue' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+ 'no_accounts_create_revenue' => 'Create a revenue account',
+ 'no_budgets_title_default' => 'Let\'s create a budget',
+ 'no_budgets_intro_default' => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
+ 'no_budgets_imperative_default' => 'Budgets are the basic tools of financial management. Let\'s create one now:',
+ 'no_budgets_create_default' => 'Create a budget',
+ 'no_categories_title_default' => 'Let\'s create a category!',
+ 'no_categories_intro_default' => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
+ 'no_categories_imperative_default' => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+ 'no_categories_create_default' => 'Create a category',
+ 'no_tags_title_default' => 'Let\'s create a tag!',
+ 'no_tags_intro_default' => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
+ 'no_tags_imperative_default' => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+ 'no_tags_create_default' => 'Create a tag',
+ 'no_transactions_title_withdrawal' => 'Let\'s create an expense!',
+ 'no_transactions_intro_withdrawal' => 'You have no expenses yet. You should create expenses to start managing your finances.',
+ 'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
+ 'no_transactions_create_withdrawal' => 'Create an expense',
+ 'no_transactions_title_deposit' => 'Let\'s create some income!',
+ 'no_transactions_intro_deposit' => 'You have no recorded income yet. You should create income entries to start managing your finances.',
+ 'no_transactions_imperative_deposit' => 'Have you received some money? Then you should write it down:',
+ 'no_transactions_create_deposit' => 'Create a deposit',
+ 'no_transactions_title_transfers' => 'Let\'s create a transfer!',
+ 'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
+ 'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:',
+ 'no_transactions_create_transfers' => 'Create a transfer',
+ 'no_piggies_title_default' => 'Let\'s create a piggy bank!',
+ 'no_piggies_intro_default' => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
+ 'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
+ 'no_piggies_create_default' => 'Create a new piggy bank',
+ 'no_bills_title_default' => 'Let\'s create a bill!',
+ 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+ 'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+ 'no_bills_create_default' => 'Create a bill',
+
+
];
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index 271005bc4f..10a2aba64b 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -64,6 +64,11 @@ return [
'expense_account' => 'Expense account',
'revenue_account' => 'Revenue account',
'decimal_places' => 'Decimal places',
+ 'exchange_rate_instruction' => 'Foreign currencies',
+ 'exchanged_amount' => 'Exchanged amount',
+ 'source_amount' => 'Amount (source)',
+ 'destination_amount' => 'Amount (destination)',
+ 'native_amount' => 'Native amount',
'revenue_account_source' => 'Revenue account (source)',
'source_account_asset' => 'Source account (asset account)',
diff --git a/resources/lang/es_ES/auth.php b/resources/lang/es_ES/auth.php
index 3f4e103f18..45d765e4fa 100644
--- a/resources/lang/es_ES/auth.php
+++ b/resources/lang/es_ES/auth.php
@@ -25,4 +25,4 @@ return [
'failed' => 'Las credenciales no coinciden con los registros.',
'throttle' => 'Demasiados intentos de inicio de sesión. Por favor reintente en :seconds segundos.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php
index ddb5479e3f..211e6a3037 100644
--- a/resources/lang/es_ES/breadcrumbs.php
+++ b/resources/lang/es_ES/breadcrumbs.php
@@ -38,4 +38,4 @@ return [
'createTag' => 'Crear nueva etiqueta',
'edit_tag' => 'Editar etiqueta ":tag"',
'delete_tag' => 'Eliminar etiqueta ":tag"',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/es_ES/config.php b/resources/lang/es_ES/config.php
deleted file mode 100644
index 223b3f8bd3..0000000000
--- a/resources/lang/es_ES/config.php
+++ /dev/null
@@ -1,23 +0,0 @@
- 'es, Spanish, es_ES, es_ES.utf8, es_ES.UTF-8',
- 'month' => '%B %Y',
- 'month_and_day' => '%B %e, %Y',
- 'date_time' => '%B %e, %Y, @ %T',
- 'specific_day' => '%e %B %Y',
- 'week_in_year' => 'Week %W, %Y',
- 'quarter_of_year' => '%B %Y',
- 'year' => '%Y',
- 'half_year' => '%B %Y',
-
-];
\ No newline at end of file
diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php
index 27143be1bc..47b611f81a 100644
--- a/resources/lang/es_ES/csv.php
+++ b/resources/lang/es_ES/csv.php
@@ -9,7 +9,7 @@
* See the LICENSE file for details.
*/
-declare(strict_types=1);
+declare(strict_types = 1);
return [
@@ -77,4 +77,4 @@ return [
'column_tags-space' => 'Etiquetas (separadas por espacios)',
'column_account-number' => 'Caja de ahorro (número de cuenta)',
'column_opposing-number' => 'Cuenta opuesta (número de cuenta)',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/es_ES/demo.php b/resources/lang/es_ES/demo.php
index ed19589949..e2d7695439 100644
--- a/resources/lang/es_ES/demo.php
+++ b/resources/lang/es_ES/demo.php
@@ -21,4 +21,4 @@ return [
'import-index' => 'Of course, any CSV file can be imported into Firefly III ',
'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.',
'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
deleted file mode 100644
index a8d8567267..0000000000
--- a/resources/lang/es_ES/firefly.php
+++ /dev/null
@@ -1,1063 +0,0 @@
- 'incomplete translation',
- 'close' => 'Close',
- 'actions' => 'Actions',
- 'edit' => 'Edit',
- 'delete' => 'Delete',
- 'welcomeBack' => 'What\'s playing?',
- 'everything' => 'Everything',
- 'customRange' => 'Custom range',
- 'apply' => 'Apply',
- 'cancel' => 'Cancel',
- 'from' => 'From',
- 'to' => 'To',
- 'showEverything' => 'Show everything',
- 'never' => 'Never',
- 'search_results_for' => 'Search results for ":query"',
- 'advanced_search' => 'Advanced search',
- 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.',
- 'bounced_error' => 'The message sent to :email bounced, so no access for you.',
- 'deleted_error' => 'These credentials do not match our records.',
- 'general_blocked_error' => 'Your account has been disabled, so you cannot login.',
- 'expired_error' => 'Your account has expired, and can no longer be used.',
- 'removed_amount' => 'Removed :amount',
- 'added_amount' => 'Added :amount',
- 'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.',
- 'Opening balance' => 'Opening balance',
- 'create_new_stuff' => 'Create new stuff',
- 'new_withdrawal' => 'New withdrawal',
- 'new_deposit' => 'New deposit',
- 'new_transfer' => 'New transfer',
- 'new_asset_account' => 'New asset account',
- 'new_expense_account' => 'New expense account',
- 'new_revenue_account' => 'New revenue account',
- 'new_budget' => 'New budget',
- 'new_bill' => 'New bill',
- 'block_account_logout' => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?',
- 'flash_success' => 'Success!',
- 'flash_info' => 'Message',
- 'flash_warning' => 'Warning!',
- 'flash_error' => 'Error!',
- 'flash_info_multiple' => 'There is one message|There are :count messages',
- 'flash_error_multiple' => 'There is one error|There are :count errors',
- 'net_worth' => 'Net worth',
- 'route_has_no_help' => 'There is no help for this route.',
- 'help_may_not_be_your_language' => 'This help text is in English. It is not yet available in your language',
- 'two_factor_welcome' => 'Hello, :user!',
- 'two_factor_enter_code' => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
- 'two_factor_code_here' => 'Enter code here',
- 'two_factor_title' => 'Two factor authentication',
- 'authenticate' => 'Authenticate',
- 'two_factor_forgot_title' => 'Lost two factor authentication',
- 'two_factor_forgot' => 'I forgot my two-factor thing.',
- 'two_factor_lost_header' => 'Lost your two factor authentication?',
- 'two_factor_lost_intro' => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',
- 'two_factor_lost_fix_self' => 'If you run your own instance of Firefly III, check the logs in storage/logs for instructions.',
- 'two_factor_lost_fix_owner' => 'Otherwise, email the site owner, :site_owner and ask them to reset your two factor authentication.',
- 'warning_much_data' => ':days days of data may take a while to load.',
- 'registered' => 'You have registered successfully!',
- 'search' => 'Search',
- 'search_found_accounts' => 'Found :count account(s) for your query.',
- 'search_found_categories' => 'Found :count category(ies) for your query.',
- 'search_found_budgets' => 'Found :count budget(s) for your query.',
- 'search_found_tags' => 'Found :count tag(s) for your query.',
- 'search_found_transactions' => 'Found :count transaction(s) for your query.',
- 'results_limited' => 'The results are limited to :count entries.',
- 'tagbalancingAct' => 'Balancing act',
- 'tagadvancePayment' => 'Advance payment',
- 'tagnothing' => '',
- 'Default asset account' => 'Default asset account',
- 'no_budget_pointer' => 'You seem to have no budgets yet. You should create some on the budgets-page. Budgets can help you keep track of expenses.',
- 'Savings account' => 'Savings account',
- 'Credit card' => 'Credit card',
- 'source_accounts' => 'Source account(s)',
- 'destination_accounts' => 'Destination account(s)',
- 'user_id_is' => 'Your user id is :user',
- 'field_supports_markdown' => 'This field supports Markdown.',
- 'need_more_help' => 'If you need more help using Firefly III, please open a ticket on Github.',
- 'nothing_to_display' => 'There are no transactions to show you',
- 'show_all_no_filter' => 'Show all transactions without grouping them by date.',
- 'expenses_by_category' => 'Expenses by category',
- 'expenses_by_budget' => 'Expenses by budget',
- 'income_by_category' => 'Income by category',
- 'expenses_by_asset_account' => 'Expenses by asset account',
- 'expenses_by_expense_account' => 'Expenses by expense account',
- 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.',
- 'sum_of_expenses' => 'Sum of expenses',
- 'sum_of_income' => 'Sum of income',
- 'total_sum' => 'Total sum',
- 'spent_in_specific_budget' => 'Spent in budget ":budget"',
- 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"',
- 'left_in_budget_limit' => 'Left to spend according to budgeting',
- 'cannot_change_demo' => 'You cannot change the password of the demonstration account.',
- 'cannot_delete_demo' => 'You cannot remove the demonstration account.',
- 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account',
- 'per_period' => 'Per period',
- 'all_periods' => 'All periods',
- 'current_period' => 'Current period',
- 'show_the_current_period_and_overview' => 'Show the current period and overview',
- 'pref_languages_locale' => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
- 'budget_in_period' => 'All transactions for budget ":name" between :start and :end',
- 'chart_budget_in_period' => 'Chart for all transactions for budget ":name" between :start and :end',
- 'chart_account_in_period' => 'Chart for all transactions for account ":name" between :start and :end',
- 'chart_category_in_period' => 'Chart for all transactions for category ":name" between :start and :end',
- 'chart_category_all' => 'Chart for all transactions for category ":name"',
- 'budget_in_period_breadcrumb' => 'Between :start and :end',
- 'clone_withdrawal' => 'Clone this withdrawal',
- 'clone_deposit' => 'Clone this deposit',
- 'clone_transfer' => 'Clone this transfer',
- 'transaction_journal_other_options' => 'Other options',
- 'multi_select_no_selection' => 'None selected',
- 'multi_select_all_selected' => 'All selected',
- 'multi_select_filter_placeholder' => 'Find..',
- 'between_dates_breadcrumb' => 'Between :start and :end',
- 'all_journals_without_budget' => 'All transactions without a budget',
- 'journals_without_budget' => 'Transactions without a budget',
- 'all_journals_without_category' => 'All transactions without a category',
- 'journals_without_category' => 'Transactions without a category',
- 'all_journals_for_account' => 'All transactions for account :name',
- 'chart_all_journals_for_account' => 'Chart of all transactions for account :name',
- 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end',
- 'transferred' => 'Transferred',
- 'all_withdrawal' => 'All expenses',
- 'all_transactions' => 'All transactions',
- 'title_withdrawal_between' => 'All expenses between :start and :end',
- 'all_deposit' => 'All revenue',
- 'title_deposit_between' => 'All revenue between :start and :end',
- 'all_transfers' => 'All transfers',
- 'title_transfers_between' => 'All transfers between :start and :end',
- 'all_transfer' => 'All transfers',
- 'all_journals_for_tag' => 'All transactions for tag ":tag"',
- 'title_transfer_between' => 'All transfers between :start and :end',
- 'all_journals_for_category' => 'All transactions for category :name',
- 'all_journals_for_budget' => 'All transactions for budget :name',
- 'chart_all_journals_for_budget' => 'Chart of all transactions for budget :name',
- 'journals_in_period_for_category' => 'All transactions for category :name between :start and :end',
- 'journals_in_period_for_tag' => 'All transactions for tag :tag between :start and :end',
- 'not_available_demo_user' => 'The feature you try to access is not available to demo users.',
- 'exchange_rate_instructions' => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
- 'transfer_exchange_rate_instructions' => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
-
- // repeat frequencies:
- 'repeat_freq_yearly' => 'yearly',
- 'repeat_freq_monthly' => 'monthly',
- 'weekly' => 'weekly',
- 'quarterly' => 'quarterly',
- 'half-year' => 'every half year',
- 'yearly' => 'yearly',
- // account confirmation:
- 'confirm_account_header' => 'Please confirm your account',
- 'confirm_account_intro' => 'An email has been sent to the address you used during your registration. Please check it out for further instructions. If you did not get this message, you can have Firefly send it again.',
- 'confirm_account_resend_email' => 'Send me the confirmation message I need to activate my account.',
- 'account_is_confirmed' => 'Your account has been confirmed!',
- 'invalid_activation_code' => 'It seems the code you are using is not valid, or has expired.',
- 'confirm_account_is_resent_header' => 'The confirmation has been resent',
- 'confirm_account_is_resent_text' => 'The confirmation message has been resent. If you still did not receive the confirmation message, please contact the site owner at :owner or check the log files to see what went wrong.',
- 'confirm_account_is_resent_go_home' => 'Go to the index page of Firefly',
- 'confirm_account_not_resent_header' => 'Something went wrong :(',
- 'confirm_account_not_resent_intro' => 'The confirmation message has been not resent. If you still did not receive the confirmation message, please contact the site owner at :owner instead. Possibly, you have tried to resend the activation message too often. You can have Firefly III try to resend the confirmation message every hour.',
- 'confirm_account_not_resent_go_home' => 'Go to the index page of Firefly',
-
- // export data:
- 'import_and_export' => 'Import and export',
- 'export_data' => 'Export data',
- 'export_data_intro' => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
- 'export_format' => 'Export format',
- 'export_format_csv' => 'Comma separated values (CSV file)',
- 'export_format_mt940' => 'MT940 compatible format',
- 'export_included_accounts' => 'Export transactions from these accounts',
- 'include_old_uploads_help' => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
- 'do_export' => 'Export',
- 'export_status_never_started' => 'The export has not started yet',
- 'export_status_make_exporter' => 'Creating exporter thing...',
- 'export_status_collecting_journals' => 'Collecting your transactions...',
- 'export_status_collected_journals' => 'Collected your transactions!',
- 'export_status_converting_to_export_format' => 'Converting your transactions...',
- 'export_status_converted_to_export_format' => 'Converted your transactions!',
- 'export_status_creating_journal_file' => 'Creating the export file...',
- 'export_status_created_journal_file' => 'Created the export file!',
- 'export_status_collecting_attachments' => 'Collecting all your attachments...',
- 'export_status_collected_attachments' => 'Collected all your attachments!',
- 'export_status_collecting_old_uploads' => 'Collecting all your previous uploads...',
- 'export_status_collected_old_uploads' => 'Collected all your previous uploads!',
- 'export_status_creating_config_file' => 'Creating a configuration file...',
- 'export_status_created_config_file' => 'Created a configuration file!',
- 'export_status_creating_zip_file' => 'Creating a zip file...',
- 'export_status_created_zip_file' => 'Created a zip file!',
- 'export_status_finished' => 'Export has succesfully finished! Yay!',
- 'export_data_please_wait' => 'Please wait...',
- 'attachment_explanation' => 'The file called \':attachment_name\' (#:attachment_id) was originally uploaded to :type \':description\' (#:journal_id) dated :date for the amount of :amount.',
-
- // rules
- 'rules' => 'Rules',
- 'rules_explanation' => 'Here you can manage rules. Rules are triggered when a transaction is created or updated. Then, if the transaction has certain properties (called "triggers") Firefly will execute the "actions". Combined, you can make Firefly respond in a certain way to new transactions.',
- 'rule_name' => 'Name of rule',
- 'rule_triggers' => 'Rule triggers when',
- 'rule_actions' => 'Rule will',
- 'new_rule' => 'New rule',
- 'new_rule_group' => 'New rule group',
- 'rule_priority_up' => 'Give rule more priority',
- 'rule_priority_down' => 'Give rule less priority',
- 'make_new_rule_group' => 'Make new rule group',
- 'store_new_rule_group' => 'Store new rule group',
- 'created_new_rule_group' => 'New rule group ":title" stored!',
- 'updated_rule_group' => 'Successfully updated rule group ":title".',
- 'edit_rule_group' => 'Edit rule group ":title"',
- 'delete_rule_group' => 'Delete rule group ":title"',
- 'deleted_rule_group' => 'Deleted rule group ":title"',
- 'update_rule_group' => 'Update rule group',
- 'no_rules_in_group' => 'There are no rules in this group',
- 'move_rule_group_up' => 'Move rule group up',
- 'move_rule_group_down' => 'Move rule group down',
- 'save_rules_by_moving' => 'Save these rule(s) by moving them to another rule group:',
- 'make_new_rule' => 'Make new rule in rule group ":title"',
- 'rule_help_stop_processing' => 'When you check this box, later rules in this group will not be executed.',
- 'rule_help_active' => 'Inactive rules will never fire.',
- 'stored_new_rule' => 'Stored new rule with title ":title"',
- 'deleted_rule' => 'Deleted rule with title ":title"',
- 'store_new_rule' => 'Store new rule',
- 'updated_rule' => 'Updated rule with title ":title"',
- 'default_rule_group_name' => 'Default rules',
- 'default_rule_group_description' => 'All your rules not in a particular group.',
- 'default_rule_name' => 'Your first default rule',
- 'default_rule_description' => 'This rule is an example. You can safely delete it.',
- 'default_rule_trigger_description' => 'The Man Who Sold the World',
- 'default_rule_trigger_from_account' => 'David Bowie',
- 'default_rule_action_prepend' => 'Bought the world from ',
- 'default_rule_action_set_category' => 'Large expenses',
- 'trigger' => 'Trigger',
- 'trigger_value' => 'Trigger on value',
- 'stop_processing_other_triggers' => 'Stop processing other triggers',
- 'add_rule_trigger' => 'Add new trigger',
- 'action' => 'Action',
- 'action_value' => 'Action value',
- 'stop_executing_other_actions' => 'Stop executing other actions',
- 'add_rule_action' => 'Add new action',
- 'edit_rule' => 'Edit rule ":title"',
- 'delete_rule' => 'Delete rule ":title"',
- 'update_rule' => 'Update rule',
- 'test_rule_triggers' => 'See matching transactions',
- 'warning_transaction_subset' => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
- 'warning_no_matching_transactions' => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
- 'warning_no_valid_triggers' => 'No valid triggers provided.',
- 'execute_on_existing_transactions' => 'Execute for existing transactions',
- 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions',
- 'execute_on_existing_transactions_intro' => 'When a rule or group has been changed or added, you can execute it for existing transactions',
- 'execute_on_existing_transactions_short' => 'Existing transactions',
- 'executed_group_on_existing_transactions' => 'Executed group ":title" for existing transactions',
- 'execute_group_on_existing_transactions' => 'Execute group ":title" for existing transactions',
- 'include_transactions_from_accounts' => 'Include transactions from these accounts',
- 'execute' => 'Execute',
-
- // actions and triggers
- 'rule_trigger_user_action' => 'User action is ":trigger_value"',
- 'rule_trigger_from_account_starts' => 'Source account starts with ":trigger_value"',
- 'rule_trigger_from_account_ends' => 'Source account ends with ":trigger_value"',
- 'rule_trigger_from_account_is' => 'Source account is ":trigger_value"',
- 'rule_trigger_from_account_contains' => 'Source account contains ":trigger_value"',
- 'rule_trigger_to_account_starts' => 'Destination account starts with ":trigger_value"',
- 'rule_trigger_to_account_ends' => 'Destination account ends with ":trigger_value"',
- 'rule_trigger_to_account_is' => 'Destination account is ":trigger_value"',
- 'rule_trigger_to_account_contains' => 'Destination account contains ":trigger_value"',
- 'rule_trigger_transaction_type' => 'Transaction is of type ":trigger_value"',
- 'rule_trigger_category_is' => 'Category is ":trigger_value"',
- 'rule_trigger_amount_less' => 'Amount is less than :trigger_value',
- 'rule_trigger_amount_exactly' => 'Amount is :trigger_value',
- 'rule_trigger_amount_more' => 'Amount is more than :trigger_value',
- 'rule_trigger_description_starts' => 'Description starts with ":trigger_value"',
- 'rule_trigger_description_ends' => 'Description ends with ":trigger_value"',
- 'rule_trigger_description_contains' => 'Description contains ":trigger_value"',
- 'rule_trigger_description_is' => 'Description is ":trigger_value"',
- 'rule_trigger_from_account_starts_choice' => 'Source account starts with..',
- 'rule_trigger_from_account_ends_choice' => 'Source account ends with..',
- 'rule_trigger_from_account_is_choice' => 'Source account is..',
- 'rule_trigger_from_account_contains_choice' => 'Source account contains..',
- 'rule_trigger_to_account_starts_choice' => 'Destination account starts with..',
- 'rule_trigger_to_account_ends_choice' => 'Destination account ends with..',
- 'rule_trigger_to_account_is_choice' => 'Destination account is..',
- 'rule_trigger_to_account_contains_choice' => 'Destination account contains..',
- 'rule_trigger_transaction_type_choice' => 'Transaction is of type..',
- 'rule_trigger_amount_less_choice' => 'Amount is less than..',
- 'rule_trigger_amount_exactly_choice' => 'Amount is..',
- 'rule_trigger_amount_more_choice' => 'Amount is more than..',
- 'rule_trigger_description_starts_choice' => 'Description starts with..',
- 'rule_trigger_description_ends_choice' => 'Description ends with..',
- 'rule_trigger_description_contains_choice' => 'Description contains..',
- 'rule_trigger_description_is_choice' => 'Description is..',
- 'rule_trigger_category_is_choice' => 'Category is..',
- 'rule_trigger_budget_is_choice' => 'Budget is..',
- 'rule_trigger_tag_is_choice' => '(A) tag is..',
- 'rule_trigger_has_attachments_choice' => 'Has at least this many attachments',
- 'rule_trigger_has_attachments' => 'Has at least :trigger_value attachment(s)',
- 'rule_trigger_store_journal' => 'When a transaction is created',
- 'rule_trigger_update_journal' => 'When a transaction is updated',
- 'rule_action_set_category' => 'Set category to ":action_value"',
- 'rule_action_clear_category' => 'Clear category',
- 'rule_action_set_budget' => 'Set budget to ":action_value"',
- 'rule_action_clear_budget' => 'Clear budget',
- 'rule_action_add_tag' => 'Add tag ":action_value"',
- 'rule_action_remove_tag' => 'Remove tag ":action_value"',
- 'rule_action_remove_all_tags' => 'Remove all tags',
- 'rule_action_set_description' => 'Set description to ":action_value"',
- 'rule_action_append_description' => 'Append description with ":action_value"',
- 'rule_action_prepend_description' => 'Prepend description with ":action_value"',
- 'rule_action_set_category_choice' => 'Set category to..',
- 'rule_action_clear_category_choice' => 'Clear any category',
- 'rule_action_set_budget_choice' => 'Set budget to..',
- 'rule_action_clear_budget_choice' => 'Clear any budget',
- 'rule_action_add_tag_choice' => 'Add tag..',
- 'rule_action_remove_tag_choice' => 'Remove tag..',
- 'rule_action_remove_all_tags_choice' => 'Remove all tags',
- 'rule_action_set_description_choice' => 'Set description to..',
- 'rule_action_append_description_choice' => 'Append description with..',
- 'rule_action_prepend_description_choice' => 'Prepend description with..',
- 'rule_action_set_source_account_choice' => 'Set source account to...',
- 'rule_action_set_source_account' => 'Set source account to :action_value',
- 'rule_action_set_destination_account_choice' => 'Set destination account to...',
- 'rule_action_set_destination_account' => 'Set destination account to :action_value',
-
- // tags
- 'store_new_tag' => 'Store new tag',
- 'update_tag' => 'Update tag',
- 'no_location_set' => 'No location set.',
- 'meta_data' => 'Meta data',
- 'location' => 'Location',
-
- // preferences
- 'pref_home_screen_accounts' => 'Home screen accounts',
- 'pref_home_screen_accounts_help' => 'Which accounts should be displayed on the home page?',
- 'pref_view_range' => 'View range',
- 'pref_view_range_help' => 'Some charts are automatically grouped in periods. What period would you prefer?',
- 'pref_1D' => 'One day',
- 'pref_1W' => 'One week',
- 'pref_1M' => 'One month',
- 'pref_3M' => 'Three months (quarter)',
- 'pref_6M' => 'Six months',
- 'pref_1Y' => 'One year',
- 'pref_languages' => 'Languages',
- 'pref_languages_help' => 'Firefly III supports several languages. Which one do you prefer?',
- 'pref_custom_fiscal_year' => 'Fiscal year settings',
- 'pref_custom_fiscal_year_label' => 'Enabled',
- 'pref_custom_fiscal_year_help' => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
- 'pref_fiscal_year_start_label' => 'Fiscal year start date',
- 'pref_two_factor_auth' => '2-step verification',
- 'pref_two_factor_auth_help' => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
- 'pref_enable_two_factor_auth' => 'Enable 2-step verification',
- 'pref_two_factor_auth_disabled' => '2-step verification code removed and disabled',
- 'pref_two_factor_auth_remove_it' => 'Don\'t forget to remove the account from your authentication app!',
- 'pref_two_factor_auth_code' => 'Verify code',
- 'pref_two_factor_auth_code_help' => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
- 'pref_two_factor_auth_reset_code' => 'Reset verification code',
- 'pref_two_factor_auth_remove_code' => 'Remove verification code',
- 'pref_two_factor_auth_remove_will_disable' => '(this will also disable two-factor authentication)',
- 'pref_save_settings' => 'Save settings',
- 'saved_preferences' => 'Preferences saved!',
- 'preferences_general' => 'General',
- 'preferences_frontpage' => 'Home screen',
- 'preferences_security' => 'Security',
- 'preferences_layout' => 'Layout',
- 'pref_home_show_deposits' => 'Show deposits on the home screen',
- 'pref_home_show_deposits_info' => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
- 'pref_home_do_show_deposits' => 'Yes, show them',
- 'successful_count' => 'of which :count successful',
- 'transaction_page_size_title' => 'Page size',
- 'transaction_page_size_help' => 'Any list of transactions shows at most this many transactions',
- 'transaction_page_size_label' => 'Page size',
- 'between_dates' => '(:start and :end)',
- 'pref_optional_fields_transaction' => 'Optional fields for transactions',
- 'pref_optional_fields_transaction_help' => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
- 'optional_tj_date_fields' => 'Date fields',
- 'optional_tj_business_fields' => 'Business fields',
- 'optional_tj_attachment_fields' => 'Attachment fields',
- 'pref_optional_tj_interest_date' => 'Interest date',
- 'pref_optional_tj_book_date' => 'Book date',
- 'pref_optional_tj_process_date' => 'Processing date',
- 'pref_optional_tj_due_date' => 'Due date',
- 'pref_optional_tj_payment_date' => 'Payment date',
- 'pref_optional_tj_invoice_date' => 'Invoice date',
- 'pref_optional_tj_internal_reference' => 'Internal reference',
- 'pref_optional_tj_notes' => 'Notes',
- 'pref_optional_tj_attachments' => 'Attachments',
- 'optional_field_meta_dates' => 'Dates',
- 'optional_field_meta_business' => 'Business',
- 'optional_field_attachments' => 'Attachments',
- 'optional_field_meta_data' => 'Optional meta data',
-
-
- // profile:
- 'change_your_password' => 'Change your password',
- 'delete_account' => 'Delete account',
- 'current_password' => 'Current password',
- 'new_password' => 'New password',
- 'new_password_again' => 'New password (again)',
- 'delete_your_account' => 'Delete your account',
- 'delete_your_account_help' => 'Deleting your account will also delete any accounts, transactions, anything you might have saved into Firefly III. It\'ll be GONE.',
- 'delete_your_account_password' => 'Enter your password to continue.',
- 'password' => 'Password',
- 'are_you_sure' => 'Are you sure? You cannot undo this.',
- 'delete_account_button' => 'DELETE your account',
- 'invalid_current_password' => 'Invalid current password!',
- 'password_changed' => 'Password changed!',
- 'should_change' => 'The idea is to change your password.',
- 'invalid_password' => 'Invalid password!',
-
-
- // attachments
- 'nr_of_attachments' => 'One attachment|:count attachments',
- 'attachments' => 'Attachments',
- 'edit_attachment' => 'Edit attachment ":name"',
- 'update_attachment' => 'Update attachment',
- 'delete_attachment' => 'Delete attachment ":name"',
- 'attachment_deleted' => 'Deleted attachment ":name"',
- 'attachment_updated' => 'Updated attachment ":name"',
- 'upload_max_file_size' => 'Maximum file size: :size',
-
- // tour:
- 'prev' => 'Prev',
- 'next' => 'Next',
- 'end-tour' => 'End tour',
- 'pause' => 'Pause',
-
- // transaction index
- 'title_expenses' => 'Expenses',
- 'title_withdrawal' => 'Expenses',
- 'title_revenue' => 'Revenue / income',
- 'title_deposit' => 'Revenue / income',
- 'title_transfer' => 'Transfers',
- 'title_transfers' => 'Transfers',
-
- // convert stuff:
- 'convert_is_already_type_Withdrawal' => 'This transaction is already a withdrawal',
- 'convert_is_already_type_Deposit' => 'This transaction is already a deposit',
- 'convert_is_already_type_Transfer' => 'This transaction is already a transfer',
- 'convert_to_Withdrawal' => 'Convert ":description" to a withdrawal',
- 'convert_to_Deposit' => 'Convert ":description" to a deposit',
- 'convert_to_Transfer' => 'Convert ":description" to a transfer',
- 'convert_options_WithdrawalDeposit' => 'Convert a withdrawal into a deposit',
- 'convert_options_WithdrawalTransfer' => 'Convert a withdrawal into a transfer',
- 'convert_options_DepositTransfer' => 'Convert a deposit into a transfer',
- 'convert_options_DepositWithdrawal' => 'Convert a deposit into a withdrawal',
- 'convert_options_TransferWithdrawal' => 'Convert a transfer into a withdrawal',
- 'convert_options_TransferDeposit' => 'Convert a transfer into a deposit',
- 'transaction_journal_convert_options' => 'Convert this transaction',
- 'convert_Withdrawal_to_deposit' => 'Convert this withdrawal to a deposit',
- 'convert_Withdrawal_to_transfer' => 'Convert this withdrawal to a transfer',
- 'convert_Deposit_to_withdrawal' => 'Convert this deposit to a withdrawal',
- 'convert_Deposit_to_transfer' => 'Convert this deposit to a transfer',
- 'convert_Transfer_to_deposit' => 'Convert this transfer to a deposit',
- 'convert_Transfer_to_withdrawal' => 'Convert this transfer to a withdrawal',
- 'convert_please_set_revenue_source' => 'Please pick the revenue account where the money will come from.',
- 'convert_please_set_asset_destination' => 'Please pick the asset account where the money will go to.',
- 'convert_please_set_expense_destination' => 'Please pick the expense account where the money will go to.',
- 'convert_please_set_asset_source' => 'Please pick the asset account where the money will come from.',
- 'convert_explanation_withdrawal_deposit' => 'If you convert this withdrawal into a deposit, :amount will be deposited into :sourceName instead of taken from it.',
- 'convert_explanation_withdrawal_transfer' => 'If you convert this withdrawal into a transfer, :amount will be transferred from :sourceName to a new asset account, instead of being paid to :destinationName.',
- 'convert_explanation_deposit_withdrawal' => 'If you convert this deposit into a withdrawal, :amount will be removed from :destinationName instead of added to it.',
- 'convert_explanation_deposit_transfer' => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into :destinationName.',
- 'convert_explanation_transfer_withdrawal' => 'If you convert this transfer into a withdrawal, :amount will go from :sourceName to a new destination as an expense, instead of to :destinationName as a transfer.',
- 'convert_explanation_transfer_deposit' => 'If you convert this transfer into a deposit, :amount will be deposited into account :destinationName instead of being transferred there.',
- 'converted_to_Withdrawal' => 'The transaction has been converted to a withdrawal',
- 'converted_to_Deposit' => 'The transaction has been converted to a deposit',
- 'converted_to_Transfer' => 'The transaction has been converted to a transfer',
-
-
- // create new stuff:
- 'create_new_withdrawal' => 'Create new withdrawal',
- 'create_new_deposit' => 'Create new deposit',
- 'create_new_transfer' => 'Create new transfer',
- 'create_new_asset' => 'Create new asset account',
- 'create_new_expense' => 'Create new expense account',
- 'create_new_revenue' => 'Create new revenue account',
- 'create_new_piggy_bank' => 'Create new piggy bank',
- 'create_new_bill' => 'Create new bill',
-
- // currencies:
- 'create_currency' => 'Create a new currency',
- 'store_currency' => 'Store new currency',
- 'update_currency' => 'Update currency',
- 'new_default_currency' => ':name is now the default currency.',
- 'cannot_delete_currency' => 'Cannot delete :name because it is still in use.',
- 'deleted_currency' => 'Currency :name deleted',
- 'created_currency' => 'Currency :name created',
- 'updated_currency' => 'Currency :name updated',
- 'ask_site_owner' => 'Please ask :owner to add, remove or edit currencies.',
- 'currencies_intro' => 'Firefly III supports various currencies which you can set and enable here.',
- 'make_default_currency' => 'make default',
- 'default_currency' => 'default',
-
- // new user:
- 'submit' => 'Submit',
- 'getting_started' => 'Getting started',
- 'to_get_started' => 'To get started with Firefly, please enter your current bank\'s name, and the balance of your checking account:',
- 'savings_balance_text' => 'If you have a savings account, please enter the current balance of your savings account:',
- 'cc_balance_text' => 'If you have a credit card, please enter your credit card\'s limit.',
- 'stored_new_account_new_user' => 'Yay! Your new account has been stored.',
- 'stored_new_accounts_new_user' => 'Yay! Your new accounts have been stored.',
-
- // forms:
- 'mandatoryFields' => 'Mandatory fields',
- 'optionalFields' => 'Optional fields',
- 'options' => 'Options',
-
- // budgets:
- 'create_new_budget' => 'Create a new budget',
- 'store_new_budget' => 'Store new budget',
- 'stored_new_budget' => 'Stored new budget ":name"',
- 'available_between' => 'Available between :start and :end',
- 'transactionsWithoutBudget' => 'Expenses without budget',
- 'transactions_no_budget' => 'Expenses without budget between :start and :end',
- 'spent_between' => 'Spent between :start and :end',
- 'createBudget' => 'New budget',
- 'inactiveBudgets' => 'Inactive budgets',
- 'without_budget_between' => 'Transactions without a budget between :start and :end',
- 'budget_in_month' => ':name in :month',
- 'delete_budget' => 'Delete budget ":name"',
- 'deleted_budget' => 'Deleted budget ":name"',
- 'edit_budget' => 'Edit budget ":name"',
- 'updated_budget' => 'Updated budget ":name"',
- 'update_amount' => 'Update amount',
- 'update_budget' => 'Update budget',
- 'update_budget_amount_range' => 'Update (expected) available amount between :start and :end',
-
- // bills:
- 'matching_on' => 'Matching on',
- 'between_amounts' => 'between :low and :high.',
- 'repeats' => 'Repeats',
- 'connected_journals' => 'Connected transactions',
- 'auto_match_on' => 'Automatically matched by Firefly',
- 'auto_match_off' => 'Not automatically matched by Firefly',
- 'next_expected_match' => 'Next expected match',
- 'delete_bill' => 'Delete bill ":name"',
- 'deleted_bill' => 'Deleted bill ":name"',
- 'edit_bill' => 'Edit bill ":name"',
- 'more' => 'More',
- 'rescan_old' => 'Rescan old transactions',
- 'update_bill' => 'Update bill',
- 'updated_bill' => 'Updated bill ":name"',
- 'store_new_bill' => 'Store new bill',
- 'stored_new_bill' => 'Stored new bill ":name"',
- 'cannot_scan_inactive_bill' => 'Inactive bills cannot be scanned.',
- 'rescanned_bill' => 'Rescanned everything.',
- 'average_bill_amount_year' => 'Average bill amount (:year)',
- 'average_bill_amount_overall' => 'Average bill amount (overall)',
- 'not_or_not_yet' => 'Not (yet)',
- 'not_expected_period' => 'Not expected this period',
- // accounts:
- 'details_for_asset' => 'Details for asset account ":name"',
- 'details_for_expense' => 'Details for expense account ":name"',
- 'details_for_revenue' => 'Details for revenue account ":name"',
- 'details_for_cash' => 'Details for cash account ":name"',
- 'store_new_asset_account' => 'Store new asset account',
- 'store_new_expense_account' => 'Store new expense account',
- 'store_new_revenue_account' => 'Store new revenue account',
- 'edit_asset_account' => 'Edit asset account ":name"',
- 'edit_expense_account' => 'Edit expense account ":name"',
- 'edit_revenue_account' => 'Edit revenue account ":name"',
- 'delete_asset_account' => 'Delete asset account ":name"',
- 'delete_expense_account' => 'Delete expense account ":name"',
- 'delete_revenue_account' => 'Delete revenue account ":name"',
- 'asset_deleted' => 'Successfully deleted asset account ":name"',
- 'expense_deleted' => 'Successfully deleted expense account ":name"',
- 'revenue_deleted' => 'Successfully deleted revenue account ":name"',
- 'update_asset_account' => 'Update asset account',
- 'update_expense_account' => 'Update expense account',
- 'update_revenue_account' => 'Update revenue account',
- 'make_new_asset_account' => 'Create a new asset account',
- 'make_new_expense_account' => 'Create a new expense account',
- 'make_new_revenue_account' => 'Create a new revenue account',
- 'asset_accounts' => 'Asset accounts',
- 'expense_accounts' => 'Expense accounts',
- 'revenue_accounts' => 'Revenue accounts',
- 'cash_accounts' => 'Cash accounts',
- 'Cash account' => 'Cash account',
- 'account_type' => 'Account type',
- 'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
- 'stored_new_account' => 'New account ":name" stored!',
- 'updated_account' => 'Updated account ":name"',
- 'credit_card_options' => 'Credit card options',
- 'no_transactions_account' => 'There are no transactions (in this period) for asset account ":name".',
- 'no_data_for_chart' => 'There is not enough information (yet) to generate this chart.',
- 'select_more_than_one_account' => 'Please select more than one account',
- 'select_more_than_one_category' => 'Please select more than one category',
- 'select_more_than_one_budget' => 'Please select more than one budget',
- 'select_more_than_one_tag' => 'Please select more than one tag',
- 'from_to' => 'From :start to :end',
- 'from_to_breadcrumb' => 'from :start to :end',
- 'account_default_currency' => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
-
- // categories:
- 'new_category' => 'New category',
- 'create_new_category' => 'Create a new category',
- 'without_category' => 'Without a category',
- 'update_category' => 'Update category',
- 'updated_category' => 'Updated category ":name"',
- 'categories' => 'Categories',
- 'edit_category' => 'Edit category ":name"',
- 'no_category' => '(no category)',
- 'category' => 'Category',
- 'delete_category' => 'Delete category ":name"',
- 'deleted_category' => 'Deleted category ":name"',
- 'store_category' => 'Store new category',
- 'stored_category' => 'Stored new category ":name"',
- 'without_category_between' => 'Without category between :start and :end',
-
- // transactions:
- 'update_withdrawal' => 'Update withdrawal',
- 'update_deposit' => 'Update deposit',
- 'update_transfer' => 'Update transfer',
- 'updated_withdrawal' => 'Updated withdrawal ":description"',
- 'updated_deposit' => 'Updated deposit ":description"',
- 'updated_transfer' => 'Updated transfer ":description"',
- 'delete_withdrawal' => 'Delete withdrawal ":description"',
- 'delete_deposit' => 'Delete deposit ":description"',
- 'delete_transfer' => 'Delete transfer ":description"',
- 'deleted_withdrawal' => 'Successfully deleted withdrawal ":description"',
- 'deleted_deposit' => 'Successfully deleted deposit ":description"',
- 'deleted_transfer' => 'Successfully deleted transfer ":description"',
- 'stored_journal' => 'Successfully created new transaction ":description"',
- 'select_transactions' => 'Select transactions',
- 'stop_selection' => 'Stop selecting transactions',
- 'edit_selected' => 'Edit selected',
- 'delete_selected' => 'Delete selected',
- 'mass_delete_journals' => 'Delete a number of transactions',
- 'mass_edit_journals' => 'Edit a number of transactions',
- 'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
- 'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious.',
- 'mass_deleted_transactions_success' => 'Deleted :amount transaction(s).',
- 'mass_edited_transactions_success' => 'Updated :amount transaction(s)',
-
-
- // new user:
- 'welcome' => 'Welcome to Firefly!',
-
- // home page:
- 'yourAccounts' => 'Your accounts',
- 'budgetsAndSpending' => 'Budgets and spending',
- 'savings' => 'Savings',
- 'markAsSavingsToContinue' => 'Mark your asset accounts as "Savings account" to fill this panel',
- 'createPiggyToContinue' => 'Create piggy banks to fill this panel.',
- 'newWithdrawal' => 'New expense',
- 'newDeposit' => 'New deposit',
- 'newTransfer' => 'New transfer',
- 'moneyIn' => 'Money in',
- 'moneyOut' => 'Money out',
- 'billsToPay' => 'Bills to pay',
- 'billsPaid' => 'Bills paid',
- 'divided' => 'divided',
- 'toDivide' => 'left to divide',
-
- // menu and titles, should be recycled as often as possible:
- 'currency' => 'Currency',
- 'preferences' => 'Preferences',
- 'logout' => 'Logout',
- 'searchPlaceholder' => 'Search...',
- 'dashboard' => 'Dashboard',
- 'currencies' => 'Currencies',
- 'accounts' => 'Accounts',
- 'Asset account' => 'Asset account',
- 'Default account' => 'Asset account',
- 'Expense account' => 'Expense account',
- 'Revenue account' => 'Revenue account',
- 'Initial balance account' => 'Initial balance account',
- 'budgets' => 'Budgets',
- 'tags' => 'Tags',
- 'reports' => 'Reports',
- 'transactions' => 'Transactions',
- 'expenses' => 'Expenses',
- 'income' => 'Revenue / income',
- 'transfers' => 'Transfers',
- 'moneyManagement' => 'Money management',
- 'piggyBanks' => 'Piggy banks',
- 'bills' => 'Bills',
- 'withdrawal' => 'Withdrawal',
- 'deposit' => 'Deposit',
- 'account' => 'Account',
- 'transfer' => 'Transfer',
- 'Withdrawal' => 'Withdrawal',
- 'Deposit' => 'Deposit',
- 'Transfer' => 'Transfer',
- 'bill' => 'Bill',
- 'yes' => 'Yes',
- 'no' => 'No',
- 'amount' => 'Amount',
- 'overview' => 'Overview',
- 'saveOnAccount' => 'Save on account',
- 'unknown' => 'Unknown',
- 'daily' => 'Daily',
- 'monthly' => 'Monthly',
- 'profile' => 'Profile',
- 'errors' => 'Errors',
-
- // reports:
- 'report_default' => 'Default financial report between :start and :end',
- 'report_audit' => 'Transaction history overview between :start and :end',
- 'report_category' => 'Category report between :start and :end',
- 'report_budget' => 'Budget report between :start and :end',
- 'report_tag' => 'Tag report between :start and :end',
- 'quick_link_reports' => 'Quick links',
- 'quick_link_default_report' => 'Default financial report',
- 'quick_link_audit_report' => 'Transaction history overview',
- 'report_this_month_quick' => 'Current month, all accounts',
- 'report_this_year_quick' => 'Current year, all accounts',
- 'report_this_fiscal_year_quick' => 'Current fiscal year, all accounts',
- 'report_all_time_quick' => 'All-time, all accounts',
- 'reports_can_bookmark' => 'Remember that reports can be bookmarked.',
- 'incomeVsExpenses' => 'Income vs. expenses',
- 'accountBalances' => 'Account balances',
- 'balanceStartOfYear' => 'Balance at start of year',
- 'balanceEndOfYear' => 'Balance at end of year',
- 'balanceStartOfMonth' => 'Balance at start of month',
- 'balanceEndOfMonth' => 'Balance at end of month',
- 'balanceStart' => 'Balance at start of period',
- 'balanceEnd' => 'Balance at end of period',
- 'reportsOwnAccounts' => 'Reports for your own accounts',
- 'reportsOwnAccountsAndShared' => 'Reports for your own accounts and shared accounts',
- 'splitByAccount' => 'Split by account',
- 'balancedByTransfersAndTags' => 'Balanced by transfers and tags',
- 'coveredWithTags' => 'Covered with tags',
- 'leftUnbalanced' => 'Left unbalanced',
- 'expectedBalance' => 'Expected balance',
- 'outsideOfBudgets' => 'Outside of budgets',
- 'leftInBudget' => 'Left in budget',
- 'sumOfSums' => 'Sum of sums',
- 'noCategory' => '(no category)',
- 'notCharged' => 'Not charged (yet)',
- 'inactive' => 'Inactive',
- 'active' => 'Active',
- 'difference' => 'Difference',
- 'in' => 'In',
- 'out' => 'Out',
- 'topX' => 'top :number',
- 'show_full_list' => 'Show entire list',
- 'show_only_top' => 'Show only top :number',
- 'sum_of_year' => 'Sum of year',
- 'sum_of_years' => 'Sum of years',
- 'average_of_year' => 'Average of year',
- 'average_of_years' => 'Average of years',
- 'categories_earned_in_year' => 'Categories (by earnings)',
- 'categories_spent_in_year' => 'Categories (by spendings)',
- 'report_type' => 'Report type',
- 'report_type_default' => 'Default financial report',
- 'report_type_audit' => 'Transaction history overview (audit)',
- 'report_type_category' => 'Category report',
- 'report_type_budget' => 'Budget report',
- 'report_type_tag' => 'Tag report',
- 'report_type_meta-history' => 'Categories, budgets and bills overview',
- 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
- 'report_included_accounts' => 'Included accounts',
- 'report_date_range' => 'Date range',
- 'report_preset_ranges' => 'Pre-set ranges',
- 'shared' => 'Shared',
- 'fiscal_year' => 'Fiscal year',
- 'income_entry' => 'Income from account ":name" between :start and :end',
- 'expense_entry' => 'Expenses to account ":name" between :start and :end',
- 'category_entry' => 'Expenses in category ":name" between :start and :end',
- 'budget_spent_amount' => 'Expenses in budget ":budget" between :start and :end',
- 'balance_amount' => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
- 'no_audit_activity' => 'No activity was recorded on account :account_name between :start and :end.',
- 'audit_end_balance' => 'Account balance of :account_name at the end of :end was: :balance',
- 'reports_extra_options' => 'Extra options',
- 'report_has_no_extra_options' => 'This report has no extra options',
- 'reports_submit' => 'View report',
- 'end_after_start_date' => 'End date of report must be after start date.',
- 'select_category' => 'Select category(ies)',
- 'select_budget' => 'Select budget(s).',
- 'select_tag' => 'Select tag(s).',
- 'income_per_category' => 'Income per category',
- 'expense_per_category' => 'Expense per category',
- 'expense_per_budget' => 'Expense per budget',
- 'income_per_account' => 'Income per account',
- 'expense_per_account' => 'Expense per account',
- 'expense_per_tag' => 'Expense per tag',
- 'income_per_tag' => 'Income per tag',
- 'include_expense_not_in_budget' => 'Included expenses not in the selected budget(s)',
- 'include_expense_not_in_account' => 'Included expenses not in the selected account(s)',
- 'include_expense_not_in_category' => 'Included expenses not in the selected category(ies)',
- 'include_income_not_in_category' => 'Included income not in the selected category(ies)',
- 'include_income_not_in_account' => 'Included income not in the selected account(s)',
- 'include_income_not_in_tags' => 'Included income not in the selected tag(s)',
- 'include_expense_not_in_tags' => 'Included expenses not in the selected tag(s)',
- 'everything_else' => 'Everything else',
- 'income_and_expenses' => 'Income and expenses',
- 'spent_average' => 'Spent (average)',
- 'income_average' => 'Income (average)',
- 'transaction_count' => 'Transaction count',
- 'average_spending_per_account' => 'Average spending per account',
- 'average_income_per_account' => 'Average income per account',
- 'total' => 'Total',
- 'description' => 'Description',
- 'sum_of_period' => 'Sum of period',
- 'average_in_period' => 'Average in period',
- 'account_role_defaultAsset' => 'Default asset account',
- 'account_role_sharedAsset' => 'Shared asset account',
- 'account_role_savingAsset' => 'Savings account',
- 'account_role_ccAsset' => 'Credit card',
-
- // charts:
- 'chart' => 'Chart',
- 'dayOfMonth' => 'Day of the month',
- 'month' => 'Month',
- 'budget' => 'Budget',
- 'spent' => 'Spent',
- 'spent_in_budget' => 'Spent in budget',
- 'left_to_spend' => 'Left to spend',
- 'earned' => 'Earned',
- 'overspent' => 'Overspent',
- 'left' => 'Left',
- 'no_budget' => '(no budget)',
- 'max-amount' => 'Maximum amount',
- 'min-amount' => 'Minumum amount',
- 'journal-amount' => 'Current bill entry',
- 'name' => 'Name',
- 'date' => 'Date',
- 'paid' => 'Paid',
- 'unpaid' => 'Unpaid',
- 'day' => 'Day',
- 'budgeted' => 'Budgeted',
- 'period' => 'Period',
- 'balance' => 'Balance',
- 'summary' => 'Summary',
- 'sum' => 'Sum',
- 'average' => 'Average',
- 'balanceFor' => 'Balance for :name',
-
- // piggy banks:
- 'add_money_to_piggy' => 'Add money to piggy bank ":name"',
- 'piggy_bank' => 'Piggy bank',
- 'new_piggy_bank' => 'New piggy bank',
- 'store_piggy_bank' => 'Store new piggy bank',
- 'stored_piggy_bank' => 'Store new piggy bank ":name"',
- 'account_status' => 'Account status',
- 'left_for_piggy_banks' => 'Left for piggy banks',
- 'sum_of_piggy_banks' => 'Sum of piggy banks',
- 'saved_so_far' => 'Saved so far',
- 'left_to_save' => 'Left to save',
- 'suggested_amount' => 'Suggested monthly amount to save',
- 'add_money_to_piggy_title' => 'Add money to piggy bank ":name"',
- 'remove_money_from_piggy_title' => 'Remove money from piggy bank ":name"',
- 'add' => 'Add',
-
- 'remove' => 'Remove',
- 'max_amount_add' => 'The maximum amount you can add is',
- 'max_amount_remove' => 'The maximum amount you can remove is',
- 'update_piggy_button' => 'Update piggy bank',
- 'update_piggy_title' => 'Update piggy bank ":name"',
- 'updated_piggy_bank' => 'Updated piggy bank ":name"',
- 'details' => 'Details',
- 'events' => 'Events',
- 'target_amount' => 'Target amount',
- 'start_date' => 'Start date',
- 'target_date' => 'Target date',
- 'no_target_date' => 'No target date',
- 'todo' => 'to do',
- 'table' => 'Table',
- 'piggy_bank_not_exists' => 'Piggy bank no longer exists.',
- 'add_any_amount_to_piggy' => 'Add money to this piggy bank to reach your target of :amount.',
- 'add_set_amount_to_piggy' => 'Add :amount to fill this piggy bank on :date',
- 'delete_piggy_bank' => 'Delete piggy bank ":name"',
- 'cannot_add_amount_piggy' => 'Could not add :amount to ":name".',
- 'cannot_remove_from_piggy' => 'Could not remove :amount from ":name".',
- 'deleted_piggy_bank' => 'Deleted piggy bank ":name"',
- 'added_amount_to_piggy' => 'Added :amount to ":name"',
- 'removed_amount_from_piggy' => 'Removed :amount from ":name"',
- 'cannot_remove_amount_piggy' => 'Could not remove :amount from ":name".',
-
- // tags
- 'regular_tag' => 'Just a regular tag.',
- 'balancing_act' => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
- 'advance_payment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
- 'delete_tag' => 'Delete tag ":tag"',
- 'deleted_tag' => 'Deleted tag ":tag"',
- 'new_tag' => 'Make new tag',
- 'edit_tag' => 'Edit tag ":tag"',
- 'updated_tag' => 'Updated tag ":tag"',
- 'created_tag' => 'Tag ":tag" has been created!',
- 'no_year' => 'No year set',
- 'no_month' => 'No month set',
- 'tag_title_nothing' => 'Default tags',
- 'tag_title_balancingAct' => 'Balancing act tags',
- 'tag_title_advancePayment' => 'Advance payment tags',
- 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.',
- 'tags_group' => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.',
- 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.',
-
- 'transaction_journal_information' => 'Transaction information',
- 'transaction_journal_meta' => 'Meta information',
- 'total_amount' => 'Total amount',
- 'number_of_decimals' => 'Number of decimals',
-
- // administration
- 'administration' => 'Administration',
- 'user_administration' => 'User administration',
- 'list_all_users' => 'All users',
- 'all_users' => 'All users',
- 'instance_configuration' => 'Configuration',
- 'firefly_instance_configuration' => 'Configuration options for Firefly III',
- 'setting_single_user_mode' => 'Single user mode',
- 'setting_single_user_mode_explain' => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
- 'store_configuration' => 'Store configuration',
- 'single_user_administration' => 'User administration for :email',
- 'edit_user' => 'Edit user :email',
- 'hidden_fields_preferences' => 'Not all fields are visible right now. You must enable them in your settings.',
- 'user_data_information' => 'User data',
- 'user_information' => 'User information',
- 'total_size' => 'total size',
- 'budget_or_budgets' => 'budget(s)',
- 'budgets_with_limits' => 'budget(s) with configured amount',
- 'rule_or_rules' => 'rule(s)',
- 'rulegroup_or_groups' => 'rule group(s)',
- 'setting_must_confirm_account' => 'Account confirmation',
- 'setting_must_confirm_account_explain' => 'When this setting is enabled, users must activate their account before it can be used.',
- 'configuration_updated' => 'The configuration has been updated',
- 'setting_is_demo_site' => 'Demo site',
- 'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
- 'setting_send_email_notifications' => 'Send email notifications',
- 'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'block_code_bounced' => 'Email message(s) bounced',
- 'block_code_expired' => 'Demo account expired',
- 'no_block_code' => 'No reason for block or user not blocked',
-
-
- // split a transaction:
- 'transaction_meta_data' => 'Transaction meta-data',
- 'transaction_dates' => 'Transaction dates',
- 'splits' => 'Splits',
- 'split_title_withdrawal' => 'Split your new withdrawal',
- 'split_intro_one_withdrawal' => 'Firefly supports the "splitting" of a withdrawal.',
- 'split_intro_two_withdrawal' => 'It means that the amount of money you\'ve spent is divided between several destination expense accounts, budgets or categories.',
- 'split_intro_three_withdrawal' => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
- 'split_table_intro_withdrawal' => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_withdrawal' => 'Store splitted withdrawal',
- 'update_splitted_withdrawal' => 'Update splitted withdrawal',
- 'split_title_deposit' => 'Split your new deposit',
- 'split_intro_one_deposit' => 'Firefly supports the "splitting" of a deposit.',
- 'split_intro_two_deposit' => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
- 'split_intro_three_deposit' => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
- 'split_table_intro_deposit' => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_deposit' => 'Store splitted deposit',
- 'split_title_transfer' => 'Split your new transfer',
- 'split_intro_one_transfer' => 'Firefly supports the "splitting" of a transfer.',
- 'split_intro_two_transfer' => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
- 'split_intro_three_transfer' => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
- 'split_table_intro_transfer' => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_transfer' => 'Store splitted transfer',
- 'add_another_split' => 'Add another split',
- 'split-transactions' => 'Split transactions',
- 'split-new-transaction' => 'Split a new transaction',
- 'do_split' => 'Do a split',
- 'split_this_withdrawal' => 'Split this withdrawal',
- 'split_this_deposit' => 'Split this deposit',
- 'split_this_transfer' => 'Split this transfer',
- 'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
- 'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
- 'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
-
- // import
- 'configuration_file_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file.',
- 'import_data_index' => 'Index',
- 'import_file_type_csv' => 'CSV (comma separated values)',
- 'import_file_type_help' => 'Select the type of file you will upload',
- 'import_start' => 'Start the import',
- 'configure_import' => 'Further configure your import',
- 'import_finish_configuration' => 'Finish configuration',
- 'settings_for_import' => 'Settings',
- 'import_status' => 'Import status',
- 'import_status_text' => 'The import is currently running, or will start momentarily.',
- 'import_complete' => 'Import configuration complete!',
- 'import_complete_text' => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
- 'import_download_config' => 'Download configuration',
- 'import_start_import' => 'Start import',
- 'import_data' => 'Import data',
- 'import_data_full' => 'Import data into Firefly III',
- 'import' => 'Import',
- 'import_file_help' => 'Select your file',
- 'import_status_settings_complete' => 'The import is ready to start.',
- 'import_status_import_complete' => 'The import has completed.',
- 'import_status_import_running' => 'The import is currently running. Please be patient.',
- 'import_status_header' => 'Import status and progress',
- 'import_status_errors' => 'Import errors',
- 'import_status_report' => 'Import report',
- 'import_finished' => 'Import has finished',
- 'import_error_single' => 'An error has occured during the import.',
- 'import_error_multi' => 'Some errors occured during the import.',
- 'import_error_fatal' => 'There was an error during the import routine. Please check the log files. The error seems to be:',
- 'import_error_timeout' => 'The import seems to have timed out. If this error persists, please import your data using the console command.',
- 'import_double' => 'Row #:row: This row has been imported before, and is stored in :description.',
- 'import_finished_all' => 'The import has finished. Please check out the results below.',
- 'import_with_key' => 'Import with key \':key\'',
- 'import_share_configuration' => 'Please consider downloading your configuration and sharing it at the import configuration center. This will allow other users of Firefly III to import their files more easily.',
- 'import_finished_report' => 'The import has finished. Please note any errors in the block above this line. All transactions imported during this particular session have been tagged, and you can check them out below. ',
- 'import_finished_link' => 'The transactions imported can be found in tag :tag.',
- 'need_at_least_one_account' => 'You need at least one asset account to be able to create piggy banks',
- 'see_help_top_right' => 'For more information, please check out the help pages using the icon in the top right corner of the page.',
- 'bread_crumb_import_complete' => 'Import ":key" complete',
- 'bread_crumb_configure_import' => 'Configure import ":key"',
- 'bread_crumb_import_finished' => 'Import ":key" finished',
- 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.',
- 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
- 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
-
- // sandstorm.io errors and messages:
- 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
-
- // empty lists? no objects? instructions:
- 'no_transactions_in_period' => 'There are no transactions in this period.',
- 'no_accounts_title_asset' => 'Let\'s create an asset account!',
- 'no_accounts_intro_asset' => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
- 'no_accounts_imperative_asset' => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
- 'no_accounts_create_asset' => 'Create an asset account',
- 'no_accounts_title_expense' => 'Let\'s create an expense account!',
- 'no_accounts_intro_expense' => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
- 'no_accounts_imperative_expense' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
- 'no_accounts_create_expense' => 'Create an expense account',
- 'no_accounts_title_revenue' => 'Let\'s create a revenue account!',
- 'no_accounts_intro_revenue' => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
- 'no_accounts_imperative_revenue' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
- 'no_accounts_create_revenue' => 'Create a revenue account',
- 'no_budgets_title_default' => 'Let\'s create a budget',
- 'no_budgets_intro_default' => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
- 'no_budgets_imperative_default' => 'Budgets are the basic tools of financial management. Let\'s create one now:',
- 'no_budgets_create_default' => 'Create a budget',
- 'no_categories_title_default' => 'Let\'s create a category!',
- 'no_categories_intro_default' => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
- 'no_categories_imperative_default' => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
- 'no_categories_create_default' => 'Create a category',
- 'no_tags_title_default' => 'Let\'s create a tag!',
- 'no_tags_intro_default' => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
- 'no_tags_imperative_default' => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
- 'no_tags_create_default' => 'Create a tag',
- 'no_transactions_title_withdrawal' => 'Let\'s create an expense!',
- 'no_transactions_intro_withdrawal' => 'You have no expenses yet. You should create expenses to start managing your finances.',
- 'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
- 'no_transactions_create_withdrawal' => 'Create an expense',
- 'no_transactions_title_deposit' => 'Let\'s create some income!',
- 'no_transactions_intro_deposit' => 'You have no recorded income yet. You should create income entries to start managing your finances.',
- 'no_transactions_imperative_deposit' => 'Have you received some money? Then you should write it down:',
- 'no_transactions_create_deposit' => 'Create a deposit',
- 'no_transactions_title_transfers' => 'Let\'s create a transfer!',
- 'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
- 'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:',
- 'no_transactions_create_transfers' => 'Create a transfer',
- 'no_piggies_title_default' => 'Let\'s create a piggy bank!',
- 'no_piggies_intro_default' => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
- 'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
- 'no_piggies_create_default' => 'Create a new piggy bank',
- 'no_bills_title_default' => 'Let\'s create a bill!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
- 'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
- 'no_bills_create_default' => 'Create a bill',
-
-
-];
\ No newline at end of file
diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
deleted file mode 100644
index 20be49e75a..0000000000
--- a/resources/lang/es_ES/form.php
+++ /dev/null
@@ -1,189 +0,0 @@
- 'Bank name',
- 'bank_balance' => 'Balance',
- 'savings_balance' => 'Savings balance',
- 'credit_card_limit' => 'Credit card limit',
- 'automatch' => 'Match automatically',
- 'skip' => 'Skip',
- 'name' => 'Name',
- 'active' => 'Active',
- 'amount_min' => 'Minimum amount',
- 'amount_max' => 'Maximum amount',
- 'match' => 'Matches on',
- 'repeat_freq' => 'Repeats',
- 'journal_currency_id' => 'Currency',
- 'currency_id' => 'Currency',
- 'attachments' => 'Attachments',
- 'journal_amount' => 'Amount',
- 'journal_asset_source_account' => 'Asset account (source)',
- 'journal_source_account_name' => 'Revenue account (source)',
- 'journal_source_account_id' => 'Asset account (source)',
- 'BIC' => 'BIC',
- 'account_from_id' => 'From account',
- 'account_to_id' => 'To account',
- 'source_account' => 'Source account',
- 'destination_account' => 'Destination account',
- 'journal_destination_account_id' => 'Asset account (destination)',
- 'asset_destination_account' => 'Asset account (destination)',
- 'asset_source_account' => 'Asset account (source)',
- 'journal_description' => 'Description',
- 'note' => 'Notes',
- 'split_journal' => 'Split this transaction',
- 'split_journal_explanation' => 'Split this transaction in multiple parts',
- 'currency' => 'Currency',
- 'account_id' => 'Asset account',
- 'budget_id' => 'Budget',
- 'openingBalance' => 'Opening balance',
- 'tagMode' => 'Tag mode',
- 'tagPosition' => 'Tag location',
- 'virtualBalance' => 'Virtual balance',
- 'longitude_latitude' => 'Location',
- 'targetamount' => 'Target amount',
- 'accountRole' => 'Account role',
- 'openingBalanceDate' => 'Opening balance date',
- 'ccType' => 'Credit card payment plan',
- 'ccMonthlyPaymentDate' => 'Credit card monthly payment date',
- 'piggy_bank_id' => 'Piggy bank',
- 'returnHere' => 'Return here',
- 'returnHereExplanation' => 'After storing, return here to create another one.',
- 'returnHereUpdateExplanation' => 'After updating, return here.',
- 'description' => 'Description',
- 'expense_account' => 'Expense account',
- 'revenue_account' => 'Revenue account',
- 'decimal_places' => 'Decimal places',
- 'exchange_rate_instruction' => 'Foreign currencies',
- 'exchanged_amount' => 'Exchanged amount',
- 'source_amount' => 'Amount (source)',
- 'destination_amount' => 'Amount (destination)',
- 'native_amount' => 'Native amount',
-
- 'revenue_account_source' => 'Revenue account (source)',
- 'source_account_asset' => 'Source account (asset account)',
- 'destination_account_expense' => 'Destination account (expense account)',
- 'destination_account_asset' => 'Destination account (asset account)',
- 'source_account_revenue' => 'Source account (revenue account)',
- 'type' => 'Type',
- 'convert_Withdrawal' => 'Convert withdrawal',
- 'convert_Deposit' => 'Convert deposit',
- 'convert_Transfer' => 'Convert transfer',
-
-
- 'amount' => 'Amount',
- 'date' => 'Date',
- 'interest_date' => 'Interest date',
- 'book_date' => 'Book date',
- 'process_date' => 'Processing date',
- 'category' => 'Category',
- 'tags' => 'Tags',
- 'deletePermanently' => 'Delete permanently',
- 'cancel' => 'Cancel',
- 'targetdate' => 'Target date',
- 'tag' => 'Tag',
- 'under' => 'Under',
- 'symbol' => 'Symbol',
- 'code' => 'Code',
- 'iban' => 'IBAN',
- 'accountNumber' => 'Account number',
- 'has_headers' => 'Headers',
- 'date_format' => 'Date format',
- 'specifix' => 'Bank- or file specific fixes',
- 'attachments[]' => 'Attachments',
- 'store_new_withdrawal' => 'Store new withdrawal',
- 'store_new_deposit' => 'Store new deposit',
- 'store_new_transfer' => 'Store new transfer',
- 'add_new_withdrawal' => 'Add a new withdrawal',
- 'add_new_deposit' => 'Add a new deposit',
- 'add_new_transfer' => 'Add a new transfer',
- 'noPiggybank' => '(no piggy bank)',
- 'title' => 'Title',
- 'notes' => 'Notes',
- 'filename' => 'File name',
- 'mime' => 'Mime type',
- 'size' => 'Size',
- 'trigger' => 'Trigger',
- 'stop_processing' => 'Stop processing',
- 'start_date' => 'Start of range',
- 'end_date' => 'End of range',
- 'export_start_range' => 'Start of export range',
- 'export_end_range' => 'End of export range',
- 'export_format' => 'File format',
- 'include_attachments' => 'Include uploaded attachments',
- 'include_old_uploads' => 'Include imported data',
- 'accounts' => 'Export transactions from these accounts',
- 'delete_account' => 'Delete account ":name"',
- 'delete_bill' => 'Delete bill ":name"',
- 'delete_budget' => 'Delete budget ":name"',
- 'delete_category' => 'Delete category ":name"',
- 'delete_currency' => 'Delete currency ":name"',
- 'delete_journal' => 'Delete transaction with description ":description"',
- 'delete_attachment' => 'Delete attachment ":name"',
- 'delete_rule' => 'Delete rule ":title"',
- 'delete_rule_group' => 'Delete rule group ":title"',
- 'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?',
- 'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?',
- 'bill_areYouSure' => 'Are you sure you want to delete the bill named ":name"?',
- 'rule_areYouSure' => 'Are you sure you want to delete the rule titled ":title"?',
- 'ruleGroup_areYouSure' => 'Are you sure you want to delete the rule group titled ":title"?',
- 'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?',
- 'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?',
- 'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?',
- 'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?',
- 'journal_areYouSure' => 'Are you sure you want to delete the transaction described ":description"?',
- 'mass_journal_are_you_sure' => 'Are you sure you want to delete these transactions?',
- 'tag_areYouSure' => 'Are you sure you want to delete the tag ":tag"?',
- 'permDeleteWarning' => 'Deleting stuff from Firely is permanent and cannot be undone.',
- 'mass_make_selection' => 'You can still prevent items from being deleted by removing the checkbox.',
- 'delete_all_permanently' => 'Delete selected permanently',
- 'update_all_journals' => 'Update these transactions',
- 'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
- 'also_delete_rules' => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
- 'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
- 'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
- 'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
- 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
- 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
-
- 'email' => 'Email address',
- 'password' => 'Password',
- 'password_confirmation' => 'Password (again)',
- 'blocked' => 'Is blocked?',
- 'blocked_code' => 'Reason for block',
-
-
- // admin
- 'domain' => 'Domain',
- 'single_user_mode' => 'Single user mode',
- 'must_confirm_account' => 'New users must activate account',
- 'is_demo_site' => 'Is demo site',
-
-
- // import
- 'import_file' => 'Import file',
- 'configuration_file' => 'Configuration file',
- 'import_file_type' => 'Import file type',
- 'csv_comma' => 'A comma (,)',
- 'csv_semicolon' => 'A semicolon (;)',
- 'csv_tab' => 'A tab (invisible)',
- 'csv_delimiter' => 'CSV field delimiter',
- 'csv_import_account' => 'Default import account',
- 'csv_config' => 'CSV import configuration',
-
-
- 'due_date' => 'Due date',
- 'payment_date' => 'Payment date',
- 'invoice_date' => 'Invoice date',
- 'internal_reference' => 'Internal reference',
-];
\ No newline at end of file
diff --git a/resources/lang/es_ES/help.php b/resources/lang/es_ES/help.php
deleted file mode 100644
index 61210ffe41..0000000000
--- a/resources/lang/es_ES/help.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'Welcome to Firefly III',
- 'main-content-text' => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
- 'sidebar-toggle-title' => 'Sidebar to create stuff',
- 'sidebar-toggle-text' => 'Hidden under the plus icon are all the buttons to create new stuff. Accounts, transactions, everything!',
- 'account-menu-title' => 'All your accounts',
- 'account-menu-text' => 'Here you can find all the accounts you\'ve made.',
- 'budget-menu-title' => 'Budgets',
- 'budget-menu-text' => 'Use this page to organise your finances and limit spending.',
- 'report-menu-title' => 'Reports',
- 'report-menu-text' => 'Check this out when you want a solid overview of your finances.',
- 'transaction-menu-title' => 'Transactions',
- 'transaction-menu-text' => 'All transactions you\'ve created can be found here.',
- 'option-menu-title' => 'Options',
- 'option-menu-text' => 'This is pretty self-explanatory.',
- 'main-content-end-title' => 'The end!',
- 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
- 'index' => 'index',
- 'home' => 'home',
-];
\ No newline at end of file
diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php
deleted file mode 100644
index 90625d54e6..0000000000
--- a/resources/lang/es_ES/list.php
+++ /dev/null
@@ -1,89 +0,0 @@
- 'Buttons',
- 'icon' => 'Icon',
- 'id' => 'ID',
- 'create_date' => 'Created at',
- 'update_date' => 'Updated at',
- 'balance_before' => 'Balance before',
- 'balance_after' => 'Balance after',
- 'name' => 'Name',
- 'role' => 'Role',
- 'currentBalance' => 'Current balance',
- 'active' => 'Is active?',
- 'lastActivity' => 'Last activity',
- 'balanceDiff' => 'Balance difference between :start and :end',
- 'matchedOn' => 'Matched on',
- 'matchesOn' => 'Matched on',
- 'account_type' => 'Account type',
- 'created_at' => 'Created at',
- 'new_balance' => 'New balance',
- 'account' => 'Account',
- 'matchingAmount' => 'Amount',
- 'lastMatch' => 'Last match',
- 'split_number' => 'Split #',
- 'destination' => 'Destination',
- 'source' => 'Source',
- 'next_expected_match' => 'Next expected match',
- 'automatch' => 'Auto match?',
- 'repeat_freq' => 'Repeats',
- 'description' => 'Description',
- 'amount' => 'Amount',
- 'internal_reference' => 'Internal reference',
- 'date' => 'Date',
- 'interest_date' => 'Interest date',
- 'book_date' => 'Book date',
- 'process_date' => 'Processing date',
- 'due_date' => 'Due date',
- 'payment_date' => 'Payment date',
- 'invoice_date' => 'Invoice date',
- 'interal_reference' => 'Internal reference',
- 'notes' => 'Notes',
- 'from' => 'From',
- 'piggy_bank' => 'Piggy bank',
- 'to' => 'To',
- 'budget' => 'Budget',
- 'category' => 'Category',
- 'bill' => 'Bill',
- 'withdrawal' => 'Withdrawal',
- 'deposit' => 'Deposit',
- 'transfer' => 'Transfer',
- 'type' => 'Type',
- 'completed' => 'Completed',
- 'iban' => 'IBAN',
- 'paid_current_period' => 'Paid this period',
- 'email' => 'Email',
- 'registered_at' => 'Registered at',
- 'is_activated' => 'Is activated',
- 'is_blocked' => 'Is blocked',
- 'is_admin' => 'Is admin',
- 'has_two_factor' => 'Has 2FA',
- 'confirmed_from' => 'Confirmed from',
- 'registered_from' => 'Registered from',
- 'blocked_code' => 'Block code',
- 'domain' => 'Domain',
- 'registration_attempts' => 'Registration attempts',
- 'source_account' => 'Source account',
- 'destination_account' => 'Destination account',
-
- 'accounts_count' => 'Number of accounts',
- 'journals_count' => 'Number of transactions',
- 'attachments_count' => 'Number of attachments',
- 'bills_count' => 'Number of bills',
- 'categories_count' => 'Number of categories',
- 'export_jobs_count' => 'Number of export jobs',
- 'import_jobs_count' => 'Number of import jobs',
- 'budget_count' => 'Number of budgets',
- 'rule_and_groups_count' => 'Number of rules and rule groups',
- 'tags_count' => 'Number of tags',
-];
\ No newline at end of file
diff --git a/resources/lang/es_ES/passwords.php b/resources/lang/es_ES/passwords.php
index f61f371a0d..1dfc1a738c 100644
--- a/resources/lang/es_ES/passwords.php
+++ b/resources/lang/es_ES/passwords.php
@@ -16,4 +16,4 @@ return [
'sent' => 'Te enviamos un correo con el link para reestablecer tu contraseña!',
'reset' => 'Tu contraseña fue reestablecida!',
'blocked' => 'Buen intento.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php
index 843a9438eb..e5ef49397a 100644
--- a/resources/lang/es_ES/validation.php
+++ b/resources/lang/es_ES/validation.php
@@ -88,4 +88,4 @@ return [
'in_array' => 'The :attribute field does not exist in :other.',
'present' => 'The :attribute field must be present.',
'amount_zero' => 'The total amount cannot be zero',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/hr_HR/auth.php b/resources/lang/hr_HR/auth.php
deleted file mode 100644
index 5d833b3d68..0000000000
--- a/resources/lang/hr_HR/auth.php
+++ /dev/null
@@ -1,28 +0,0 @@
- 'These credentials do not match our records.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
-
-];
\ No newline at end of file
diff --git a/resources/lang/hr_HR/breadcrumbs.php b/resources/lang/hr_HR/breadcrumbs.php
deleted file mode 100644
index 4b23411578..0000000000
--- a/resources/lang/hr_HR/breadcrumbs.php
+++ /dev/null
@@ -1,41 +0,0 @@
- 'Početna',
- 'edit_currency' => 'Uredi valutu ":name"',
- 'delete_currency' => 'Obriši valutu ":name"',
- 'newPiggyBank' => 'Kreiraj novu kasicu prasicu',
- 'edit_piggyBank' => 'Uredi kasicu prasicu ":name"',
- 'preferences' => 'Postavke',
- 'profile' => 'Profil',
- 'changePassword' => 'Promijeni lozinku',
- 'bills' => 'Bills',
- 'newBill' => 'New bill',
- 'edit_bill' => 'Edit bill ":name"',
- 'delete_bill' => 'Delete bill ":name"',
- 'reports' => 'Izvještaji',
- 'searchResult' => 'Pretraživanje za ":query"',
- 'withdrawal_list' => 'Troškovi',
- 'deposit_list' => 'Revenue, income and deposits',
- 'transfer_list' => 'Transfers',
- 'transfers_list' => 'Transfers',
- 'create_withdrawal' => 'Create new withdrawal',
- 'create_deposit' => 'Create new deposit',
- 'create_transfer' => 'Create new transfer',
- 'edit_journal' => 'Uredi transakciju ":description"',
- 'delete_journal' => 'Obriši transakciju ":description"',
- 'tags' => 'Oznake',
- 'createTag' => 'Kreiraj novu oznaku',
- 'edit_tag' => 'Uredi oznaku ":tag"',
- 'delete_tag' => 'Obriši oznaku ":tag"',
-];
\ No newline at end of file
diff --git a/resources/lang/hr_HR/config.php b/resources/lang/hr_HR/config.php
deleted file mode 100644
index 61ed65512d..0000000000
--- a/resources/lang/hr_HR/config.php
+++ /dev/null
@@ -1,23 +0,0 @@
- 'hr, Croatian, hr_HR, hr_HR.utf8, hr_HR.UTF-8',
- 'month' => '%B %Y',
- 'month_and_day' => '%e %B %Y',
- 'date_time' => '%e %B %Y, @ %T',
- 'specific_day' => '%e %B %Y',
- 'week_in_year' => 'Tjedan %W, %Y',
- 'quarter_of_year' => '%B %Y',
- 'year' => '%Y',
- 'half_year' => '%B %Y',
-
-];
\ No newline at end of file
diff --git a/resources/lang/hr_HR/csv.php b/resources/lang/hr_HR/csv.php
deleted file mode 100644
index 4424610191..0000000000
--- a/resources/lang/hr_HR/csv.php
+++ /dev/null
@@ -1,80 +0,0 @@
- 'Configure your import',
- 'import_configure_intro' => 'There are some options for your CSV import. Please indicate if your CSV file contains headers on the first column, and what the date format of your date-fields is. That might require some experimentation. The field delimiter is usually a ",", but could also be a ";". Check this carefully.',
- 'import_configure_form' => 'Basic CSV import options',
- 'header_help' => 'Check this if the first row of your CSV file are the column titles',
- 'date_help' => 'Date time format in your CSV. Follow the format like this page indicates. The default value will parse dates that look like this: :dateExample.',
- 'delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
- 'import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
- 'upload_not_writeable' => 'The grey box contains a file path. It should be writeable. Please make sure it is.',
-
- // roles
- 'column_roles_title' => 'Define column roles',
- 'column_roles_table' => 'Table',
- 'column_name' => 'Name of column',
- 'column_example' => 'Column example data',
- 'column_role' => 'Column data meaning',
- 'do_map_value' => 'Map these values',
- 'column' => 'Column',
- 'no_example_data' => 'No example data available',
- 'store_column_roles' => 'Continue import',
- 'do_not_map' => '(do not map)',
- 'map_title' => 'Connect import data to Firefly III data',
- 'map_text' => 'In the following tables, the left value shows you information found in your uploaded CSV file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.',
-
- 'field_value' => 'Field value',
- 'field_mapped_to' => 'Mapped to',
- 'store_column_mapping' => 'Store mapping',
-
- // map things.
-
-
- 'column__ignore' => '(ignore this column)',
- 'column_account-iban' => 'Asset account (IBAN)',
- 'column_account-id' => 'Asset account ID (matching Firefly)',
- 'column_account-name' => 'Asset account (name)',
- 'column_amount' => 'Amount',
- 'column_amount-comma-separated' => 'Amount (comma as decimal separator)',
- 'column_bill-id' => 'Bill ID (matching Firefly)',
- 'column_bill-name' => 'Bill name',
- 'column_budget-id' => 'Budget ID (matching Firefly)',
- 'column_budget-name' => 'Budget name',
- 'column_category-id' => 'Category ID (matching Firefly)',
- 'column_category-name' => 'Category name',
- 'column_currency-code' => 'Currency code (ISO 4217)',
- 'column_currency-id' => 'Currency ID (matching Firefly)',
- 'column_currency-name' => 'Currency name (matching Firefly)',
- 'column_currency-symbol' => 'Currency symbol (matching Firefly)',
- 'column_date-interest' => 'Interest calculation date',
- 'column_date-book' => 'Transaction booking date',
- 'column_date-process' => 'Transaction process date',
- 'column_date-transaction' => 'Date',
- 'column_description' => 'Description',
- 'column_opposing-iban' => 'Opposing account (IBAN)',
- 'column_opposing-id' => 'Opposing account ID (matching Firefly)',
- 'column_external-id' => 'External ID',
- 'column_opposing-name' => 'Opposing account (name)',
- 'column_rabo-debet-credit' => 'Rabobank specific debet/credit indicator',
- 'column_ing-debet-credit' => 'ING specific debet/credit indicator',
- 'column_sepa-ct-id' => 'SEPA Credit Transfer end-to-end ID',
- 'column_sepa-ct-op' => 'SEPA Credit Transfer opposing account',
- 'column_sepa-db' => 'SEPA Direct Debet',
- 'column_tags-comma' => 'Tags (comma separated)',
- 'column_tags-space' => 'Tags (space separated)',
- 'column_account-number' => 'Asset account (account number)',
- 'column_opposing-number' => 'Opposing account (account number)',
-];
\ No newline at end of file
diff --git a/resources/lang/hr_HR/demo.php b/resources/lang/hr_HR/demo.php
deleted file mode 100644
index e7f8ea934d..0000000000
--- a/resources/lang/hr_HR/demo.php
+++ /dev/null
@@ -1,24 +0,0 @@
- 'Sorry, there is no extra demo-explanation text for this page.',
- 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.',
- 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.',
- 'accounts-index' => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.',
- 'budgets-index' => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.',
- 'reports-index-start' => 'Firefly III supports four types of reports. Read about them by clicking on the -icon in the top right corner.',
- 'reports-index-examples' => 'Be sure to check out these examples: a monthly financial overview, a yearly financial overview and a budget overview.',
- 'currencies-index' => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
- 'transactions-index' => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
- 'piggy-banks-index' => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
- 'import-index' => 'Of course, any CSV file can be imported into Firefly III ',
- 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.',
- 'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
-];
\ No newline at end of file
diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
deleted file mode 100644
index a8d8567267..0000000000
--- a/resources/lang/hr_HR/firefly.php
+++ /dev/null
@@ -1,1063 +0,0 @@
- 'incomplete translation',
- 'close' => 'Close',
- 'actions' => 'Actions',
- 'edit' => 'Edit',
- 'delete' => 'Delete',
- 'welcomeBack' => 'What\'s playing?',
- 'everything' => 'Everything',
- 'customRange' => 'Custom range',
- 'apply' => 'Apply',
- 'cancel' => 'Cancel',
- 'from' => 'From',
- 'to' => 'To',
- 'showEverything' => 'Show everything',
- 'never' => 'Never',
- 'search_results_for' => 'Search results for ":query"',
- 'advanced_search' => 'Advanced search',
- 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.',
- 'bounced_error' => 'The message sent to :email bounced, so no access for you.',
- 'deleted_error' => 'These credentials do not match our records.',
- 'general_blocked_error' => 'Your account has been disabled, so you cannot login.',
- 'expired_error' => 'Your account has expired, and can no longer be used.',
- 'removed_amount' => 'Removed :amount',
- 'added_amount' => 'Added :amount',
- 'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.',
- 'Opening balance' => 'Opening balance',
- 'create_new_stuff' => 'Create new stuff',
- 'new_withdrawal' => 'New withdrawal',
- 'new_deposit' => 'New deposit',
- 'new_transfer' => 'New transfer',
- 'new_asset_account' => 'New asset account',
- 'new_expense_account' => 'New expense account',
- 'new_revenue_account' => 'New revenue account',
- 'new_budget' => 'New budget',
- 'new_bill' => 'New bill',
- 'block_account_logout' => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?',
- 'flash_success' => 'Success!',
- 'flash_info' => 'Message',
- 'flash_warning' => 'Warning!',
- 'flash_error' => 'Error!',
- 'flash_info_multiple' => 'There is one message|There are :count messages',
- 'flash_error_multiple' => 'There is one error|There are :count errors',
- 'net_worth' => 'Net worth',
- 'route_has_no_help' => 'There is no help for this route.',
- 'help_may_not_be_your_language' => 'This help text is in English. It is not yet available in your language',
- 'two_factor_welcome' => 'Hello, :user!',
- 'two_factor_enter_code' => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
- 'two_factor_code_here' => 'Enter code here',
- 'two_factor_title' => 'Two factor authentication',
- 'authenticate' => 'Authenticate',
- 'two_factor_forgot_title' => 'Lost two factor authentication',
- 'two_factor_forgot' => 'I forgot my two-factor thing.',
- 'two_factor_lost_header' => 'Lost your two factor authentication?',
- 'two_factor_lost_intro' => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',
- 'two_factor_lost_fix_self' => 'If you run your own instance of Firefly III, check the logs in storage/logs for instructions.',
- 'two_factor_lost_fix_owner' => 'Otherwise, email the site owner, :site_owner and ask them to reset your two factor authentication.',
- 'warning_much_data' => ':days days of data may take a while to load.',
- 'registered' => 'You have registered successfully!',
- 'search' => 'Search',
- 'search_found_accounts' => 'Found :count account(s) for your query.',
- 'search_found_categories' => 'Found :count category(ies) for your query.',
- 'search_found_budgets' => 'Found :count budget(s) for your query.',
- 'search_found_tags' => 'Found :count tag(s) for your query.',
- 'search_found_transactions' => 'Found :count transaction(s) for your query.',
- 'results_limited' => 'The results are limited to :count entries.',
- 'tagbalancingAct' => 'Balancing act',
- 'tagadvancePayment' => 'Advance payment',
- 'tagnothing' => '',
- 'Default asset account' => 'Default asset account',
- 'no_budget_pointer' => 'You seem to have no budgets yet. You should create some on the budgets-page. Budgets can help you keep track of expenses.',
- 'Savings account' => 'Savings account',
- 'Credit card' => 'Credit card',
- 'source_accounts' => 'Source account(s)',
- 'destination_accounts' => 'Destination account(s)',
- 'user_id_is' => 'Your user id is :user',
- 'field_supports_markdown' => 'This field supports Markdown.',
- 'need_more_help' => 'If you need more help using Firefly III, please open a ticket on Github.',
- 'nothing_to_display' => 'There are no transactions to show you',
- 'show_all_no_filter' => 'Show all transactions without grouping them by date.',
- 'expenses_by_category' => 'Expenses by category',
- 'expenses_by_budget' => 'Expenses by budget',
- 'income_by_category' => 'Income by category',
- 'expenses_by_asset_account' => 'Expenses by asset account',
- 'expenses_by_expense_account' => 'Expenses by expense account',
- 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.',
- 'sum_of_expenses' => 'Sum of expenses',
- 'sum_of_income' => 'Sum of income',
- 'total_sum' => 'Total sum',
- 'spent_in_specific_budget' => 'Spent in budget ":budget"',
- 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"',
- 'left_in_budget_limit' => 'Left to spend according to budgeting',
- 'cannot_change_demo' => 'You cannot change the password of the demonstration account.',
- 'cannot_delete_demo' => 'You cannot remove the demonstration account.',
- 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account',
- 'per_period' => 'Per period',
- 'all_periods' => 'All periods',
- 'current_period' => 'Current period',
- 'show_the_current_period_and_overview' => 'Show the current period and overview',
- 'pref_languages_locale' => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
- 'budget_in_period' => 'All transactions for budget ":name" between :start and :end',
- 'chart_budget_in_period' => 'Chart for all transactions for budget ":name" between :start and :end',
- 'chart_account_in_period' => 'Chart for all transactions for account ":name" between :start and :end',
- 'chart_category_in_period' => 'Chart for all transactions for category ":name" between :start and :end',
- 'chart_category_all' => 'Chart for all transactions for category ":name"',
- 'budget_in_period_breadcrumb' => 'Between :start and :end',
- 'clone_withdrawal' => 'Clone this withdrawal',
- 'clone_deposit' => 'Clone this deposit',
- 'clone_transfer' => 'Clone this transfer',
- 'transaction_journal_other_options' => 'Other options',
- 'multi_select_no_selection' => 'None selected',
- 'multi_select_all_selected' => 'All selected',
- 'multi_select_filter_placeholder' => 'Find..',
- 'between_dates_breadcrumb' => 'Between :start and :end',
- 'all_journals_without_budget' => 'All transactions without a budget',
- 'journals_without_budget' => 'Transactions without a budget',
- 'all_journals_without_category' => 'All transactions without a category',
- 'journals_without_category' => 'Transactions without a category',
- 'all_journals_for_account' => 'All transactions for account :name',
- 'chart_all_journals_for_account' => 'Chart of all transactions for account :name',
- 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end',
- 'transferred' => 'Transferred',
- 'all_withdrawal' => 'All expenses',
- 'all_transactions' => 'All transactions',
- 'title_withdrawal_between' => 'All expenses between :start and :end',
- 'all_deposit' => 'All revenue',
- 'title_deposit_between' => 'All revenue between :start and :end',
- 'all_transfers' => 'All transfers',
- 'title_transfers_between' => 'All transfers between :start and :end',
- 'all_transfer' => 'All transfers',
- 'all_journals_for_tag' => 'All transactions for tag ":tag"',
- 'title_transfer_between' => 'All transfers between :start and :end',
- 'all_journals_for_category' => 'All transactions for category :name',
- 'all_journals_for_budget' => 'All transactions for budget :name',
- 'chart_all_journals_for_budget' => 'Chart of all transactions for budget :name',
- 'journals_in_period_for_category' => 'All transactions for category :name between :start and :end',
- 'journals_in_period_for_tag' => 'All transactions for tag :tag between :start and :end',
- 'not_available_demo_user' => 'The feature you try to access is not available to demo users.',
- 'exchange_rate_instructions' => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
- 'transfer_exchange_rate_instructions' => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
-
- // repeat frequencies:
- 'repeat_freq_yearly' => 'yearly',
- 'repeat_freq_monthly' => 'monthly',
- 'weekly' => 'weekly',
- 'quarterly' => 'quarterly',
- 'half-year' => 'every half year',
- 'yearly' => 'yearly',
- // account confirmation:
- 'confirm_account_header' => 'Please confirm your account',
- 'confirm_account_intro' => 'An email has been sent to the address you used during your registration. Please check it out for further instructions. If you did not get this message, you can have Firefly send it again.',
- 'confirm_account_resend_email' => 'Send me the confirmation message I need to activate my account.',
- 'account_is_confirmed' => 'Your account has been confirmed!',
- 'invalid_activation_code' => 'It seems the code you are using is not valid, or has expired.',
- 'confirm_account_is_resent_header' => 'The confirmation has been resent',
- 'confirm_account_is_resent_text' => 'The confirmation message has been resent. If you still did not receive the confirmation message, please contact the site owner at :owner or check the log files to see what went wrong.',
- 'confirm_account_is_resent_go_home' => 'Go to the index page of Firefly',
- 'confirm_account_not_resent_header' => 'Something went wrong :(',
- 'confirm_account_not_resent_intro' => 'The confirmation message has been not resent. If you still did not receive the confirmation message, please contact the site owner at :owner instead. Possibly, you have tried to resend the activation message too often. You can have Firefly III try to resend the confirmation message every hour.',
- 'confirm_account_not_resent_go_home' => 'Go to the index page of Firefly',
-
- // export data:
- 'import_and_export' => 'Import and export',
- 'export_data' => 'Export data',
- 'export_data_intro' => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
- 'export_format' => 'Export format',
- 'export_format_csv' => 'Comma separated values (CSV file)',
- 'export_format_mt940' => 'MT940 compatible format',
- 'export_included_accounts' => 'Export transactions from these accounts',
- 'include_old_uploads_help' => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
- 'do_export' => 'Export',
- 'export_status_never_started' => 'The export has not started yet',
- 'export_status_make_exporter' => 'Creating exporter thing...',
- 'export_status_collecting_journals' => 'Collecting your transactions...',
- 'export_status_collected_journals' => 'Collected your transactions!',
- 'export_status_converting_to_export_format' => 'Converting your transactions...',
- 'export_status_converted_to_export_format' => 'Converted your transactions!',
- 'export_status_creating_journal_file' => 'Creating the export file...',
- 'export_status_created_journal_file' => 'Created the export file!',
- 'export_status_collecting_attachments' => 'Collecting all your attachments...',
- 'export_status_collected_attachments' => 'Collected all your attachments!',
- 'export_status_collecting_old_uploads' => 'Collecting all your previous uploads...',
- 'export_status_collected_old_uploads' => 'Collected all your previous uploads!',
- 'export_status_creating_config_file' => 'Creating a configuration file...',
- 'export_status_created_config_file' => 'Created a configuration file!',
- 'export_status_creating_zip_file' => 'Creating a zip file...',
- 'export_status_created_zip_file' => 'Created a zip file!',
- 'export_status_finished' => 'Export has succesfully finished! Yay!',
- 'export_data_please_wait' => 'Please wait...',
- 'attachment_explanation' => 'The file called \':attachment_name\' (#:attachment_id) was originally uploaded to :type \':description\' (#:journal_id) dated :date for the amount of :amount.',
-
- // rules
- 'rules' => 'Rules',
- 'rules_explanation' => 'Here you can manage rules. Rules are triggered when a transaction is created or updated. Then, if the transaction has certain properties (called "triggers") Firefly will execute the "actions". Combined, you can make Firefly respond in a certain way to new transactions.',
- 'rule_name' => 'Name of rule',
- 'rule_triggers' => 'Rule triggers when',
- 'rule_actions' => 'Rule will',
- 'new_rule' => 'New rule',
- 'new_rule_group' => 'New rule group',
- 'rule_priority_up' => 'Give rule more priority',
- 'rule_priority_down' => 'Give rule less priority',
- 'make_new_rule_group' => 'Make new rule group',
- 'store_new_rule_group' => 'Store new rule group',
- 'created_new_rule_group' => 'New rule group ":title" stored!',
- 'updated_rule_group' => 'Successfully updated rule group ":title".',
- 'edit_rule_group' => 'Edit rule group ":title"',
- 'delete_rule_group' => 'Delete rule group ":title"',
- 'deleted_rule_group' => 'Deleted rule group ":title"',
- 'update_rule_group' => 'Update rule group',
- 'no_rules_in_group' => 'There are no rules in this group',
- 'move_rule_group_up' => 'Move rule group up',
- 'move_rule_group_down' => 'Move rule group down',
- 'save_rules_by_moving' => 'Save these rule(s) by moving them to another rule group:',
- 'make_new_rule' => 'Make new rule in rule group ":title"',
- 'rule_help_stop_processing' => 'When you check this box, later rules in this group will not be executed.',
- 'rule_help_active' => 'Inactive rules will never fire.',
- 'stored_new_rule' => 'Stored new rule with title ":title"',
- 'deleted_rule' => 'Deleted rule with title ":title"',
- 'store_new_rule' => 'Store new rule',
- 'updated_rule' => 'Updated rule with title ":title"',
- 'default_rule_group_name' => 'Default rules',
- 'default_rule_group_description' => 'All your rules not in a particular group.',
- 'default_rule_name' => 'Your first default rule',
- 'default_rule_description' => 'This rule is an example. You can safely delete it.',
- 'default_rule_trigger_description' => 'The Man Who Sold the World',
- 'default_rule_trigger_from_account' => 'David Bowie',
- 'default_rule_action_prepend' => 'Bought the world from ',
- 'default_rule_action_set_category' => 'Large expenses',
- 'trigger' => 'Trigger',
- 'trigger_value' => 'Trigger on value',
- 'stop_processing_other_triggers' => 'Stop processing other triggers',
- 'add_rule_trigger' => 'Add new trigger',
- 'action' => 'Action',
- 'action_value' => 'Action value',
- 'stop_executing_other_actions' => 'Stop executing other actions',
- 'add_rule_action' => 'Add new action',
- 'edit_rule' => 'Edit rule ":title"',
- 'delete_rule' => 'Delete rule ":title"',
- 'update_rule' => 'Update rule',
- 'test_rule_triggers' => 'See matching transactions',
- 'warning_transaction_subset' => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
- 'warning_no_matching_transactions' => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
- 'warning_no_valid_triggers' => 'No valid triggers provided.',
- 'execute_on_existing_transactions' => 'Execute for existing transactions',
- 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions',
- 'execute_on_existing_transactions_intro' => 'When a rule or group has been changed or added, you can execute it for existing transactions',
- 'execute_on_existing_transactions_short' => 'Existing transactions',
- 'executed_group_on_existing_transactions' => 'Executed group ":title" for existing transactions',
- 'execute_group_on_existing_transactions' => 'Execute group ":title" for existing transactions',
- 'include_transactions_from_accounts' => 'Include transactions from these accounts',
- 'execute' => 'Execute',
-
- // actions and triggers
- 'rule_trigger_user_action' => 'User action is ":trigger_value"',
- 'rule_trigger_from_account_starts' => 'Source account starts with ":trigger_value"',
- 'rule_trigger_from_account_ends' => 'Source account ends with ":trigger_value"',
- 'rule_trigger_from_account_is' => 'Source account is ":trigger_value"',
- 'rule_trigger_from_account_contains' => 'Source account contains ":trigger_value"',
- 'rule_trigger_to_account_starts' => 'Destination account starts with ":trigger_value"',
- 'rule_trigger_to_account_ends' => 'Destination account ends with ":trigger_value"',
- 'rule_trigger_to_account_is' => 'Destination account is ":trigger_value"',
- 'rule_trigger_to_account_contains' => 'Destination account contains ":trigger_value"',
- 'rule_trigger_transaction_type' => 'Transaction is of type ":trigger_value"',
- 'rule_trigger_category_is' => 'Category is ":trigger_value"',
- 'rule_trigger_amount_less' => 'Amount is less than :trigger_value',
- 'rule_trigger_amount_exactly' => 'Amount is :trigger_value',
- 'rule_trigger_amount_more' => 'Amount is more than :trigger_value',
- 'rule_trigger_description_starts' => 'Description starts with ":trigger_value"',
- 'rule_trigger_description_ends' => 'Description ends with ":trigger_value"',
- 'rule_trigger_description_contains' => 'Description contains ":trigger_value"',
- 'rule_trigger_description_is' => 'Description is ":trigger_value"',
- 'rule_trigger_from_account_starts_choice' => 'Source account starts with..',
- 'rule_trigger_from_account_ends_choice' => 'Source account ends with..',
- 'rule_trigger_from_account_is_choice' => 'Source account is..',
- 'rule_trigger_from_account_contains_choice' => 'Source account contains..',
- 'rule_trigger_to_account_starts_choice' => 'Destination account starts with..',
- 'rule_trigger_to_account_ends_choice' => 'Destination account ends with..',
- 'rule_trigger_to_account_is_choice' => 'Destination account is..',
- 'rule_trigger_to_account_contains_choice' => 'Destination account contains..',
- 'rule_trigger_transaction_type_choice' => 'Transaction is of type..',
- 'rule_trigger_amount_less_choice' => 'Amount is less than..',
- 'rule_trigger_amount_exactly_choice' => 'Amount is..',
- 'rule_trigger_amount_more_choice' => 'Amount is more than..',
- 'rule_trigger_description_starts_choice' => 'Description starts with..',
- 'rule_trigger_description_ends_choice' => 'Description ends with..',
- 'rule_trigger_description_contains_choice' => 'Description contains..',
- 'rule_trigger_description_is_choice' => 'Description is..',
- 'rule_trigger_category_is_choice' => 'Category is..',
- 'rule_trigger_budget_is_choice' => 'Budget is..',
- 'rule_trigger_tag_is_choice' => '(A) tag is..',
- 'rule_trigger_has_attachments_choice' => 'Has at least this many attachments',
- 'rule_trigger_has_attachments' => 'Has at least :trigger_value attachment(s)',
- 'rule_trigger_store_journal' => 'When a transaction is created',
- 'rule_trigger_update_journal' => 'When a transaction is updated',
- 'rule_action_set_category' => 'Set category to ":action_value"',
- 'rule_action_clear_category' => 'Clear category',
- 'rule_action_set_budget' => 'Set budget to ":action_value"',
- 'rule_action_clear_budget' => 'Clear budget',
- 'rule_action_add_tag' => 'Add tag ":action_value"',
- 'rule_action_remove_tag' => 'Remove tag ":action_value"',
- 'rule_action_remove_all_tags' => 'Remove all tags',
- 'rule_action_set_description' => 'Set description to ":action_value"',
- 'rule_action_append_description' => 'Append description with ":action_value"',
- 'rule_action_prepend_description' => 'Prepend description with ":action_value"',
- 'rule_action_set_category_choice' => 'Set category to..',
- 'rule_action_clear_category_choice' => 'Clear any category',
- 'rule_action_set_budget_choice' => 'Set budget to..',
- 'rule_action_clear_budget_choice' => 'Clear any budget',
- 'rule_action_add_tag_choice' => 'Add tag..',
- 'rule_action_remove_tag_choice' => 'Remove tag..',
- 'rule_action_remove_all_tags_choice' => 'Remove all tags',
- 'rule_action_set_description_choice' => 'Set description to..',
- 'rule_action_append_description_choice' => 'Append description with..',
- 'rule_action_prepend_description_choice' => 'Prepend description with..',
- 'rule_action_set_source_account_choice' => 'Set source account to...',
- 'rule_action_set_source_account' => 'Set source account to :action_value',
- 'rule_action_set_destination_account_choice' => 'Set destination account to...',
- 'rule_action_set_destination_account' => 'Set destination account to :action_value',
-
- // tags
- 'store_new_tag' => 'Store new tag',
- 'update_tag' => 'Update tag',
- 'no_location_set' => 'No location set.',
- 'meta_data' => 'Meta data',
- 'location' => 'Location',
-
- // preferences
- 'pref_home_screen_accounts' => 'Home screen accounts',
- 'pref_home_screen_accounts_help' => 'Which accounts should be displayed on the home page?',
- 'pref_view_range' => 'View range',
- 'pref_view_range_help' => 'Some charts are automatically grouped in periods. What period would you prefer?',
- 'pref_1D' => 'One day',
- 'pref_1W' => 'One week',
- 'pref_1M' => 'One month',
- 'pref_3M' => 'Three months (quarter)',
- 'pref_6M' => 'Six months',
- 'pref_1Y' => 'One year',
- 'pref_languages' => 'Languages',
- 'pref_languages_help' => 'Firefly III supports several languages. Which one do you prefer?',
- 'pref_custom_fiscal_year' => 'Fiscal year settings',
- 'pref_custom_fiscal_year_label' => 'Enabled',
- 'pref_custom_fiscal_year_help' => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
- 'pref_fiscal_year_start_label' => 'Fiscal year start date',
- 'pref_two_factor_auth' => '2-step verification',
- 'pref_two_factor_auth_help' => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
- 'pref_enable_two_factor_auth' => 'Enable 2-step verification',
- 'pref_two_factor_auth_disabled' => '2-step verification code removed and disabled',
- 'pref_two_factor_auth_remove_it' => 'Don\'t forget to remove the account from your authentication app!',
- 'pref_two_factor_auth_code' => 'Verify code',
- 'pref_two_factor_auth_code_help' => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
- 'pref_two_factor_auth_reset_code' => 'Reset verification code',
- 'pref_two_factor_auth_remove_code' => 'Remove verification code',
- 'pref_two_factor_auth_remove_will_disable' => '(this will also disable two-factor authentication)',
- 'pref_save_settings' => 'Save settings',
- 'saved_preferences' => 'Preferences saved!',
- 'preferences_general' => 'General',
- 'preferences_frontpage' => 'Home screen',
- 'preferences_security' => 'Security',
- 'preferences_layout' => 'Layout',
- 'pref_home_show_deposits' => 'Show deposits on the home screen',
- 'pref_home_show_deposits_info' => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
- 'pref_home_do_show_deposits' => 'Yes, show them',
- 'successful_count' => 'of which :count successful',
- 'transaction_page_size_title' => 'Page size',
- 'transaction_page_size_help' => 'Any list of transactions shows at most this many transactions',
- 'transaction_page_size_label' => 'Page size',
- 'between_dates' => '(:start and :end)',
- 'pref_optional_fields_transaction' => 'Optional fields for transactions',
- 'pref_optional_fields_transaction_help' => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
- 'optional_tj_date_fields' => 'Date fields',
- 'optional_tj_business_fields' => 'Business fields',
- 'optional_tj_attachment_fields' => 'Attachment fields',
- 'pref_optional_tj_interest_date' => 'Interest date',
- 'pref_optional_tj_book_date' => 'Book date',
- 'pref_optional_tj_process_date' => 'Processing date',
- 'pref_optional_tj_due_date' => 'Due date',
- 'pref_optional_tj_payment_date' => 'Payment date',
- 'pref_optional_tj_invoice_date' => 'Invoice date',
- 'pref_optional_tj_internal_reference' => 'Internal reference',
- 'pref_optional_tj_notes' => 'Notes',
- 'pref_optional_tj_attachments' => 'Attachments',
- 'optional_field_meta_dates' => 'Dates',
- 'optional_field_meta_business' => 'Business',
- 'optional_field_attachments' => 'Attachments',
- 'optional_field_meta_data' => 'Optional meta data',
-
-
- // profile:
- 'change_your_password' => 'Change your password',
- 'delete_account' => 'Delete account',
- 'current_password' => 'Current password',
- 'new_password' => 'New password',
- 'new_password_again' => 'New password (again)',
- 'delete_your_account' => 'Delete your account',
- 'delete_your_account_help' => 'Deleting your account will also delete any accounts, transactions, anything you might have saved into Firefly III. It\'ll be GONE.',
- 'delete_your_account_password' => 'Enter your password to continue.',
- 'password' => 'Password',
- 'are_you_sure' => 'Are you sure? You cannot undo this.',
- 'delete_account_button' => 'DELETE your account',
- 'invalid_current_password' => 'Invalid current password!',
- 'password_changed' => 'Password changed!',
- 'should_change' => 'The idea is to change your password.',
- 'invalid_password' => 'Invalid password!',
-
-
- // attachments
- 'nr_of_attachments' => 'One attachment|:count attachments',
- 'attachments' => 'Attachments',
- 'edit_attachment' => 'Edit attachment ":name"',
- 'update_attachment' => 'Update attachment',
- 'delete_attachment' => 'Delete attachment ":name"',
- 'attachment_deleted' => 'Deleted attachment ":name"',
- 'attachment_updated' => 'Updated attachment ":name"',
- 'upload_max_file_size' => 'Maximum file size: :size',
-
- // tour:
- 'prev' => 'Prev',
- 'next' => 'Next',
- 'end-tour' => 'End tour',
- 'pause' => 'Pause',
-
- // transaction index
- 'title_expenses' => 'Expenses',
- 'title_withdrawal' => 'Expenses',
- 'title_revenue' => 'Revenue / income',
- 'title_deposit' => 'Revenue / income',
- 'title_transfer' => 'Transfers',
- 'title_transfers' => 'Transfers',
-
- // convert stuff:
- 'convert_is_already_type_Withdrawal' => 'This transaction is already a withdrawal',
- 'convert_is_already_type_Deposit' => 'This transaction is already a deposit',
- 'convert_is_already_type_Transfer' => 'This transaction is already a transfer',
- 'convert_to_Withdrawal' => 'Convert ":description" to a withdrawal',
- 'convert_to_Deposit' => 'Convert ":description" to a deposit',
- 'convert_to_Transfer' => 'Convert ":description" to a transfer',
- 'convert_options_WithdrawalDeposit' => 'Convert a withdrawal into a deposit',
- 'convert_options_WithdrawalTransfer' => 'Convert a withdrawal into a transfer',
- 'convert_options_DepositTransfer' => 'Convert a deposit into a transfer',
- 'convert_options_DepositWithdrawal' => 'Convert a deposit into a withdrawal',
- 'convert_options_TransferWithdrawal' => 'Convert a transfer into a withdrawal',
- 'convert_options_TransferDeposit' => 'Convert a transfer into a deposit',
- 'transaction_journal_convert_options' => 'Convert this transaction',
- 'convert_Withdrawal_to_deposit' => 'Convert this withdrawal to a deposit',
- 'convert_Withdrawal_to_transfer' => 'Convert this withdrawal to a transfer',
- 'convert_Deposit_to_withdrawal' => 'Convert this deposit to a withdrawal',
- 'convert_Deposit_to_transfer' => 'Convert this deposit to a transfer',
- 'convert_Transfer_to_deposit' => 'Convert this transfer to a deposit',
- 'convert_Transfer_to_withdrawal' => 'Convert this transfer to a withdrawal',
- 'convert_please_set_revenue_source' => 'Please pick the revenue account where the money will come from.',
- 'convert_please_set_asset_destination' => 'Please pick the asset account where the money will go to.',
- 'convert_please_set_expense_destination' => 'Please pick the expense account where the money will go to.',
- 'convert_please_set_asset_source' => 'Please pick the asset account where the money will come from.',
- 'convert_explanation_withdrawal_deposit' => 'If you convert this withdrawal into a deposit, :amount will be deposited into :sourceName instead of taken from it.',
- 'convert_explanation_withdrawal_transfer' => 'If you convert this withdrawal into a transfer, :amount will be transferred from :sourceName to a new asset account, instead of being paid to :destinationName.',
- 'convert_explanation_deposit_withdrawal' => 'If you convert this deposit into a withdrawal, :amount will be removed from :destinationName instead of added to it.',
- 'convert_explanation_deposit_transfer' => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into :destinationName.',
- 'convert_explanation_transfer_withdrawal' => 'If you convert this transfer into a withdrawal, :amount will go from :sourceName to a new destination as an expense, instead of to :destinationName as a transfer.',
- 'convert_explanation_transfer_deposit' => 'If you convert this transfer into a deposit, :amount will be deposited into account :destinationName instead of being transferred there.',
- 'converted_to_Withdrawal' => 'The transaction has been converted to a withdrawal',
- 'converted_to_Deposit' => 'The transaction has been converted to a deposit',
- 'converted_to_Transfer' => 'The transaction has been converted to a transfer',
-
-
- // create new stuff:
- 'create_new_withdrawal' => 'Create new withdrawal',
- 'create_new_deposit' => 'Create new deposit',
- 'create_new_transfer' => 'Create new transfer',
- 'create_new_asset' => 'Create new asset account',
- 'create_new_expense' => 'Create new expense account',
- 'create_new_revenue' => 'Create new revenue account',
- 'create_new_piggy_bank' => 'Create new piggy bank',
- 'create_new_bill' => 'Create new bill',
-
- // currencies:
- 'create_currency' => 'Create a new currency',
- 'store_currency' => 'Store new currency',
- 'update_currency' => 'Update currency',
- 'new_default_currency' => ':name is now the default currency.',
- 'cannot_delete_currency' => 'Cannot delete :name because it is still in use.',
- 'deleted_currency' => 'Currency :name deleted',
- 'created_currency' => 'Currency :name created',
- 'updated_currency' => 'Currency :name updated',
- 'ask_site_owner' => 'Please ask :owner to add, remove or edit currencies.',
- 'currencies_intro' => 'Firefly III supports various currencies which you can set and enable here.',
- 'make_default_currency' => 'make default',
- 'default_currency' => 'default',
-
- // new user:
- 'submit' => 'Submit',
- 'getting_started' => 'Getting started',
- 'to_get_started' => 'To get started with Firefly, please enter your current bank\'s name, and the balance of your checking account:',
- 'savings_balance_text' => 'If you have a savings account, please enter the current balance of your savings account:',
- 'cc_balance_text' => 'If you have a credit card, please enter your credit card\'s limit.',
- 'stored_new_account_new_user' => 'Yay! Your new account has been stored.',
- 'stored_new_accounts_new_user' => 'Yay! Your new accounts have been stored.',
-
- // forms:
- 'mandatoryFields' => 'Mandatory fields',
- 'optionalFields' => 'Optional fields',
- 'options' => 'Options',
-
- // budgets:
- 'create_new_budget' => 'Create a new budget',
- 'store_new_budget' => 'Store new budget',
- 'stored_new_budget' => 'Stored new budget ":name"',
- 'available_between' => 'Available between :start and :end',
- 'transactionsWithoutBudget' => 'Expenses without budget',
- 'transactions_no_budget' => 'Expenses without budget between :start and :end',
- 'spent_between' => 'Spent between :start and :end',
- 'createBudget' => 'New budget',
- 'inactiveBudgets' => 'Inactive budgets',
- 'without_budget_between' => 'Transactions without a budget between :start and :end',
- 'budget_in_month' => ':name in :month',
- 'delete_budget' => 'Delete budget ":name"',
- 'deleted_budget' => 'Deleted budget ":name"',
- 'edit_budget' => 'Edit budget ":name"',
- 'updated_budget' => 'Updated budget ":name"',
- 'update_amount' => 'Update amount',
- 'update_budget' => 'Update budget',
- 'update_budget_amount_range' => 'Update (expected) available amount between :start and :end',
-
- // bills:
- 'matching_on' => 'Matching on',
- 'between_amounts' => 'between :low and :high.',
- 'repeats' => 'Repeats',
- 'connected_journals' => 'Connected transactions',
- 'auto_match_on' => 'Automatically matched by Firefly',
- 'auto_match_off' => 'Not automatically matched by Firefly',
- 'next_expected_match' => 'Next expected match',
- 'delete_bill' => 'Delete bill ":name"',
- 'deleted_bill' => 'Deleted bill ":name"',
- 'edit_bill' => 'Edit bill ":name"',
- 'more' => 'More',
- 'rescan_old' => 'Rescan old transactions',
- 'update_bill' => 'Update bill',
- 'updated_bill' => 'Updated bill ":name"',
- 'store_new_bill' => 'Store new bill',
- 'stored_new_bill' => 'Stored new bill ":name"',
- 'cannot_scan_inactive_bill' => 'Inactive bills cannot be scanned.',
- 'rescanned_bill' => 'Rescanned everything.',
- 'average_bill_amount_year' => 'Average bill amount (:year)',
- 'average_bill_amount_overall' => 'Average bill amount (overall)',
- 'not_or_not_yet' => 'Not (yet)',
- 'not_expected_period' => 'Not expected this period',
- // accounts:
- 'details_for_asset' => 'Details for asset account ":name"',
- 'details_for_expense' => 'Details for expense account ":name"',
- 'details_for_revenue' => 'Details for revenue account ":name"',
- 'details_for_cash' => 'Details for cash account ":name"',
- 'store_new_asset_account' => 'Store new asset account',
- 'store_new_expense_account' => 'Store new expense account',
- 'store_new_revenue_account' => 'Store new revenue account',
- 'edit_asset_account' => 'Edit asset account ":name"',
- 'edit_expense_account' => 'Edit expense account ":name"',
- 'edit_revenue_account' => 'Edit revenue account ":name"',
- 'delete_asset_account' => 'Delete asset account ":name"',
- 'delete_expense_account' => 'Delete expense account ":name"',
- 'delete_revenue_account' => 'Delete revenue account ":name"',
- 'asset_deleted' => 'Successfully deleted asset account ":name"',
- 'expense_deleted' => 'Successfully deleted expense account ":name"',
- 'revenue_deleted' => 'Successfully deleted revenue account ":name"',
- 'update_asset_account' => 'Update asset account',
- 'update_expense_account' => 'Update expense account',
- 'update_revenue_account' => 'Update revenue account',
- 'make_new_asset_account' => 'Create a new asset account',
- 'make_new_expense_account' => 'Create a new expense account',
- 'make_new_revenue_account' => 'Create a new revenue account',
- 'asset_accounts' => 'Asset accounts',
- 'expense_accounts' => 'Expense accounts',
- 'revenue_accounts' => 'Revenue accounts',
- 'cash_accounts' => 'Cash accounts',
- 'Cash account' => 'Cash account',
- 'account_type' => 'Account type',
- 'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
- 'stored_new_account' => 'New account ":name" stored!',
- 'updated_account' => 'Updated account ":name"',
- 'credit_card_options' => 'Credit card options',
- 'no_transactions_account' => 'There are no transactions (in this period) for asset account ":name".',
- 'no_data_for_chart' => 'There is not enough information (yet) to generate this chart.',
- 'select_more_than_one_account' => 'Please select more than one account',
- 'select_more_than_one_category' => 'Please select more than one category',
- 'select_more_than_one_budget' => 'Please select more than one budget',
- 'select_more_than_one_tag' => 'Please select more than one tag',
- 'from_to' => 'From :start to :end',
- 'from_to_breadcrumb' => 'from :start to :end',
- 'account_default_currency' => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
-
- // categories:
- 'new_category' => 'New category',
- 'create_new_category' => 'Create a new category',
- 'without_category' => 'Without a category',
- 'update_category' => 'Update category',
- 'updated_category' => 'Updated category ":name"',
- 'categories' => 'Categories',
- 'edit_category' => 'Edit category ":name"',
- 'no_category' => '(no category)',
- 'category' => 'Category',
- 'delete_category' => 'Delete category ":name"',
- 'deleted_category' => 'Deleted category ":name"',
- 'store_category' => 'Store new category',
- 'stored_category' => 'Stored new category ":name"',
- 'without_category_between' => 'Without category between :start and :end',
-
- // transactions:
- 'update_withdrawal' => 'Update withdrawal',
- 'update_deposit' => 'Update deposit',
- 'update_transfer' => 'Update transfer',
- 'updated_withdrawal' => 'Updated withdrawal ":description"',
- 'updated_deposit' => 'Updated deposit ":description"',
- 'updated_transfer' => 'Updated transfer ":description"',
- 'delete_withdrawal' => 'Delete withdrawal ":description"',
- 'delete_deposit' => 'Delete deposit ":description"',
- 'delete_transfer' => 'Delete transfer ":description"',
- 'deleted_withdrawal' => 'Successfully deleted withdrawal ":description"',
- 'deleted_deposit' => 'Successfully deleted deposit ":description"',
- 'deleted_transfer' => 'Successfully deleted transfer ":description"',
- 'stored_journal' => 'Successfully created new transaction ":description"',
- 'select_transactions' => 'Select transactions',
- 'stop_selection' => 'Stop selecting transactions',
- 'edit_selected' => 'Edit selected',
- 'delete_selected' => 'Delete selected',
- 'mass_delete_journals' => 'Delete a number of transactions',
- 'mass_edit_journals' => 'Edit a number of transactions',
- 'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
- 'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious.',
- 'mass_deleted_transactions_success' => 'Deleted :amount transaction(s).',
- 'mass_edited_transactions_success' => 'Updated :amount transaction(s)',
-
-
- // new user:
- 'welcome' => 'Welcome to Firefly!',
-
- // home page:
- 'yourAccounts' => 'Your accounts',
- 'budgetsAndSpending' => 'Budgets and spending',
- 'savings' => 'Savings',
- 'markAsSavingsToContinue' => 'Mark your asset accounts as "Savings account" to fill this panel',
- 'createPiggyToContinue' => 'Create piggy banks to fill this panel.',
- 'newWithdrawal' => 'New expense',
- 'newDeposit' => 'New deposit',
- 'newTransfer' => 'New transfer',
- 'moneyIn' => 'Money in',
- 'moneyOut' => 'Money out',
- 'billsToPay' => 'Bills to pay',
- 'billsPaid' => 'Bills paid',
- 'divided' => 'divided',
- 'toDivide' => 'left to divide',
-
- // menu and titles, should be recycled as often as possible:
- 'currency' => 'Currency',
- 'preferences' => 'Preferences',
- 'logout' => 'Logout',
- 'searchPlaceholder' => 'Search...',
- 'dashboard' => 'Dashboard',
- 'currencies' => 'Currencies',
- 'accounts' => 'Accounts',
- 'Asset account' => 'Asset account',
- 'Default account' => 'Asset account',
- 'Expense account' => 'Expense account',
- 'Revenue account' => 'Revenue account',
- 'Initial balance account' => 'Initial balance account',
- 'budgets' => 'Budgets',
- 'tags' => 'Tags',
- 'reports' => 'Reports',
- 'transactions' => 'Transactions',
- 'expenses' => 'Expenses',
- 'income' => 'Revenue / income',
- 'transfers' => 'Transfers',
- 'moneyManagement' => 'Money management',
- 'piggyBanks' => 'Piggy banks',
- 'bills' => 'Bills',
- 'withdrawal' => 'Withdrawal',
- 'deposit' => 'Deposit',
- 'account' => 'Account',
- 'transfer' => 'Transfer',
- 'Withdrawal' => 'Withdrawal',
- 'Deposit' => 'Deposit',
- 'Transfer' => 'Transfer',
- 'bill' => 'Bill',
- 'yes' => 'Yes',
- 'no' => 'No',
- 'amount' => 'Amount',
- 'overview' => 'Overview',
- 'saveOnAccount' => 'Save on account',
- 'unknown' => 'Unknown',
- 'daily' => 'Daily',
- 'monthly' => 'Monthly',
- 'profile' => 'Profile',
- 'errors' => 'Errors',
-
- // reports:
- 'report_default' => 'Default financial report between :start and :end',
- 'report_audit' => 'Transaction history overview between :start and :end',
- 'report_category' => 'Category report between :start and :end',
- 'report_budget' => 'Budget report between :start and :end',
- 'report_tag' => 'Tag report between :start and :end',
- 'quick_link_reports' => 'Quick links',
- 'quick_link_default_report' => 'Default financial report',
- 'quick_link_audit_report' => 'Transaction history overview',
- 'report_this_month_quick' => 'Current month, all accounts',
- 'report_this_year_quick' => 'Current year, all accounts',
- 'report_this_fiscal_year_quick' => 'Current fiscal year, all accounts',
- 'report_all_time_quick' => 'All-time, all accounts',
- 'reports_can_bookmark' => 'Remember that reports can be bookmarked.',
- 'incomeVsExpenses' => 'Income vs. expenses',
- 'accountBalances' => 'Account balances',
- 'balanceStartOfYear' => 'Balance at start of year',
- 'balanceEndOfYear' => 'Balance at end of year',
- 'balanceStartOfMonth' => 'Balance at start of month',
- 'balanceEndOfMonth' => 'Balance at end of month',
- 'balanceStart' => 'Balance at start of period',
- 'balanceEnd' => 'Balance at end of period',
- 'reportsOwnAccounts' => 'Reports for your own accounts',
- 'reportsOwnAccountsAndShared' => 'Reports for your own accounts and shared accounts',
- 'splitByAccount' => 'Split by account',
- 'balancedByTransfersAndTags' => 'Balanced by transfers and tags',
- 'coveredWithTags' => 'Covered with tags',
- 'leftUnbalanced' => 'Left unbalanced',
- 'expectedBalance' => 'Expected balance',
- 'outsideOfBudgets' => 'Outside of budgets',
- 'leftInBudget' => 'Left in budget',
- 'sumOfSums' => 'Sum of sums',
- 'noCategory' => '(no category)',
- 'notCharged' => 'Not charged (yet)',
- 'inactive' => 'Inactive',
- 'active' => 'Active',
- 'difference' => 'Difference',
- 'in' => 'In',
- 'out' => 'Out',
- 'topX' => 'top :number',
- 'show_full_list' => 'Show entire list',
- 'show_only_top' => 'Show only top :number',
- 'sum_of_year' => 'Sum of year',
- 'sum_of_years' => 'Sum of years',
- 'average_of_year' => 'Average of year',
- 'average_of_years' => 'Average of years',
- 'categories_earned_in_year' => 'Categories (by earnings)',
- 'categories_spent_in_year' => 'Categories (by spendings)',
- 'report_type' => 'Report type',
- 'report_type_default' => 'Default financial report',
- 'report_type_audit' => 'Transaction history overview (audit)',
- 'report_type_category' => 'Category report',
- 'report_type_budget' => 'Budget report',
- 'report_type_tag' => 'Tag report',
- 'report_type_meta-history' => 'Categories, budgets and bills overview',
- 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
- 'report_included_accounts' => 'Included accounts',
- 'report_date_range' => 'Date range',
- 'report_preset_ranges' => 'Pre-set ranges',
- 'shared' => 'Shared',
- 'fiscal_year' => 'Fiscal year',
- 'income_entry' => 'Income from account ":name" between :start and :end',
- 'expense_entry' => 'Expenses to account ":name" between :start and :end',
- 'category_entry' => 'Expenses in category ":name" between :start and :end',
- 'budget_spent_amount' => 'Expenses in budget ":budget" between :start and :end',
- 'balance_amount' => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
- 'no_audit_activity' => 'No activity was recorded on account :account_name between :start and :end.',
- 'audit_end_balance' => 'Account balance of :account_name at the end of :end was: :balance',
- 'reports_extra_options' => 'Extra options',
- 'report_has_no_extra_options' => 'This report has no extra options',
- 'reports_submit' => 'View report',
- 'end_after_start_date' => 'End date of report must be after start date.',
- 'select_category' => 'Select category(ies)',
- 'select_budget' => 'Select budget(s).',
- 'select_tag' => 'Select tag(s).',
- 'income_per_category' => 'Income per category',
- 'expense_per_category' => 'Expense per category',
- 'expense_per_budget' => 'Expense per budget',
- 'income_per_account' => 'Income per account',
- 'expense_per_account' => 'Expense per account',
- 'expense_per_tag' => 'Expense per tag',
- 'income_per_tag' => 'Income per tag',
- 'include_expense_not_in_budget' => 'Included expenses not in the selected budget(s)',
- 'include_expense_not_in_account' => 'Included expenses not in the selected account(s)',
- 'include_expense_not_in_category' => 'Included expenses not in the selected category(ies)',
- 'include_income_not_in_category' => 'Included income not in the selected category(ies)',
- 'include_income_not_in_account' => 'Included income not in the selected account(s)',
- 'include_income_not_in_tags' => 'Included income not in the selected tag(s)',
- 'include_expense_not_in_tags' => 'Included expenses not in the selected tag(s)',
- 'everything_else' => 'Everything else',
- 'income_and_expenses' => 'Income and expenses',
- 'spent_average' => 'Spent (average)',
- 'income_average' => 'Income (average)',
- 'transaction_count' => 'Transaction count',
- 'average_spending_per_account' => 'Average spending per account',
- 'average_income_per_account' => 'Average income per account',
- 'total' => 'Total',
- 'description' => 'Description',
- 'sum_of_period' => 'Sum of period',
- 'average_in_period' => 'Average in period',
- 'account_role_defaultAsset' => 'Default asset account',
- 'account_role_sharedAsset' => 'Shared asset account',
- 'account_role_savingAsset' => 'Savings account',
- 'account_role_ccAsset' => 'Credit card',
-
- // charts:
- 'chart' => 'Chart',
- 'dayOfMonth' => 'Day of the month',
- 'month' => 'Month',
- 'budget' => 'Budget',
- 'spent' => 'Spent',
- 'spent_in_budget' => 'Spent in budget',
- 'left_to_spend' => 'Left to spend',
- 'earned' => 'Earned',
- 'overspent' => 'Overspent',
- 'left' => 'Left',
- 'no_budget' => '(no budget)',
- 'max-amount' => 'Maximum amount',
- 'min-amount' => 'Minumum amount',
- 'journal-amount' => 'Current bill entry',
- 'name' => 'Name',
- 'date' => 'Date',
- 'paid' => 'Paid',
- 'unpaid' => 'Unpaid',
- 'day' => 'Day',
- 'budgeted' => 'Budgeted',
- 'period' => 'Period',
- 'balance' => 'Balance',
- 'summary' => 'Summary',
- 'sum' => 'Sum',
- 'average' => 'Average',
- 'balanceFor' => 'Balance for :name',
-
- // piggy banks:
- 'add_money_to_piggy' => 'Add money to piggy bank ":name"',
- 'piggy_bank' => 'Piggy bank',
- 'new_piggy_bank' => 'New piggy bank',
- 'store_piggy_bank' => 'Store new piggy bank',
- 'stored_piggy_bank' => 'Store new piggy bank ":name"',
- 'account_status' => 'Account status',
- 'left_for_piggy_banks' => 'Left for piggy banks',
- 'sum_of_piggy_banks' => 'Sum of piggy banks',
- 'saved_so_far' => 'Saved so far',
- 'left_to_save' => 'Left to save',
- 'suggested_amount' => 'Suggested monthly amount to save',
- 'add_money_to_piggy_title' => 'Add money to piggy bank ":name"',
- 'remove_money_from_piggy_title' => 'Remove money from piggy bank ":name"',
- 'add' => 'Add',
-
- 'remove' => 'Remove',
- 'max_amount_add' => 'The maximum amount you can add is',
- 'max_amount_remove' => 'The maximum amount you can remove is',
- 'update_piggy_button' => 'Update piggy bank',
- 'update_piggy_title' => 'Update piggy bank ":name"',
- 'updated_piggy_bank' => 'Updated piggy bank ":name"',
- 'details' => 'Details',
- 'events' => 'Events',
- 'target_amount' => 'Target amount',
- 'start_date' => 'Start date',
- 'target_date' => 'Target date',
- 'no_target_date' => 'No target date',
- 'todo' => 'to do',
- 'table' => 'Table',
- 'piggy_bank_not_exists' => 'Piggy bank no longer exists.',
- 'add_any_amount_to_piggy' => 'Add money to this piggy bank to reach your target of :amount.',
- 'add_set_amount_to_piggy' => 'Add :amount to fill this piggy bank on :date',
- 'delete_piggy_bank' => 'Delete piggy bank ":name"',
- 'cannot_add_amount_piggy' => 'Could not add :amount to ":name".',
- 'cannot_remove_from_piggy' => 'Could not remove :amount from ":name".',
- 'deleted_piggy_bank' => 'Deleted piggy bank ":name"',
- 'added_amount_to_piggy' => 'Added :amount to ":name"',
- 'removed_amount_from_piggy' => 'Removed :amount from ":name"',
- 'cannot_remove_amount_piggy' => 'Could not remove :amount from ":name".',
-
- // tags
- 'regular_tag' => 'Just a regular tag.',
- 'balancing_act' => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
- 'advance_payment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
- 'delete_tag' => 'Delete tag ":tag"',
- 'deleted_tag' => 'Deleted tag ":tag"',
- 'new_tag' => 'Make new tag',
- 'edit_tag' => 'Edit tag ":tag"',
- 'updated_tag' => 'Updated tag ":tag"',
- 'created_tag' => 'Tag ":tag" has been created!',
- 'no_year' => 'No year set',
- 'no_month' => 'No month set',
- 'tag_title_nothing' => 'Default tags',
- 'tag_title_balancingAct' => 'Balancing act tags',
- 'tag_title_advancePayment' => 'Advance payment tags',
- 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.',
- 'tags_group' => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.',
- 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.',
-
- 'transaction_journal_information' => 'Transaction information',
- 'transaction_journal_meta' => 'Meta information',
- 'total_amount' => 'Total amount',
- 'number_of_decimals' => 'Number of decimals',
-
- // administration
- 'administration' => 'Administration',
- 'user_administration' => 'User administration',
- 'list_all_users' => 'All users',
- 'all_users' => 'All users',
- 'instance_configuration' => 'Configuration',
- 'firefly_instance_configuration' => 'Configuration options for Firefly III',
- 'setting_single_user_mode' => 'Single user mode',
- 'setting_single_user_mode_explain' => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
- 'store_configuration' => 'Store configuration',
- 'single_user_administration' => 'User administration for :email',
- 'edit_user' => 'Edit user :email',
- 'hidden_fields_preferences' => 'Not all fields are visible right now. You must enable them in your settings.',
- 'user_data_information' => 'User data',
- 'user_information' => 'User information',
- 'total_size' => 'total size',
- 'budget_or_budgets' => 'budget(s)',
- 'budgets_with_limits' => 'budget(s) with configured amount',
- 'rule_or_rules' => 'rule(s)',
- 'rulegroup_or_groups' => 'rule group(s)',
- 'setting_must_confirm_account' => 'Account confirmation',
- 'setting_must_confirm_account_explain' => 'When this setting is enabled, users must activate their account before it can be used.',
- 'configuration_updated' => 'The configuration has been updated',
- 'setting_is_demo_site' => 'Demo site',
- 'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
- 'setting_send_email_notifications' => 'Send email notifications',
- 'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'block_code_bounced' => 'Email message(s) bounced',
- 'block_code_expired' => 'Demo account expired',
- 'no_block_code' => 'No reason for block or user not blocked',
-
-
- // split a transaction:
- 'transaction_meta_data' => 'Transaction meta-data',
- 'transaction_dates' => 'Transaction dates',
- 'splits' => 'Splits',
- 'split_title_withdrawal' => 'Split your new withdrawal',
- 'split_intro_one_withdrawal' => 'Firefly supports the "splitting" of a withdrawal.',
- 'split_intro_two_withdrawal' => 'It means that the amount of money you\'ve spent is divided between several destination expense accounts, budgets or categories.',
- 'split_intro_three_withdrawal' => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
- 'split_table_intro_withdrawal' => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_withdrawal' => 'Store splitted withdrawal',
- 'update_splitted_withdrawal' => 'Update splitted withdrawal',
- 'split_title_deposit' => 'Split your new deposit',
- 'split_intro_one_deposit' => 'Firefly supports the "splitting" of a deposit.',
- 'split_intro_two_deposit' => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
- 'split_intro_three_deposit' => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
- 'split_table_intro_deposit' => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_deposit' => 'Store splitted deposit',
- 'split_title_transfer' => 'Split your new transfer',
- 'split_intro_one_transfer' => 'Firefly supports the "splitting" of a transfer.',
- 'split_intro_two_transfer' => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
- 'split_intro_three_transfer' => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
- 'split_table_intro_transfer' => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_transfer' => 'Store splitted transfer',
- 'add_another_split' => 'Add another split',
- 'split-transactions' => 'Split transactions',
- 'split-new-transaction' => 'Split a new transaction',
- 'do_split' => 'Do a split',
- 'split_this_withdrawal' => 'Split this withdrawal',
- 'split_this_deposit' => 'Split this deposit',
- 'split_this_transfer' => 'Split this transfer',
- 'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
- 'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
- 'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
-
- // import
- 'configuration_file_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file.',
- 'import_data_index' => 'Index',
- 'import_file_type_csv' => 'CSV (comma separated values)',
- 'import_file_type_help' => 'Select the type of file you will upload',
- 'import_start' => 'Start the import',
- 'configure_import' => 'Further configure your import',
- 'import_finish_configuration' => 'Finish configuration',
- 'settings_for_import' => 'Settings',
- 'import_status' => 'Import status',
- 'import_status_text' => 'The import is currently running, or will start momentarily.',
- 'import_complete' => 'Import configuration complete!',
- 'import_complete_text' => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
- 'import_download_config' => 'Download configuration',
- 'import_start_import' => 'Start import',
- 'import_data' => 'Import data',
- 'import_data_full' => 'Import data into Firefly III',
- 'import' => 'Import',
- 'import_file_help' => 'Select your file',
- 'import_status_settings_complete' => 'The import is ready to start.',
- 'import_status_import_complete' => 'The import has completed.',
- 'import_status_import_running' => 'The import is currently running. Please be patient.',
- 'import_status_header' => 'Import status and progress',
- 'import_status_errors' => 'Import errors',
- 'import_status_report' => 'Import report',
- 'import_finished' => 'Import has finished',
- 'import_error_single' => 'An error has occured during the import.',
- 'import_error_multi' => 'Some errors occured during the import.',
- 'import_error_fatal' => 'There was an error during the import routine. Please check the log files. The error seems to be:',
- 'import_error_timeout' => 'The import seems to have timed out. If this error persists, please import your data using the console command.',
- 'import_double' => 'Row #:row: This row has been imported before, and is stored in :description.',
- 'import_finished_all' => 'The import has finished. Please check out the results below.',
- 'import_with_key' => 'Import with key \':key\'',
- 'import_share_configuration' => 'Please consider downloading your configuration and sharing it at the import configuration center. This will allow other users of Firefly III to import their files more easily.',
- 'import_finished_report' => 'The import has finished. Please note any errors in the block above this line. All transactions imported during this particular session have been tagged, and you can check them out below. ',
- 'import_finished_link' => 'The transactions imported can be found in tag :tag.',
- 'need_at_least_one_account' => 'You need at least one asset account to be able to create piggy banks',
- 'see_help_top_right' => 'For more information, please check out the help pages using the icon in the top right corner of the page.',
- 'bread_crumb_import_complete' => 'Import ":key" complete',
- 'bread_crumb_configure_import' => 'Configure import ":key"',
- 'bread_crumb_import_finished' => 'Import ":key" finished',
- 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.',
- 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
- 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
-
- // sandstorm.io errors and messages:
- 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
-
- // empty lists? no objects? instructions:
- 'no_transactions_in_period' => 'There are no transactions in this period.',
- 'no_accounts_title_asset' => 'Let\'s create an asset account!',
- 'no_accounts_intro_asset' => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
- 'no_accounts_imperative_asset' => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
- 'no_accounts_create_asset' => 'Create an asset account',
- 'no_accounts_title_expense' => 'Let\'s create an expense account!',
- 'no_accounts_intro_expense' => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
- 'no_accounts_imperative_expense' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
- 'no_accounts_create_expense' => 'Create an expense account',
- 'no_accounts_title_revenue' => 'Let\'s create a revenue account!',
- 'no_accounts_intro_revenue' => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
- 'no_accounts_imperative_revenue' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
- 'no_accounts_create_revenue' => 'Create a revenue account',
- 'no_budgets_title_default' => 'Let\'s create a budget',
- 'no_budgets_intro_default' => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
- 'no_budgets_imperative_default' => 'Budgets are the basic tools of financial management. Let\'s create one now:',
- 'no_budgets_create_default' => 'Create a budget',
- 'no_categories_title_default' => 'Let\'s create a category!',
- 'no_categories_intro_default' => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
- 'no_categories_imperative_default' => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
- 'no_categories_create_default' => 'Create a category',
- 'no_tags_title_default' => 'Let\'s create a tag!',
- 'no_tags_intro_default' => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
- 'no_tags_imperative_default' => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
- 'no_tags_create_default' => 'Create a tag',
- 'no_transactions_title_withdrawal' => 'Let\'s create an expense!',
- 'no_transactions_intro_withdrawal' => 'You have no expenses yet. You should create expenses to start managing your finances.',
- 'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
- 'no_transactions_create_withdrawal' => 'Create an expense',
- 'no_transactions_title_deposit' => 'Let\'s create some income!',
- 'no_transactions_intro_deposit' => 'You have no recorded income yet. You should create income entries to start managing your finances.',
- 'no_transactions_imperative_deposit' => 'Have you received some money? Then you should write it down:',
- 'no_transactions_create_deposit' => 'Create a deposit',
- 'no_transactions_title_transfers' => 'Let\'s create a transfer!',
- 'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
- 'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:',
- 'no_transactions_create_transfers' => 'Create a transfer',
- 'no_piggies_title_default' => 'Let\'s create a piggy bank!',
- 'no_piggies_intro_default' => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
- 'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
- 'no_piggies_create_default' => 'Create a new piggy bank',
- 'no_bills_title_default' => 'Let\'s create a bill!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
- 'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
- 'no_bills_create_default' => 'Create a bill',
-
-
-];
\ No newline at end of file
diff --git a/resources/lang/hr_HR/form.php b/resources/lang/hr_HR/form.php
deleted file mode 100644
index 20be49e75a..0000000000
--- a/resources/lang/hr_HR/form.php
+++ /dev/null
@@ -1,189 +0,0 @@
- 'Bank name',
- 'bank_balance' => 'Balance',
- 'savings_balance' => 'Savings balance',
- 'credit_card_limit' => 'Credit card limit',
- 'automatch' => 'Match automatically',
- 'skip' => 'Skip',
- 'name' => 'Name',
- 'active' => 'Active',
- 'amount_min' => 'Minimum amount',
- 'amount_max' => 'Maximum amount',
- 'match' => 'Matches on',
- 'repeat_freq' => 'Repeats',
- 'journal_currency_id' => 'Currency',
- 'currency_id' => 'Currency',
- 'attachments' => 'Attachments',
- 'journal_amount' => 'Amount',
- 'journal_asset_source_account' => 'Asset account (source)',
- 'journal_source_account_name' => 'Revenue account (source)',
- 'journal_source_account_id' => 'Asset account (source)',
- 'BIC' => 'BIC',
- 'account_from_id' => 'From account',
- 'account_to_id' => 'To account',
- 'source_account' => 'Source account',
- 'destination_account' => 'Destination account',
- 'journal_destination_account_id' => 'Asset account (destination)',
- 'asset_destination_account' => 'Asset account (destination)',
- 'asset_source_account' => 'Asset account (source)',
- 'journal_description' => 'Description',
- 'note' => 'Notes',
- 'split_journal' => 'Split this transaction',
- 'split_journal_explanation' => 'Split this transaction in multiple parts',
- 'currency' => 'Currency',
- 'account_id' => 'Asset account',
- 'budget_id' => 'Budget',
- 'openingBalance' => 'Opening balance',
- 'tagMode' => 'Tag mode',
- 'tagPosition' => 'Tag location',
- 'virtualBalance' => 'Virtual balance',
- 'longitude_latitude' => 'Location',
- 'targetamount' => 'Target amount',
- 'accountRole' => 'Account role',
- 'openingBalanceDate' => 'Opening balance date',
- 'ccType' => 'Credit card payment plan',
- 'ccMonthlyPaymentDate' => 'Credit card monthly payment date',
- 'piggy_bank_id' => 'Piggy bank',
- 'returnHere' => 'Return here',
- 'returnHereExplanation' => 'After storing, return here to create another one.',
- 'returnHereUpdateExplanation' => 'After updating, return here.',
- 'description' => 'Description',
- 'expense_account' => 'Expense account',
- 'revenue_account' => 'Revenue account',
- 'decimal_places' => 'Decimal places',
- 'exchange_rate_instruction' => 'Foreign currencies',
- 'exchanged_amount' => 'Exchanged amount',
- 'source_amount' => 'Amount (source)',
- 'destination_amount' => 'Amount (destination)',
- 'native_amount' => 'Native amount',
-
- 'revenue_account_source' => 'Revenue account (source)',
- 'source_account_asset' => 'Source account (asset account)',
- 'destination_account_expense' => 'Destination account (expense account)',
- 'destination_account_asset' => 'Destination account (asset account)',
- 'source_account_revenue' => 'Source account (revenue account)',
- 'type' => 'Type',
- 'convert_Withdrawal' => 'Convert withdrawal',
- 'convert_Deposit' => 'Convert deposit',
- 'convert_Transfer' => 'Convert transfer',
-
-
- 'amount' => 'Amount',
- 'date' => 'Date',
- 'interest_date' => 'Interest date',
- 'book_date' => 'Book date',
- 'process_date' => 'Processing date',
- 'category' => 'Category',
- 'tags' => 'Tags',
- 'deletePermanently' => 'Delete permanently',
- 'cancel' => 'Cancel',
- 'targetdate' => 'Target date',
- 'tag' => 'Tag',
- 'under' => 'Under',
- 'symbol' => 'Symbol',
- 'code' => 'Code',
- 'iban' => 'IBAN',
- 'accountNumber' => 'Account number',
- 'has_headers' => 'Headers',
- 'date_format' => 'Date format',
- 'specifix' => 'Bank- or file specific fixes',
- 'attachments[]' => 'Attachments',
- 'store_new_withdrawal' => 'Store new withdrawal',
- 'store_new_deposit' => 'Store new deposit',
- 'store_new_transfer' => 'Store new transfer',
- 'add_new_withdrawal' => 'Add a new withdrawal',
- 'add_new_deposit' => 'Add a new deposit',
- 'add_new_transfer' => 'Add a new transfer',
- 'noPiggybank' => '(no piggy bank)',
- 'title' => 'Title',
- 'notes' => 'Notes',
- 'filename' => 'File name',
- 'mime' => 'Mime type',
- 'size' => 'Size',
- 'trigger' => 'Trigger',
- 'stop_processing' => 'Stop processing',
- 'start_date' => 'Start of range',
- 'end_date' => 'End of range',
- 'export_start_range' => 'Start of export range',
- 'export_end_range' => 'End of export range',
- 'export_format' => 'File format',
- 'include_attachments' => 'Include uploaded attachments',
- 'include_old_uploads' => 'Include imported data',
- 'accounts' => 'Export transactions from these accounts',
- 'delete_account' => 'Delete account ":name"',
- 'delete_bill' => 'Delete bill ":name"',
- 'delete_budget' => 'Delete budget ":name"',
- 'delete_category' => 'Delete category ":name"',
- 'delete_currency' => 'Delete currency ":name"',
- 'delete_journal' => 'Delete transaction with description ":description"',
- 'delete_attachment' => 'Delete attachment ":name"',
- 'delete_rule' => 'Delete rule ":title"',
- 'delete_rule_group' => 'Delete rule group ":title"',
- 'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?',
- 'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?',
- 'bill_areYouSure' => 'Are you sure you want to delete the bill named ":name"?',
- 'rule_areYouSure' => 'Are you sure you want to delete the rule titled ":title"?',
- 'ruleGroup_areYouSure' => 'Are you sure you want to delete the rule group titled ":title"?',
- 'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?',
- 'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?',
- 'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?',
- 'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?',
- 'journal_areYouSure' => 'Are you sure you want to delete the transaction described ":description"?',
- 'mass_journal_are_you_sure' => 'Are you sure you want to delete these transactions?',
- 'tag_areYouSure' => 'Are you sure you want to delete the tag ":tag"?',
- 'permDeleteWarning' => 'Deleting stuff from Firely is permanent and cannot be undone.',
- 'mass_make_selection' => 'You can still prevent items from being deleted by removing the checkbox.',
- 'delete_all_permanently' => 'Delete selected permanently',
- 'update_all_journals' => 'Update these transactions',
- 'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
- 'also_delete_rules' => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
- 'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
- 'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
- 'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
- 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
- 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
-
- 'email' => 'Email address',
- 'password' => 'Password',
- 'password_confirmation' => 'Password (again)',
- 'blocked' => 'Is blocked?',
- 'blocked_code' => 'Reason for block',
-
-
- // admin
- 'domain' => 'Domain',
- 'single_user_mode' => 'Single user mode',
- 'must_confirm_account' => 'New users must activate account',
- 'is_demo_site' => 'Is demo site',
-
-
- // import
- 'import_file' => 'Import file',
- 'configuration_file' => 'Configuration file',
- 'import_file_type' => 'Import file type',
- 'csv_comma' => 'A comma (,)',
- 'csv_semicolon' => 'A semicolon (;)',
- 'csv_tab' => 'A tab (invisible)',
- 'csv_delimiter' => 'CSV field delimiter',
- 'csv_import_account' => 'Default import account',
- 'csv_config' => 'CSV import configuration',
-
-
- 'due_date' => 'Due date',
- 'payment_date' => 'Payment date',
- 'invoice_date' => 'Invoice date',
- 'internal_reference' => 'Internal reference',
-];
\ No newline at end of file
diff --git a/resources/lang/hr_HR/help.php b/resources/lang/hr_HR/help.php
deleted file mode 100644
index 61210ffe41..0000000000
--- a/resources/lang/hr_HR/help.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'Welcome to Firefly III',
- 'main-content-text' => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
- 'sidebar-toggle-title' => 'Sidebar to create stuff',
- 'sidebar-toggle-text' => 'Hidden under the plus icon are all the buttons to create new stuff. Accounts, transactions, everything!',
- 'account-menu-title' => 'All your accounts',
- 'account-menu-text' => 'Here you can find all the accounts you\'ve made.',
- 'budget-menu-title' => 'Budgets',
- 'budget-menu-text' => 'Use this page to organise your finances and limit spending.',
- 'report-menu-title' => 'Reports',
- 'report-menu-text' => 'Check this out when you want a solid overview of your finances.',
- 'transaction-menu-title' => 'Transactions',
- 'transaction-menu-text' => 'All transactions you\'ve created can be found here.',
- 'option-menu-title' => 'Options',
- 'option-menu-text' => 'This is pretty self-explanatory.',
- 'main-content-end-title' => 'The end!',
- 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
- 'index' => 'index',
- 'home' => 'home',
-];
\ No newline at end of file
diff --git a/resources/lang/hr_HR/list.php b/resources/lang/hr_HR/list.php
deleted file mode 100644
index 90625d54e6..0000000000
--- a/resources/lang/hr_HR/list.php
+++ /dev/null
@@ -1,89 +0,0 @@
- 'Buttons',
- 'icon' => 'Icon',
- 'id' => 'ID',
- 'create_date' => 'Created at',
- 'update_date' => 'Updated at',
- 'balance_before' => 'Balance before',
- 'balance_after' => 'Balance after',
- 'name' => 'Name',
- 'role' => 'Role',
- 'currentBalance' => 'Current balance',
- 'active' => 'Is active?',
- 'lastActivity' => 'Last activity',
- 'balanceDiff' => 'Balance difference between :start and :end',
- 'matchedOn' => 'Matched on',
- 'matchesOn' => 'Matched on',
- 'account_type' => 'Account type',
- 'created_at' => 'Created at',
- 'new_balance' => 'New balance',
- 'account' => 'Account',
- 'matchingAmount' => 'Amount',
- 'lastMatch' => 'Last match',
- 'split_number' => 'Split #',
- 'destination' => 'Destination',
- 'source' => 'Source',
- 'next_expected_match' => 'Next expected match',
- 'automatch' => 'Auto match?',
- 'repeat_freq' => 'Repeats',
- 'description' => 'Description',
- 'amount' => 'Amount',
- 'internal_reference' => 'Internal reference',
- 'date' => 'Date',
- 'interest_date' => 'Interest date',
- 'book_date' => 'Book date',
- 'process_date' => 'Processing date',
- 'due_date' => 'Due date',
- 'payment_date' => 'Payment date',
- 'invoice_date' => 'Invoice date',
- 'interal_reference' => 'Internal reference',
- 'notes' => 'Notes',
- 'from' => 'From',
- 'piggy_bank' => 'Piggy bank',
- 'to' => 'To',
- 'budget' => 'Budget',
- 'category' => 'Category',
- 'bill' => 'Bill',
- 'withdrawal' => 'Withdrawal',
- 'deposit' => 'Deposit',
- 'transfer' => 'Transfer',
- 'type' => 'Type',
- 'completed' => 'Completed',
- 'iban' => 'IBAN',
- 'paid_current_period' => 'Paid this period',
- 'email' => 'Email',
- 'registered_at' => 'Registered at',
- 'is_activated' => 'Is activated',
- 'is_blocked' => 'Is blocked',
- 'is_admin' => 'Is admin',
- 'has_two_factor' => 'Has 2FA',
- 'confirmed_from' => 'Confirmed from',
- 'registered_from' => 'Registered from',
- 'blocked_code' => 'Block code',
- 'domain' => 'Domain',
- 'registration_attempts' => 'Registration attempts',
- 'source_account' => 'Source account',
- 'destination_account' => 'Destination account',
-
- 'accounts_count' => 'Number of accounts',
- 'journals_count' => 'Number of transactions',
- 'attachments_count' => 'Number of attachments',
- 'bills_count' => 'Number of bills',
- 'categories_count' => 'Number of categories',
- 'export_jobs_count' => 'Number of export jobs',
- 'import_jobs_count' => 'Number of import jobs',
- 'budget_count' => 'Number of budgets',
- 'rule_and_groups_count' => 'Number of rules and rule groups',
- 'tags_count' => 'Number of tags',
-];
\ No newline at end of file
diff --git a/resources/lang/hr_HR/pagination.php b/resources/lang/hr_HR/pagination.php
deleted file mode 100644
index 0efae8cb62..0000000000
--- a/resources/lang/hr_HR/pagination.php
+++ /dev/null
@@ -1,17 +0,0 @@
- '« Prethodna',
- 'next' => 'Sljedeća »',
-
-];
\ No newline at end of file
diff --git a/resources/lang/hr_HR/passwords.php b/resources/lang/hr_HR/passwords.php
deleted file mode 100644
index 80362c2eca..0000000000
--- a/resources/lang/hr_HR/passwords.php
+++ /dev/null
@@ -1,19 +0,0 @@
- 'Passwords must be at least six characters and match the confirmation.',
- 'user' => 'Ne možemo naći korisnika s tom e-mail adresom.',
- 'token' => 'Token za promjenu lozinke je nevažeći.',
- 'sent' => 'Na e-mail smo ti poslali poveznicu za promjenu lozinke!',
- 'reset' => 'Tvoja lozinka je promijenjena!',
- 'blocked' => 'Lijep pokušaj.',
-];
\ No newline at end of file
diff --git a/resources/lang/hr_HR/validation.php b/resources/lang/hr_HR/validation.php
deleted file mode 100644
index addd0e6f39..0000000000
--- a/resources/lang/hr_HR/validation.php
+++ /dev/null
@@ -1,91 +0,0 @@
- 'This is not a valid IBAN.',
- 'unique_account_number_for_user' => 'It looks like this account number is already in use.',
- 'deleted_user' => 'Due to security constraints, you cannot register using this email address.',
- 'rule_trigger_value' => 'This value is invalid for the selected trigger.',
- 'rule_action_value' => 'This value is invalid for the selected action.',
- 'invalid_domain' => 'Due to security constraints, you cannot register from this domain.',
- 'file_already_attached' => 'Uploaded file ":name" is already attached to this object.',
- 'file_attached' => 'Succesfully uploaded file ":name".',
- 'file_invalid_mime' => 'File ":name" is of type ":mime" which is not accepted as a new upload.',
- 'file_too_large' => 'File ":name" is too large.',
- 'belongs_to_user' => 'The value of :attribute is unknown',
- 'accepted' => 'The :attribute must be accepted.',
- 'bic' => 'This is not a valid BIC.',
- 'more' => ':attribute must be larger than zero.',
- 'active_url' => 'The :attribute is not a valid URL.',
- 'after' => 'The :attribute must be a date after :date.',
- 'alpha' => 'The :attribute may only contain letters.',
- 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
- 'alpha_num' => 'The :attribute may only contain letters and numbers.',
- 'array' => 'The :attribute must be an array.',
- 'unique_for_user' => 'There already is an entry with this :attribute.',
- 'before' => 'The :attribute must be a date before :date.',
- 'unique_object_for_user' => 'This name is already in use',
- 'unique_account_for_user' => 'This account name is already in use',
- 'between.numeric' => 'The :attribute must be between :min and :max.',
- 'between.file' => 'The :attribute must be between :min and :max kilobytes.',
- 'between.string' => 'The :attribute must be between :min and :max characters.',
- 'between.array' => 'The :attribute must have between :min and :max items.',
- 'boolean' => 'The :attribute field must be true or false.',
- 'confirmed' => 'The :attribute confirmation does not match.',
- 'date' => 'The :attribute is not a valid date.',
- 'date_format' => 'The :attribute does not match the format :format.',
- 'different' => 'The :attribute and :other must be different.',
- 'digits' => 'The :attribute must be :digits digits.',
- 'digits_between' => 'The :attribute must be between :min and :max digits.',
- 'email' => 'The :attribute must be a valid email address.',
- 'filled' => 'The :attribute field is required.',
- 'exists' => 'The selected :attribute is invalid.',
- 'image' => 'The :attribute must be an image.',
- 'in' => 'The selected :attribute is invalid.',
- 'integer' => 'The :attribute must be an integer.',
- 'ip' => 'The :attribute must be a valid IP address.',
- 'json' => 'The :attribute must be a valid JSON string.',
- 'max.numeric' => 'The :attribute may not be greater than :max.',
- 'max.file' => 'The :attribute may not be greater than :max kilobytes.',
- 'max.string' => 'The :attribute may not be greater than :max characters.',
- 'max.array' => 'The :attribute may not have more than :max items.',
- 'mimes' => 'The :attribute must be a file of type: :values.',
- 'min.numeric' => 'The :attribute must be at least :min.',
- 'min.file' => 'The :attribute must be at least :min kilobytes.',
- 'min.string' => 'The :attribute must be at least :min characters.',
- 'min.array' => 'The :attribute must have at least :min items.',
- 'not_in' => 'The selected :attribute is invalid.',
- 'numeric' => 'The :attribute must be a number.',
- 'regex' => 'The :attribute format is invalid.',
- 'required' => 'The :attribute field is required.',
- 'required_if' => 'The :attribute field is required when :other is :value.',
- 'required_unless' => 'The :attribute field is required unless :other is in :values.',
- 'required_with' => 'The :attribute field is required when :values is present.',
- 'required_with_all' => 'The :attribute field is required when :values is present.',
- 'required_without' => 'The :attribute field is required when :values is not present.',
- 'required_without_all' => 'The :attribute field is required when none of :values are present.',
- 'same' => 'The :attribute and :other must match.',
- 'size.numeric' => 'The :attribute must be :size.',
- 'size.file' => 'The :attribute must be :size kilobytes.',
- 'size.string' => 'The :attribute must be :size characters.',
- 'size.array' => 'The :attribute must contain :size items.',
- 'unique' => 'The :attribute has already been taken.',
- 'string' => 'The :attribute must be a string.',
- 'url' => 'The :attribute format is invalid.',
- 'timezone' => 'The :attribute must be a valid zone.',
- '2fa_code' => 'The :attribute field is invalid.',
- 'dimensions' => 'The :attribute has invalid image dimensions.',
- 'distinct' => 'The :attribute field has a duplicate value.',
- 'file' => 'The :attribute must be a file.',
- 'in_array' => 'The :attribute field does not exist in :other.',
- 'present' => 'The :attribute field must be present.',
- 'amount_zero' => 'The total amount cannot be zero',
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/auth.php b/resources/lang/ru_RU/auth.php
deleted file mode 100644
index bc725bca9b..0000000000
--- a/resources/lang/ru_RU/auth.php
+++ /dev/null
@@ -1,28 +0,0 @@
- 'Неправильный адрес электронной почты или пароль.',
- 'throttle' => 'Слишком много попыток логина. Пожалуйста, попробуйте снова через :seconds секунд.',
-
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php
deleted file mode 100644
index 646511cec4..0000000000
--- a/resources/lang/ru_RU/breadcrumbs.php
+++ /dev/null
@@ -1,41 +0,0 @@
- 'Главная',
- 'edit_currency' => 'Edit currency ":name"',
- 'delete_currency' => 'Delete currency ":name"',
- 'newPiggyBank' => 'Создать новую копилку',
- 'edit_piggyBank' => 'Редактировать копилку ":name"',
- 'preferences' => 'Параметры',
- 'profile' => 'Профиль',
- 'changePassword' => 'Сменить пароль',
- 'bills' => 'Счета',
- 'newBill' => 'Новый счет',
- 'edit_bill' => 'Редактировать счет ":name"',
- 'delete_bill' => 'Удалить счет ":name"',
- 'reports' => 'Отчёты',
- 'searchResult' => 'Поиск ":query"',
- 'withdrawal_list' => 'Расходы',
- 'deposit_list' => 'Доходы и депозиты',
- 'transfer_list' => 'Переводы',
- 'transfers_list' => 'Переводы',
- 'create_withdrawal' => 'Создать новый вывод средств',
- 'create_deposit' => 'Создать новый депозит',
- 'create_transfer' => 'Создать новый перевод',
- 'edit_journal' => 'Редактировать транзакцию ":description"',
- 'delete_journal' => 'Удалить транзакцию ":description"',
- 'tags' => 'Теги',
- 'createTag' => 'Создать новый тег',
- 'edit_tag' => 'Редактировать тег ":tag"',
- 'delete_tag' => 'Удалить тег ":tag"',
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/config.php b/resources/lang/ru_RU/config.php
deleted file mode 100644
index 4e7ce17f0f..0000000000
--- a/resources/lang/ru_RU/config.php
+++ /dev/null
@@ -1,23 +0,0 @@
- 'ru, Russian, ru_RU, ru_RU.utf8, ru_RU.UTF-8',
- 'month' => '%B %Y',
- 'month_and_day' => '%B %e, %Y',
- 'date_time' => '%B %e, %Y, @ %T',
- 'specific_day' => '%e %B %Y',
- 'week_in_year' => 'Неделя %W, %Y',
- 'quarter_of_year' => '%B %Y',
- 'year' => '%Y',
- 'half_year' => '%B %Y',
-
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/csv.php b/resources/lang/ru_RU/csv.php
deleted file mode 100644
index 0bfa2c13e0..0000000000
--- a/resources/lang/ru_RU/csv.php
+++ /dev/null
@@ -1,80 +0,0 @@
- 'Настройки импорта',
- 'import_configure_intro' => 'Есть несколько вариантов для импорта CSV. Пожалуйста, укажите, содержит ли CSV-файл заголовки в первом столбце, и каков формат даты в вашем поле даты. Возможно, придется немного поэкспериментировать. Разделитель полей обычно «,», но также может быть «;». Внимательно проверьте это.',
- 'import_configure_form' => 'Основные параметры импорта CSV',
- 'header_help' => 'Проверьте, если первая строка CSV файла - это заголовки столбцов',
- 'date_help' => 'Формат даты и времени в CSV файле. Следуйте формату, как показывает на этой странице. По умолчанию будет анализироваться даты, которые выглядят следующим образом: :dateExample.',
- 'delimiter_help' => 'Выберите разделитель полей, который используется в вашем файле. Если не уверены, запятая - самый безопасный вариант.',
- 'import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
- 'upload_not_writeable' => 'The grey box contains a file path. It should be writeable. Please make sure it is.',
-
- // roles
- 'column_roles_title' => 'Define column roles',
- 'column_roles_table' => 'Table',
- 'column_name' => 'Name of column',
- 'column_example' => 'Column example data',
- 'column_role' => 'Column data meaning',
- 'do_map_value' => 'Map these values',
- 'column' => 'Column',
- 'no_example_data' => 'No example data available',
- 'store_column_roles' => 'Continue import',
- 'do_not_map' => '(do not map)',
- 'map_title' => 'Connect import data to Firefly III data',
- 'map_text' => 'In the following tables, the left value shows you information found in your uploaded CSV file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.',
-
- 'field_value' => 'Field value',
- 'field_mapped_to' => 'Mapped to',
- 'store_column_mapping' => 'Store mapping',
-
- // map things.
-
-
- 'column__ignore' => '(ignore this column)',
- 'column_account-iban' => 'Asset account (IBAN)',
- 'column_account-id' => 'Asset account ID (matching Firefly)',
- 'column_account-name' => 'Asset account (name)',
- 'column_amount' => 'Amount',
- 'column_amount-comma-separated' => 'Amount (comma as decimal separator)',
- 'column_bill-id' => 'Bill ID (matching Firefly)',
- 'column_bill-name' => 'Bill name',
- 'column_budget-id' => 'Budget ID (matching Firefly)',
- 'column_budget-name' => 'Budget name',
- 'column_category-id' => 'Category ID (matching Firefly)',
- 'column_category-name' => 'Category name',
- 'column_currency-code' => 'Currency code (ISO 4217)',
- 'column_currency-id' => 'Currency ID (matching Firefly)',
- 'column_currency-name' => 'Currency name (matching Firefly)',
- 'column_currency-symbol' => 'Currency symbol (matching Firefly)',
- 'column_date-interest' => 'Interest calculation date',
- 'column_date-book' => 'Transaction booking date',
- 'column_date-process' => 'Transaction process date',
- 'column_date-transaction' => 'Date',
- 'column_description' => 'Description',
- 'column_opposing-iban' => 'Opposing account (IBAN)',
- 'column_opposing-id' => 'Opposing account ID (matching Firefly)',
- 'column_external-id' => 'External ID',
- 'column_opposing-name' => 'Opposing account (name)',
- 'column_rabo-debet-credit' => 'Rabobank specific debet/credit indicator',
- 'column_ing-debet-credit' => 'ING specific debet/credit indicator',
- 'column_sepa-ct-id' => 'SEPA Credit Transfer end-to-end ID',
- 'column_sepa-ct-op' => 'SEPA Credit Transfer opposing account',
- 'column_sepa-db' => 'SEPA Direct Debet',
- 'column_tags-comma' => 'Tags (comma separated)',
- 'column_tags-space' => 'Tags (space separated)',
- 'column_account-number' => 'Asset account (account number)',
- 'column_opposing-number' => 'Opposing account (account number)',
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/demo.php b/resources/lang/ru_RU/demo.php
deleted file mode 100644
index e7f8ea934d..0000000000
--- a/resources/lang/ru_RU/demo.php
+++ /dev/null
@@ -1,24 +0,0 @@
- 'Sorry, there is no extra demo-explanation text for this page.',
- 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.',
- 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.',
- 'accounts-index' => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.',
- 'budgets-index' => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.',
- 'reports-index-start' => 'Firefly III supports four types of reports. Read about them by clicking on the -icon in the top right corner.',
- 'reports-index-examples' => 'Be sure to check out these examples: a monthly financial overview, a yearly financial overview and a budget overview.',
- 'currencies-index' => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
- 'transactions-index' => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
- 'piggy-banks-index' => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
- 'import-index' => 'Of course, any CSV file can be imported into Firefly III ',
- 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.',
- 'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
deleted file mode 100644
index a8d8567267..0000000000
--- a/resources/lang/ru_RU/firefly.php
+++ /dev/null
@@ -1,1063 +0,0 @@
- 'incomplete translation',
- 'close' => 'Close',
- 'actions' => 'Actions',
- 'edit' => 'Edit',
- 'delete' => 'Delete',
- 'welcomeBack' => 'What\'s playing?',
- 'everything' => 'Everything',
- 'customRange' => 'Custom range',
- 'apply' => 'Apply',
- 'cancel' => 'Cancel',
- 'from' => 'From',
- 'to' => 'To',
- 'showEverything' => 'Show everything',
- 'never' => 'Never',
- 'search_results_for' => 'Search results for ":query"',
- 'advanced_search' => 'Advanced search',
- 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.',
- 'bounced_error' => 'The message sent to :email bounced, so no access for you.',
- 'deleted_error' => 'These credentials do not match our records.',
- 'general_blocked_error' => 'Your account has been disabled, so you cannot login.',
- 'expired_error' => 'Your account has expired, and can no longer be used.',
- 'removed_amount' => 'Removed :amount',
- 'added_amount' => 'Added :amount',
- 'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.',
- 'Opening balance' => 'Opening balance',
- 'create_new_stuff' => 'Create new stuff',
- 'new_withdrawal' => 'New withdrawal',
- 'new_deposit' => 'New deposit',
- 'new_transfer' => 'New transfer',
- 'new_asset_account' => 'New asset account',
- 'new_expense_account' => 'New expense account',
- 'new_revenue_account' => 'New revenue account',
- 'new_budget' => 'New budget',
- 'new_bill' => 'New bill',
- 'block_account_logout' => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?',
- 'flash_success' => 'Success!',
- 'flash_info' => 'Message',
- 'flash_warning' => 'Warning!',
- 'flash_error' => 'Error!',
- 'flash_info_multiple' => 'There is one message|There are :count messages',
- 'flash_error_multiple' => 'There is one error|There are :count errors',
- 'net_worth' => 'Net worth',
- 'route_has_no_help' => 'There is no help for this route.',
- 'help_may_not_be_your_language' => 'This help text is in English. It is not yet available in your language',
- 'two_factor_welcome' => 'Hello, :user!',
- 'two_factor_enter_code' => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
- 'two_factor_code_here' => 'Enter code here',
- 'two_factor_title' => 'Two factor authentication',
- 'authenticate' => 'Authenticate',
- 'two_factor_forgot_title' => 'Lost two factor authentication',
- 'two_factor_forgot' => 'I forgot my two-factor thing.',
- 'two_factor_lost_header' => 'Lost your two factor authentication?',
- 'two_factor_lost_intro' => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',
- 'two_factor_lost_fix_self' => 'If you run your own instance of Firefly III, check the logs in storage/logs for instructions.',
- 'two_factor_lost_fix_owner' => 'Otherwise, email the site owner, :site_owner and ask them to reset your two factor authentication.',
- 'warning_much_data' => ':days days of data may take a while to load.',
- 'registered' => 'You have registered successfully!',
- 'search' => 'Search',
- 'search_found_accounts' => 'Found :count account(s) for your query.',
- 'search_found_categories' => 'Found :count category(ies) for your query.',
- 'search_found_budgets' => 'Found :count budget(s) for your query.',
- 'search_found_tags' => 'Found :count tag(s) for your query.',
- 'search_found_transactions' => 'Found :count transaction(s) for your query.',
- 'results_limited' => 'The results are limited to :count entries.',
- 'tagbalancingAct' => 'Balancing act',
- 'tagadvancePayment' => 'Advance payment',
- 'tagnothing' => '',
- 'Default asset account' => 'Default asset account',
- 'no_budget_pointer' => 'You seem to have no budgets yet. You should create some on the budgets-page. Budgets can help you keep track of expenses.',
- 'Savings account' => 'Savings account',
- 'Credit card' => 'Credit card',
- 'source_accounts' => 'Source account(s)',
- 'destination_accounts' => 'Destination account(s)',
- 'user_id_is' => 'Your user id is :user',
- 'field_supports_markdown' => 'This field supports Markdown.',
- 'need_more_help' => 'If you need more help using Firefly III, please open a ticket on Github.',
- 'nothing_to_display' => 'There are no transactions to show you',
- 'show_all_no_filter' => 'Show all transactions without grouping them by date.',
- 'expenses_by_category' => 'Expenses by category',
- 'expenses_by_budget' => 'Expenses by budget',
- 'income_by_category' => 'Income by category',
- 'expenses_by_asset_account' => 'Expenses by asset account',
- 'expenses_by_expense_account' => 'Expenses by expense account',
- 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.',
- 'sum_of_expenses' => 'Sum of expenses',
- 'sum_of_income' => 'Sum of income',
- 'total_sum' => 'Total sum',
- 'spent_in_specific_budget' => 'Spent in budget ":budget"',
- 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"',
- 'left_in_budget_limit' => 'Left to spend according to budgeting',
- 'cannot_change_demo' => 'You cannot change the password of the demonstration account.',
- 'cannot_delete_demo' => 'You cannot remove the demonstration account.',
- 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account',
- 'per_period' => 'Per period',
- 'all_periods' => 'All periods',
- 'current_period' => 'Current period',
- 'show_the_current_period_and_overview' => 'Show the current period and overview',
- 'pref_languages_locale' => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
- 'budget_in_period' => 'All transactions for budget ":name" between :start and :end',
- 'chart_budget_in_period' => 'Chart for all transactions for budget ":name" between :start and :end',
- 'chart_account_in_period' => 'Chart for all transactions for account ":name" between :start and :end',
- 'chart_category_in_period' => 'Chart for all transactions for category ":name" between :start and :end',
- 'chart_category_all' => 'Chart for all transactions for category ":name"',
- 'budget_in_period_breadcrumb' => 'Between :start and :end',
- 'clone_withdrawal' => 'Clone this withdrawal',
- 'clone_deposit' => 'Clone this deposit',
- 'clone_transfer' => 'Clone this transfer',
- 'transaction_journal_other_options' => 'Other options',
- 'multi_select_no_selection' => 'None selected',
- 'multi_select_all_selected' => 'All selected',
- 'multi_select_filter_placeholder' => 'Find..',
- 'between_dates_breadcrumb' => 'Between :start and :end',
- 'all_journals_without_budget' => 'All transactions without a budget',
- 'journals_without_budget' => 'Transactions without a budget',
- 'all_journals_without_category' => 'All transactions without a category',
- 'journals_without_category' => 'Transactions without a category',
- 'all_journals_for_account' => 'All transactions for account :name',
- 'chart_all_journals_for_account' => 'Chart of all transactions for account :name',
- 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end',
- 'transferred' => 'Transferred',
- 'all_withdrawal' => 'All expenses',
- 'all_transactions' => 'All transactions',
- 'title_withdrawal_between' => 'All expenses between :start and :end',
- 'all_deposit' => 'All revenue',
- 'title_deposit_between' => 'All revenue between :start and :end',
- 'all_transfers' => 'All transfers',
- 'title_transfers_between' => 'All transfers between :start and :end',
- 'all_transfer' => 'All transfers',
- 'all_journals_for_tag' => 'All transactions for tag ":tag"',
- 'title_transfer_between' => 'All transfers between :start and :end',
- 'all_journals_for_category' => 'All transactions for category :name',
- 'all_journals_for_budget' => 'All transactions for budget :name',
- 'chart_all_journals_for_budget' => 'Chart of all transactions for budget :name',
- 'journals_in_period_for_category' => 'All transactions for category :name between :start and :end',
- 'journals_in_period_for_tag' => 'All transactions for tag :tag between :start and :end',
- 'not_available_demo_user' => 'The feature you try to access is not available to demo users.',
- 'exchange_rate_instructions' => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
- 'transfer_exchange_rate_instructions' => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
-
- // repeat frequencies:
- 'repeat_freq_yearly' => 'yearly',
- 'repeat_freq_monthly' => 'monthly',
- 'weekly' => 'weekly',
- 'quarterly' => 'quarterly',
- 'half-year' => 'every half year',
- 'yearly' => 'yearly',
- // account confirmation:
- 'confirm_account_header' => 'Please confirm your account',
- 'confirm_account_intro' => 'An email has been sent to the address you used during your registration. Please check it out for further instructions. If you did not get this message, you can have Firefly send it again.',
- 'confirm_account_resend_email' => 'Send me the confirmation message I need to activate my account.',
- 'account_is_confirmed' => 'Your account has been confirmed!',
- 'invalid_activation_code' => 'It seems the code you are using is not valid, or has expired.',
- 'confirm_account_is_resent_header' => 'The confirmation has been resent',
- 'confirm_account_is_resent_text' => 'The confirmation message has been resent. If you still did not receive the confirmation message, please contact the site owner at :owner or check the log files to see what went wrong.',
- 'confirm_account_is_resent_go_home' => 'Go to the index page of Firefly',
- 'confirm_account_not_resent_header' => 'Something went wrong :(',
- 'confirm_account_not_resent_intro' => 'The confirmation message has been not resent. If you still did not receive the confirmation message, please contact the site owner at :owner instead. Possibly, you have tried to resend the activation message too often. You can have Firefly III try to resend the confirmation message every hour.',
- 'confirm_account_not_resent_go_home' => 'Go to the index page of Firefly',
-
- // export data:
- 'import_and_export' => 'Import and export',
- 'export_data' => 'Export data',
- 'export_data_intro' => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
- 'export_format' => 'Export format',
- 'export_format_csv' => 'Comma separated values (CSV file)',
- 'export_format_mt940' => 'MT940 compatible format',
- 'export_included_accounts' => 'Export transactions from these accounts',
- 'include_old_uploads_help' => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
- 'do_export' => 'Export',
- 'export_status_never_started' => 'The export has not started yet',
- 'export_status_make_exporter' => 'Creating exporter thing...',
- 'export_status_collecting_journals' => 'Collecting your transactions...',
- 'export_status_collected_journals' => 'Collected your transactions!',
- 'export_status_converting_to_export_format' => 'Converting your transactions...',
- 'export_status_converted_to_export_format' => 'Converted your transactions!',
- 'export_status_creating_journal_file' => 'Creating the export file...',
- 'export_status_created_journal_file' => 'Created the export file!',
- 'export_status_collecting_attachments' => 'Collecting all your attachments...',
- 'export_status_collected_attachments' => 'Collected all your attachments!',
- 'export_status_collecting_old_uploads' => 'Collecting all your previous uploads...',
- 'export_status_collected_old_uploads' => 'Collected all your previous uploads!',
- 'export_status_creating_config_file' => 'Creating a configuration file...',
- 'export_status_created_config_file' => 'Created a configuration file!',
- 'export_status_creating_zip_file' => 'Creating a zip file...',
- 'export_status_created_zip_file' => 'Created a zip file!',
- 'export_status_finished' => 'Export has succesfully finished! Yay!',
- 'export_data_please_wait' => 'Please wait...',
- 'attachment_explanation' => 'The file called \':attachment_name\' (#:attachment_id) was originally uploaded to :type \':description\' (#:journal_id) dated :date for the amount of :amount.',
-
- // rules
- 'rules' => 'Rules',
- 'rules_explanation' => 'Here you can manage rules. Rules are triggered when a transaction is created or updated. Then, if the transaction has certain properties (called "triggers") Firefly will execute the "actions". Combined, you can make Firefly respond in a certain way to new transactions.',
- 'rule_name' => 'Name of rule',
- 'rule_triggers' => 'Rule triggers when',
- 'rule_actions' => 'Rule will',
- 'new_rule' => 'New rule',
- 'new_rule_group' => 'New rule group',
- 'rule_priority_up' => 'Give rule more priority',
- 'rule_priority_down' => 'Give rule less priority',
- 'make_new_rule_group' => 'Make new rule group',
- 'store_new_rule_group' => 'Store new rule group',
- 'created_new_rule_group' => 'New rule group ":title" stored!',
- 'updated_rule_group' => 'Successfully updated rule group ":title".',
- 'edit_rule_group' => 'Edit rule group ":title"',
- 'delete_rule_group' => 'Delete rule group ":title"',
- 'deleted_rule_group' => 'Deleted rule group ":title"',
- 'update_rule_group' => 'Update rule group',
- 'no_rules_in_group' => 'There are no rules in this group',
- 'move_rule_group_up' => 'Move rule group up',
- 'move_rule_group_down' => 'Move rule group down',
- 'save_rules_by_moving' => 'Save these rule(s) by moving them to another rule group:',
- 'make_new_rule' => 'Make new rule in rule group ":title"',
- 'rule_help_stop_processing' => 'When you check this box, later rules in this group will not be executed.',
- 'rule_help_active' => 'Inactive rules will never fire.',
- 'stored_new_rule' => 'Stored new rule with title ":title"',
- 'deleted_rule' => 'Deleted rule with title ":title"',
- 'store_new_rule' => 'Store new rule',
- 'updated_rule' => 'Updated rule with title ":title"',
- 'default_rule_group_name' => 'Default rules',
- 'default_rule_group_description' => 'All your rules not in a particular group.',
- 'default_rule_name' => 'Your first default rule',
- 'default_rule_description' => 'This rule is an example. You can safely delete it.',
- 'default_rule_trigger_description' => 'The Man Who Sold the World',
- 'default_rule_trigger_from_account' => 'David Bowie',
- 'default_rule_action_prepend' => 'Bought the world from ',
- 'default_rule_action_set_category' => 'Large expenses',
- 'trigger' => 'Trigger',
- 'trigger_value' => 'Trigger on value',
- 'stop_processing_other_triggers' => 'Stop processing other triggers',
- 'add_rule_trigger' => 'Add new trigger',
- 'action' => 'Action',
- 'action_value' => 'Action value',
- 'stop_executing_other_actions' => 'Stop executing other actions',
- 'add_rule_action' => 'Add new action',
- 'edit_rule' => 'Edit rule ":title"',
- 'delete_rule' => 'Delete rule ":title"',
- 'update_rule' => 'Update rule',
- 'test_rule_triggers' => 'See matching transactions',
- 'warning_transaction_subset' => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
- 'warning_no_matching_transactions' => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
- 'warning_no_valid_triggers' => 'No valid triggers provided.',
- 'execute_on_existing_transactions' => 'Execute for existing transactions',
- 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions',
- 'execute_on_existing_transactions_intro' => 'When a rule or group has been changed or added, you can execute it for existing transactions',
- 'execute_on_existing_transactions_short' => 'Existing transactions',
- 'executed_group_on_existing_transactions' => 'Executed group ":title" for existing transactions',
- 'execute_group_on_existing_transactions' => 'Execute group ":title" for existing transactions',
- 'include_transactions_from_accounts' => 'Include transactions from these accounts',
- 'execute' => 'Execute',
-
- // actions and triggers
- 'rule_trigger_user_action' => 'User action is ":trigger_value"',
- 'rule_trigger_from_account_starts' => 'Source account starts with ":trigger_value"',
- 'rule_trigger_from_account_ends' => 'Source account ends with ":trigger_value"',
- 'rule_trigger_from_account_is' => 'Source account is ":trigger_value"',
- 'rule_trigger_from_account_contains' => 'Source account contains ":trigger_value"',
- 'rule_trigger_to_account_starts' => 'Destination account starts with ":trigger_value"',
- 'rule_trigger_to_account_ends' => 'Destination account ends with ":trigger_value"',
- 'rule_trigger_to_account_is' => 'Destination account is ":trigger_value"',
- 'rule_trigger_to_account_contains' => 'Destination account contains ":trigger_value"',
- 'rule_trigger_transaction_type' => 'Transaction is of type ":trigger_value"',
- 'rule_trigger_category_is' => 'Category is ":trigger_value"',
- 'rule_trigger_amount_less' => 'Amount is less than :trigger_value',
- 'rule_trigger_amount_exactly' => 'Amount is :trigger_value',
- 'rule_trigger_amount_more' => 'Amount is more than :trigger_value',
- 'rule_trigger_description_starts' => 'Description starts with ":trigger_value"',
- 'rule_trigger_description_ends' => 'Description ends with ":trigger_value"',
- 'rule_trigger_description_contains' => 'Description contains ":trigger_value"',
- 'rule_trigger_description_is' => 'Description is ":trigger_value"',
- 'rule_trigger_from_account_starts_choice' => 'Source account starts with..',
- 'rule_trigger_from_account_ends_choice' => 'Source account ends with..',
- 'rule_trigger_from_account_is_choice' => 'Source account is..',
- 'rule_trigger_from_account_contains_choice' => 'Source account contains..',
- 'rule_trigger_to_account_starts_choice' => 'Destination account starts with..',
- 'rule_trigger_to_account_ends_choice' => 'Destination account ends with..',
- 'rule_trigger_to_account_is_choice' => 'Destination account is..',
- 'rule_trigger_to_account_contains_choice' => 'Destination account contains..',
- 'rule_trigger_transaction_type_choice' => 'Transaction is of type..',
- 'rule_trigger_amount_less_choice' => 'Amount is less than..',
- 'rule_trigger_amount_exactly_choice' => 'Amount is..',
- 'rule_trigger_amount_more_choice' => 'Amount is more than..',
- 'rule_trigger_description_starts_choice' => 'Description starts with..',
- 'rule_trigger_description_ends_choice' => 'Description ends with..',
- 'rule_trigger_description_contains_choice' => 'Description contains..',
- 'rule_trigger_description_is_choice' => 'Description is..',
- 'rule_trigger_category_is_choice' => 'Category is..',
- 'rule_trigger_budget_is_choice' => 'Budget is..',
- 'rule_trigger_tag_is_choice' => '(A) tag is..',
- 'rule_trigger_has_attachments_choice' => 'Has at least this many attachments',
- 'rule_trigger_has_attachments' => 'Has at least :trigger_value attachment(s)',
- 'rule_trigger_store_journal' => 'When a transaction is created',
- 'rule_trigger_update_journal' => 'When a transaction is updated',
- 'rule_action_set_category' => 'Set category to ":action_value"',
- 'rule_action_clear_category' => 'Clear category',
- 'rule_action_set_budget' => 'Set budget to ":action_value"',
- 'rule_action_clear_budget' => 'Clear budget',
- 'rule_action_add_tag' => 'Add tag ":action_value"',
- 'rule_action_remove_tag' => 'Remove tag ":action_value"',
- 'rule_action_remove_all_tags' => 'Remove all tags',
- 'rule_action_set_description' => 'Set description to ":action_value"',
- 'rule_action_append_description' => 'Append description with ":action_value"',
- 'rule_action_prepend_description' => 'Prepend description with ":action_value"',
- 'rule_action_set_category_choice' => 'Set category to..',
- 'rule_action_clear_category_choice' => 'Clear any category',
- 'rule_action_set_budget_choice' => 'Set budget to..',
- 'rule_action_clear_budget_choice' => 'Clear any budget',
- 'rule_action_add_tag_choice' => 'Add tag..',
- 'rule_action_remove_tag_choice' => 'Remove tag..',
- 'rule_action_remove_all_tags_choice' => 'Remove all tags',
- 'rule_action_set_description_choice' => 'Set description to..',
- 'rule_action_append_description_choice' => 'Append description with..',
- 'rule_action_prepend_description_choice' => 'Prepend description with..',
- 'rule_action_set_source_account_choice' => 'Set source account to...',
- 'rule_action_set_source_account' => 'Set source account to :action_value',
- 'rule_action_set_destination_account_choice' => 'Set destination account to...',
- 'rule_action_set_destination_account' => 'Set destination account to :action_value',
-
- // tags
- 'store_new_tag' => 'Store new tag',
- 'update_tag' => 'Update tag',
- 'no_location_set' => 'No location set.',
- 'meta_data' => 'Meta data',
- 'location' => 'Location',
-
- // preferences
- 'pref_home_screen_accounts' => 'Home screen accounts',
- 'pref_home_screen_accounts_help' => 'Which accounts should be displayed on the home page?',
- 'pref_view_range' => 'View range',
- 'pref_view_range_help' => 'Some charts are automatically grouped in periods. What period would you prefer?',
- 'pref_1D' => 'One day',
- 'pref_1W' => 'One week',
- 'pref_1M' => 'One month',
- 'pref_3M' => 'Three months (quarter)',
- 'pref_6M' => 'Six months',
- 'pref_1Y' => 'One year',
- 'pref_languages' => 'Languages',
- 'pref_languages_help' => 'Firefly III supports several languages. Which one do you prefer?',
- 'pref_custom_fiscal_year' => 'Fiscal year settings',
- 'pref_custom_fiscal_year_label' => 'Enabled',
- 'pref_custom_fiscal_year_help' => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
- 'pref_fiscal_year_start_label' => 'Fiscal year start date',
- 'pref_two_factor_auth' => '2-step verification',
- 'pref_two_factor_auth_help' => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
- 'pref_enable_two_factor_auth' => 'Enable 2-step verification',
- 'pref_two_factor_auth_disabled' => '2-step verification code removed and disabled',
- 'pref_two_factor_auth_remove_it' => 'Don\'t forget to remove the account from your authentication app!',
- 'pref_two_factor_auth_code' => 'Verify code',
- 'pref_two_factor_auth_code_help' => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
- 'pref_two_factor_auth_reset_code' => 'Reset verification code',
- 'pref_two_factor_auth_remove_code' => 'Remove verification code',
- 'pref_two_factor_auth_remove_will_disable' => '(this will also disable two-factor authentication)',
- 'pref_save_settings' => 'Save settings',
- 'saved_preferences' => 'Preferences saved!',
- 'preferences_general' => 'General',
- 'preferences_frontpage' => 'Home screen',
- 'preferences_security' => 'Security',
- 'preferences_layout' => 'Layout',
- 'pref_home_show_deposits' => 'Show deposits on the home screen',
- 'pref_home_show_deposits_info' => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
- 'pref_home_do_show_deposits' => 'Yes, show them',
- 'successful_count' => 'of which :count successful',
- 'transaction_page_size_title' => 'Page size',
- 'transaction_page_size_help' => 'Any list of transactions shows at most this many transactions',
- 'transaction_page_size_label' => 'Page size',
- 'between_dates' => '(:start and :end)',
- 'pref_optional_fields_transaction' => 'Optional fields for transactions',
- 'pref_optional_fields_transaction_help' => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
- 'optional_tj_date_fields' => 'Date fields',
- 'optional_tj_business_fields' => 'Business fields',
- 'optional_tj_attachment_fields' => 'Attachment fields',
- 'pref_optional_tj_interest_date' => 'Interest date',
- 'pref_optional_tj_book_date' => 'Book date',
- 'pref_optional_tj_process_date' => 'Processing date',
- 'pref_optional_tj_due_date' => 'Due date',
- 'pref_optional_tj_payment_date' => 'Payment date',
- 'pref_optional_tj_invoice_date' => 'Invoice date',
- 'pref_optional_tj_internal_reference' => 'Internal reference',
- 'pref_optional_tj_notes' => 'Notes',
- 'pref_optional_tj_attachments' => 'Attachments',
- 'optional_field_meta_dates' => 'Dates',
- 'optional_field_meta_business' => 'Business',
- 'optional_field_attachments' => 'Attachments',
- 'optional_field_meta_data' => 'Optional meta data',
-
-
- // profile:
- 'change_your_password' => 'Change your password',
- 'delete_account' => 'Delete account',
- 'current_password' => 'Current password',
- 'new_password' => 'New password',
- 'new_password_again' => 'New password (again)',
- 'delete_your_account' => 'Delete your account',
- 'delete_your_account_help' => 'Deleting your account will also delete any accounts, transactions, anything you might have saved into Firefly III. It\'ll be GONE.',
- 'delete_your_account_password' => 'Enter your password to continue.',
- 'password' => 'Password',
- 'are_you_sure' => 'Are you sure? You cannot undo this.',
- 'delete_account_button' => 'DELETE your account',
- 'invalid_current_password' => 'Invalid current password!',
- 'password_changed' => 'Password changed!',
- 'should_change' => 'The idea is to change your password.',
- 'invalid_password' => 'Invalid password!',
-
-
- // attachments
- 'nr_of_attachments' => 'One attachment|:count attachments',
- 'attachments' => 'Attachments',
- 'edit_attachment' => 'Edit attachment ":name"',
- 'update_attachment' => 'Update attachment',
- 'delete_attachment' => 'Delete attachment ":name"',
- 'attachment_deleted' => 'Deleted attachment ":name"',
- 'attachment_updated' => 'Updated attachment ":name"',
- 'upload_max_file_size' => 'Maximum file size: :size',
-
- // tour:
- 'prev' => 'Prev',
- 'next' => 'Next',
- 'end-tour' => 'End tour',
- 'pause' => 'Pause',
-
- // transaction index
- 'title_expenses' => 'Expenses',
- 'title_withdrawal' => 'Expenses',
- 'title_revenue' => 'Revenue / income',
- 'title_deposit' => 'Revenue / income',
- 'title_transfer' => 'Transfers',
- 'title_transfers' => 'Transfers',
-
- // convert stuff:
- 'convert_is_already_type_Withdrawal' => 'This transaction is already a withdrawal',
- 'convert_is_already_type_Deposit' => 'This transaction is already a deposit',
- 'convert_is_already_type_Transfer' => 'This transaction is already a transfer',
- 'convert_to_Withdrawal' => 'Convert ":description" to a withdrawal',
- 'convert_to_Deposit' => 'Convert ":description" to a deposit',
- 'convert_to_Transfer' => 'Convert ":description" to a transfer',
- 'convert_options_WithdrawalDeposit' => 'Convert a withdrawal into a deposit',
- 'convert_options_WithdrawalTransfer' => 'Convert a withdrawal into a transfer',
- 'convert_options_DepositTransfer' => 'Convert a deposit into a transfer',
- 'convert_options_DepositWithdrawal' => 'Convert a deposit into a withdrawal',
- 'convert_options_TransferWithdrawal' => 'Convert a transfer into a withdrawal',
- 'convert_options_TransferDeposit' => 'Convert a transfer into a deposit',
- 'transaction_journal_convert_options' => 'Convert this transaction',
- 'convert_Withdrawal_to_deposit' => 'Convert this withdrawal to a deposit',
- 'convert_Withdrawal_to_transfer' => 'Convert this withdrawal to a transfer',
- 'convert_Deposit_to_withdrawal' => 'Convert this deposit to a withdrawal',
- 'convert_Deposit_to_transfer' => 'Convert this deposit to a transfer',
- 'convert_Transfer_to_deposit' => 'Convert this transfer to a deposit',
- 'convert_Transfer_to_withdrawal' => 'Convert this transfer to a withdrawal',
- 'convert_please_set_revenue_source' => 'Please pick the revenue account where the money will come from.',
- 'convert_please_set_asset_destination' => 'Please pick the asset account where the money will go to.',
- 'convert_please_set_expense_destination' => 'Please pick the expense account where the money will go to.',
- 'convert_please_set_asset_source' => 'Please pick the asset account where the money will come from.',
- 'convert_explanation_withdrawal_deposit' => 'If you convert this withdrawal into a deposit, :amount will be deposited into :sourceName instead of taken from it.',
- 'convert_explanation_withdrawal_transfer' => 'If you convert this withdrawal into a transfer, :amount will be transferred from :sourceName to a new asset account, instead of being paid to :destinationName.',
- 'convert_explanation_deposit_withdrawal' => 'If you convert this deposit into a withdrawal, :amount will be removed from :destinationName instead of added to it.',
- 'convert_explanation_deposit_transfer' => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into :destinationName.',
- 'convert_explanation_transfer_withdrawal' => 'If you convert this transfer into a withdrawal, :amount will go from :sourceName to a new destination as an expense, instead of to :destinationName as a transfer.',
- 'convert_explanation_transfer_deposit' => 'If you convert this transfer into a deposit, :amount will be deposited into account :destinationName instead of being transferred there.',
- 'converted_to_Withdrawal' => 'The transaction has been converted to a withdrawal',
- 'converted_to_Deposit' => 'The transaction has been converted to a deposit',
- 'converted_to_Transfer' => 'The transaction has been converted to a transfer',
-
-
- // create new stuff:
- 'create_new_withdrawal' => 'Create new withdrawal',
- 'create_new_deposit' => 'Create new deposit',
- 'create_new_transfer' => 'Create new transfer',
- 'create_new_asset' => 'Create new asset account',
- 'create_new_expense' => 'Create new expense account',
- 'create_new_revenue' => 'Create new revenue account',
- 'create_new_piggy_bank' => 'Create new piggy bank',
- 'create_new_bill' => 'Create new bill',
-
- // currencies:
- 'create_currency' => 'Create a new currency',
- 'store_currency' => 'Store new currency',
- 'update_currency' => 'Update currency',
- 'new_default_currency' => ':name is now the default currency.',
- 'cannot_delete_currency' => 'Cannot delete :name because it is still in use.',
- 'deleted_currency' => 'Currency :name deleted',
- 'created_currency' => 'Currency :name created',
- 'updated_currency' => 'Currency :name updated',
- 'ask_site_owner' => 'Please ask :owner to add, remove or edit currencies.',
- 'currencies_intro' => 'Firefly III supports various currencies which you can set and enable here.',
- 'make_default_currency' => 'make default',
- 'default_currency' => 'default',
-
- // new user:
- 'submit' => 'Submit',
- 'getting_started' => 'Getting started',
- 'to_get_started' => 'To get started with Firefly, please enter your current bank\'s name, and the balance of your checking account:',
- 'savings_balance_text' => 'If you have a savings account, please enter the current balance of your savings account:',
- 'cc_balance_text' => 'If you have a credit card, please enter your credit card\'s limit.',
- 'stored_new_account_new_user' => 'Yay! Your new account has been stored.',
- 'stored_new_accounts_new_user' => 'Yay! Your new accounts have been stored.',
-
- // forms:
- 'mandatoryFields' => 'Mandatory fields',
- 'optionalFields' => 'Optional fields',
- 'options' => 'Options',
-
- // budgets:
- 'create_new_budget' => 'Create a new budget',
- 'store_new_budget' => 'Store new budget',
- 'stored_new_budget' => 'Stored new budget ":name"',
- 'available_between' => 'Available between :start and :end',
- 'transactionsWithoutBudget' => 'Expenses without budget',
- 'transactions_no_budget' => 'Expenses without budget between :start and :end',
- 'spent_between' => 'Spent between :start and :end',
- 'createBudget' => 'New budget',
- 'inactiveBudgets' => 'Inactive budgets',
- 'without_budget_between' => 'Transactions without a budget between :start and :end',
- 'budget_in_month' => ':name in :month',
- 'delete_budget' => 'Delete budget ":name"',
- 'deleted_budget' => 'Deleted budget ":name"',
- 'edit_budget' => 'Edit budget ":name"',
- 'updated_budget' => 'Updated budget ":name"',
- 'update_amount' => 'Update amount',
- 'update_budget' => 'Update budget',
- 'update_budget_amount_range' => 'Update (expected) available amount between :start and :end',
-
- // bills:
- 'matching_on' => 'Matching on',
- 'between_amounts' => 'between :low and :high.',
- 'repeats' => 'Repeats',
- 'connected_journals' => 'Connected transactions',
- 'auto_match_on' => 'Automatically matched by Firefly',
- 'auto_match_off' => 'Not automatically matched by Firefly',
- 'next_expected_match' => 'Next expected match',
- 'delete_bill' => 'Delete bill ":name"',
- 'deleted_bill' => 'Deleted bill ":name"',
- 'edit_bill' => 'Edit bill ":name"',
- 'more' => 'More',
- 'rescan_old' => 'Rescan old transactions',
- 'update_bill' => 'Update bill',
- 'updated_bill' => 'Updated bill ":name"',
- 'store_new_bill' => 'Store new bill',
- 'stored_new_bill' => 'Stored new bill ":name"',
- 'cannot_scan_inactive_bill' => 'Inactive bills cannot be scanned.',
- 'rescanned_bill' => 'Rescanned everything.',
- 'average_bill_amount_year' => 'Average bill amount (:year)',
- 'average_bill_amount_overall' => 'Average bill amount (overall)',
- 'not_or_not_yet' => 'Not (yet)',
- 'not_expected_period' => 'Not expected this period',
- // accounts:
- 'details_for_asset' => 'Details for asset account ":name"',
- 'details_for_expense' => 'Details for expense account ":name"',
- 'details_for_revenue' => 'Details for revenue account ":name"',
- 'details_for_cash' => 'Details for cash account ":name"',
- 'store_new_asset_account' => 'Store new asset account',
- 'store_new_expense_account' => 'Store new expense account',
- 'store_new_revenue_account' => 'Store new revenue account',
- 'edit_asset_account' => 'Edit asset account ":name"',
- 'edit_expense_account' => 'Edit expense account ":name"',
- 'edit_revenue_account' => 'Edit revenue account ":name"',
- 'delete_asset_account' => 'Delete asset account ":name"',
- 'delete_expense_account' => 'Delete expense account ":name"',
- 'delete_revenue_account' => 'Delete revenue account ":name"',
- 'asset_deleted' => 'Successfully deleted asset account ":name"',
- 'expense_deleted' => 'Successfully deleted expense account ":name"',
- 'revenue_deleted' => 'Successfully deleted revenue account ":name"',
- 'update_asset_account' => 'Update asset account',
- 'update_expense_account' => 'Update expense account',
- 'update_revenue_account' => 'Update revenue account',
- 'make_new_asset_account' => 'Create a new asset account',
- 'make_new_expense_account' => 'Create a new expense account',
- 'make_new_revenue_account' => 'Create a new revenue account',
- 'asset_accounts' => 'Asset accounts',
- 'expense_accounts' => 'Expense accounts',
- 'revenue_accounts' => 'Revenue accounts',
- 'cash_accounts' => 'Cash accounts',
- 'Cash account' => 'Cash account',
- 'account_type' => 'Account type',
- 'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
- 'stored_new_account' => 'New account ":name" stored!',
- 'updated_account' => 'Updated account ":name"',
- 'credit_card_options' => 'Credit card options',
- 'no_transactions_account' => 'There are no transactions (in this period) for asset account ":name".',
- 'no_data_for_chart' => 'There is not enough information (yet) to generate this chart.',
- 'select_more_than_one_account' => 'Please select more than one account',
- 'select_more_than_one_category' => 'Please select more than one category',
- 'select_more_than_one_budget' => 'Please select more than one budget',
- 'select_more_than_one_tag' => 'Please select more than one tag',
- 'from_to' => 'From :start to :end',
- 'from_to_breadcrumb' => 'from :start to :end',
- 'account_default_currency' => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
-
- // categories:
- 'new_category' => 'New category',
- 'create_new_category' => 'Create a new category',
- 'without_category' => 'Without a category',
- 'update_category' => 'Update category',
- 'updated_category' => 'Updated category ":name"',
- 'categories' => 'Categories',
- 'edit_category' => 'Edit category ":name"',
- 'no_category' => '(no category)',
- 'category' => 'Category',
- 'delete_category' => 'Delete category ":name"',
- 'deleted_category' => 'Deleted category ":name"',
- 'store_category' => 'Store new category',
- 'stored_category' => 'Stored new category ":name"',
- 'without_category_between' => 'Without category between :start and :end',
-
- // transactions:
- 'update_withdrawal' => 'Update withdrawal',
- 'update_deposit' => 'Update deposit',
- 'update_transfer' => 'Update transfer',
- 'updated_withdrawal' => 'Updated withdrawal ":description"',
- 'updated_deposit' => 'Updated deposit ":description"',
- 'updated_transfer' => 'Updated transfer ":description"',
- 'delete_withdrawal' => 'Delete withdrawal ":description"',
- 'delete_deposit' => 'Delete deposit ":description"',
- 'delete_transfer' => 'Delete transfer ":description"',
- 'deleted_withdrawal' => 'Successfully deleted withdrawal ":description"',
- 'deleted_deposit' => 'Successfully deleted deposit ":description"',
- 'deleted_transfer' => 'Successfully deleted transfer ":description"',
- 'stored_journal' => 'Successfully created new transaction ":description"',
- 'select_transactions' => 'Select transactions',
- 'stop_selection' => 'Stop selecting transactions',
- 'edit_selected' => 'Edit selected',
- 'delete_selected' => 'Delete selected',
- 'mass_delete_journals' => 'Delete a number of transactions',
- 'mass_edit_journals' => 'Edit a number of transactions',
- 'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
- 'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious.',
- 'mass_deleted_transactions_success' => 'Deleted :amount transaction(s).',
- 'mass_edited_transactions_success' => 'Updated :amount transaction(s)',
-
-
- // new user:
- 'welcome' => 'Welcome to Firefly!',
-
- // home page:
- 'yourAccounts' => 'Your accounts',
- 'budgetsAndSpending' => 'Budgets and spending',
- 'savings' => 'Savings',
- 'markAsSavingsToContinue' => 'Mark your asset accounts as "Savings account" to fill this panel',
- 'createPiggyToContinue' => 'Create piggy banks to fill this panel.',
- 'newWithdrawal' => 'New expense',
- 'newDeposit' => 'New deposit',
- 'newTransfer' => 'New transfer',
- 'moneyIn' => 'Money in',
- 'moneyOut' => 'Money out',
- 'billsToPay' => 'Bills to pay',
- 'billsPaid' => 'Bills paid',
- 'divided' => 'divided',
- 'toDivide' => 'left to divide',
-
- // menu and titles, should be recycled as often as possible:
- 'currency' => 'Currency',
- 'preferences' => 'Preferences',
- 'logout' => 'Logout',
- 'searchPlaceholder' => 'Search...',
- 'dashboard' => 'Dashboard',
- 'currencies' => 'Currencies',
- 'accounts' => 'Accounts',
- 'Asset account' => 'Asset account',
- 'Default account' => 'Asset account',
- 'Expense account' => 'Expense account',
- 'Revenue account' => 'Revenue account',
- 'Initial balance account' => 'Initial balance account',
- 'budgets' => 'Budgets',
- 'tags' => 'Tags',
- 'reports' => 'Reports',
- 'transactions' => 'Transactions',
- 'expenses' => 'Expenses',
- 'income' => 'Revenue / income',
- 'transfers' => 'Transfers',
- 'moneyManagement' => 'Money management',
- 'piggyBanks' => 'Piggy banks',
- 'bills' => 'Bills',
- 'withdrawal' => 'Withdrawal',
- 'deposit' => 'Deposit',
- 'account' => 'Account',
- 'transfer' => 'Transfer',
- 'Withdrawal' => 'Withdrawal',
- 'Deposit' => 'Deposit',
- 'Transfer' => 'Transfer',
- 'bill' => 'Bill',
- 'yes' => 'Yes',
- 'no' => 'No',
- 'amount' => 'Amount',
- 'overview' => 'Overview',
- 'saveOnAccount' => 'Save on account',
- 'unknown' => 'Unknown',
- 'daily' => 'Daily',
- 'monthly' => 'Monthly',
- 'profile' => 'Profile',
- 'errors' => 'Errors',
-
- // reports:
- 'report_default' => 'Default financial report between :start and :end',
- 'report_audit' => 'Transaction history overview between :start and :end',
- 'report_category' => 'Category report between :start and :end',
- 'report_budget' => 'Budget report between :start and :end',
- 'report_tag' => 'Tag report between :start and :end',
- 'quick_link_reports' => 'Quick links',
- 'quick_link_default_report' => 'Default financial report',
- 'quick_link_audit_report' => 'Transaction history overview',
- 'report_this_month_quick' => 'Current month, all accounts',
- 'report_this_year_quick' => 'Current year, all accounts',
- 'report_this_fiscal_year_quick' => 'Current fiscal year, all accounts',
- 'report_all_time_quick' => 'All-time, all accounts',
- 'reports_can_bookmark' => 'Remember that reports can be bookmarked.',
- 'incomeVsExpenses' => 'Income vs. expenses',
- 'accountBalances' => 'Account balances',
- 'balanceStartOfYear' => 'Balance at start of year',
- 'balanceEndOfYear' => 'Balance at end of year',
- 'balanceStartOfMonth' => 'Balance at start of month',
- 'balanceEndOfMonth' => 'Balance at end of month',
- 'balanceStart' => 'Balance at start of period',
- 'balanceEnd' => 'Balance at end of period',
- 'reportsOwnAccounts' => 'Reports for your own accounts',
- 'reportsOwnAccountsAndShared' => 'Reports for your own accounts and shared accounts',
- 'splitByAccount' => 'Split by account',
- 'balancedByTransfersAndTags' => 'Balanced by transfers and tags',
- 'coveredWithTags' => 'Covered with tags',
- 'leftUnbalanced' => 'Left unbalanced',
- 'expectedBalance' => 'Expected balance',
- 'outsideOfBudgets' => 'Outside of budgets',
- 'leftInBudget' => 'Left in budget',
- 'sumOfSums' => 'Sum of sums',
- 'noCategory' => '(no category)',
- 'notCharged' => 'Not charged (yet)',
- 'inactive' => 'Inactive',
- 'active' => 'Active',
- 'difference' => 'Difference',
- 'in' => 'In',
- 'out' => 'Out',
- 'topX' => 'top :number',
- 'show_full_list' => 'Show entire list',
- 'show_only_top' => 'Show only top :number',
- 'sum_of_year' => 'Sum of year',
- 'sum_of_years' => 'Sum of years',
- 'average_of_year' => 'Average of year',
- 'average_of_years' => 'Average of years',
- 'categories_earned_in_year' => 'Categories (by earnings)',
- 'categories_spent_in_year' => 'Categories (by spendings)',
- 'report_type' => 'Report type',
- 'report_type_default' => 'Default financial report',
- 'report_type_audit' => 'Transaction history overview (audit)',
- 'report_type_category' => 'Category report',
- 'report_type_budget' => 'Budget report',
- 'report_type_tag' => 'Tag report',
- 'report_type_meta-history' => 'Categories, budgets and bills overview',
- 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
- 'report_included_accounts' => 'Included accounts',
- 'report_date_range' => 'Date range',
- 'report_preset_ranges' => 'Pre-set ranges',
- 'shared' => 'Shared',
- 'fiscal_year' => 'Fiscal year',
- 'income_entry' => 'Income from account ":name" between :start and :end',
- 'expense_entry' => 'Expenses to account ":name" between :start and :end',
- 'category_entry' => 'Expenses in category ":name" between :start and :end',
- 'budget_spent_amount' => 'Expenses in budget ":budget" between :start and :end',
- 'balance_amount' => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
- 'no_audit_activity' => 'No activity was recorded on account :account_name between :start and :end.',
- 'audit_end_balance' => 'Account balance of :account_name at the end of :end was: :balance',
- 'reports_extra_options' => 'Extra options',
- 'report_has_no_extra_options' => 'This report has no extra options',
- 'reports_submit' => 'View report',
- 'end_after_start_date' => 'End date of report must be after start date.',
- 'select_category' => 'Select category(ies)',
- 'select_budget' => 'Select budget(s).',
- 'select_tag' => 'Select tag(s).',
- 'income_per_category' => 'Income per category',
- 'expense_per_category' => 'Expense per category',
- 'expense_per_budget' => 'Expense per budget',
- 'income_per_account' => 'Income per account',
- 'expense_per_account' => 'Expense per account',
- 'expense_per_tag' => 'Expense per tag',
- 'income_per_tag' => 'Income per tag',
- 'include_expense_not_in_budget' => 'Included expenses not in the selected budget(s)',
- 'include_expense_not_in_account' => 'Included expenses not in the selected account(s)',
- 'include_expense_not_in_category' => 'Included expenses not in the selected category(ies)',
- 'include_income_not_in_category' => 'Included income not in the selected category(ies)',
- 'include_income_not_in_account' => 'Included income not in the selected account(s)',
- 'include_income_not_in_tags' => 'Included income not in the selected tag(s)',
- 'include_expense_not_in_tags' => 'Included expenses not in the selected tag(s)',
- 'everything_else' => 'Everything else',
- 'income_and_expenses' => 'Income and expenses',
- 'spent_average' => 'Spent (average)',
- 'income_average' => 'Income (average)',
- 'transaction_count' => 'Transaction count',
- 'average_spending_per_account' => 'Average spending per account',
- 'average_income_per_account' => 'Average income per account',
- 'total' => 'Total',
- 'description' => 'Description',
- 'sum_of_period' => 'Sum of period',
- 'average_in_period' => 'Average in period',
- 'account_role_defaultAsset' => 'Default asset account',
- 'account_role_sharedAsset' => 'Shared asset account',
- 'account_role_savingAsset' => 'Savings account',
- 'account_role_ccAsset' => 'Credit card',
-
- // charts:
- 'chart' => 'Chart',
- 'dayOfMonth' => 'Day of the month',
- 'month' => 'Month',
- 'budget' => 'Budget',
- 'spent' => 'Spent',
- 'spent_in_budget' => 'Spent in budget',
- 'left_to_spend' => 'Left to spend',
- 'earned' => 'Earned',
- 'overspent' => 'Overspent',
- 'left' => 'Left',
- 'no_budget' => '(no budget)',
- 'max-amount' => 'Maximum amount',
- 'min-amount' => 'Minumum amount',
- 'journal-amount' => 'Current bill entry',
- 'name' => 'Name',
- 'date' => 'Date',
- 'paid' => 'Paid',
- 'unpaid' => 'Unpaid',
- 'day' => 'Day',
- 'budgeted' => 'Budgeted',
- 'period' => 'Period',
- 'balance' => 'Balance',
- 'summary' => 'Summary',
- 'sum' => 'Sum',
- 'average' => 'Average',
- 'balanceFor' => 'Balance for :name',
-
- // piggy banks:
- 'add_money_to_piggy' => 'Add money to piggy bank ":name"',
- 'piggy_bank' => 'Piggy bank',
- 'new_piggy_bank' => 'New piggy bank',
- 'store_piggy_bank' => 'Store new piggy bank',
- 'stored_piggy_bank' => 'Store new piggy bank ":name"',
- 'account_status' => 'Account status',
- 'left_for_piggy_banks' => 'Left for piggy banks',
- 'sum_of_piggy_banks' => 'Sum of piggy banks',
- 'saved_so_far' => 'Saved so far',
- 'left_to_save' => 'Left to save',
- 'suggested_amount' => 'Suggested monthly amount to save',
- 'add_money_to_piggy_title' => 'Add money to piggy bank ":name"',
- 'remove_money_from_piggy_title' => 'Remove money from piggy bank ":name"',
- 'add' => 'Add',
-
- 'remove' => 'Remove',
- 'max_amount_add' => 'The maximum amount you can add is',
- 'max_amount_remove' => 'The maximum amount you can remove is',
- 'update_piggy_button' => 'Update piggy bank',
- 'update_piggy_title' => 'Update piggy bank ":name"',
- 'updated_piggy_bank' => 'Updated piggy bank ":name"',
- 'details' => 'Details',
- 'events' => 'Events',
- 'target_amount' => 'Target amount',
- 'start_date' => 'Start date',
- 'target_date' => 'Target date',
- 'no_target_date' => 'No target date',
- 'todo' => 'to do',
- 'table' => 'Table',
- 'piggy_bank_not_exists' => 'Piggy bank no longer exists.',
- 'add_any_amount_to_piggy' => 'Add money to this piggy bank to reach your target of :amount.',
- 'add_set_amount_to_piggy' => 'Add :amount to fill this piggy bank on :date',
- 'delete_piggy_bank' => 'Delete piggy bank ":name"',
- 'cannot_add_amount_piggy' => 'Could not add :amount to ":name".',
- 'cannot_remove_from_piggy' => 'Could not remove :amount from ":name".',
- 'deleted_piggy_bank' => 'Deleted piggy bank ":name"',
- 'added_amount_to_piggy' => 'Added :amount to ":name"',
- 'removed_amount_from_piggy' => 'Removed :amount from ":name"',
- 'cannot_remove_amount_piggy' => 'Could not remove :amount from ":name".',
-
- // tags
- 'regular_tag' => 'Just a regular tag.',
- 'balancing_act' => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
- 'advance_payment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
- 'delete_tag' => 'Delete tag ":tag"',
- 'deleted_tag' => 'Deleted tag ":tag"',
- 'new_tag' => 'Make new tag',
- 'edit_tag' => 'Edit tag ":tag"',
- 'updated_tag' => 'Updated tag ":tag"',
- 'created_tag' => 'Tag ":tag" has been created!',
- 'no_year' => 'No year set',
- 'no_month' => 'No month set',
- 'tag_title_nothing' => 'Default tags',
- 'tag_title_balancingAct' => 'Balancing act tags',
- 'tag_title_advancePayment' => 'Advance payment tags',
- 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.',
- 'tags_group' => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.',
- 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.',
-
- 'transaction_journal_information' => 'Transaction information',
- 'transaction_journal_meta' => 'Meta information',
- 'total_amount' => 'Total amount',
- 'number_of_decimals' => 'Number of decimals',
-
- // administration
- 'administration' => 'Administration',
- 'user_administration' => 'User administration',
- 'list_all_users' => 'All users',
- 'all_users' => 'All users',
- 'instance_configuration' => 'Configuration',
- 'firefly_instance_configuration' => 'Configuration options for Firefly III',
- 'setting_single_user_mode' => 'Single user mode',
- 'setting_single_user_mode_explain' => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
- 'store_configuration' => 'Store configuration',
- 'single_user_administration' => 'User administration for :email',
- 'edit_user' => 'Edit user :email',
- 'hidden_fields_preferences' => 'Not all fields are visible right now. You must enable them in your settings.',
- 'user_data_information' => 'User data',
- 'user_information' => 'User information',
- 'total_size' => 'total size',
- 'budget_or_budgets' => 'budget(s)',
- 'budgets_with_limits' => 'budget(s) with configured amount',
- 'rule_or_rules' => 'rule(s)',
- 'rulegroup_or_groups' => 'rule group(s)',
- 'setting_must_confirm_account' => 'Account confirmation',
- 'setting_must_confirm_account_explain' => 'When this setting is enabled, users must activate their account before it can be used.',
- 'configuration_updated' => 'The configuration has been updated',
- 'setting_is_demo_site' => 'Demo site',
- 'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
- 'setting_send_email_notifications' => 'Send email notifications',
- 'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'block_code_bounced' => 'Email message(s) bounced',
- 'block_code_expired' => 'Demo account expired',
- 'no_block_code' => 'No reason for block or user not blocked',
-
-
- // split a transaction:
- 'transaction_meta_data' => 'Transaction meta-data',
- 'transaction_dates' => 'Transaction dates',
- 'splits' => 'Splits',
- 'split_title_withdrawal' => 'Split your new withdrawal',
- 'split_intro_one_withdrawal' => 'Firefly supports the "splitting" of a withdrawal.',
- 'split_intro_two_withdrawal' => 'It means that the amount of money you\'ve spent is divided between several destination expense accounts, budgets or categories.',
- 'split_intro_three_withdrawal' => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
- 'split_table_intro_withdrawal' => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_withdrawal' => 'Store splitted withdrawal',
- 'update_splitted_withdrawal' => 'Update splitted withdrawal',
- 'split_title_deposit' => 'Split your new deposit',
- 'split_intro_one_deposit' => 'Firefly supports the "splitting" of a deposit.',
- 'split_intro_two_deposit' => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
- 'split_intro_three_deposit' => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
- 'split_table_intro_deposit' => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_deposit' => 'Store splitted deposit',
- 'split_title_transfer' => 'Split your new transfer',
- 'split_intro_one_transfer' => 'Firefly supports the "splitting" of a transfer.',
- 'split_intro_two_transfer' => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
- 'split_intro_three_transfer' => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
- 'split_table_intro_transfer' => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_transfer' => 'Store splitted transfer',
- 'add_another_split' => 'Add another split',
- 'split-transactions' => 'Split transactions',
- 'split-new-transaction' => 'Split a new transaction',
- 'do_split' => 'Do a split',
- 'split_this_withdrawal' => 'Split this withdrawal',
- 'split_this_deposit' => 'Split this deposit',
- 'split_this_transfer' => 'Split this transfer',
- 'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
- 'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
- 'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
-
- // import
- 'configuration_file_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file.',
- 'import_data_index' => 'Index',
- 'import_file_type_csv' => 'CSV (comma separated values)',
- 'import_file_type_help' => 'Select the type of file you will upload',
- 'import_start' => 'Start the import',
- 'configure_import' => 'Further configure your import',
- 'import_finish_configuration' => 'Finish configuration',
- 'settings_for_import' => 'Settings',
- 'import_status' => 'Import status',
- 'import_status_text' => 'The import is currently running, or will start momentarily.',
- 'import_complete' => 'Import configuration complete!',
- 'import_complete_text' => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
- 'import_download_config' => 'Download configuration',
- 'import_start_import' => 'Start import',
- 'import_data' => 'Import data',
- 'import_data_full' => 'Import data into Firefly III',
- 'import' => 'Import',
- 'import_file_help' => 'Select your file',
- 'import_status_settings_complete' => 'The import is ready to start.',
- 'import_status_import_complete' => 'The import has completed.',
- 'import_status_import_running' => 'The import is currently running. Please be patient.',
- 'import_status_header' => 'Import status and progress',
- 'import_status_errors' => 'Import errors',
- 'import_status_report' => 'Import report',
- 'import_finished' => 'Import has finished',
- 'import_error_single' => 'An error has occured during the import.',
- 'import_error_multi' => 'Some errors occured during the import.',
- 'import_error_fatal' => 'There was an error during the import routine. Please check the log files. The error seems to be:',
- 'import_error_timeout' => 'The import seems to have timed out. If this error persists, please import your data using the console command.',
- 'import_double' => 'Row #:row: This row has been imported before, and is stored in :description.',
- 'import_finished_all' => 'The import has finished. Please check out the results below.',
- 'import_with_key' => 'Import with key \':key\'',
- 'import_share_configuration' => 'Please consider downloading your configuration and sharing it at the import configuration center. This will allow other users of Firefly III to import their files more easily.',
- 'import_finished_report' => 'The import has finished. Please note any errors in the block above this line. All transactions imported during this particular session have been tagged, and you can check them out below. ',
- 'import_finished_link' => 'The transactions imported can be found in tag :tag.',
- 'need_at_least_one_account' => 'You need at least one asset account to be able to create piggy banks',
- 'see_help_top_right' => 'For more information, please check out the help pages using the icon in the top right corner of the page.',
- 'bread_crumb_import_complete' => 'Import ":key" complete',
- 'bread_crumb_configure_import' => 'Configure import ":key"',
- 'bread_crumb_import_finished' => 'Import ":key" finished',
- 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.',
- 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
- 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
-
- // sandstorm.io errors and messages:
- 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
-
- // empty lists? no objects? instructions:
- 'no_transactions_in_period' => 'There are no transactions in this period.',
- 'no_accounts_title_asset' => 'Let\'s create an asset account!',
- 'no_accounts_intro_asset' => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
- 'no_accounts_imperative_asset' => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
- 'no_accounts_create_asset' => 'Create an asset account',
- 'no_accounts_title_expense' => 'Let\'s create an expense account!',
- 'no_accounts_intro_expense' => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
- 'no_accounts_imperative_expense' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
- 'no_accounts_create_expense' => 'Create an expense account',
- 'no_accounts_title_revenue' => 'Let\'s create a revenue account!',
- 'no_accounts_intro_revenue' => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
- 'no_accounts_imperative_revenue' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
- 'no_accounts_create_revenue' => 'Create a revenue account',
- 'no_budgets_title_default' => 'Let\'s create a budget',
- 'no_budgets_intro_default' => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
- 'no_budgets_imperative_default' => 'Budgets are the basic tools of financial management. Let\'s create one now:',
- 'no_budgets_create_default' => 'Create a budget',
- 'no_categories_title_default' => 'Let\'s create a category!',
- 'no_categories_intro_default' => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
- 'no_categories_imperative_default' => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
- 'no_categories_create_default' => 'Create a category',
- 'no_tags_title_default' => 'Let\'s create a tag!',
- 'no_tags_intro_default' => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
- 'no_tags_imperative_default' => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
- 'no_tags_create_default' => 'Create a tag',
- 'no_transactions_title_withdrawal' => 'Let\'s create an expense!',
- 'no_transactions_intro_withdrawal' => 'You have no expenses yet. You should create expenses to start managing your finances.',
- 'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
- 'no_transactions_create_withdrawal' => 'Create an expense',
- 'no_transactions_title_deposit' => 'Let\'s create some income!',
- 'no_transactions_intro_deposit' => 'You have no recorded income yet. You should create income entries to start managing your finances.',
- 'no_transactions_imperative_deposit' => 'Have you received some money? Then you should write it down:',
- 'no_transactions_create_deposit' => 'Create a deposit',
- 'no_transactions_title_transfers' => 'Let\'s create a transfer!',
- 'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
- 'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:',
- 'no_transactions_create_transfers' => 'Create a transfer',
- 'no_piggies_title_default' => 'Let\'s create a piggy bank!',
- 'no_piggies_intro_default' => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
- 'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
- 'no_piggies_create_default' => 'Create a new piggy bank',
- 'no_bills_title_default' => 'Let\'s create a bill!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
- 'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
- 'no_bills_create_default' => 'Create a bill',
-
-
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php
deleted file mode 100644
index 20be49e75a..0000000000
--- a/resources/lang/ru_RU/form.php
+++ /dev/null
@@ -1,189 +0,0 @@
- 'Bank name',
- 'bank_balance' => 'Balance',
- 'savings_balance' => 'Savings balance',
- 'credit_card_limit' => 'Credit card limit',
- 'automatch' => 'Match automatically',
- 'skip' => 'Skip',
- 'name' => 'Name',
- 'active' => 'Active',
- 'amount_min' => 'Minimum amount',
- 'amount_max' => 'Maximum amount',
- 'match' => 'Matches on',
- 'repeat_freq' => 'Repeats',
- 'journal_currency_id' => 'Currency',
- 'currency_id' => 'Currency',
- 'attachments' => 'Attachments',
- 'journal_amount' => 'Amount',
- 'journal_asset_source_account' => 'Asset account (source)',
- 'journal_source_account_name' => 'Revenue account (source)',
- 'journal_source_account_id' => 'Asset account (source)',
- 'BIC' => 'BIC',
- 'account_from_id' => 'From account',
- 'account_to_id' => 'To account',
- 'source_account' => 'Source account',
- 'destination_account' => 'Destination account',
- 'journal_destination_account_id' => 'Asset account (destination)',
- 'asset_destination_account' => 'Asset account (destination)',
- 'asset_source_account' => 'Asset account (source)',
- 'journal_description' => 'Description',
- 'note' => 'Notes',
- 'split_journal' => 'Split this transaction',
- 'split_journal_explanation' => 'Split this transaction in multiple parts',
- 'currency' => 'Currency',
- 'account_id' => 'Asset account',
- 'budget_id' => 'Budget',
- 'openingBalance' => 'Opening balance',
- 'tagMode' => 'Tag mode',
- 'tagPosition' => 'Tag location',
- 'virtualBalance' => 'Virtual balance',
- 'longitude_latitude' => 'Location',
- 'targetamount' => 'Target amount',
- 'accountRole' => 'Account role',
- 'openingBalanceDate' => 'Opening balance date',
- 'ccType' => 'Credit card payment plan',
- 'ccMonthlyPaymentDate' => 'Credit card monthly payment date',
- 'piggy_bank_id' => 'Piggy bank',
- 'returnHere' => 'Return here',
- 'returnHereExplanation' => 'After storing, return here to create another one.',
- 'returnHereUpdateExplanation' => 'After updating, return here.',
- 'description' => 'Description',
- 'expense_account' => 'Expense account',
- 'revenue_account' => 'Revenue account',
- 'decimal_places' => 'Decimal places',
- 'exchange_rate_instruction' => 'Foreign currencies',
- 'exchanged_amount' => 'Exchanged amount',
- 'source_amount' => 'Amount (source)',
- 'destination_amount' => 'Amount (destination)',
- 'native_amount' => 'Native amount',
-
- 'revenue_account_source' => 'Revenue account (source)',
- 'source_account_asset' => 'Source account (asset account)',
- 'destination_account_expense' => 'Destination account (expense account)',
- 'destination_account_asset' => 'Destination account (asset account)',
- 'source_account_revenue' => 'Source account (revenue account)',
- 'type' => 'Type',
- 'convert_Withdrawal' => 'Convert withdrawal',
- 'convert_Deposit' => 'Convert deposit',
- 'convert_Transfer' => 'Convert transfer',
-
-
- 'amount' => 'Amount',
- 'date' => 'Date',
- 'interest_date' => 'Interest date',
- 'book_date' => 'Book date',
- 'process_date' => 'Processing date',
- 'category' => 'Category',
- 'tags' => 'Tags',
- 'deletePermanently' => 'Delete permanently',
- 'cancel' => 'Cancel',
- 'targetdate' => 'Target date',
- 'tag' => 'Tag',
- 'under' => 'Under',
- 'symbol' => 'Symbol',
- 'code' => 'Code',
- 'iban' => 'IBAN',
- 'accountNumber' => 'Account number',
- 'has_headers' => 'Headers',
- 'date_format' => 'Date format',
- 'specifix' => 'Bank- or file specific fixes',
- 'attachments[]' => 'Attachments',
- 'store_new_withdrawal' => 'Store new withdrawal',
- 'store_new_deposit' => 'Store new deposit',
- 'store_new_transfer' => 'Store new transfer',
- 'add_new_withdrawal' => 'Add a new withdrawal',
- 'add_new_deposit' => 'Add a new deposit',
- 'add_new_transfer' => 'Add a new transfer',
- 'noPiggybank' => '(no piggy bank)',
- 'title' => 'Title',
- 'notes' => 'Notes',
- 'filename' => 'File name',
- 'mime' => 'Mime type',
- 'size' => 'Size',
- 'trigger' => 'Trigger',
- 'stop_processing' => 'Stop processing',
- 'start_date' => 'Start of range',
- 'end_date' => 'End of range',
- 'export_start_range' => 'Start of export range',
- 'export_end_range' => 'End of export range',
- 'export_format' => 'File format',
- 'include_attachments' => 'Include uploaded attachments',
- 'include_old_uploads' => 'Include imported data',
- 'accounts' => 'Export transactions from these accounts',
- 'delete_account' => 'Delete account ":name"',
- 'delete_bill' => 'Delete bill ":name"',
- 'delete_budget' => 'Delete budget ":name"',
- 'delete_category' => 'Delete category ":name"',
- 'delete_currency' => 'Delete currency ":name"',
- 'delete_journal' => 'Delete transaction with description ":description"',
- 'delete_attachment' => 'Delete attachment ":name"',
- 'delete_rule' => 'Delete rule ":title"',
- 'delete_rule_group' => 'Delete rule group ":title"',
- 'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?',
- 'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?',
- 'bill_areYouSure' => 'Are you sure you want to delete the bill named ":name"?',
- 'rule_areYouSure' => 'Are you sure you want to delete the rule titled ":title"?',
- 'ruleGroup_areYouSure' => 'Are you sure you want to delete the rule group titled ":title"?',
- 'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?',
- 'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?',
- 'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?',
- 'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?',
- 'journal_areYouSure' => 'Are you sure you want to delete the transaction described ":description"?',
- 'mass_journal_are_you_sure' => 'Are you sure you want to delete these transactions?',
- 'tag_areYouSure' => 'Are you sure you want to delete the tag ":tag"?',
- 'permDeleteWarning' => 'Deleting stuff from Firely is permanent and cannot be undone.',
- 'mass_make_selection' => 'You can still prevent items from being deleted by removing the checkbox.',
- 'delete_all_permanently' => 'Delete selected permanently',
- 'update_all_journals' => 'Update these transactions',
- 'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
- 'also_delete_rules' => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
- 'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
- 'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
- 'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
- 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
- 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
-
- 'email' => 'Email address',
- 'password' => 'Password',
- 'password_confirmation' => 'Password (again)',
- 'blocked' => 'Is blocked?',
- 'blocked_code' => 'Reason for block',
-
-
- // admin
- 'domain' => 'Domain',
- 'single_user_mode' => 'Single user mode',
- 'must_confirm_account' => 'New users must activate account',
- 'is_demo_site' => 'Is demo site',
-
-
- // import
- 'import_file' => 'Import file',
- 'configuration_file' => 'Configuration file',
- 'import_file_type' => 'Import file type',
- 'csv_comma' => 'A comma (,)',
- 'csv_semicolon' => 'A semicolon (;)',
- 'csv_tab' => 'A tab (invisible)',
- 'csv_delimiter' => 'CSV field delimiter',
- 'csv_import_account' => 'Default import account',
- 'csv_config' => 'CSV import configuration',
-
-
- 'due_date' => 'Due date',
- 'payment_date' => 'Payment date',
- 'invoice_date' => 'Invoice date',
- 'internal_reference' => 'Internal reference',
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/help.php b/resources/lang/ru_RU/help.php
deleted file mode 100644
index 61210ffe41..0000000000
--- a/resources/lang/ru_RU/help.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'Welcome to Firefly III',
- 'main-content-text' => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
- 'sidebar-toggle-title' => 'Sidebar to create stuff',
- 'sidebar-toggle-text' => 'Hidden under the plus icon are all the buttons to create new stuff. Accounts, transactions, everything!',
- 'account-menu-title' => 'All your accounts',
- 'account-menu-text' => 'Here you can find all the accounts you\'ve made.',
- 'budget-menu-title' => 'Budgets',
- 'budget-menu-text' => 'Use this page to organise your finances and limit spending.',
- 'report-menu-title' => 'Reports',
- 'report-menu-text' => 'Check this out when you want a solid overview of your finances.',
- 'transaction-menu-title' => 'Transactions',
- 'transaction-menu-text' => 'All transactions you\'ve created can be found here.',
- 'option-menu-title' => 'Options',
- 'option-menu-text' => 'This is pretty self-explanatory.',
- 'main-content-end-title' => 'The end!',
- 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
- 'index' => 'index',
- 'home' => 'home',
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php
deleted file mode 100644
index 90625d54e6..0000000000
--- a/resources/lang/ru_RU/list.php
+++ /dev/null
@@ -1,89 +0,0 @@
- 'Buttons',
- 'icon' => 'Icon',
- 'id' => 'ID',
- 'create_date' => 'Created at',
- 'update_date' => 'Updated at',
- 'balance_before' => 'Balance before',
- 'balance_after' => 'Balance after',
- 'name' => 'Name',
- 'role' => 'Role',
- 'currentBalance' => 'Current balance',
- 'active' => 'Is active?',
- 'lastActivity' => 'Last activity',
- 'balanceDiff' => 'Balance difference between :start and :end',
- 'matchedOn' => 'Matched on',
- 'matchesOn' => 'Matched on',
- 'account_type' => 'Account type',
- 'created_at' => 'Created at',
- 'new_balance' => 'New balance',
- 'account' => 'Account',
- 'matchingAmount' => 'Amount',
- 'lastMatch' => 'Last match',
- 'split_number' => 'Split #',
- 'destination' => 'Destination',
- 'source' => 'Source',
- 'next_expected_match' => 'Next expected match',
- 'automatch' => 'Auto match?',
- 'repeat_freq' => 'Repeats',
- 'description' => 'Description',
- 'amount' => 'Amount',
- 'internal_reference' => 'Internal reference',
- 'date' => 'Date',
- 'interest_date' => 'Interest date',
- 'book_date' => 'Book date',
- 'process_date' => 'Processing date',
- 'due_date' => 'Due date',
- 'payment_date' => 'Payment date',
- 'invoice_date' => 'Invoice date',
- 'interal_reference' => 'Internal reference',
- 'notes' => 'Notes',
- 'from' => 'From',
- 'piggy_bank' => 'Piggy bank',
- 'to' => 'To',
- 'budget' => 'Budget',
- 'category' => 'Category',
- 'bill' => 'Bill',
- 'withdrawal' => 'Withdrawal',
- 'deposit' => 'Deposit',
- 'transfer' => 'Transfer',
- 'type' => 'Type',
- 'completed' => 'Completed',
- 'iban' => 'IBAN',
- 'paid_current_period' => 'Paid this period',
- 'email' => 'Email',
- 'registered_at' => 'Registered at',
- 'is_activated' => 'Is activated',
- 'is_blocked' => 'Is blocked',
- 'is_admin' => 'Is admin',
- 'has_two_factor' => 'Has 2FA',
- 'confirmed_from' => 'Confirmed from',
- 'registered_from' => 'Registered from',
- 'blocked_code' => 'Block code',
- 'domain' => 'Domain',
- 'registration_attempts' => 'Registration attempts',
- 'source_account' => 'Source account',
- 'destination_account' => 'Destination account',
-
- 'accounts_count' => 'Number of accounts',
- 'journals_count' => 'Number of transactions',
- 'attachments_count' => 'Number of attachments',
- 'bills_count' => 'Number of bills',
- 'categories_count' => 'Number of categories',
- 'export_jobs_count' => 'Number of export jobs',
- 'import_jobs_count' => 'Number of import jobs',
- 'budget_count' => 'Number of budgets',
- 'rule_and_groups_count' => 'Number of rules and rule groups',
- 'tags_count' => 'Number of tags',
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/pagination.php b/resources/lang/ru_RU/pagination.php
deleted file mode 100644
index 4eeab21dee..0000000000
--- a/resources/lang/ru_RU/pagination.php
+++ /dev/null
@@ -1,17 +0,0 @@
- '« Previous',
- 'next' => 'Next »',
-
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/passwords.php b/resources/lang/ru_RU/passwords.php
deleted file mode 100644
index 2e11aa92dc..0000000000
--- a/resources/lang/ru_RU/passwords.php
+++ /dev/null
@@ -1,19 +0,0 @@
- 'Passwords must be at least six characters and match the confirmation.',
- 'user' => 'We can\'t find a user with that e-mail address.',
- 'token' => 'This password reset token is invalid.',
- 'sent' => 'We have e-mailed your password reset link!',
- 'reset' => 'Your password has been reset!',
- 'blocked' => 'Nice try though.',
-];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/validation.php b/resources/lang/ru_RU/validation.php
deleted file mode 100644
index addd0e6f39..0000000000
--- a/resources/lang/ru_RU/validation.php
+++ /dev/null
@@ -1,91 +0,0 @@
- 'This is not a valid IBAN.',
- 'unique_account_number_for_user' => 'It looks like this account number is already in use.',
- 'deleted_user' => 'Due to security constraints, you cannot register using this email address.',
- 'rule_trigger_value' => 'This value is invalid for the selected trigger.',
- 'rule_action_value' => 'This value is invalid for the selected action.',
- 'invalid_domain' => 'Due to security constraints, you cannot register from this domain.',
- 'file_already_attached' => 'Uploaded file ":name" is already attached to this object.',
- 'file_attached' => 'Succesfully uploaded file ":name".',
- 'file_invalid_mime' => 'File ":name" is of type ":mime" which is not accepted as a new upload.',
- 'file_too_large' => 'File ":name" is too large.',
- 'belongs_to_user' => 'The value of :attribute is unknown',
- 'accepted' => 'The :attribute must be accepted.',
- 'bic' => 'This is not a valid BIC.',
- 'more' => ':attribute must be larger than zero.',
- 'active_url' => 'The :attribute is not a valid URL.',
- 'after' => 'The :attribute must be a date after :date.',
- 'alpha' => 'The :attribute may only contain letters.',
- 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
- 'alpha_num' => 'The :attribute may only contain letters and numbers.',
- 'array' => 'The :attribute must be an array.',
- 'unique_for_user' => 'There already is an entry with this :attribute.',
- 'before' => 'The :attribute must be a date before :date.',
- 'unique_object_for_user' => 'This name is already in use',
- 'unique_account_for_user' => 'This account name is already in use',
- 'between.numeric' => 'The :attribute must be between :min and :max.',
- 'between.file' => 'The :attribute must be between :min and :max kilobytes.',
- 'between.string' => 'The :attribute must be between :min and :max characters.',
- 'between.array' => 'The :attribute must have between :min and :max items.',
- 'boolean' => 'The :attribute field must be true or false.',
- 'confirmed' => 'The :attribute confirmation does not match.',
- 'date' => 'The :attribute is not a valid date.',
- 'date_format' => 'The :attribute does not match the format :format.',
- 'different' => 'The :attribute and :other must be different.',
- 'digits' => 'The :attribute must be :digits digits.',
- 'digits_between' => 'The :attribute must be between :min and :max digits.',
- 'email' => 'The :attribute must be a valid email address.',
- 'filled' => 'The :attribute field is required.',
- 'exists' => 'The selected :attribute is invalid.',
- 'image' => 'The :attribute must be an image.',
- 'in' => 'The selected :attribute is invalid.',
- 'integer' => 'The :attribute must be an integer.',
- 'ip' => 'The :attribute must be a valid IP address.',
- 'json' => 'The :attribute must be a valid JSON string.',
- 'max.numeric' => 'The :attribute may not be greater than :max.',
- 'max.file' => 'The :attribute may not be greater than :max kilobytes.',
- 'max.string' => 'The :attribute may not be greater than :max characters.',
- 'max.array' => 'The :attribute may not have more than :max items.',
- 'mimes' => 'The :attribute must be a file of type: :values.',
- 'min.numeric' => 'The :attribute must be at least :min.',
- 'min.file' => 'The :attribute must be at least :min kilobytes.',
- 'min.string' => 'The :attribute must be at least :min characters.',
- 'min.array' => 'The :attribute must have at least :min items.',
- 'not_in' => 'The selected :attribute is invalid.',
- 'numeric' => 'The :attribute must be a number.',
- 'regex' => 'The :attribute format is invalid.',
- 'required' => 'The :attribute field is required.',
- 'required_if' => 'The :attribute field is required when :other is :value.',
- 'required_unless' => 'The :attribute field is required unless :other is in :values.',
- 'required_with' => 'The :attribute field is required when :values is present.',
- 'required_with_all' => 'The :attribute field is required when :values is present.',
- 'required_without' => 'The :attribute field is required when :values is not present.',
- 'required_without_all' => 'The :attribute field is required when none of :values are present.',
- 'same' => 'The :attribute and :other must match.',
- 'size.numeric' => 'The :attribute must be :size.',
- 'size.file' => 'The :attribute must be :size kilobytes.',
- 'size.string' => 'The :attribute must be :size characters.',
- 'size.array' => 'The :attribute must contain :size items.',
- 'unique' => 'The :attribute has already been taken.',
- 'string' => 'The :attribute must be a string.',
- 'url' => 'The :attribute format is invalid.',
- 'timezone' => 'The :attribute must be a valid zone.',
- '2fa_code' => 'The :attribute field is invalid.',
- 'dimensions' => 'The :attribute has invalid image dimensions.',
- 'distinct' => 'The :attribute field has a duplicate value.',
- 'file' => 'The :attribute must be a file.',
- 'in_array' => 'The :attribute field does not exist in :other.',
- 'present' => 'The :attribute field must be present.',
- 'amount_zero' => 'The total amount cannot be zero',
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/auth.php b/resources/lang/zh_HK/auth.php
deleted file mode 100644
index 5d833b3d68..0000000000
--- a/resources/lang/zh_HK/auth.php
+++ /dev/null
@@ -1,28 +0,0 @@
- 'These credentials do not match our records.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
-
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/breadcrumbs.php b/resources/lang/zh_HK/breadcrumbs.php
deleted file mode 100644
index 6bcf9b862d..0000000000
--- a/resources/lang/zh_HK/breadcrumbs.php
+++ /dev/null
@@ -1,41 +0,0 @@
- 'Home',
- 'edit_currency' => 'Edit currency ":name"',
- 'delete_currency' => 'Delete currency ":name"',
- 'newPiggyBank' => 'Create a new piggy bank',
- 'edit_piggyBank' => 'Edit piggy bank ":name"',
- 'preferences' => 'Preferences',
- 'profile' => 'Profile',
- 'changePassword' => 'Change your password',
- 'bills' => 'Bills',
- 'newBill' => 'New bill',
- 'edit_bill' => 'Edit bill ":name"',
- 'delete_bill' => 'Delete bill ":name"',
- 'reports' => 'Reports',
- 'searchResult' => 'Search for ":query"',
- 'withdrawal_list' => 'Expenses',
- 'deposit_list' => 'Revenue, income and deposits',
- 'transfer_list' => 'Transfers',
- 'transfers_list' => 'Transfers',
- 'create_withdrawal' => 'Create new withdrawal',
- 'create_deposit' => 'Create new deposit',
- 'create_transfer' => 'Create new transfer',
- 'edit_journal' => 'Edit transaction ":description"',
- 'delete_journal' => 'Delete transaction ":description"',
- 'tags' => 'Tags',
- 'createTag' => 'Create new tag',
- 'edit_tag' => 'Edit tag ":tag"',
- 'delete_tag' => 'Delete tag ":tag"',
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/config.php b/resources/lang/zh_HK/config.php
deleted file mode 100644
index 827ebea3f0..0000000000
--- a/resources/lang/zh_HK/config.php
+++ /dev/null
@@ -1,23 +0,0 @@
- 'en, English, en_US, en_US.utf8, en_US.UTF-8',
- 'month' => '%B %Y',
- 'month_and_day' => '%B %e, %Y',
- 'date_time' => '%B %e, %Y, @ %T',
- 'specific_day' => '%e %B %Y',
- 'week_in_year' => 'Week %W, %Y',
- 'quarter_of_year' => '%B %Y',
- 'year' => '%Y',
- 'half_year' => '%B %Y',
-
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/csv.php b/resources/lang/zh_HK/csv.php
deleted file mode 100644
index 4424610191..0000000000
--- a/resources/lang/zh_HK/csv.php
+++ /dev/null
@@ -1,80 +0,0 @@
- 'Configure your import',
- 'import_configure_intro' => 'There are some options for your CSV import. Please indicate if your CSV file contains headers on the first column, and what the date format of your date-fields is. That might require some experimentation. The field delimiter is usually a ",", but could also be a ";". Check this carefully.',
- 'import_configure_form' => 'Basic CSV import options',
- 'header_help' => 'Check this if the first row of your CSV file are the column titles',
- 'date_help' => 'Date time format in your CSV. Follow the format like this page indicates. The default value will parse dates that look like this: :dateExample.',
- 'delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
- 'import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
- 'upload_not_writeable' => 'The grey box contains a file path. It should be writeable. Please make sure it is.',
-
- // roles
- 'column_roles_title' => 'Define column roles',
- 'column_roles_table' => 'Table',
- 'column_name' => 'Name of column',
- 'column_example' => 'Column example data',
- 'column_role' => 'Column data meaning',
- 'do_map_value' => 'Map these values',
- 'column' => 'Column',
- 'no_example_data' => 'No example data available',
- 'store_column_roles' => 'Continue import',
- 'do_not_map' => '(do not map)',
- 'map_title' => 'Connect import data to Firefly III data',
- 'map_text' => 'In the following tables, the left value shows you information found in your uploaded CSV file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.',
-
- 'field_value' => 'Field value',
- 'field_mapped_to' => 'Mapped to',
- 'store_column_mapping' => 'Store mapping',
-
- // map things.
-
-
- 'column__ignore' => '(ignore this column)',
- 'column_account-iban' => 'Asset account (IBAN)',
- 'column_account-id' => 'Asset account ID (matching Firefly)',
- 'column_account-name' => 'Asset account (name)',
- 'column_amount' => 'Amount',
- 'column_amount-comma-separated' => 'Amount (comma as decimal separator)',
- 'column_bill-id' => 'Bill ID (matching Firefly)',
- 'column_bill-name' => 'Bill name',
- 'column_budget-id' => 'Budget ID (matching Firefly)',
- 'column_budget-name' => 'Budget name',
- 'column_category-id' => 'Category ID (matching Firefly)',
- 'column_category-name' => 'Category name',
- 'column_currency-code' => 'Currency code (ISO 4217)',
- 'column_currency-id' => 'Currency ID (matching Firefly)',
- 'column_currency-name' => 'Currency name (matching Firefly)',
- 'column_currency-symbol' => 'Currency symbol (matching Firefly)',
- 'column_date-interest' => 'Interest calculation date',
- 'column_date-book' => 'Transaction booking date',
- 'column_date-process' => 'Transaction process date',
- 'column_date-transaction' => 'Date',
- 'column_description' => 'Description',
- 'column_opposing-iban' => 'Opposing account (IBAN)',
- 'column_opposing-id' => 'Opposing account ID (matching Firefly)',
- 'column_external-id' => 'External ID',
- 'column_opposing-name' => 'Opposing account (name)',
- 'column_rabo-debet-credit' => 'Rabobank specific debet/credit indicator',
- 'column_ing-debet-credit' => 'ING specific debet/credit indicator',
- 'column_sepa-ct-id' => 'SEPA Credit Transfer end-to-end ID',
- 'column_sepa-ct-op' => 'SEPA Credit Transfer opposing account',
- 'column_sepa-db' => 'SEPA Direct Debet',
- 'column_tags-comma' => 'Tags (comma separated)',
- 'column_tags-space' => 'Tags (space separated)',
- 'column_account-number' => 'Asset account (account number)',
- 'column_opposing-number' => 'Opposing account (account number)',
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/demo.php b/resources/lang/zh_HK/demo.php
deleted file mode 100644
index e7f8ea934d..0000000000
--- a/resources/lang/zh_HK/demo.php
+++ /dev/null
@@ -1,24 +0,0 @@
- 'Sorry, there is no extra demo-explanation text for this page.',
- 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.',
- 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.',
- 'accounts-index' => 'Asset accounts are your personal bank accounts. Expense accounts are the accounts you spend money at, such as stores and friends. Revenue accounts are accounts you receive money from, such as your job, the government or other sources of income. On this page you can edit or remove them.',
- 'budgets-index' => 'This page shows you an overview of your budgets. The top bar shows the amount that is available to be budgeted. This can be customized for any period by clicking the amount on the right. The amount you\'ve actually spent is shown in the bar below. Below that are the expenses per budget and what you\'ve budgeted for them.',
- 'reports-index-start' => 'Firefly III supports four types of reports. Read about them by clicking on the -icon in the top right corner.',
- 'reports-index-examples' => 'Be sure to check out these examples: a monthly financial overview, a yearly financial overview and a budget overview.',
- 'currencies-index' => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
- 'transactions-index' => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
- 'piggy-banks-index' => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
- 'import-index' => 'Of course, any CSV file can be imported into Firefly III ',
- 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.',
- 'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
deleted file mode 100644
index a8d8567267..0000000000
--- a/resources/lang/zh_HK/firefly.php
+++ /dev/null
@@ -1,1063 +0,0 @@
- 'incomplete translation',
- 'close' => 'Close',
- 'actions' => 'Actions',
- 'edit' => 'Edit',
- 'delete' => 'Delete',
- 'welcomeBack' => 'What\'s playing?',
- 'everything' => 'Everything',
- 'customRange' => 'Custom range',
- 'apply' => 'Apply',
- 'cancel' => 'Cancel',
- 'from' => 'From',
- 'to' => 'To',
- 'showEverything' => 'Show everything',
- 'never' => 'Never',
- 'search_results_for' => 'Search results for ":query"',
- 'advanced_search' => 'Advanced search',
- 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.',
- 'bounced_error' => 'The message sent to :email bounced, so no access for you.',
- 'deleted_error' => 'These credentials do not match our records.',
- 'general_blocked_error' => 'Your account has been disabled, so you cannot login.',
- 'expired_error' => 'Your account has expired, and can no longer be used.',
- 'removed_amount' => 'Removed :amount',
- 'added_amount' => 'Added :amount',
- 'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.',
- 'Opening balance' => 'Opening balance',
- 'create_new_stuff' => 'Create new stuff',
- 'new_withdrawal' => 'New withdrawal',
- 'new_deposit' => 'New deposit',
- 'new_transfer' => 'New transfer',
- 'new_asset_account' => 'New asset account',
- 'new_expense_account' => 'New expense account',
- 'new_revenue_account' => 'New revenue account',
- 'new_budget' => 'New budget',
- 'new_bill' => 'New bill',
- 'block_account_logout' => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?',
- 'flash_success' => 'Success!',
- 'flash_info' => 'Message',
- 'flash_warning' => 'Warning!',
- 'flash_error' => 'Error!',
- 'flash_info_multiple' => 'There is one message|There are :count messages',
- 'flash_error_multiple' => 'There is one error|There are :count errors',
- 'net_worth' => 'Net worth',
- 'route_has_no_help' => 'There is no help for this route.',
- 'help_may_not_be_your_language' => 'This help text is in English. It is not yet available in your language',
- 'two_factor_welcome' => 'Hello, :user!',
- 'two_factor_enter_code' => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
- 'two_factor_code_here' => 'Enter code here',
- 'two_factor_title' => 'Two factor authentication',
- 'authenticate' => 'Authenticate',
- 'two_factor_forgot_title' => 'Lost two factor authentication',
- 'two_factor_forgot' => 'I forgot my two-factor thing.',
- 'two_factor_lost_header' => 'Lost your two factor authentication?',
- 'two_factor_lost_intro' => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',
- 'two_factor_lost_fix_self' => 'If you run your own instance of Firefly III, check the logs in storage/logs for instructions.',
- 'two_factor_lost_fix_owner' => 'Otherwise, email the site owner, :site_owner and ask them to reset your two factor authentication.',
- 'warning_much_data' => ':days days of data may take a while to load.',
- 'registered' => 'You have registered successfully!',
- 'search' => 'Search',
- 'search_found_accounts' => 'Found :count account(s) for your query.',
- 'search_found_categories' => 'Found :count category(ies) for your query.',
- 'search_found_budgets' => 'Found :count budget(s) for your query.',
- 'search_found_tags' => 'Found :count tag(s) for your query.',
- 'search_found_transactions' => 'Found :count transaction(s) for your query.',
- 'results_limited' => 'The results are limited to :count entries.',
- 'tagbalancingAct' => 'Balancing act',
- 'tagadvancePayment' => 'Advance payment',
- 'tagnothing' => '',
- 'Default asset account' => 'Default asset account',
- 'no_budget_pointer' => 'You seem to have no budgets yet. You should create some on the budgets-page. Budgets can help you keep track of expenses.',
- 'Savings account' => 'Savings account',
- 'Credit card' => 'Credit card',
- 'source_accounts' => 'Source account(s)',
- 'destination_accounts' => 'Destination account(s)',
- 'user_id_is' => 'Your user id is :user',
- 'field_supports_markdown' => 'This field supports Markdown.',
- 'need_more_help' => 'If you need more help using Firefly III, please open a ticket on Github.',
- 'nothing_to_display' => 'There are no transactions to show you',
- 'show_all_no_filter' => 'Show all transactions without grouping them by date.',
- 'expenses_by_category' => 'Expenses by category',
- 'expenses_by_budget' => 'Expenses by budget',
- 'income_by_category' => 'Income by category',
- 'expenses_by_asset_account' => 'Expenses by asset account',
- 'expenses_by_expense_account' => 'Expenses by expense account',
- 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.',
- 'sum_of_expenses' => 'Sum of expenses',
- 'sum_of_income' => 'Sum of income',
- 'total_sum' => 'Total sum',
- 'spent_in_specific_budget' => 'Spent in budget ":budget"',
- 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"',
- 'left_in_budget_limit' => 'Left to spend according to budgeting',
- 'cannot_change_demo' => 'You cannot change the password of the demonstration account.',
- 'cannot_delete_demo' => 'You cannot remove the demonstration account.',
- 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account',
- 'per_period' => 'Per period',
- 'all_periods' => 'All periods',
- 'current_period' => 'Current period',
- 'show_the_current_period_and_overview' => 'Show the current period and overview',
- 'pref_languages_locale' => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
- 'budget_in_period' => 'All transactions for budget ":name" between :start and :end',
- 'chart_budget_in_period' => 'Chart for all transactions for budget ":name" between :start and :end',
- 'chart_account_in_period' => 'Chart for all transactions for account ":name" between :start and :end',
- 'chart_category_in_period' => 'Chart for all transactions for category ":name" between :start and :end',
- 'chart_category_all' => 'Chart for all transactions for category ":name"',
- 'budget_in_period_breadcrumb' => 'Between :start and :end',
- 'clone_withdrawal' => 'Clone this withdrawal',
- 'clone_deposit' => 'Clone this deposit',
- 'clone_transfer' => 'Clone this transfer',
- 'transaction_journal_other_options' => 'Other options',
- 'multi_select_no_selection' => 'None selected',
- 'multi_select_all_selected' => 'All selected',
- 'multi_select_filter_placeholder' => 'Find..',
- 'between_dates_breadcrumb' => 'Between :start and :end',
- 'all_journals_without_budget' => 'All transactions without a budget',
- 'journals_without_budget' => 'Transactions without a budget',
- 'all_journals_without_category' => 'All transactions without a category',
- 'journals_without_category' => 'Transactions without a category',
- 'all_journals_for_account' => 'All transactions for account :name',
- 'chart_all_journals_for_account' => 'Chart of all transactions for account :name',
- 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end',
- 'transferred' => 'Transferred',
- 'all_withdrawal' => 'All expenses',
- 'all_transactions' => 'All transactions',
- 'title_withdrawal_between' => 'All expenses between :start and :end',
- 'all_deposit' => 'All revenue',
- 'title_deposit_between' => 'All revenue between :start and :end',
- 'all_transfers' => 'All transfers',
- 'title_transfers_between' => 'All transfers between :start and :end',
- 'all_transfer' => 'All transfers',
- 'all_journals_for_tag' => 'All transactions for tag ":tag"',
- 'title_transfer_between' => 'All transfers between :start and :end',
- 'all_journals_for_category' => 'All transactions for category :name',
- 'all_journals_for_budget' => 'All transactions for budget :name',
- 'chart_all_journals_for_budget' => 'Chart of all transactions for budget :name',
- 'journals_in_period_for_category' => 'All transactions for category :name between :start and :end',
- 'journals_in_period_for_tag' => 'All transactions for tag :tag between :start and :end',
- 'not_available_demo_user' => 'The feature you try to access is not available to demo users.',
- 'exchange_rate_instructions' => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
- 'transfer_exchange_rate_instructions' => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
-
- // repeat frequencies:
- 'repeat_freq_yearly' => 'yearly',
- 'repeat_freq_monthly' => 'monthly',
- 'weekly' => 'weekly',
- 'quarterly' => 'quarterly',
- 'half-year' => 'every half year',
- 'yearly' => 'yearly',
- // account confirmation:
- 'confirm_account_header' => 'Please confirm your account',
- 'confirm_account_intro' => 'An email has been sent to the address you used during your registration. Please check it out for further instructions. If you did not get this message, you can have Firefly send it again.',
- 'confirm_account_resend_email' => 'Send me the confirmation message I need to activate my account.',
- 'account_is_confirmed' => 'Your account has been confirmed!',
- 'invalid_activation_code' => 'It seems the code you are using is not valid, or has expired.',
- 'confirm_account_is_resent_header' => 'The confirmation has been resent',
- 'confirm_account_is_resent_text' => 'The confirmation message has been resent. If you still did not receive the confirmation message, please contact the site owner at :owner or check the log files to see what went wrong.',
- 'confirm_account_is_resent_go_home' => 'Go to the index page of Firefly',
- 'confirm_account_not_resent_header' => 'Something went wrong :(',
- 'confirm_account_not_resent_intro' => 'The confirmation message has been not resent. If you still did not receive the confirmation message, please contact the site owner at :owner instead. Possibly, you have tried to resend the activation message too often. You can have Firefly III try to resend the confirmation message every hour.',
- 'confirm_account_not_resent_go_home' => 'Go to the index page of Firefly',
-
- // export data:
- 'import_and_export' => 'Import and export',
- 'export_data' => 'Export data',
- 'export_data_intro' => 'For backup purposes, when migrating to another system or when migrating to another Firefly III installation.',
- 'export_format' => 'Export format',
- 'export_format_csv' => 'Comma separated values (CSV file)',
- 'export_format_mt940' => 'MT940 compatible format',
- 'export_included_accounts' => 'Export transactions from these accounts',
- 'include_old_uploads_help' => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
- 'do_export' => 'Export',
- 'export_status_never_started' => 'The export has not started yet',
- 'export_status_make_exporter' => 'Creating exporter thing...',
- 'export_status_collecting_journals' => 'Collecting your transactions...',
- 'export_status_collected_journals' => 'Collected your transactions!',
- 'export_status_converting_to_export_format' => 'Converting your transactions...',
- 'export_status_converted_to_export_format' => 'Converted your transactions!',
- 'export_status_creating_journal_file' => 'Creating the export file...',
- 'export_status_created_journal_file' => 'Created the export file!',
- 'export_status_collecting_attachments' => 'Collecting all your attachments...',
- 'export_status_collected_attachments' => 'Collected all your attachments!',
- 'export_status_collecting_old_uploads' => 'Collecting all your previous uploads...',
- 'export_status_collected_old_uploads' => 'Collected all your previous uploads!',
- 'export_status_creating_config_file' => 'Creating a configuration file...',
- 'export_status_created_config_file' => 'Created a configuration file!',
- 'export_status_creating_zip_file' => 'Creating a zip file...',
- 'export_status_created_zip_file' => 'Created a zip file!',
- 'export_status_finished' => 'Export has succesfully finished! Yay!',
- 'export_data_please_wait' => 'Please wait...',
- 'attachment_explanation' => 'The file called \':attachment_name\' (#:attachment_id) was originally uploaded to :type \':description\' (#:journal_id) dated :date for the amount of :amount.',
-
- // rules
- 'rules' => 'Rules',
- 'rules_explanation' => 'Here you can manage rules. Rules are triggered when a transaction is created or updated. Then, if the transaction has certain properties (called "triggers") Firefly will execute the "actions". Combined, you can make Firefly respond in a certain way to new transactions.',
- 'rule_name' => 'Name of rule',
- 'rule_triggers' => 'Rule triggers when',
- 'rule_actions' => 'Rule will',
- 'new_rule' => 'New rule',
- 'new_rule_group' => 'New rule group',
- 'rule_priority_up' => 'Give rule more priority',
- 'rule_priority_down' => 'Give rule less priority',
- 'make_new_rule_group' => 'Make new rule group',
- 'store_new_rule_group' => 'Store new rule group',
- 'created_new_rule_group' => 'New rule group ":title" stored!',
- 'updated_rule_group' => 'Successfully updated rule group ":title".',
- 'edit_rule_group' => 'Edit rule group ":title"',
- 'delete_rule_group' => 'Delete rule group ":title"',
- 'deleted_rule_group' => 'Deleted rule group ":title"',
- 'update_rule_group' => 'Update rule group',
- 'no_rules_in_group' => 'There are no rules in this group',
- 'move_rule_group_up' => 'Move rule group up',
- 'move_rule_group_down' => 'Move rule group down',
- 'save_rules_by_moving' => 'Save these rule(s) by moving them to another rule group:',
- 'make_new_rule' => 'Make new rule in rule group ":title"',
- 'rule_help_stop_processing' => 'When you check this box, later rules in this group will not be executed.',
- 'rule_help_active' => 'Inactive rules will never fire.',
- 'stored_new_rule' => 'Stored new rule with title ":title"',
- 'deleted_rule' => 'Deleted rule with title ":title"',
- 'store_new_rule' => 'Store new rule',
- 'updated_rule' => 'Updated rule with title ":title"',
- 'default_rule_group_name' => 'Default rules',
- 'default_rule_group_description' => 'All your rules not in a particular group.',
- 'default_rule_name' => 'Your first default rule',
- 'default_rule_description' => 'This rule is an example. You can safely delete it.',
- 'default_rule_trigger_description' => 'The Man Who Sold the World',
- 'default_rule_trigger_from_account' => 'David Bowie',
- 'default_rule_action_prepend' => 'Bought the world from ',
- 'default_rule_action_set_category' => 'Large expenses',
- 'trigger' => 'Trigger',
- 'trigger_value' => 'Trigger on value',
- 'stop_processing_other_triggers' => 'Stop processing other triggers',
- 'add_rule_trigger' => 'Add new trigger',
- 'action' => 'Action',
- 'action_value' => 'Action value',
- 'stop_executing_other_actions' => 'Stop executing other actions',
- 'add_rule_action' => 'Add new action',
- 'edit_rule' => 'Edit rule ":title"',
- 'delete_rule' => 'Delete rule ":title"',
- 'update_rule' => 'Update rule',
- 'test_rule_triggers' => 'See matching transactions',
- 'warning_transaction_subset' => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
- 'warning_no_matching_transactions' => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
- 'warning_no_valid_triggers' => 'No valid triggers provided.',
- 'execute_on_existing_transactions' => 'Execute for existing transactions',
- 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions',
- 'execute_on_existing_transactions_intro' => 'When a rule or group has been changed or added, you can execute it for existing transactions',
- 'execute_on_existing_transactions_short' => 'Existing transactions',
- 'executed_group_on_existing_transactions' => 'Executed group ":title" for existing transactions',
- 'execute_group_on_existing_transactions' => 'Execute group ":title" for existing transactions',
- 'include_transactions_from_accounts' => 'Include transactions from these accounts',
- 'execute' => 'Execute',
-
- // actions and triggers
- 'rule_trigger_user_action' => 'User action is ":trigger_value"',
- 'rule_trigger_from_account_starts' => 'Source account starts with ":trigger_value"',
- 'rule_trigger_from_account_ends' => 'Source account ends with ":trigger_value"',
- 'rule_trigger_from_account_is' => 'Source account is ":trigger_value"',
- 'rule_trigger_from_account_contains' => 'Source account contains ":trigger_value"',
- 'rule_trigger_to_account_starts' => 'Destination account starts with ":trigger_value"',
- 'rule_trigger_to_account_ends' => 'Destination account ends with ":trigger_value"',
- 'rule_trigger_to_account_is' => 'Destination account is ":trigger_value"',
- 'rule_trigger_to_account_contains' => 'Destination account contains ":trigger_value"',
- 'rule_trigger_transaction_type' => 'Transaction is of type ":trigger_value"',
- 'rule_trigger_category_is' => 'Category is ":trigger_value"',
- 'rule_trigger_amount_less' => 'Amount is less than :trigger_value',
- 'rule_trigger_amount_exactly' => 'Amount is :trigger_value',
- 'rule_trigger_amount_more' => 'Amount is more than :trigger_value',
- 'rule_trigger_description_starts' => 'Description starts with ":trigger_value"',
- 'rule_trigger_description_ends' => 'Description ends with ":trigger_value"',
- 'rule_trigger_description_contains' => 'Description contains ":trigger_value"',
- 'rule_trigger_description_is' => 'Description is ":trigger_value"',
- 'rule_trigger_from_account_starts_choice' => 'Source account starts with..',
- 'rule_trigger_from_account_ends_choice' => 'Source account ends with..',
- 'rule_trigger_from_account_is_choice' => 'Source account is..',
- 'rule_trigger_from_account_contains_choice' => 'Source account contains..',
- 'rule_trigger_to_account_starts_choice' => 'Destination account starts with..',
- 'rule_trigger_to_account_ends_choice' => 'Destination account ends with..',
- 'rule_trigger_to_account_is_choice' => 'Destination account is..',
- 'rule_trigger_to_account_contains_choice' => 'Destination account contains..',
- 'rule_trigger_transaction_type_choice' => 'Transaction is of type..',
- 'rule_trigger_amount_less_choice' => 'Amount is less than..',
- 'rule_trigger_amount_exactly_choice' => 'Amount is..',
- 'rule_trigger_amount_more_choice' => 'Amount is more than..',
- 'rule_trigger_description_starts_choice' => 'Description starts with..',
- 'rule_trigger_description_ends_choice' => 'Description ends with..',
- 'rule_trigger_description_contains_choice' => 'Description contains..',
- 'rule_trigger_description_is_choice' => 'Description is..',
- 'rule_trigger_category_is_choice' => 'Category is..',
- 'rule_trigger_budget_is_choice' => 'Budget is..',
- 'rule_trigger_tag_is_choice' => '(A) tag is..',
- 'rule_trigger_has_attachments_choice' => 'Has at least this many attachments',
- 'rule_trigger_has_attachments' => 'Has at least :trigger_value attachment(s)',
- 'rule_trigger_store_journal' => 'When a transaction is created',
- 'rule_trigger_update_journal' => 'When a transaction is updated',
- 'rule_action_set_category' => 'Set category to ":action_value"',
- 'rule_action_clear_category' => 'Clear category',
- 'rule_action_set_budget' => 'Set budget to ":action_value"',
- 'rule_action_clear_budget' => 'Clear budget',
- 'rule_action_add_tag' => 'Add tag ":action_value"',
- 'rule_action_remove_tag' => 'Remove tag ":action_value"',
- 'rule_action_remove_all_tags' => 'Remove all tags',
- 'rule_action_set_description' => 'Set description to ":action_value"',
- 'rule_action_append_description' => 'Append description with ":action_value"',
- 'rule_action_prepend_description' => 'Prepend description with ":action_value"',
- 'rule_action_set_category_choice' => 'Set category to..',
- 'rule_action_clear_category_choice' => 'Clear any category',
- 'rule_action_set_budget_choice' => 'Set budget to..',
- 'rule_action_clear_budget_choice' => 'Clear any budget',
- 'rule_action_add_tag_choice' => 'Add tag..',
- 'rule_action_remove_tag_choice' => 'Remove tag..',
- 'rule_action_remove_all_tags_choice' => 'Remove all tags',
- 'rule_action_set_description_choice' => 'Set description to..',
- 'rule_action_append_description_choice' => 'Append description with..',
- 'rule_action_prepend_description_choice' => 'Prepend description with..',
- 'rule_action_set_source_account_choice' => 'Set source account to...',
- 'rule_action_set_source_account' => 'Set source account to :action_value',
- 'rule_action_set_destination_account_choice' => 'Set destination account to...',
- 'rule_action_set_destination_account' => 'Set destination account to :action_value',
-
- // tags
- 'store_new_tag' => 'Store new tag',
- 'update_tag' => 'Update tag',
- 'no_location_set' => 'No location set.',
- 'meta_data' => 'Meta data',
- 'location' => 'Location',
-
- // preferences
- 'pref_home_screen_accounts' => 'Home screen accounts',
- 'pref_home_screen_accounts_help' => 'Which accounts should be displayed on the home page?',
- 'pref_view_range' => 'View range',
- 'pref_view_range_help' => 'Some charts are automatically grouped in periods. What period would you prefer?',
- 'pref_1D' => 'One day',
- 'pref_1W' => 'One week',
- 'pref_1M' => 'One month',
- 'pref_3M' => 'Three months (quarter)',
- 'pref_6M' => 'Six months',
- 'pref_1Y' => 'One year',
- 'pref_languages' => 'Languages',
- 'pref_languages_help' => 'Firefly III supports several languages. Which one do you prefer?',
- 'pref_custom_fiscal_year' => 'Fiscal year settings',
- 'pref_custom_fiscal_year_label' => 'Enabled',
- 'pref_custom_fiscal_year_help' => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
- 'pref_fiscal_year_start_label' => 'Fiscal year start date',
- 'pref_two_factor_auth' => '2-step verification',
- 'pref_two_factor_auth_help' => 'When you enable 2-step verification (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
- 'pref_enable_two_factor_auth' => 'Enable 2-step verification',
- 'pref_two_factor_auth_disabled' => '2-step verification code removed and disabled',
- 'pref_two_factor_auth_remove_it' => 'Don\'t forget to remove the account from your authentication app!',
- 'pref_two_factor_auth_code' => 'Verify code',
- 'pref_two_factor_auth_code_help' => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code.',
- 'pref_two_factor_auth_reset_code' => 'Reset verification code',
- 'pref_two_factor_auth_remove_code' => 'Remove verification code',
- 'pref_two_factor_auth_remove_will_disable' => '(this will also disable two-factor authentication)',
- 'pref_save_settings' => 'Save settings',
- 'saved_preferences' => 'Preferences saved!',
- 'preferences_general' => 'General',
- 'preferences_frontpage' => 'Home screen',
- 'preferences_security' => 'Security',
- 'preferences_layout' => 'Layout',
- 'pref_home_show_deposits' => 'Show deposits on the home screen',
- 'pref_home_show_deposits_info' => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
- 'pref_home_do_show_deposits' => 'Yes, show them',
- 'successful_count' => 'of which :count successful',
- 'transaction_page_size_title' => 'Page size',
- 'transaction_page_size_help' => 'Any list of transactions shows at most this many transactions',
- 'transaction_page_size_label' => 'Page size',
- 'between_dates' => '(:start and :end)',
- 'pref_optional_fields_transaction' => 'Optional fields for transactions',
- 'pref_optional_fields_transaction_help' => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
- 'optional_tj_date_fields' => 'Date fields',
- 'optional_tj_business_fields' => 'Business fields',
- 'optional_tj_attachment_fields' => 'Attachment fields',
- 'pref_optional_tj_interest_date' => 'Interest date',
- 'pref_optional_tj_book_date' => 'Book date',
- 'pref_optional_tj_process_date' => 'Processing date',
- 'pref_optional_tj_due_date' => 'Due date',
- 'pref_optional_tj_payment_date' => 'Payment date',
- 'pref_optional_tj_invoice_date' => 'Invoice date',
- 'pref_optional_tj_internal_reference' => 'Internal reference',
- 'pref_optional_tj_notes' => 'Notes',
- 'pref_optional_tj_attachments' => 'Attachments',
- 'optional_field_meta_dates' => 'Dates',
- 'optional_field_meta_business' => 'Business',
- 'optional_field_attachments' => 'Attachments',
- 'optional_field_meta_data' => 'Optional meta data',
-
-
- // profile:
- 'change_your_password' => 'Change your password',
- 'delete_account' => 'Delete account',
- 'current_password' => 'Current password',
- 'new_password' => 'New password',
- 'new_password_again' => 'New password (again)',
- 'delete_your_account' => 'Delete your account',
- 'delete_your_account_help' => 'Deleting your account will also delete any accounts, transactions, anything you might have saved into Firefly III. It\'ll be GONE.',
- 'delete_your_account_password' => 'Enter your password to continue.',
- 'password' => 'Password',
- 'are_you_sure' => 'Are you sure? You cannot undo this.',
- 'delete_account_button' => 'DELETE your account',
- 'invalid_current_password' => 'Invalid current password!',
- 'password_changed' => 'Password changed!',
- 'should_change' => 'The idea is to change your password.',
- 'invalid_password' => 'Invalid password!',
-
-
- // attachments
- 'nr_of_attachments' => 'One attachment|:count attachments',
- 'attachments' => 'Attachments',
- 'edit_attachment' => 'Edit attachment ":name"',
- 'update_attachment' => 'Update attachment',
- 'delete_attachment' => 'Delete attachment ":name"',
- 'attachment_deleted' => 'Deleted attachment ":name"',
- 'attachment_updated' => 'Updated attachment ":name"',
- 'upload_max_file_size' => 'Maximum file size: :size',
-
- // tour:
- 'prev' => 'Prev',
- 'next' => 'Next',
- 'end-tour' => 'End tour',
- 'pause' => 'Pause',
-
- // transaction index
- 'title_expenses' => 'Expenses',
- 'title_withdrawal' => 'Expenses',
- 'title_revenue' => 'Revenue / income',
- 'title_deposit' => 'Revenue / income',
- 'title_transfer' => 'Transfers',
- 'title_transfers' => 'Transfers',
-
- // convert stuff:
- 'convert_is_already_type_Withdrawal' => 'This transaction is already a withdrawal',
- 'convert_is_already_type_Deposit' => 'This transaction is already a deposit',
- 'convert_is_already_type_Transfer' => 'This transaction is already a transfer',
- 'convert_to_Withdrawal' => 'Convert ":description" to a withdrawal',
- 'convert_to_Deposit' => 'Convert ":description" to a deposit',
- 'convert_to_Transfer' => 'Convert ":description" to a transfer',
- 'convert_options_WithdrawalDeposit' => 'Convert a withdrawal into a deposit',
- 'convert_options_WithdrawalTransfer' => 'Convert a withdrawal into a transfer',
- 'convert_options_DepositTransfer' => 'Convert a deposit into a transfer',
- 'convert_options_DepositWithdrawal' => 'Convert a deposit into a withdrawal',
- 'convert_options_TransferWithdrawal' => 'Convert a transfer into a withdrawal',
- 'convert_options_TransferDeposit' => 'Convert a transfer into a deposit',
- 'transaction_journal_convert_options' => 'Convert this transaction',
- 'convert_Withdrawal_to_deposit' => 'Convert this withdrawal to a deposit',
- 'convert_Withdrawal_to_transfer' => 'Convert this withdrawal to a transfer',
- 'convert_Deposit_to_withdrawal' => 'Convert this deposit to a withdrawal',
- 'convert_Deposit_to_transfer' => 'Convert this deposit to a transfer',
- 'convert_Transfer_to_deposit' => 'Convert this transfer to a deposit',
- 'convert_Transfer_to_withdrawal' => 'Convert this transfer to a withdrawal',
- 'convert_please_set_revenue_source' => 'Please pick the revenue account where the money will come from.',
- 'convert_please_set_asset_destination' => 'Please pick the asset account where the money will go to.',
- 'convert_please_set_expense_destination' => 'Please pick the expense account where the money will go to.',
- 'convert_please_set_asset_source' => 'Please pick the asset account where the money will come from.',
- 'convert_explanation_withdrawal_deposit' => 'If you convert this withdrawal into a deposit, :amount will be deposited into :sourceName instead of taken from it.',
- 'convert_explanation_withdrawal_transfer' => 'If you convert this withdrawal into a transfer, :amount will be transferred from :sourceName to a new asset account, instead of being paid to :destinationName.',
- 'convert_explanation_deposit_withdrawal' => 'If you convert this deposit into a withdrawal, :amount will be removed from :destinationName instead of added to it.',
- 'convert_explanation_deposit_transfer' => 'If you convert this deposit into a transfer, :amount will be transferred from an asset account of your choice into :destinationName.',
- 'convert_explanation_transfer_withdrawal' => 'If you convert this transfer into a withdrawal, :amount will go from :sourceName to a new destination as an expense, instead of to :destinationName as a transfer.',
- 'convert_explanation_transfer_deposit' => 'If you convert this transfer into a deposit, :amount will be deposited into account :destinationName instead of being transferred there.',
- 'converted_to_Withdrawal' => 'The transaction has been converted to a withdrawal',
- 'converted_to_Deposit' => 'The transaction has been converted to a deposit',
- 'converted_to_Transfer' => 'The transaction has been converted to a transfer',
-
-
- // create new stuff:
- 'create_new_withdrawal' => 'Create new withdrawal',
- 'create_new_deposit' => 'Create new deposit',
- 'create_new_transfer' => 'Create new transfer',
- 'create_new_asset' => 'Create new asset account',
- 'create_new_expense' => 'Create new expense account',
- 'create_new_revenue' => 'Create new revenue account',
- 'create_new_piggy_bank' => 'Create new piggy bank',
- 'create_new_bill' => 'Create new bill',
-
- // currencies:
- 'create_currency' => 'Create a new currency',
- 'store_currency' => 'Store new currency',
- 'update_currency' => 'Update currency',
- 'new_default_currency' => ':name is now the default currency.',
- 'cannot_delete_currency' => 'Cannot delete :name because it is still in use.',
- 'deleted_currency' => 'Currency :name deleted',
- 'created_currency' => 'Currency :name created',
- 'updated_currency' => 'Currency :name updated',
- 'ask_site_owner' => 'Please ask :owner to add, remove or edit currencies.',
- 'currencies_intro' => 'Firefly III supports various currencies which you can set and enable here.',
- 'make_default_currency' => 'make default',
- 'default_currency' => 'default',
-
- // new user:
- 'submit' => 'Submit',
- 'getting_started' => 'Getting started',
- 'to_get_started' => 'To get started with Firefly, please enter your current bank\'s name, and the balance of your checking account:',
- 'savings_balance_text' => 'If you have a savings account, please enter the current balance of your savings account:',
- 'cc_balance_text' => 'If you have a credit card, please enter your credit card\'s limit.',
- 'stored_new_account_new_user' => 'Yay! Your new account has been stored.',
- 'stored_new_accounts_new_user' => 'Yay! Your new accounts have been stored.',
-
- // forms:
- 'mandatoryFields' => 'Mandatory fields',
- 'optionalFields' => 'Optional fields',
- 'options' => 'Options',
-
- // budgets:
- 'create_new_budget' => 'Create a new budget',
- 'store_new_budget' => 'Store new budget',
- 'stored_new_budget' => 'Stored new budget ":name"',
- 'available_between' => 'Available between :start and :end',
- 'transactionsWithoutBudget' => 'Expenses without budget',
- 'transactions_no_budget' => 'Expenses without budget between :start and :end',
- 'spent_between' => 'Spent between :start and :end',
- 'createBudget' => 'New budget',
- 'inactiveBudgets' => 'Inactive budgets',
- 'without_budget_between' => 'Transactions without a budget between :start and :end',
- 'budget_in_month' => ':name in :month',
- 'delete_budget' => 'Delete budget ":name"',
- 'deleted_budget' => 'Deleted budget ":name"',
- 'edit_budget' => 'Edit budget ":name"',
- 'updated_budget' => 'Updated budget ":name"',
- 'update_amount' => 'Update amount',
- 'update_budget' => 'Update budget',
- 'update_budget_amount_range' => 'Update (expected) available amount between :start and :end',
-
- // bills:
- 'matching_on' => 'Matching on',
- 'between_amounts' => 'between :low and :high.',
- 'repeats' => 'Repeats',
- 'connected_journals' => 'Connected transactions',
- 'auto_match_on' => 'Automatically matched by Firefly',
- 'auto_match_off' => 'Not automatically matched by Firefly',
- 'next_expected_match' => 'Next expected match',
- 'delete_bill' => 'Delete bill ":name"',
- 'deleted_bill' => 'Deleted bill ":name"',
- 'edit_bill' => 'Edit bill ":name"',
- 'more' => 'More',
- 'rescan_old' => 'Rescan old transactions',
- 'update_bill' => 'Update bill',
- 'updated_bill' => 'Updated bill ":name"',
- 'store_new_bill' => 'Store new bill',
- 'stored_new_bill' => 'Stored new bill ":name"',
- 'cannot_scan_inactive_bill' => 'Inactive bills cannot be scanned.',
- 'rescanned_bill' => 'Rescanned everything.',
- 'average_bill_amount_year' => 'Average bill amount (:year)',
- 'average_bill_amount_overall' => 'Average bill amount (overall)',
- 'not_or_not_yet' => 'Not (yet)',
- 'not_expected_period' => 'Not expected this period',
- // accounts:
- 'details_for_asset' => 'Details for asset account ":name"',
- 'details_for_expense' => 'Details for expense account ":name"',
- 'details_for_revenue' => 'Details for revenue account ":name"',
- 'details_for_cash' => 'Details for cash account ":name"',
- 'store_new_asset_account' => 'Store new asset account',
- 'store_new_expense_account' => 'Store new expense account',
- 'store_new_revenue_account' => 'Store new revenue account',
- 'edit_asset_account' => 'Edit asset account ":name"',
- 'edit_expense_account' => 'Edit expense account ":name"',
- 'edit_revenue_account' => 'Edit revenue account ":name"',
- 'delete_asset_account' => 'Delete asset account ":name"',
- 'delete_expense_account' => 'Delete expense account ":name"',
- 'delete_revenue_account' => 'Delete revenue account ":name"',
- 'asset_deleted' => 'Successfully deleted asset account ":name"',
- 'expense_deleted' => 'Successfully deleted expense account ":name"',
- 'revenue_deleted' => 'Successfully deleted revenue account ":name"',
- 'update_asset_account' => 'Update asset account',
- 'update_expense_account' => 'Update expense account',
- 'update_revenue_account' => 'Update revenue account',
- 'make_new_asset_account' => 'Create a new asset account',
- 'make_new_expense_account' => 'Create a new expense account',
- 'make_new_revenue_account' => 'Create a new revenue account',
- 'asset_accounts' => 'Asset accounts',
- 'expense_accounts' => 'Expense accounts',
- 'revenue_accounts' => 'Revenue accounts',
- 'cash_accounts' => 'Cash accounts',
- 'Cash account' => 'Cash account',
- 'account_type' => 'Account type',
- 'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
- 'stored_new_account' => 'New account ":name" stored!',
- 'updated_account' => 'Updated account ":name"',
- 'credit_card_options' => 'Credit card options',
- 'no_transactions_account' => 'There are no transactions (in this period) for asset account ":name".',
- 'no_data_for_chart' => 'There is not enough information (yet) to generate this chart.',
- 'select_more_than_one_account' => 'Please select more than one account',
- 'select_more_than_one_category' => 'Please select more than one category',
- 'select_more_than_one_budget' => 'Please select more than one budget',
- 'select_more_than_one_tag' => 'Please select more than one tag',
- 'from_to' => 'From :start to :end',
- 'from_to_breadcrumb' => 'from :start to :end',
- 'account_default_currency' => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
-
- // categories:
- 'new_category' => 'New category',
- 'create_new_category' => 'Create a new category',
- 'without_category' => 'Without a category',
- 'update_category' => 'Update category',
- 'updated_category' => 'Updated category ":name"',
- 'categories' => 'Categories',
- 'edit_category' => 'Edit category ":name"',
- 'no_category' => '(no category)',
- 'category' => 'Category',
- 'delete_category' => 'Delete category ":name"',
- 'deleted_category' => 'Deleted category ":name"',
- 'store_category' => 'Store new category',
- 'stored_category' => 'Stored new category ":name"',
- 'without_category_between' => 'Without category between :start and :end',
-
- // transactions:
- 'update_withdrawal' => 'Update withdrawal',
- 'update_deposit' => 'Update deposit',
- 'update_transfer' => 'Update transfer',
- 'updated_withdrawal' => 'Updated withdrawal ":description"',
- 'updated_deposit' => 'Updated deposit ":description"',
- 'updated_transfer' => 'Updated transfer ":description"',
- 'delete_withdrawal' => 'Delete withdrawal ":description"',
- 'delete_deposit' => 'Delete deposit ":description"',
- 'delete_transfer' => 'Delete transfer ":description"',
- 'deleted_withdrawal' => 'Successfully deleted withdrawal ":description"',
- 'deleted_deposit' => 'Successfully deleted deposit ":description"',
- 'deleted_transfer' => 'Successfully deleted transfer ":description"',
- 'stored_journal' => 'Successfully created new transaction ":description"',
- 'select_transactions' => 'Select transactions',
- 'stop_selection' => 'Stop selecting transactions',
- 'edit_selected' => 'Edit selected',
- 'delete_selected' => 'Delete selected',
- 'mass_delete_journals' => 'Delete a number of transactions',
- 'mass_edit_journals' => 'Edit a number of transactions',
- 'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
- 'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious.',
- 'mass_deleted_transactions_success' => 'Deleted :amount transaction(s).',
- 'mass_edited_transactions_success' => 'Updated :amount transaction(s)',
-
-
- // new user:
- 'welcome' => 'Welcome to Firefly!',
-
- // home page:
- 'yourAccounts' => 'Your accounts',
- 'budgetsAndSpending' => 'Budgets and spending',
- 'savings' => 'Savings',
- 'markAsSavingsToContinue' => 'Mark your asset accounts as "Savings account" to fill this panel',
- 'createPiggyToContinue' => 'Create piggy banks to fill this panel.',
- 'newWithdrawal' => 'New expense',
- 'newDeposit' => 'New deposit',
- 'newTransfer' => 'New transfer',
- 'moneyIn' => 'Money in',
- 'moneyOut' => 'Money out',
- 'billsToPay' => 'Bills to pay',
- 'billsPaid' => 'Bills paid',
- 'divided' => 'divided',
- 'toDivide' => 'left to divide',
-
- // menu and titles, should be recycled as often as possible:
- 'currency' => 'Currency',
- 'preferences' => 'Preferences',
- 'logout' => 'Logout',
- 'searchPlaceholder' => 'Search...',
- 'dashboard' => 'Dashboard',
- 'currencies' => 'Currencies',
- 'accounts' => 'Accounts',
- 'Asset account' => 'Asset account',
- 'Default account' => 'Asset account',
- 'Expense account' => 'Expense account',
- 'Revenue account' => 'Revenue account',
- 'Initial balance account' => 'Initial balance account',
- 'budgets' => 'Budgets',
- 'tags' => 'Tags',
- 'reports' => 'Reports',
- 'transactions' => 'Transactions',
- 'expenses' => 'Expenses',
- 'income' => 'Revenue / income',
- 'transfers' => 'Transfers',
- 'moneyManagement' => 'Money management',
- 'piggyBanks' => 'Piggy banks',
- 'bills' => 'Bills',
- 'withdrawal' => 'Withdrawal',
- 'deposit' => 'Deposit',
- 'account' => 'Account',
- 'transfer' => 'Transfer',
- 'Withdrawal' => 'Withdrawal',
- 'Deposit' => 'Deposit',
- 'Transfer' => 'Transfer',
- 'bill' => 'Bill',
- 'yes' => 'Yes',
- 'no' => 'No',
- 'amount' => 'Amount',
- 'overview' => 'Overview',
- 'saveOnAccount' => 'Save on account',
- 'unknown' => 'Unknown',
- 'daily' => 'Daily',
- 'monthly' => 'Monthly',
- 'profile' => 'Profile',
- 'errors' => 'Errors',
-
- // reports:
- 'report_default' => 'Default financial report between :start and :end',
- 'report_audit' => 'Transaction history overview between :start and :end',
- 'report_category' => 'Category report between :start and :end',
- 'report_budget' => 'Budget report between :start and :end',
- 'report_tag' => 'Tag report between :start and :end',
- 'quick_link_reports' => 'Quick links',
- 'quick_link_default_report' => 'Default financial report',
- 'quick_link_audit_report' => 'Transaction history overview',
- 'report_this_month_quick' => 'Current month, all accounts',
- 'report_this_year_quick' => 'Current year, all accounts',
- 'report_this_fiscal_year_quick' => 'Current fiscal year, all accounts',
- 'report_all_time_quick' => 'All-time, all accounts',
- 'reports_can_bookmark' => 'Remember that reports can be bookmarked.',
- 'incomeVsExpenses' => 'Income vs. expenses',
- 'accountBalances' => 'Account balances',
- 'balanceStartOfYear' => 'Balance at start of year',
- 'balanceEndOfYear' => 'Balance at end of year',
- 'balanceStartOfMonth' => 'Balance at start of month',
- 'balanceEndOfMonth' => 'Balance at end of month',
- 'balanceStart' => 'Balance at start of period',
- 'balanceEnd' => 'Balance at end of period',
- 'reportsOwnAccounts' => 'Reports for your own accounts',
- 'reportsOwnAccountsAndShared' => 'Reports for your own accounts and shared accounts',
- 'splitByAccount' => 'Split by account',
- 'balancedByTransfersAndTags' => 'Balanced by transfers and tags',
- 'coveredWithTags' => 'Covered with tags',
- 'leftUnbalanced' => 'Left unbalanced',
- 'expectedBalance' => 'Expected balance',
- 'outsideOfBudgets' => 'Outside of budgets',
- 'leftInBudget' => 'Left in budget',
- 'sumOfSums' => 'Sum of sums',
- 'noCategory' => '(no category)',
- 'notCharged' => 'Not charged (yet)',
- 'inactive' => 'Inactive',
- 'active' => 'Active',
- 'difference' => 'Difference',
- 'in' => 'In',
- 'out' => 'Out',
- 'topX' => 'top :number',
- 'show_full_list' => 'Show entire list',
- 'show_only_top' => 'Show only top :number',
- 'sum_of_year' => 'Sum of year',
- 'sum_of_years' => 'Sum of years',
- 'average_of_year' => 'Average of year',
- 'average_of_years' => 'Average of years',
- 'categories_earned_in_year' => 'Categories (by earnings)',
- 'categories_spent_in_year' => 'Categories (by spendings)',
- 'report_type' => 'Report type',
- 'report_type_default' => 'Default financial report',
- 'report_type_audit' => 'Transaction history overview (audit)',
- 'report_type_category' => 'Category report',
- 'report_type_budget' => 'Budget report',
- 'report_type_tag' => 'Tag report',
- 'report_type_meta-history' => 'Categories, budgets and bills overview',
- 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
- 'report_included_accounts' => 'Included accounts',
- 'report_date_range' => 'Date range',
- 'report_preset_ranges' => 'Pre-set ranges',
- 'shared' => 'Shared',
- 'fiscal_year' => 'Fiscal year',
- 'income_entry' => 'Income from account ":name" between :start and :end',
- 'expense_entry' => 'Expenses to account ":name" between :start and :end',
- 'category_entry' => 'Expenses in category ":name" between :start and :end',
- 'budget_spent_amount' => 'Expenses in budget ":budget" between :start and :end',
- 'balance_amount' => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
- 'no_audit_activity' => 'No activity was recorded on account :account_name between :start and :end.',
- 'audit_end_balance' => 'Account balance of :account_name at the end of :end was: :balance',
- 'reports_extra_options' => 'Extra options',
- 'report_has_no_extra_options' => 'This report has no extra options',
- 'reports_submit' => 'View report',
- 'end_after_start_date' => 'End date of report must be after start date.',
- 'select_category' => 'Select category(ies)',
- 'select_budget' => 'Select budget(s).',
- 'select_tag' => 'Select tag(s).',
- 'income_per_category' => 'Income per category',
- 'expense_per_category' => 'Expense per category',
- 'expense_per_budget' => 'Expense per budget',
- 'income_per_account' => 'Income per account',
- 'expense_per_account' => 'Expense per account',
- 'expense_per_tag' => 'Expense per tag',
- 'income_per_tag' => 'Income per tag',
- 'include_expense_not_in_budget' => 'Included expenses not in the selected budget(s)',
- 'include_expense_not_in_account' => 'Included expenses not in the selected account(s)',
- 'include_expense_not_in_category' => 'Included expenses not in the selected category(ies)',
- 'include_income_not_in_category' => 'Included income not in the selected category(ies)',
- 'include_income_not_in_account' => 'Included income not in the selected account(s)',
- 'include_income_not_in_tags' => 'Included income not in the selected tag(s)',
- 'include_expense_not_in_tags' => 'Included expenses not in the selected tag(s)',
- 'everything_else' => 'Everything else',
- 'income_and_expenses' => 'Income and expenses',
- 'spent_average' => 'Spent (average)',
- 'income_average' => 'Income (average)',
- 'transaction_count' => 'Transaction count',
- 'average_spending_per_account' => 'Average spending per account',
- 'average_income_per_account' => 'Average income per account',
- 'total' => 'Total',
- 'description' => 'Description',
- 'sum_of_period' => 'Sum of period',
- 'average_in_period' => 'Average in period',
- 'account_role_defaultAsset' => 'Default asset account',
- 'account_role_sharedAsset' => 'Shared asset account',
- 'account_role_savingAsset' => 'Savings account',
- 'account_role_ccAsset' => 'Credit card',
-
- // charts:
- 'chart' => 'Chart',
- 'dayOfMonth' => 'Day of the month',
- 'month' => 'Month',
- 'budget' => 'Budget',
- 'spent' => 'Spent',
- 'spent_in_budget' => 'Spent in budget',
- 'left_to_spend' => 'Left to spend',
- 'earned' => 'Earned',
- 'overspent' => 'Overspent',
- 'left' => 'Left',
- 'no_budget' => '(no budget)',
- 'max-amount' => 'Maximum amount',
- 'min-amount' => 'Minumum amount',
- 'journal-amount' => 'Current bill entry',
- 'name' => 'Name',
- 'date' => 'Date',
- 'paid' => 'Paid',
- 'unpaid' => 'Unpaid',
- 'day' => 'Day',
- 'budgeted' => 'Budgeted',
- 'period' => 'Period',
- 'balance' => 'Balance',
- 'summary' => 'Summary',
- 'sum' => 'Sum',
- 'average' => 'Average',
- 'balanceFor' => 'Balance for :name',
-
- // piggy banks:
- 'add_money_to_piggy' => 'Add money to piggy bank ":name"',
- 'piggy_bank' => 'Piggy bank',
- 'new_piggy_bank' => 'New piggy bank',
- 'store_piggy_bank' => 'Store new piggy bank',
- 'stored_piggy_bank' => 'Store new piggy bank ":name"',
- 'account_status' => 'Account status',
- 'left_for_piggy_banks' => 'Left for piggy banks',
- 'sum_of_piggy_banks' => 'Sum of piggy banks',
- 'saved_so_far' => 'Saved so far',
- 'left_to_save' => 'Left to save',
- 'suggested_amount' => 'Suggested monthly amount to save',
- 'add_money_to_piggy_title' => 'Add money to piggy bank ":name"',
- 'remove_money_from_piggy_title' => 'Remove money from piggy bank ":name"',
- 'add' => 'Add',
-
- 'remove' => 'Remove',
- 'max_amount_add' => 'The maximum amount you can add is',
- 'max_amount_remove' => 'The maximum amount you can remove is',
- 'update_piggy_button' => 'Update piggy bank',
- 'update_piggy_title' => 'Update piggy bank ":name"',
- 'updated_piggy_bank' => 'Updated piggy bank ":name"',
- 'details' => 'Details',
- 'events' => 'Events',
- 'target_amount' => 'Target amount',
- 'start_date' => 'Start date',
- 'target_date' => 'Target date',
- 'no_target_date' => 'No target date',
- 'todo' => 'to do',
- 'table' => 'Table',
- 'piggy_bank_not_exists' => 'Piggy bank no longer exists.',
- 'add_any_amount_to_piggy' => 'Add money to this piggy bank to reach your target of :amount.',
- 'add_set_amount_to_piggy' => 'Add :amount to fill this piggy bank on :date',
- 'delete_piggy_bank' => 'Delete piggy bank ":name"',
- 'cannot_add_amount_piggy' => 'Could not add :amount to ":name".',
- 'cannot_remove_from_piggy' => 'Could not remove :amount from ":name".',
- 'deleted_piggy_bank' => 'Deleted piggy bank ":name"',
- 'added_amount_to_piggy' => 'Added :amount to ":name"',
- 'removed_amount_from_piggy' => 'Removed :amount from ":name"',
- 'cannot_remove_amount_piggy' => 'Could not remove :amount from ":name".',
-
- // tags
- 'regular_tag' => 'Just a regular tag.',
- 'balancing_act' => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
- 'advance_payment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
- 'delete_tag' => 'Delete tag ":tag"',
- 'deleted_tag' => 'Deleted tag ":tag"',
- 'new_tag' => 'Make new tag',
- 'edit_tag' => 'Edit tag ":tag"',
- 'updated_tag' => 'Updated tag ":tag"',
- 'created_tag' => 'Tag ":tag" has been created!',
- 'no_year' => 'No year set',
- 'no_month' => 'No month set',
- 'tag_title_nothing' => 'Default tags',
- 'tag_title_balancingAct' => 'Balancing act tags',
- 'tag_title_advancePayment' => 'Advance payment tags',
- 'tags_introduction' => 'Usually tags are singular words, designed to quickly band items together using things like expensive, bill or for-party. In Firefly III, tags can have more properties such as a date, description and location. This allows you to join transactions together in a more meaningful way. For example, you could make a tag called Christmas dinner with friends and add information about the restaurant. Such tags are "singular", you would only use them for a single occasion, perhaps with multiple transactions.',
- 'tags_group' => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.',
- 'tags_start' => 'Create a tag to get started or enter tags when creating new transactions.',
-
- 'transaction_journal_information' => 'Transaction information',
- 'transaction_journal_meta' => 'Meta information',
- 'total_amount' => 'Total amount',
- 'number_of_decimals' => 'Number of decimals',
-
- // administration
- 'administration' => 'Administration',
- 'user_administration' => 'User administration',
- 'list_all_users' => 'All users',
- 'all_users' => 'All users',
- 'instance_configuration' => 'Configuration',
- 'firefly_instance_configuration' => 'Configuration options for Firefly III',
- 'setting_single_user_mode' => 'Single user mode',
- 'setting_single_user_mode_explain' => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
- 'store_configuration' => 'Store configuration',
- 'single_user_administration' => 'User administration for :email',
- 'edit_user' => 'Edit user :email',
- 'hidden_fields_preferences' => 'Not all fields are visible right now. You must enable them in your settings.',
- 'user_data_information' => 'User data',
- 'user_information' => 'User information',
- 'total_size' => 'total size',
- 'budget_or_budgets' => 'budget(s)',
- 'budgets_with_limits' => 'budget(s) with configured amount',
- 'rule_or_rules' => 'rule(s)',
- 'rulegroup_or_groups' => 'rule group(s)',
- 'setting_must_confirm_account' => 'Account confirmation',
- 'setting_must_confirm_account_explain' => 'When this setting is enabled, users must activate their account before it can be used.',
- 'configuration_updated' => 'The configuration has been updated',
- 'setting_is_demo_site' => 'Demo site',
- 'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
- 'setting_send_email_notifications' => 'Send email notifications',
- 'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'block_code_bounced' => 'Email message(s) bounced',
- 'block_code_expired' => 'Demo account expired',
- 'no_block_code' => 'No reason for block or user not blocked',
-
-
- // split a transaction:
- 'transaction_meta_data' => 'Transaction meta-data',
- 'transaction_dates' => 'Transaction dates',
- 'splits' => 'Splits',
- 'split_title_withdrawal' => 'Split your new withdrawal',
- 'split_intro_one_withdrawal' => 'Firefly supports the "splitting" of a withdrawal.',
- 'split_intro_two_withdrawal' => 'It means that the amount of money you\'ve spent is divided between several destination expense accounts, budgets or categories.',
- 'split_intro_three_withdrawal' => 'For example: you could split your :total groceries so you pay :split_one from your "daily groceries" budget and :split_two from your "cigarettes" budget.',
- 'split_table_intro_withdrawal' => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_withdrawal' => 'Store splitted withdrawal',
- 'update_splitted_withdrawal' => 'Update splitted withdrawal',
- 'split_title_deposit' => 'Split your new deposit',
- 'split_intro_one_deposit' => 'Firefly supports the "splitting" of a deposit.',
- 'split_intro_two_deposit' => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
- 'split_intro_three_deposit' => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
- 'split_table_intro_deposit' => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_deposit' => 'Store splitted deposit',
- 'split_title_transfer' => 'Split your new transfer',
- 'split_intro_one_transfer' => 'Firefly supports the "splitting" of a transfer.',
- 'split_intro_two_transfer' => 'It means that the amount of money you\'re moving is divided between several categories or piggy banks.',
- 'split_intro_three_transfer' => 'For example: you could split your :total move so you get :split_one in one piggy bank and :split_two in another.',
- 'split_table_intro_transfer' => 'Split your transfer in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
- 'store_splitted_transfer' => 'Store splitted transfer',
- 'add_another_split' => 'Add another split',
- 'split-transactions' => 'Split transactions',
- 'split-new-transaction' => 'Split a new transaction',
- 'do_split' => 'Do a split',
- 'split_this_withdrawal' => 'Split this withdrawal',
- 'split_this_deposit' => 'Split this deposit',
- 'split_this_transfer' => 'Split this transfer',
- 'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
- 'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
- 'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
-
- // import
- 'configuration_file_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file.',
- 'import_data_index' => 'Index',
- 'import_file_type_csv' => 'CSV (comma separated values)',
- 'import_file_type_help' => 'Select the type of file you will upload',
- 'import_start' => 'Start the import',
- 'configure_import' => 'Further configure your import',
- 'import_finish_configuration' => 'Finish configuration',
- 'settings_for_import' => 'Settings',
- 'import_status' => 'Import status',
- 'import_status_text' => 'The import is currently running, or will start momentarily.',
- 'import_complete' => 'Import configuration complete!',
- 'import_complete_text' => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
- 'import_download_config' => 'Download configuration',
- 'import_start_import' => 'Start import',
- 'import_data' => 'Import data',
- 'import_data_full' => 'Import data into Firefly III',
- 'import' => 'Import',
- 'import_file_help' => 'Select your file',
- 'import_status_settings_complete' => 'The import is ready to start.',
- 'import_status_import_complete' => 'The import has completed.',
- 'import_status_import_running' => 'The import is currently running. Please be patient.',
- 'import_status_header' => 'Import status and progress',
- 'import_status_errors' => 'Import errors',
- 'import_status_report' => 'Import report',
- 'import_finished' => 'Import has finished',
- 'import_error_single' => 'An error has occured during the import.',
- 'import_error_multi' => 'Some errors occured during the import.',
- 'import_error_fatal' => 'There was an error during the import routine. Please check the log files. The error seems to be:',
- 'import_error_timeout' => 'The import seems to have timed out. If this error persists, please import your data using the console command.',
- 'import_double' => 'Row #:row: This row has been imported before, and is stored in :description.',
- 'import_finished_all' => 'The import has finished. Please check out the results below.',
- 'import_with_key' => 'Import with key \':key\'',
- 'import_share_configuration' => 'Please consider downloading your configuration and sharing it at the import configuration center. This will allow other users of Firefly III to import their files more easily.',
- 'import_finished_report' => 'The import has finished. Please note any errors in the block above this line. All transactions imported during this particular session have been tagged, and you can check them out below. ',
- 'import_finished_link' => 'The transactions imported can be found in tag :tag.',
- 'need_at_least_one_account' => 'You need at least one asset account to be able to create piggy banks',
- 'see_help_top_right' => 'For more information, please check out the help pages using the icon in the top right corner of the page.',
- 'bread_crumb_import_complete' => 'Import ":key" complete',
- 'bread_crumb_configure_import' => 'Configure import ":key"',
- 'bread_crumb_import_finished' => 'Import ":key" finished',
- 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.',
- 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
- 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
-
- // sandstorm.io errors and messages:
- 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
-
- // empty lists? no objects? instructions:
- 'no_transactions_in_period' => 'There are no transactions in this period.',
- 'no_accounts_title_asset' => 'Let\'s create an asset account!',
- 'no_accounts_intro_asset' => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
- 'no_accounts_imperative_asset' => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
- 'no_accounts_create_asset' => 'Create an asset account',
- 'no_accounts_title_expense' => 'Let\'s create an expense account!',
- 'no_accounts_intro_expense' => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
- 'no_accounts_imperative_expense' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
- 'no_accounts_create_expense' => 'Create an expense account',
- 'no_accounts_title_revenue' => 'Let\'s create a revenue account!',
- 'no_accounts_intro_revenue' => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
- 'no_accounts_imperative_revenue' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
- 'no_accounts_create_revenue' => 'Create a revenue account',
- 'no_budgets_title_default' => 'Let\'s create a budget',
- 'no_budgets_intro_default' => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
- 'no_budgets_imperative_default' => 'Budgets are the basic tools of financial management. Let\'s create one now:',
- 'no_budgets_create_default' => 'Create a budget',
- 'no_categories_title_default' => 'Let\'s create a category!',
- 'no_categories_intro_default' => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
- 'no_categories_imperative_default' => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
- 'no_categories_create_default' => 'Create a category',
- 'no_tags_title_default' => 'Let\'s create a tag!',
- 'no_tags_intro_default' => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
- 'no_tags_imperative_default' => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
- 'no_tags_create_default' => 'Create a tag',
- 'no_transactions_title_withdrawal' => 'Let\'s create an expense!',
- 'no_transactions_intro_withdrawal' => 'You have no expenses yet. You should create expenses to start managing your finances.',
- 'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
- 'no_transactions_create_withdrawal' => 'Create an expense',
- 'no_transactions_title_deposit' => 'Let\'s create some income!',
- 'no_transactions_intro_deposit' => 'You have no recorded income yet. You should create income entries to start managing your finances.',
- 'no_transactions_imperative_deposit' => 'Have you received some money? Then you should write it down:',
- 'no_transactions_create_deposit' => 'Create a deposit',
- 'no_transactions_title_transfers' => 'Let\'s create a transfer!',
- 'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
- 'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:',
- 'no_transactions_create_transfers' => 'Create a transfer',
- 'no_piggies_title_default' => 'Let\'s create a piggy bank!',
- 'no_piggies_intro_default' => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
- 'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
- 'no_piggies_create_default' => 'Create a new piggy bank',
- 'no_bills_title_default' => 'Let\'s create a bill!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
- 'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
- 'no_bills_create_default' => 'Create a bill',
-
-
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/form.php b/resources/lang/zh_HK/form.php
deleted file mode 100644
index 20be49e75a..0000000000
--- a/resources/lang/zh_HK/form.php
+++ /dev/null
@@ -1,189 +0,0 @@
- 'Bank name',
- 'bank_balance' => 'Balance',
- 'savings_balance' => 'Savings balance',
- 'credit_card_limit' => 'Credit card limit',
- 'automatch' => 'Match automatically',
- 'skip' => 'Skip',
- 'name' => 'Name',
- 'active' => 'Active',
- 'amount_min' => 'Minimum amount',
- 'amount_max' => 'Maximum amount',
- 'match' => 'Matches on',
- 'repeat_freq' => 'Repeats',
- 'journal_currency_id' => 'Currency',
- 'currency_id' => 'Currency',
- 'attachments' => 'Attachments',
- 'journal_amount' => 'Amount',
- 'journal_asset_source_account' => 'Asset account (source)',
- 'journal_source_account_name' => 'Revenue account (source)',
- 'journal_source_account_id' => 'Asset account (source)',
- 'BIC' => 'BIC',
- 'account_from_id' => 'From account',
- 'account_to_id' => 'To account',
- 'source_account' => 'Source account',
- 'destination_account' => 'Destination account',
- 'journal_destination_account_id' => 'Asset account (destination)',
- 'asset_destination_account' => 'Asset account (destination)',
- 'asset_source_account' => 'Asset account (source)',
- 'journal_description' => 'Description',
- 'note' => 'Notes',
- 'split_journal' => 'Split this transaction',
- 'split_journal_explanation' => 'Split this transaction in multiple parts',
- 'currency' => 'Currency',
- 'account_id' => 'Asset account',
- 'budget_id' => 'Budget',
- 'openingBalance' => 'Opening balance',
- 'tagMode' => 'Tag mode',
- 'tagPosition' => 'Tag location',
- 'virtualBalance' => 'Virtual balance',
- 'longitude_latitude' => 'Location',
- 'targetamount' => 'Target amount',
- 'accountRole' => 'Account role',
- 'openingBalanceDate' => 'Opening balance date',
- 'ccType' => 'Credit card payment plan',
- 'ccMonthlyPaymentDate' => 'Credit card monthly payment date',
- 'piggy_bank_id' => 'Piggy bank',
- 'returnHere' => 'Return here',
- 'returnHereExplanation' => 'After storing, return here to create another one.',
- 'returnHereUpdateExplanation' => 'After updating, return here.',
- 'description' => 'Description',
- 'expense_account' => 'Expense account',
- 'revenue_account' => 'Revenue account',
- 'decimal_places' => 'Decimal places',
- 'exchange_rate_instruction' => 'Foreign currencies',
- 'exchanged_amount' => 'Exchanged amount',
- 'source_amount' => 'Amount (source)',
- 'destination_amount' => 'Amount (destination)',
- 'native_amount' => 'Native amount',
-
- 'revenue_account_source' => 'Revenue account (source)',
- 'source_account_asset' => 'Source account (asset account)',
- 'destination_account_expense' => 'Destination account (expense account)',
- 'destination_account_asset' => 'Destination account (asset account)',
- 'source_account_revenue' => 'Source account (revenue account)',
- 'type' => 'Type',
- 'convert_Withdrawal' => 'Convert withdrawal',
- 'convert_Deposit' => 'Convert deposit',
- 'convert_Transfer' => 'Convert transfer',
-
-
- 'amount' => 'Amount',
- 'date' => 'Date',
- 'interest_date' => 'Interest date',
- 'book_date' => 'Book date',
- 'process_date' => 'Processing date',
- 'category' => 'Category',
- 'tags' => 'Tags',
- 'deletePermanently' => 'Delete permanently',
- 'cancel' => 'Cancel',
- 'targetdate' => 'Target date',
- 'tag' => 'Tag',
- 'under' => 'Under',
- 'symbol' => 'Symbol',
- 'code' => 'Code',
- 'iban' => 'IBAN',
- 'accountNumber' => 'Account number',
- 'has_headers' => 'Headers',
- 'date_format' => 'Date format',
- 'specifix' => 'Bank- or file specific fixes',
- 'attachments[]' => 'Attachments',
- 'store_new_withdrawal' => 'Store new withdrawal',
- 'store_new_deposit' => 'Store new deposit',
- 'store_new_transfer' => 'Store new transfer',
- 'add_new_withdrawal' => 'Add a new withdrawal',
- 'add_new_deposit' => 'Add a new deposit',
- 'add_new_transfer' => 'Add a new transfer',
- 'noPiggybank' => '(no piggy bank)',
- 'title' => 'Title',
- 'notes' => 'Notes',
- 'filename' => 'File name',
- 'mime' => 'Mime type',
- 'size' => 'Size',
- 'trigger' => 'Trigger',
- 'stop_processing' => 'Stop processing',
- 'start_date' => 'Start of range',
- 'end_date' => 'End of range',
- 'export_start_range' => 'Start of export range',
- 'export_end_range' => 'End of export range',
- 'export_format' => 'File format',
- 'include_attachments' => 'Include uploaded attachments',
- 'include_old_uploads' => 'Include imported data',
- 'accounts' => 'Export transactions from these accounts',
- 'delete_account' => 'Delete account ":name"',
- 'delete_bill' => 'Delete bill ":name"',
- 'delete_budget' => 'Delete budget ":name"',
- 'delete_category' => 'Delete category ":name"',
- 'delete_currency' => 'Delete currency ":name"',
- 'delete_journal' => 'Delete transaction with description ":description"',
- 'delete_attachment' => 'Delete attachment ":name"',
- 'delete_rule' => 'Delete rule ":title"',
- 'delete_rule_group' => 'Delete rule group ":title"',
- 'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?',
- 'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?',
- 'bill_areYouSure' => 'Are you sure you want to delete the bill named ":name"?',
- 'rule_areYouSure' => 'Are you sure you want to delete the rule titled ":title"?',
- 'ruleGroup_areYouSure' => 'Are you sure you want to delete the rule group titled ":title"?',
- 'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?',
- 'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?',
- 'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?',
- 'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?',
- 'journal_areYouSure' => 'Are you sure you want to delete the transaction described ":description"?',
- 'mass_journal_are_you_sure' => 'Are you sure you want to delete these transactions?',
- 'tag_areYouSure' => 'Are you sure you want to delete the tag ":tag"?',
- 'permDeleteWarning' => 'Deleting stuff from Firely is permanent and cannot be undone.',
- 'mass_make_selection' => 'You can still prevent items from being deleted by removing the checkbox.',
- 'delete_all_permanently' => 'Delete selected permanently',
- 'update_all_journals' => 'Update these transactions',
- 'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
- 'also_delete_rules' => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
- 'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
- 'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
- 'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
- 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
- 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
-
- 'email' => 'Email address',
- 'password' => 'Password',
- 'password_confirmation' => 'Password (again)',
- 'blocked' => 'Is blocked?',
- 'blocked_code' => 'Reason for block',
-
-
- // admin
- 'domain' => 'Domain',
- 'single_user_mode' => 'Single user mode',
- 'must_confirm_account' => 'New users must activate account',
- 'is_demo_site' => 'Is demo site',
-
-
- // import
- 'import_file' => 'Import file',
- 'configuration_file' => 'Configuration file',
- 'import_file_type' => 'Import file type',
- 'csv_comma' => 'A comma (,)',
- 'csv_semicolon' => 'A semicolon (;)',
- 'csv_tab' => 'A tab (invisible)',
- 'csv_delimiter' => 'CSV field delimiter',
- 'csv_import_account' => 'Default import account',
- 'csv_config' => 'CSV import configuration',
-
-
- 'due_date' => 'Due date',
- 'payment_date' => 'Payment date',
- 'invoice_date' => 'Invoice date',
- 'internal_reference' => 'Internal reference',
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/help.php b/resources/lang/zh_HK/help.php
deleted file mode 100644
index 61210ffe41..0000000000
--- a/resources/lang/zh_HK/help.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'Welcome to Firefly III',
- 'main-content-text' => 'Do yourself a favor and follow this short guide to make sure you know your way around.',
- 'sidebar-toggle-title' => 'Sidebar to create stuff',
- 'sidebar-toggle-text' => 'Hidden under the plus icon are all the buttons to create new stuff. Accounts, transactions, everything!',
- 'account-menu-title' => 'All your accounts',
- 'account-menu-text' => 'Here you can find all the accounts you\'ve made.',
- 'budget-menu-title' => 'Budgets',
- 'budget-menu-text' => 'Use this page to organise your finances and limit spending.',
- 'report-menu-title' => 'Reports',
- 'report-menu-text' => 'Check this out when you want a solid overview of your finances.',
- 'transaction-menu-title' => 'Transactions',
- 'transaction-menu-text' => 'All transactions you\'ve created can be found here.',
- 'option-menu-title' => 'Options',
- 'option-menu-text' => 'This is pretty self-explanatory.',
- 'main-content-end-title' => 'The end!',
- 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.',
- 'index' => 'index',
- 'home' => 'home',
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/list.php b/resources/lang/zh_HK/list.php
deleted file mode 100644
index 90625d54e6..0000000000
--- a/resources/lang/zh_HK/list.php
+++ /dev/null
@@ -1,89 +0,0 @@
- 'Buttons',
- 'icon' => 'Icon',
- 'id' => 'ID',
- 'create_date' => 'Created at',
- 'update_date' => 'Updated at',
- 'balance_before' => 'Balance before',
- 'balance_after' => 'Balance after',
- 'name' => 'Name',
- 'role' => 'Role',
- 'currentBalance' => 'Current balance',
- 'active' => 'Is active?',
- 'lastActivity' => 'Last activity',
- 'balanceDiff' => 'Balance difference between :start and :end',
- 'matchedOn' => 'Matched on',
- 'matchesOn' => 'Matched on',
- 'account_type' => 'Account type',
- 'created_at' => 'Created at',
- 'new_balance' => 'New balance',
- 'account' => 'Account',
- 'matchingAmount' => 'Amount',
- 'lastMatch' => 'Last match',
- 'split_number' => 'Split #',
- 'destination' => 'Destination',
- 'source' => 'Source',
- 'next_expected_match' => 'Next expected match',
- 'automatch' => 'Auto match?',
- 'repeat_freq' => 'Repeats',
- 'description' => 'Description',
- 'amount' => 'Amount',
- 'internal_reference' => 'Internal reference',
- 'date' => 'Date',
- 'interest_date' => 'Interest date',
- 'book_date' => 'Book date',
- 'process_date' => 'Processing date',
- 'due_date' => 'Due date',
- 'payment_date' => 'Payment date',
- 'invoice_date' => 'Invoice date',
- 'interal_reference' => 'Internal reference',
- 'notes' => 'Notes',
- 'from' => 'From',
- 'piggy_bank' => 'Piggy bank',
- 'to' => 'To',
- 'budget' => 'Budget',
- 'category' => 'Category',
- 'bill' => 'Bill',
- 'withdrawal' => 'Withdrawal',
- 'deposit' => 'Deposit',
- 'transfer' => 'Transfer',
- 'type' => 'Type',
- 'completed' => 'Completed',
- 'iban' => 'IBAN',
- 'paid_current_period' => 'Paid this period',
- 'email' => 'Email',
- 'registered_at' => 'Registered at',
- 'is_activated' => 'Is activated',
- 'is_blocked' => 'Is blocked',
- 'is_admin' => 'Is admin',
- 'has_two_factor' => 'Has 2FA',
- 'confirmed_from' => 'Confirmed from',
- 'registered_from' => 'Registered from',
- 'blocked_code' => 'Block code',
- 'domain' => 'Domain',
- 'registration_attempts' => 'Registration attempts',
- 'source_account' => 'Source account',
- 'destination_account' => 'Destination account',
-
- 'accounts_count' => 'Number of accounts',
- 'journals_count' => 'Number of transactions',
- 'attachments_count' => 'Number of attachments',
- 'bills_count' => 'Number of bills',
- 'categories_count' => 'Number of categories',
- 'export_jobs_count' => 'Number of export jobs',
- 'import_jobs_count' => 'Number of import jobs',
- 'budget_count' => 'Number of budgets',
- 'rule_and_groups_count' => 'Number of rules and rule groups',
- 'tags_count' => 'Number of tags',
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/pagination.php b/resources/lang/zh_HK/pagination.php
deleted file mode 100644
index 4eeab21dee..0000000000
--- a/resources/lang/zh_HK/pagination.php
+++ /dev/null
@@ -1,17 +0,0 @@
- '« Previous',
- 'next' => 'Next »',
-
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/passwords.php b/resources/lang/zh_HK/passwords.php
deleted file mode 100644
index 2e11aa92dc..0000000000
--- a/resources/lang/zh_HK/passwords.php
+++ /dev/null
@@ -1,19 +0,0 @@
- 'Passwords must be at least six characters and match the confirmation.',
- 'user' => 'We can\'t find a user with that e-mail address.',
- 'token' => 'This password reset token is invalid.',
- 'sent' => 'We have e-mailed your password reset link!',
- 'reset' => 'Your password has been reset!',
- 'blocked' => 'Nice try though.',
-];
\ No newline at end of file
diff --git a/resources/lang/zh_HK/validation.php b/resources/lang/zh_HK/validation.php
deleted file mode 100644
index addd0e6f39..0000000000
--- a/resources/lang/zh_HK/validation.php
+++ /dev/null
@@ -1,91 +0,0 @@
- 'This is not a valid IBAN.',
- 'unique_account_number_for_user' => 'It looks like this account number is already in use.',
- 'deleted_user' => 'Due to security constraints, you cannot register using this email address.',
- 'rule_trigger_value' => 'This value is invalid for the selected trigger.',
- 'rule_action_value' => 'This value is invalid for the selected action.',
- 'invalid_domain' => 'Due to security constraints, you cannot register from this domain.',
- 'file_already_attached' => 'Uploaded file ":name" is already attached to this object.',
- 'file_attached' => 'Succesfully uploaded file ":name".',
- 'file_invalid_mime' => 'File ":name" is of type ":mime" which is not accepted as a new upload.',
- 'file_too_large' => 'File ":name" is too large.',
- 'belongs_to_user' => 'The value of :attribute is unknown',
- 'accepted' => 'The :attribute must be accepted.',
- 'bic' => 'This is not a valid BIC.',
- 'more' => ':attribute must be larger than zero.',
- 'active_url' => 'The :attribute is not a valid URL.',
- 'after' => 'The :attribute must be a date after :date.',
- 'alpha' => 'The :attribute may only contain letters.',
- 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
- 'alpha_num' => 'The :attribute may only contain letters and numbers.',
- 'array' => 'The :attribute must be an array.',
- 'unique_for_user' => 'There already is an entry with this :attribute.',
- 'before' => 'The :attribute must be a date before :date.',
- 'unique_object_for_user' => 'This name is already in use',
- 'unique_account_for_user' => 'This account name is already in use',
- 'between.numeric' => 'The :attribute must be between :min and :max.',
- 'between.file' => 'The :attribute must be between :min and :max kilobytes.',
- 'between.string' => 'The :attribute must be between :min and :max characters.',
- 'between.array' => 'The :attribute must have between :min and :max items.',
- 'boolean' => 'The :attribute field must be true or false.',
- 'confirmed' => 'The :attribute confirmation does not match.',
- 'date' => 'The :attribute is not a valid date.',
- 'date_format' => 'The :attribute does not match the format :format.',
- 'different' => 'The :attribute and :other must be different.',
- 'digits' => 'The :attribute must be :digits digits.',
- 'digits_between' => 'The :attribute must be between :min and :max digits.',
- 'email' => 'The :attribute must be a valid email address.',
- 'filled' => 'The :attribute field is required.',
- 'exists' => 'The selected :attribute is invalid.',
- 'image' => 'The :attribute must be an image.',
- 'in' => 'The selected :attribute is invalid.',
- 'integer' => 'The :attribute must be an integer.',
- 'ip' => 'The :attribute must be a valid IP address.',
- 'json' => 'The :attribute must be a valid JSON string.',
- 'max.numeric' => 'The :attribute may not be greater than :max.',
- 'max.file' => 'The :attribute may not be greater than :max kilobytes.',
- 'max.string' => 'The :attribute may not be greater than :max characters.',
- 'max.array' => 'The :attribute may not have more than :max items.',
- 'mimes' => 'The :attribute must be a file of type: :values.',
- 'min.numeric' => 'The :attribute must be at least :min.',
- 'min.file' => 'The :attribute must be at least :min kilobytes.',
- 'min.string' => 'The :attribute must be at least :min characters.',
- 'min.array' => 'The :attribute must have at least :min items.',
- 'not_in' => 'The selected :attribute is invalid.',
- 'numeric' => 'The :attribute must be a number.',
- 'regex' => 'The :attribute format is invalid.',
- 'required' => 'The :attribute field is required.',
- 'required_if' => 'The :attribute field is required when :other is :value.',
- 'required_unless' => 'The :attribute field is required unless :other is in :values.',
- 'required_with' => 'The :attribute field is required when :values is present.',
- 'required_with_all' => 'The :attribute field is required when :values is present.',
- 'required_without' => 'The :attribute field is required when :values is not present.',
- 'required_without_all' => 'The :attribute field is required when none of :values are present.',
- 'same' => 'The :attribute and :other must match.',
- 'size.numeric' => 'The :attribute must be :size.',
- 'size.file' => 'The :attribute must be :size kilobytes.',
- 'size.string' => 'The :attribute must be :size characters.',
- 'size.array' => 'The :attribute must contain :size items.',
- 'unique' => 'The :attribute has already been taken.',
- 'string' => 'The :attribute must be a string.',
- 'url' => 'The :attribute format is invalid.',
- 'timezone' => 'The :attribute must be a valid zone.',
- '2fa_code' => 'The :attribute field is invalid.',
- 'dimensions' => 'The :attribute has invalid image dimensions.',
- 'distinct' => 'The :attribute field has a duplicate value.',
- 'file' => 'The :attribute must be a file.',
- 'in_array' => 'The :attribute field does not exist in :other.',
- 'present' => 'The :attribute field must be present.',
- 'amount_zero' => 'The total amount cannot be zero',
-];
\ No newline at end of file
diff --git a/resources/views/accounts/create.twig b/resources/views/accounts/create.twig
index 2063b86e79..1747c1a20b 100644
--- a/resources/views/accounts/create.twig
+++ b/resources/views/accounts/create.twig
@@ -19,7 +19,7 @@
{{ ExpandedForm.text('name') }}
{% if what == 'asset' %}
{# Not really mandatory but OK #}
- {{ ExpandedForm.select('currency_id', currencies) }}
+ {{ ExpandedForm.select('currency_id', currencySelectList, null, {helpText:'account_default_currency'|_}) }}
{% endif %}
@@ -39,10 +39,10 @@
{% if what == 'asset' %}
- {{ ExpandedForm.balance('openingBalance') }}
+ {{ ExpandedForm.nonSelectableBalance('openingBalance') }}
{{ ExpandedForm.date('openingBalanceDate') }}
{{ ExpandedForm.select('accountRole', roles,null,{'helpText' : 'asset_account_role_help'|_}) }}
- {{ ExpandedForm.balance('virtualBalance') }}
+ {{ ExpandedForm.nonSelectableBalance('virtualBalance') }}
{% endif %}
@@ -70,6 +70,13 @@
{% block scripts %}
+ {# JS currency list for update thing #}
+
{% endblock %}
diff --git a/resources/views/accounts/delete.twig b/resources/views/accounts/delete.twig
index 7203d40a25..919ee63a76 100644
--- a/resources/views/accounts/delete.twig
+++ b/resources/views/accounts/delete.twig
@@ -1,7 +1,7 @@
{% extends "./layout/default" %}
{% block breadcrumbs %}
- {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute().getName(), account) }}
+ {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account) }}
{% endblock %}
{% block content %}
diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twig
index e01e7f98ee..5123ee9751 100644
--- a/resources/views/accounts/edit.twig
+++ b/resources/views/accounts/edit.twig
@@ -19,7 +19,7 @@
{{ ExpandedForm.text('name') }}
{% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %}
{# Not really mandatory but OK #}
- {{ ExpandedForm.select('currency_id', currencies) }}
+ {{ ExpandedForm.select('currency_id', currencySelectList) }}
{% endif %}
@@ -36,10 +36,12 @@
{{ ExpandedForm.text('accountNumber') }}
{% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %}
- {{ ExpandedForm.balance('openingBalance',null, {'currency' : openingBalance ? openingBalance.transactionCurrency : null}) }}
+
+ {# get opening balance entry for this thing! #}
+ {{ ExpandedForm.nonSelectableBalance('openingBalance',null, {'currency' : currency }) }}
{{ ExpandedForm.date('openingBalanceDate') }}
{{ ExpandedForm.select('accountRole', roles) }}
- {{ ExpandedForm.balance('virtualBalance',null) }}
+ {{ ExpandedForm.nonSelectableBalance('virtualBalance',null, {'currency' : currency }) }}
{% endif %}
{{ ExpandedForm.checkbox('active','1') }}
@@ -80,6 +82,15 @@
{% block scripts %}
+
+ {# JS currency list for update thing #}
+
+
{% endblock %}
diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twig
index 84f653aacb..e40e3984a3 100644
--- a/resources/views/accounts/index.twig
+++ b/resources/views/accounts/index.twig
@@ -5,32 +5,38 @@
{% endblock %}
{% block content %}
+ {% if accounts.count > 0 %}
+ | {{ 'spent'|_ }} | -{{ entry[2]|formatAmount }} | +{{ period.spent|formatAmount }} |
| {{ 'earned'|_ }} | -{{ entry[3]|formatAmount }} | +{{ period.earned|formatAmount }} |
- {{ 'confirm_account_intro'|_ }} -
- -- {{ trans('firefly.confirm_account_not_resent_intro', {owner:owner})|raw }} -
- -- {{ trans('firefly.confirm_account_is_resent_text', {owner:owner})|raw }} -
- -| {{ 'transactions'|_ }} | +{{ period.count }} | +
| {{ 'spent'|_ }} | +{{ period.sum|formatAmount }} | +
| {{ 'transactions'|_ }} | +{{ period.count }} | +
| {{ 'spent'|_ }} | +{{ period.spent|formatAmount }} | +
| {{ 'earned'|_ }} | +{{ period.earned|formatAmount }} | +
| {{ 'transferred'|_ }} | +{{ period.transferred|formatAmountPlain }} | +
| {{ 'spent'|_ }} | -{{ entry[2]|formatAmount }} | +{{ period.spent|formatAmount }} |
| {{ 'earned'|_ }} | -{{ entry[3]|formatAmount }} | +{{ period.earned|formatAmount }} | +
| {{ 'sum'|_ }} | +{{ period.sum|formatAmount }} | +|
| {{ 'transferred'|_ }} | +{{ period.transferred|formatAmountPlain }} |
{{ 'csv_column_roles_text'|_ }}
-- {{ 'csv_download_config_text'|_ }} -
- -- {{ 'csv_do_download_config'|_ }} -
- -- {{ 'csv_more_information_text'|_ }} -
-{{ 'csv_index_beta_warning'|_ }}
- {% if unsupported|length > 0 %} -{{ 'csv_index_unsupported_warning'|_ }}
-- {{ 'csv_map_text'|_ }} -
-- - {{ trans('firefly.csv_process_text',{rows: rows}) }} -
- - {% if errors|length > 0 %} -{{ Lang.choice('firefly.csv_import_with_errors',errors|length,{errors: errors|length}) }}
-- {{ trans('firefly.csv_error_see_logs') }} -
- {% endif %} - -- - {{ trans('firefly.csv_process_new_entries',{imported: imported}) }} -
- - {% if journals|length > 0 %} -- {{ 'csv_start_over'|_ }} - {{ 'csv_to_index'|_ }} - {{ 'csv_do_download_config'|_ }} - -
-- Firefly III ran into an error: {{ errorMessage }} + Firefly III v{{ version }} ran into an error: {{ errorMessage }}
diff --git a/resources/views/emails/error-text.twig b/resources/views/emails/error-text.twig index e195cdb631..56d4ea7a39 100644 --- a/resources/views/emails/error-text.twig +++ b/resources/views/emails/error-text.twig @@ -1,5 +1,5 @@ {% include 'emails.header-text' %} -Firefly III ran into an error: {{ errorMessage }}. +Firefly III v{{ version }} ran into an error: {{ errorMessage }}. The error was of type "{{ class }}". diff --git a/resources/views/emails/password-html.twig b/resources/views/emails/password-html.twig index 07e4e0a80a..2b15f16191 100644 --- a/resources/views/emails/password-html.twig +++ b/resources/views/emails/password-html.twig @@ -8,6 +8,6 @@
{% include 'emails.footer-html' %} diff --git a/resources/views/errors/500.twig b/resources/views/errors/500.twig index 456f0b73dd..5c90946598 100644 --- a/resources/views/errors/500.twig +++ b/resources/views/errors/500.twig @@ -1,6 +1,6 @@ -