From 4bbc898639b1cc0e476d409107cbeb4408f836a3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 11 Aug 2023 06:04:03 +0200 Subject: [PATCH 1/7] Expand bill API and v2 account API --- .../Controllers/Model/Bill/ShowController.php | 2 + .../Model/PiggyBank/ShowController.php | 73 +++++ .../Transaction/List/AccountController.php | 8 +- .../List/TransactionController.php | 11 +- app/Models/UserGroup.php | 11 + app/Providers/PiggyBankServiceProvider.php | 20 +- .../PiggyBank/PiggyBankRepository.php | 50 ++++ .../PiggyBankRepositoryInterface.php | 39 +++ app/Transformers/V2/AccountTransformer.php | 49 ++-- app/Transformers/V2/PiggyBankTransformer.php | 269 ++++++++++++++++++ routes/api.php | 15 + 11 files changed, 520 insertions(+), 27 deletions(-) create mode 100644 app/Api/V2/Controllers/Model/PiggyBank/ShowController.php create mode 100644 app/Repositories/Administration/PiggyBank/PiggyBankRepository.php create mode 100644 app/Repositories/Administration/PiggyBank/PiggyBankRepositoryInterface.php create mode 100644 app/Transformers/V2/PiggyBankTransformer.php diff --git a/app/Api/V2/Controllers/Model/Bill/ShowController.php b/app/Api/V2/Controllers/Model/Bill/ShowController.php index b9ad71529c..a0c1cdbfff 100644 --- a/app/Api/V2/Controllers/Model/Bill/ShowController.php +++ b/app/Api/V2/Controllers/Model/Bill/ShowController.php @@ -1,4 +1,6 @@ . + */ + +namespace FireflyIII\Api\V2\Controllers\Model\PiggyBank; + +use FireflyIII\Api\V2\Controllers\Controller; +use FireflyIII\Repositories\Administration\PiggyBank\PiggyBankRepositoryInterface; +use FireflyIII\Transformers\V2\PiggyBankTransformer; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\Request; +use Illuminate\Pagination\LengthAwarePaginator; + +/** + * Class ShowController + */ +class ShowController extends Controller +{ + private PiggyBankRepositoryInterface $repository; + + public function __construct() + { + parent::__construct(); + $this->middleware( + function ($request, $next) { + $this->repository = app(PiggyBankRepositoryInterface::class); + $this->repository->setAdministrationId(auth()->user()->user_group_id); + return $next($request); + } + ); + } + + /** + * @param Request $request + * + * TODO see autocomplete/accountcontroller for list. + * + * @return JsonResponse + */ + public function index(Request $request): JsonResponse + { + $piggies = $this->repository->getPiggyBanks(); + $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; + $count = $piggies->count(); + $piggies = $piggies->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $paginator = new LengthAwarePaginator($piggies, $count, $pageSize, $this->parameters->get('page')); + $transformer = new PiggyBankTransformer(); + $transformer->setParameters($this->parameters); // give params to transformer + + return response() + ->json($this->jsonApiList('piggy-banks', $paginator, $transformer)) + ->header('Content-Type', self::CONTENT_TYPE); + } +} diff --git a/app/Api/V2/Controllers/Transaction/List/AccountController.php b/app/Api/V2/Controllers/Transaction/List/AccountController.php index d00e08a81e..d0ce8d858f 100644 --- a/app/Api/V2/Controllers/Transaction/List/AccountController.php +++ b/app/Api/V2/Controllers/Transaction/List/AccountController.php @@ -80,9 +80,11 @@ class AccountController extends Controller $paginator = $collector->getPaginatedGroups(); $paginator->setPath( - sprintf('%s?%s', - route('api.v2.accounts.transactions', [$account->id]), - $request->buildParams()) + sprintf( + '%s?%s', + route('api.v2.accounts.transactions', [$account->id]), + $request->buildParams() + ) ); return response() diff --git a/app/Api/V2/Controllers/Transaction/List/TransactionController.php b/app/Api/V2/Controllers/Transaction/List/TransactionController.php index a68e344498..48d5967746 100644 --- a/app/Api/V2/Controllers/Transaction/List/TransactionController.php +++ b/app/Api/V2/Controllers/Transaction/List/TransactionController.php @@ -1,4 +1,6 @@ getPaginatedGroups(); $paginator->setPath( - sprintf('%s?%s', - route('api.v2.transactions.list'), - $request->buildParams()) + sprintf( + '%s?%s', + route('api.v2.transactions.list'), + $request->buildParams() + ) ); return response() diff --git a/app/Models/UserGroup.php b/app/Models/UserGroup.php index af28168786..8f2bd8581e 100644 --- a/app/Models/UserGroup.php +++ b/app/Models/UserGroup.php @@ -29,6 +29,7 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\Relations\HasManyThrough; use Illuminate\Support\Carbon; /** @@ -106,6 +107,16 @@ class UserGroup extends Model return $this->hasMany(GroupMembership::class); } + /** + * Link to piggy banks. + * + * @return HasManyThrough + */ + public function piggyBanks(): HasManyThrough + { + return $this->hasManyThrough(PiggyBank::class, Account::class); + } + /** * Link to transaction journals. * diff --git a/app/Providers/PiggyBankServiceProvider.php b/app/Providers/PiggyBankServiceProvider.php index 05e0514419..c05aa49467 100644 --- a/app/Providers/PiggyBankServiceProvider.php +++ b/app/Providers/PiggyBankServiceProvider.php @@ -25,6 +25,10 @@ namespace FireflyIII\Providers; use FireflyIII\Repositories\PiggyBank\PiggyBankRepository; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; + +use FireflyIII\Repositories\Administration\PiggyBank\PiggyBankRepository as AdminPiggyBankRepository; +use FireflyIII\Repositories\Administration\PiggyBank\PiggyBankRepositoryInterface as AdminPiggyBankRepositoryInterface; + use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -36,9 +40,7 @@ class PiggyBankServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot(): void - { - } + public function boot(): void {} /** * Register the application services. @@ -57,5 +59,17 @@ class PiggyBankServiceProvider extends ServiceProvider return $repository; } ); + + $this->app->bind( + AdminPiggyBankRepositoryInterface::class, + function (Application $app) { + /** @var AdminPiggyBankRepository $repository */ + $repository = app(AdminPiggyBankRepository::class); + if ($app->auth->check()) { // @phpstan-ignore-line (phpstan does not understand the reference to auth) + $repository->setUser(auth()->user()); + } + return $repository; + } + ); } } diff --git a/app/Repositories/Administration/PiggyBank/PiggyBankRepository.php b/app/Repositories/Administration/PiggyBank/PiggyBankRepository.php new file mode 100644 index 0000000000..49b3c5413e --- /dev/null +++ b/app/Repositories/Administration/PiggyBank/PiggyBankRepository.php @@ -0,0 +1,50 @@ +. + */ + +namespace FireflyIII\Repositories\Administration\PiggyBank; + +use FireflyIII\Support\Repositories\Administration\AdministrationTrait; +use Illuminate\Support\Collection; + +/** + * Class PiggyBankRepository + */ +class PiggyBankRepository implements PiggyBankRepositoryInterface +{ + use AdministrationTrait; + + /** + * @inheritDoc + */ + public function getPiggyBanks(): Collection + { + return $this->userGroup->piggyBanks() + ->with( + [ + 'account', + 'objectGroups', + ] + ) + ->orderBy('order', 'ASC')->get(); + } +} diff --git a/app/Repositories/Administration/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/Administration/PiggyBank/PiggyBankRepositoryInterface.php new file mode 100644 index 0000000000..a128e3827a --- /dev/null +++ b/app/Repositories/Administration/PiggyBank/PiggyBankRepositoryInterface.php @@ -0,0 +1,39 @@ +. + */ + +namespace FireflyIII\Repositories\Administration\PiggyBank; + +use Illuminate\Support\Collection; + +/** + * Interface PiggyBankRepositoryInterface + */ +interface PiggyBankRepositoryInterface +{ + /** + * Return all piggy banks. + * + * @return Collection + */ + public function getPiggyBanks(): Collection; +} diff --git a/app/Transformers/V2/AccountTransformer.php b/app/Transformers/V2/AccountTransformer.php index a7e82727f0..b5afd3e84b 100644 --- a/app/Transformers/V2/AccountTransformer.php +++ b/app/Transformers/V2/AccountTransformer.php @@ -37,10 +37,11 @@ use Illuminate\Support\Collection; */ class AccountTransformer extends AbstractTransformer { - private array $accountMeta; - private array $balances; - private array $currencies; - private ?TransactionCurrency $currency; + private array $accountMeta; + private array $balances; + private array $convertedBalances; + private array $currencies; + private TransactionCurrency $default; /** * @inheritDoc @@ -48,12 +49,12 @@ class AccountTransformer extends AbstractTransformer */ public function collectMetaData(Collection $objects): void { - $this->currency = null; - $this->currencies = []; - $this->accountMeta = []; - $this->balances = app('steam')->balancesByAccounts($objects, $this->getDate()); - $repository = app(CurrencyRepositoryInterface::class); - $this->currency = app('amount')->getDefaultCurrency(); + $this->currencies = []; + $this->accountMeta = []; + $this->balances = app('steam')->balancesByAccounts($objects, $this->getDate()); + $this->convertedBalances = app('steam')->balancesByAccountsConverted($objects, $this->getDate()); + $repository = app(CurrencyRepositoryInterface::class); + $this->default = app('amount')->getDefaultCurrency(); // get currencies: $accountIds = $objects->pluck('id')->toArray(); @@ -100,10 +101,13 @@ class AccountTransformer extends AbstractTransformer $id = (int)$account->id; // no currency? use default - $currency = $this->currency; + $currency = $this->default; if (0 !== (int)$this->accountMeta[$id]['currency_id']) { $currency = $this->currencies[(int)$this->accountMeta[$id]['currency_id']]; } + // amounts and calculation. + $balance = $this->balances[$id] ?? null; + $nativeBalance = $this->convertedBalances[$id]['native_balance'] ?? null; return [ 'id' => (string)$account->id, @@ -112,19 +116,30 @@ class AccountTransformer extends AbstractTransformer 'active' => $account->active, //'order' => $order, 'name' => $account->name, + 'iban' => '' === $account->iban ? null : $account->iban, // 'type' => strtolower($accountType), // 'account_role' => $accountRole, - 'currency_id' => $currency->id, + 'currency_id' => (string)$currency->id, 'currency_code' => $currency->code, 'currency_symbol' => $currency->symbol, - 'currency_decimal_places' => $currency->decimal_places, - 'current_balance' => $this->balances[$id] ?? null, - 'current_balance_date' => $this->getDate(), + 'currency_decimal_places' => (int)$currency->decimal_places, + + 'native_id' => (string)$this->default->id, + 'native_code' => $this->default->code, + 'native_symbol' => $this->default->symbol, + 'native_decimal_places' => (int)$this->default->decimal_places, + + // balance: + 'current_balance' => $balance, + 'native_current_balance' => $nativeBalance, + 'current_balance_date' => $this->getDate(), + + // more meta + // 'notes' => $this->repository->getNoteText($account), // 'monthly_payment_date' => $monthlyPaymentDate, // 'credit_card_type' => $creditCardType, // 'account_number' => $this->repository->getMetaValue($account, 'account_number'), - 'iban' => '' === $account->iban ? null : $account->iban, // 'bic' => $this->repository->getMetaValue($account, 'BIC'), // 'virtual_balance' => number_format((float) $account->virtual_balance, $decimalPlaces, '.', ''), // 'opening_balance' => $openingBalance, @@ -138,7 +153,7 @@ class AccountTransformer extends AbstractTransformer // 'longitude' => $longitude, // 'latitude' => $latitude, // 'zoom_level' => $zoomLevel, - 'links' => [ + 'links' => [ [ 'rel' => 'self', 'uri' => '/accounts/' . $account->id, diff --git a/app/Transformers/V2/PiggyBankTransformer.php b/app/Transformers/V2/PiggyBankTransformer.php new file mode 100644 index 0000000000..5db4160413 --- /dev/null +++ b/app/Transformers/V2/PiggyBankTransformer.php @@ -0,0 +1,269 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Transformers\V2; + +use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\Account; +use FireflyIII\Models\AccountMeta; +use FireflyIII\Models\Note; +use FireflyIII\Models\ObjectGroup; +use FireflyIII\Models\PiggyBank; +use FireflyIII\Models\PiggyBankRepetition; +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Support\Http\Api\ExchangeRateConverter; +use Illuminate\Support\Collection; +use Illuminate\Support\Facades\DB; +use JsonException; + +/** + * Class PiggyBankTransformer + */ +class PiggyBankTransformer extends AbstractTransformer +{ +// private AccountRepositoryInterface $accountRepos; +// private CurrencyRepositoryInterface $currencyRepos; +// private PiggyBankRepositoryInterface $piggyRepos; + private array $accounts; + private ExchangeRateConverter $converter; + private array $currencies; + private TransactionCurrency $default; + private array $groups; + private array $notes; + private array $repetitions; + + /** + * PiggyBankTransformer constructor. + * + + */ + public function __construct() + { + $this->notes = []; + $this->accounts = []; + $this->groups = []; + $this->currencies = []; + $this->repetitions = []; +// $this-> +// $this->currencyRepos = app(CurrencyRepositoryInterface::class); +// $this->piggyRepos = app(PiggyBankRepositoryInterface::class); + } + + /** + * @inheritDoc + */ + public function collectMetaData(Collection $objects): void + { + // TODO move to repository (does not exist yet) + $piggyBanks = $objects->pluck('id')->toArray(); + $accountInfo = Account::whereIn('id', $objects->pluck('account_id')->toArray())->get(); + $currencyPreferences = AccountMeta::where('name', '"currency_id"')->whereIn('account_id', $objects->pluck('account_id')->toArray())->get(); + /** @var Account $account */ + foreach ($accountInfo as $account) { + $id = (int)$account->id; + $this->accounts[$id] = [ + 'name' => $account->name, + ]; + } + /** @var AccountMeta $preference */ + foreach ($currencyPreferences as $preference) { + $currencyId = (int)$preference->data; + $accountId = (int)$preference->account_id; + $currencies[$currencyId] = $currencies[$currencyId] ?? TransactionJournal::find($currencyId); + $this->currencies[$accountId] = $currencies[$currencyId]; + } + + // grab object groups: + $set = DB::table('object_groupables') + ->leftJoin('object_groups', 'object_groups.id', '=', 'object_groupables.object_group_id') + ->where('object_groupables.object_groupable_type', PiggyBank::class) + ->get(['object_groupables.*', 'object_groups.title', 'object_groups.order']); + /** @var ObjectGroup $entry */ + foreach ($set as $entry) { + $piggyBankId = (int)$entry->object_groupable_id; + $id = (int)$entry->object_group_id; + $order = (int)$entry->order; + $this->groups[$piggyBankId] = [ + 'object_group_id' => $id, + 'object_group_title' => $entry->title, + 'object_group_order' => $order, + ]; + + } + + // grab repetitions (for current amount): + $repetitions = PiggyBankRepetition::whereIn('piggy_bank_id', $piggyBanks)->get(); + /** @var PiggyBankRepetition $repetition */ + foreach ($repetitions as $repetition) { + $this->repetitions[(int)$repetition->piggy_bank_id] = [ + 'amount' => $repetition->currentamount, + ]; + } + + // grab notes + // continue with notes + $notes = Note::whereNoteableType(PiggyBank::class)->whereIn('noteable_id', array_keys($piggyBanks))->get(); + /** @var Note $note */ + foreach ($notes as $note) { + $id = (int)$note->noteable_id; + $this->notes[$id] = $note; + } + + $this->default = app('amount')->getDefaultCurrencyByUser(auth()->user()); + $this->converter = new ExchangeRateConverter(); + } + + /** + * Transform the piggy bank. + * + * @param PiggyBank $piggyBank + * + * @return array + * @throws FireflyException + * @throws JsonException + */ + public function transform(PiggyBank $piggyBank): array + { +// $account = $piggyBank->account; +// $this->accountRepos->setUser($account->user); +// $this->currencyRepos->setUser($account->user); +// $this->piggyRepos->setUser($account->user); + + // get currency from account, or use default. +// $currency = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUser($account->user); + + // note +// $notes = $this->piggyRepos->getNoteText($piggyBank); +// $notes = '' === $notes ? null : $notes; + +// $objectGroupId = null; +// $objectGroupOrder = null; +// $objectGroupTitle = null; +// /** @var ObjectGroup $objectGroup */ +// $objectGroup = $piggyBank->objectGroups->first(); +// if (null !== $objectGroup) { +// $objectGroupId = (int)$objectGroup->id; +// $objectGroupOrder = (int)$objectGroup->order; +// $objectGroupTitle = $objectGroup->title; +// } + + // get currently saved amount: +// $currentAmount = app('steam')->bcround($this->piggyRepos->getCurrentAmount($piggyBank), $currency->decimal_places); + + $percentage = null; + $leftToSave = null; + $nativeLeftToSave = null; + $savePerMonth = null; + $nativeSavePerMonth = null; + $startDate = $piggyBank->startdate?->format('Y-m-d'); + $targetDate = $piggyBank->targetdate?->format('Y-m-d'); + $accountId = (int)$piggyBank->account_id; + $accountName = $this->accounts[$accountId]['name'] ?? null; + $currency = $this->currencies[$accountId] ?? $this->default; + $currentAmount = app('steam')->bcround($this->repetitions[(int)$piggyBank->id]['amount'] ?? '0', $currency->decimal_places); + $nativeCurrentAmount = $this->converter->convert($this->default, $currency, today(), $currentAmount); + $targetAmount = $piggyBank->targetamount; + $nativeTargetAmount = $this->converter->convert($this->default, $currency, today(), $targetAmount); + $note = $this->notes[(int)$piggyBank->id] ?? null; + $group = $this->groups[(int)$piggyBank->id] ?? null; + + if (0 !== bccomp($targetAmount, '0')) { // target amount is not 0.00 + $leftToSave = bcsub($targetAmount, $currentAmount); + $nativeLeftToSave = $this->converter->convert($this->default, $currency, today(), $leftToSave); + $percentage = (int)bcmul(bcdiv($currentAmount, $targetAmount), '100'); + $savePerMonth = $this->getSuggestedMonthlyAmount($currentAmount, $targetAmount, $piggyBank->startdate, $piggyBank->targetdate); + $nativeSavePerMonth = $this->converter->convert($this->default, $currency, today(), $savePerMonth); + } + + return [ + 'id' => (string)$piggyBank->id, + 'created_at' => $piggyBank->created_at->toAtomString(), + 'updated_at' => $piggyBank->updated_at->toAtomString(), + 'account_id' => (string)$piggyBank->account_id, + 'account_name' => $accountName, + 'name' => $piggyBank->name, + 'currency_id' => (string)$currency->id, + 'currency_code' => $currency->code, + 'currency_symbol' => $currency->symbol, + 'currency_decimal_places' => (int)$currency->decimal_places, + 'native_id' => (string)$this->default->id, + 'native_code' => $this->default->code, + 'native_symbol' => $this->default->symbol, + 'native_decimal_places' => (int)$this->default->decimal_places, + 'current_amount' => $currentAmount, + 'native_current_amount' => $nativeCurrentAmount, + 'target_amount' => $targetAmount, + 'native_target_amount' => $nativeTargetAmount, + 'percentage' => $percentage, + 'left_to_save' => $leftToSave, + 'native_left_to_save' => $nativeLeftToSave, + 'save_per_month' => $savePerMonth, + 'native_save_per_month' => $nativeSavePerMonth, + 'start_date' => $startDate, + 'target_date' => $targetDate, + 'order' => (int)$piggyBank->order, + 'active' => $piggyBank->active, + 'notes' => $note, + 'object_group_id' => $group ? $group['object_group_id'] : null, + 'object_group_order' => $group ? $group['object_group_order'] : null, + 'object_group_title' => $group ? $group['object_group_title'] : null, + 'links' => [ + [ + 'rel' => 'self', + 'uri' => '/piggy_banks/' . $piggyBank->id, + ], + ], + ]; + } + + /** + * @return string|null + */ + private function getSuggestedMonthlyAmount(string $currentAmount, string $targetAmount, ?Carbon $startDate, ?Carbon $targetDate): string + { + $savePerMonth = '0'; + if (null === $targetDate) { + return '0'; + } + if (bccomp($currentAmount, $targetAmount) < 1) { + $now = today(config('app.timezone')); + $startDate = null !== $startDate && $startDate->gte($now) ? $startDate : $now; + $diffInMonths = $startDate->diffInMonths($targetDate, false); + $remainingAmount = bcsub($targetAmount, $currentAmount); + + // more than 1 month to go and still need money to save: + if ($diffInMonths > 0 && 1 === bccomp($remainingAmount, '0')) { + $savePerMonth = bcdiv($remainingAmount, (string)$diffInMonths); + } + + // less than 1 month to go but still need money to save: + if (0 === $diffInMonths && 1 === bccomp($remainingAmount, '0')) { + $savePerMonth = $remainingAmount; + } + } + + return $savePerMonth; + } +} diff --git a/routes/api.php b/routes/api.php index 46a67cb10e..c77a37d9af 100644 --- a/routes/api.php +++ b/routes/api.php @@ -138,6 +138,21 @@ Route::group( Route::get('sum/unpaid', ['uses' => 'SumController@unpaid', 'as' => 'sum.unpaid']); } ); + +/** + * V2 API route for piggy banks. + */ +Route::group( + [ + 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\PiggyBank', + 'prefix' => 'v2/piggy-banks', + 'as' => 'api.v2.piggy-banks.', + ], + static function () { + Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']); + } +); + /** * V2 API route for budgets and budget limits: */ From 2b829cb645f29ff36a196bf8b5a85e4046725fe3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 11 Aug 2023 06:05:02 +0200 Subject: [PATCH 2/7] Code cleanup --- app/Providers/PiggyBankServiceProvider.php | 4 +- app/Transformers/V2/PiggyBankTransformer.php | 48 ++++++++++---------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/app/Providers/PiggyBankServiceProvider.php b/app/Providers/PiggyBankServiceProvider.php index c05aa49467..f06b1ab55a 100644 --- a/app/Providers/PiggyBankServiceProvider.php +++ b/app/Providers/PiggyBankServiceProvider.php @@ -40,7 +40,9 @@ class PiggyBankServiceProvider extends ServiceProvider /** * Bootstrap the application services. */ - public function boot(): void {} + public function boot(): void + { + } /** * Register the application services. diff --git a/app/Transformers/V2/PiggyBankTransformer.php b/app/Transformers/V2/PiggyBankTransformer.php index 5db4160413..7b649a925b 100644 --- a/app/Transformers/V2/PiggyBankTransformer.php +++ b/app/Transformers/V2/PiggyBankTransformer.php @@ -43,9 +43,9 @@ use JsonException; */ class PiggyBankTransformer extends AbstractTransformer { -// private AccountRepositoryInterface $accountRepos; -// private CurrencyRepositoryInterface $currencyRepos; -// private PiggyBankRepositoryInterface $piggyRepos; + // private AccountRepositoryInterface $accountRepos; + // private CurrencyRepositoryInterface $currencyRepos; + // private PiggyBankRepositoryInterface $piggyRepos; private array $accounts; private ExchangeRateConverter $converter; private array $currencies; @@ -66,9 +66,9 @@ class PiggyBankTransformer extends AbstractTransformer $this->groups = []; $this->currencies = []; $this->repetitions = []; -// $this-> -// $this->currencyRepos = app(CurrencyRepositoryInterface::class); -// $this->piggyRepos = app(PiggyBankRepositoryInterface::class); + // $this-> + // $this->currencyRepos = app(CurrencyRepositoryInterface::class); + // $this->piggyRepos = app(PiggyBankRepositoryInterface::class); } /** @@ -146,31 +146,31 @@ class PiggyBankTransformer extends AbstractTransformer */ public function transform(PiggyBank $piggyBank): array { -// $account = $piggyBank->account; -// $this->accountRepos->setUser($account->user); -// $this->currencyRepos->setUser($account->user); -// $this->piggyRepos->setUser($account->user); + // $account = $piggyBank->account; + // $this->accountRepos->setUser($account->user); + // $this->currencyRepos->setUser($account->user); + // $this->piggyRepos->setUser($account->user); // get currency from account, or use default. -// $currency = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUser($account->user); + // $currency = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUser($account->user); // note -// $notes = $this->piggyRepos->getNoteText($piggyBank); -// $notes = '' === $notes ? null : $notes; + // $notes = $this->piggyRepos->getNoteText($piggyBank); + // $notes = '' === $notes ? null : $notes; -// $objectGroupId = null; -// $objectGroupOrder = null; -// $objectGroupTitle = null; -// /** @var ObjectGroup $objectGroup */ -// $objectGroup = $piggyBank->objectGroups->first(); -// if (null !== $objectGroup) { -// $objectGroupId = (int)$objectGroup->id; -// $objectGroupOrder = (int)$objectGroup->order; -// $objectGroupTitle = $objectGroup->title; -// } + // $objectGroupId = null; + // $objectGroupOrder = null; + // $objectGroupTitle = null; + // /** @var ObjectGroup $objectGroup */ + // $objectGroup = $piggyBank->objectGroups->first(); + // if (null !== $objectGroup) { + // $objectGroupId = (int)$objectGroup->id; + // $objectGroupOrder = (int)$objectGroup->order; + // $objectGroupTitle = $objectGroup->title; + // } // get currently saved amount: -// $currentAmount = app('steam')->bcround($this->piggyRepos->getCurrentAmount($piggyBank), $currency->decimal_places); + // $currentAmount = app('steam')->bcround($this->piggyRepos->getCurrentAmount($piggyBank), $currency->decimal_places); $percentage = null; $leftToSave = null; From 939c636a74897d08d84f10a1a27f04ec6ff8f6f8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 11 Aug 2023 06:16:40 +0200 Subject: [PATCH 3/7] Add new action that can switch the source and destination account of a transfer --- .../Actions/SwitchAccounts.php | 97 +++++++++++++++++++ config/firefly.php | 2 + public/v1/js/ff/rules/create-edit.js | 91 ++++++++--------- resources/lang/en_US/firefly.php | 14 ++- 4 files changed, 156 insertions(+), 48 deletions(-) create mode 100644 app/TransactionRules/Actions/SwitchAccounts.php diff --git a/app/TransactionRules/Actions/SwitchAccounts.php b/app/TransactionRules/Actions/SwitchAccounts.php new file mode 100644 index 0000000000..98d67259fc --- /dev/null +++ b/app/TransactionRules/Actions/SwitchAccounts.php @@ -0,0 +1,97 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\TransactionRules\Actions; + +use DB; +use FireflyIII\Events\TriggeredAuditLog; +use FireflyIII\Models\RuleAction; +use FireflyIII\Models\Transaction; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Models\TransactionType; +use Illuminate\Support\Facades\Log; + +/** + * + * Class SwitchAccounts + */ +class SwitchAccounts implements ActionInterface +{ + private RuleAction $action; + + /** + * TriggerInterface constructor. + * + * @param RuleAction $action + */ + public function __construct(RuleAction $action) + { + $this->action = $action; + } + + /** + * @inheritDoc + */ + public function actOnArray(array $journal): bool + { + // make object from array (so the data is fresh). + /** @var TransactionJournal|null $object */ + $object = TransactionJournal::where('user_id', $journal['user_id'])->find($journal['transaction_journal_id']); + if (null === $object) { + Log::error(sprintf('Cannot find journal #%d, cannot switch accounts.', $journal['transaction_journal_id'])); + return false; + } + $groupCount = TransactionJournal::where('transaction_group_id', $journal['transaction_group_id'])->count(); + if ($groupCount > 1) { + Log::error(sprintf('Group #%d has more than one transaction in it, cannot switch accounts.', $journal['transaction_group_id'])); + return false; + } + + $type = $object->transactionType->type; + if (TransactionType::TRANSFER !== $type) { + Log::error(sprintf('Journal #%d is NOT a transfer (rule #%d), cannot switch accounts.', $journal['transaction_journal_id'], $this->action->rule_id)); + + return false; + } + + /** @var Transaction $sourceTransaction */ + $sourceTransaction = $object->transactions()->where('amount', '<', 0)->first(); + /** @var Transaction $destTransaction */ + $destTransaction = $object->transactions()->where('amount', '>', 0)->first(); + if (null === $sourceTransaction || null === $destTransaction) { + Log::error(sprintf('Journal #%d has no source or destination transaction (rule #%d), cannot switch accounts.', $journal['transaction_journal_id'], $this->action->rule_id)); + + return false; + } + $sourceAccountId = (int)$sourceTransaction->account_id; + $destinationAccountId = $destTransaction->account_id; + $sourceTransaction->account_id = $destinationAccountId; + $destTransaction->account_id = $sourceAccountId; + $sourceTransaction->save(); + $destTransaction->save(); + + event(new TriggeredAuditLog($this->action->rule, $object, 'switch_accounts', $sourceAccountId, $destinationAccountId)); + + return true; + } +} diff --git a/config/firefly.php b/config/firefly.php index 9330870c16..3ded7995ae 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -86,6 +86,7 @@ use FireflyIII\TransactionRules\Actions\SetDescription; use FireflyIII\TransactionRules\Actions\SetDestinationAccount; use FireflyIII\TransactionRules\Actions\SetNotes; use FireflyIII\TransactionRules\Actions\SetSourceAccount; +use FireflyIII\TransactionRules\Actions\SwitchAccounts; use FireflyIII\TransactionRules\Actions\UpdatePiggybank; use FireflyIII\User; @@ -503,6 +504,7 @@ return [ 'convert_withdrawal' => ConvertToWithdrawal::class, 'convert_deposit' => ConvertToDeposit::class, 'convert_transfer' => ConvertToTransfer::class, + 'switch_accounts' => SwitchAccounts::class, 'update_piggy' => UpdatePiggybank::class, 'delete_transaction' => DeleteTransaction::class, 'append_descr_to_notes' => AppendDescriptionToNotes::class, diff --git a/public/v1/js/ff/rules/create-edit.js b/public/v1/js/ff/rules/create-edit.js index 16b99fe032..eb3688cfa1 100644 --- a/public/v1/js/ff/rules/create-edit.js +++ b/public/v1/js/ff/rules/create-edit.js @@ -162,7 +162,7 @@ function onAddNewAction() { "use strict"; console.log('Now in onAddNewAction()'); - var selectQuery = 'select[name^="actions["][name$="][type]"]'; + var selectQuery = 'select[name^="actions["][name$="][type]"]'; var selectResult = $(selectQuery); console.log('Select query is "' + selectQuery + '" and the result length is ' + selectResult.length); @@ -190,7 +190,7 @@ function onAddNewTrigger() { "use strict"; console.log('Now in onAddNewTrigger()'); - var selectQuery = 'select[name^="triggers["][name$="][type]"]'; + var selectQuery = 'select[name^="triggers["][name$="][type]"]'; var selectResult = $(selectQuery); console.log('Select query is "' + selectQuery + '" and the result length is ' + selectResult.length); @@ -217,9 +217,9 @@ function onAddNewTrigger() { function updateActionInput(selectList) { console.log('Now in updateActionInput() for a select list, currently with value "' + selectList.val() + '".'); // the actual row this select list is in: - var parent = selectList.parent().parent(); + var parent = selectList.parent().parent(); // the text input we're looking for: - var inputQuery = 'input[name^="actions["][name$="][value]"]'; + var inputQuery = 'input[name^="actions["][name$="][value]"]'; var inputResult = parent.find(inputQuery); console.log('Searching for children in this row with query "' + inputQuery + '" resulted in ' + inputResult.length + ' results.'); @@ -234,6 +234,7 @@ function updateActionInput(selectList) { case 'clear_budget': case 'append_descr_to_notes': case 'append_notes_to_descr': + case 'switch_accounts': case 'move_descr_to_notes': case 'move_notes_to_descr': case 'clear_notes': @@ -296,9 +297,9 @@ function updateActionInput(selectList) { function updateTriggerInput(selectList) { console.log('Now in updateTriggerInput() for a select list, currently with value "' + selectList.val() + '".'); // the actual row this select list is in: - var parent = selectList.parent().parent(); + var parent = selectList.parent().parent(); // the text input we're looking for: - var inputQuery = 'input[name^="triggers["][name$="][value]"]'; + var inputQuery = 'input[name^="triggers["][name$="][value]"]'; var inputResult = parent.find(inputQuery); console.log('Searching for children in this row with query "' + inputQuery + '" resulted in ' + inputResult.length + ' results.'); @@ -391,50 +392,50 @@ function createAutoComplete(input, URL) { input.typeahead('destroy'); // append URL: - var lastChar = URL[URL.length - 1]; + var lastChar = URL[URL.length - 1]; var urlParamSplit = '?'; if ('&' === lastChar) { urlParamSplit = ''; } var source = new Bloodhound({ - datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), - queryTokenizer: Bloodhound.tokenizers.whitespace, - prefetch: { - url: URL + urlParamSplit + 'uid=' + uid, - filter: function (list) { - return $.map(list, function (item) { - if (item.hasOwnProperty('active') && item.active === true) { - return {name: item.name}; - } - if (item.hasOwnProperty('active') && item.active === false) { - return; - } - if (item.hasOwnProperty('active')) { - console.log(item.active); - } - return {name: item.name}; - }); - } - }, - remote: { - url: URL + urlParamSplit + 'query=%QUERY&uid=' + uid, - wildcard: '%QUERY', - filter: function (list) { - return $.map(list, function (item) { - if (item.hasOwnProperty('active') && item.active === true) { - return {name: item.name}; - } - if (item.hasOwnProperty('active') && item.active === false) { - return; - } - if (item.hasOwnProperty('active')) { - console.log(item.active); - } - return {name: item.name}; - }); - } - } - }); + datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), + queryTokenizer: Bloodhound.tokenizers.whitespace, + prefetch: { + url: URL + urlParamSplit + 'uid=' + uid, + filter: function (list) { + return $.map(list, function (item) { + if (item.hasOwnProperty('active') && item.active === true) { + return {name: item.name}; + } + if (item.hasOwnProperty('active') && item.active === false) { + return; + } + if (item.hasOwnProperty('active')) { + console.log(item.active); + } + return {name: item.name}; + }); + } + }, + remote: { + url: URL + urlParamSplit + 'query=%QUERY&uid=' + uid, + wildcard: '%QUERY', + filter: function (list) { + return $.map(list, function (item) { + if (item.hasOwnProperty('active') && item.active === true) { + return {name: item.name}; + } + if (item.hasOwnProperty('active') && item.active === false) { + return; + } + if (item.hasOwnProperty('active')) { + console.log(item.active); + } + return {name: item.name}; + }); + } + } + }); source.initialize(); input.typeahead({hint: true, highlight: true,}, {source: source, displayKey: 'name', autoSelect: false}); } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index b5d5bcbed1..94b792c88f 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -904,10 +904,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaction journal ID is..', 'rule_trigger_journal_id' => 'Transaction journal ID is ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1178,6 +1182,7 @@ return [ // Ignore this comment // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Set category to ":action_value"', @@ -1215,6 +1220,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Link to bill ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Set notes to ":action_value"', 'rule_action_convert_deposit_choice' => 'Convert the transaction to a deposit', 'rule_action_convert_deposit' => 'Convert the transaction to a deposit from ":action_value"', @@ -2603,6 +2610,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', From e1ba2d9ad9ad061b2a5c3871166c445951af4e07 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 11 Aug 2023 06:24:50 +0200 Subject: [PATCH 4/7] New translations --- resources/lang/bg_BG/firefly.php | 22 +++++++++++++------- resources/lang/bg_BG/form.php | 1 + resources/lang/ca_ES/firefly.php | 26 +++++++++++++++--------- resources/lang/ca_ES/form.php | 1 + resources/lang/cs_CZ/firefly.php | 22 +++++++++++++------- resources/lang/cs_CZ/form.php | 1 + resources/lang/da_DK/firefly.php | 22 +++++++++++++------- resources/lang/da_DK/form.php | 1 + resources/lang/de_DE/firefly.php | 26 +++++++++++++++--------- resources/lang/de_DE/form.php | 1 + resources/lang/el_GR/firefly.php | 22 +++++++++++++------- resources/lang/el_GR/form.php | 1 + resources/lang/en_GB/firefly.php | 22 +++++++++++++------- resources/lang/en_GB/form.php | 1 + resources/lang/es_ES/firefly.php | 26 +++++++++++++++--------- resources/lang/es_ES/form.php | 1 + resources/lang/fi_FI/firefly.php | 22 +++++++++++++------- resources/lang/fi_FI/form.php | 1 + resources/lang/fr_FR/firefly.php | 26 +++++++++++++++--------- resources/lang/fr_FR/form.php | 1 + resources/lang/hu_HU/firefly.php | 22 +++++++++++++------- resources/lang/hu_HU/form.php | 1 + resources/lang/id_ID/firefly.php | 22 +++++++++++++------- resources/lang/id_ID/form.php | 1 + resources/lang/it_IT/firefly.php | 22 +++++++++++++------- resources/lang/it_IT/form.php | 1 + resources/lang/ja_JP/breadcrumbs.php | 2 +- resources/lang/ja_JP/firefly.php | 30 ++++++++++++++++++---------- resources/lang/ja_JP/form.php | 1 + resources/lang/ko_KR/firefly.php | 30 ++++++++++++++++++---------- resources/lang/ko_KR/form.php | 1 + resources/lang/nb_NO/firefly.php | 22 +++++++++++++------- resources/lang/nb_NO/form.php | 1 + resources/lang/nl_NL/firefly.php | 22 +++++++++++++------- resources/lang/nl_NL/form.php | 1 + resources/lang/nn_NO/firefly.php | 22 +++++++++++++------- resources/lang/nn_NO/form.php | 1 + resources/lang/pl_PL/firefly.php | 30 ++++++++++++++++++---------- resources/lang/pl_PL/form.php | 1 + resources/lang/pt_BR/firefly.php | 22 +++++++++++++------- resources/lang/pt_BR/form.php | 1 + resources/lang/pt_PT/firefly.php | 22 +++++++++++++------- resources/lang/pt_PT/form.php | 1 + resources/lang/ro_RO/firefly.php | 22 +++++++++++++------- resources/lang/ro_RO/form.php | 1 + resources/lang/ru_RU/firefly.php | 26 +++++++++++++++--------- resources/lang/ru_RU/form.php | 1 + resources/lang/sk_SK/firefly.php | 22 +++++++++++++------- resources/lang/sk_SK/form.php | 1 + resources/lang/sl_SI/firefly.php | 22 +++++++++++++------- resources/lang/sl_SI/form.php | 1 + resources/lang/sv_SE/firefly.php | 22 +++++++++++++------- resources/lang/sv_SE/form.php | 1 + resources/lang/th_TH/firefly.php | 22 +++++++++++++------- resources/lang/th_TH/form.php | 1 + resources/lang/tr_TR/firefly.php | 22 +++++++++++++------- resources/lang/tr_TR/form.php | 1 + resources/lang/uk_UA/firefly.php | 22 +++++++++++++------- resources/lang/uk_UA/form.php | 1 + resources/lang/vi_VN/firefly.php | 22 +++++++++++++------- resources/lang/vi_VN/form.php | 1 + resources/lang/zh_CN/firefly.php | 22 +++++++++++++------- resources/lang/zh_CN/form.php | 1 + resources/lang/zh_TW/firefly.php | 22 +++++++++++++------- resources/lang/zh_TW/form.php | 1 + 65 files changed, 535 insertions(+), 247 deletions(-) diff --git a/resources/lang/bg_BG/firefly.php b/resources/lang/bg_BG/firefly.php index d567f48cf7..4ad4f37572 100644 --- a/resources/lang/bg_BG/firefly.php +++ b/resources/lang/bg_BG/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Транзакцията е от тип ":trigger_value"', 'rule_trigger_category_is_choice' => 'Категорията е..', 'rule_trigger_category_is' => 'Категорията е ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Сумата е по-малко от..', - 'rule_trigger_amount_less' => 'Сумата е по-малко от :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Сумата е по-голяма от..', - 'rule_trigger_amount_more' => 'Сумата е по-голяма от :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Описанието започва с..', 'rule_trigger_description_starts' => 'Описанието започва с ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Описанието завършва с..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'ID на транзакцията е..', 'rule_trigger_journal_id' => 'ID на транзакцията е ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Задайте категория на ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Свържи към сметка ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Задай бележките на ":action_value"', 'rule_action_convert_deposit_choice' => 'Преобразувайте транзакцията в депозит', 'rule_action_convert_deposit' => 'Преобразувайте транзакцията в депозит в ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/bg_BG/form.php b/resources/lang/bg_BG/form.php index f0d7053a79..8d90fa6bf0 100644 --- a/resources/lang/bg_BG/form.php +++ b/resources/lang/bg_BG/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Начало на обхвата', 'end_date' => 'Край на обхвата', 'enddate' => 'End date', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Начало на обхвата', 'end' => 'Край на обхвата', 'delete_account' => 'Изтрий сметка ":name"', diff --git a/resources/lang/ca_ES/firefly.php b/resources/lang/ca_ES/firefly.php index db11b4ad4b..04883bdcf5 100644 --- a/resources/lang/ca_ES/firefly.php +++ b/resources/lang/ca_ES/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'La transacció és del tipus ":trigger_value"', 'rule_trigger_category_is_choice' => 'La categoria és..', 'rule_trigger_category_is' => 'La categoria és ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'La quantitat és inferior a..', - 'rule_trigger_amount_less' => 'La quantitat és inferior a :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'La quantitat és..', 'rule_trigger_amount_is' => 'La quantitat és :trigger_value', - 'rule_trigger_amount_more_choice' => 'La quantitat és superior a..', - 'rule_trigger_amount_more' => 'La quantitat és superior a :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'La descripció comença per..', 'rule_trigger_description_starts' => 'La descripció comença per ":trigger_value"', 'rule_trigger_description_ends_choice' => 'La descripció acaba amb..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'La referència interna és ":trigger_value"', 'rule_trigger_journal_id_choice' => 'L\'ID del llibre de transaccions és..', 'rule_trigger_journal_id' => 'L\'ID del llibre de transaccions és ":trigger_value"', - 'rule_trigger_no_external_url' => 'La transacció no té URL extern', - 'rule_trigger_any_external_url' => 'La transacció té URL extern', - 'rule_trigger_any_external_url_choice' => 'La transacció té URL extern', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'La transacció no té URL extern', + 'rule_trigger_no_external_url' => 'La transacció no té URL extern', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'L\'ID de la transacció és..', 'rule_trigger_id' => 'L\'ID de la transacció és ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'El SEPA CT és..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'ELIMINAR transacció(!)', 'rule_action_delete_transaction' => 'ELIMINAR transacció(!)', 'rule_action_set_category' => 'Estableix categoria a ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Establir les notes a ..', 'rule_action_link_to_bill_choice' => 'Enllaçar a una factura ..', 'rule_action_link_to_bill' => 'Enllaçar a la factura ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Establir notes a ":action_value"', 'rule_action_convert_deposit_choice' => 'Convertir la transacció a un dipòsit', 'rule_action_convert_deposit' => 'Convertir la transacció a un dipòsit de ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Etiqueta buidada', 'ale_action_clear_all_tags' => 'Buidades totes les etiquetes', 'ale_action_set_bill' => 'Enllaçat a la factura', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Establir pressupost', 'ale_action_set_category' => 'Establir categoria', 'ale_action_set_source' => 'Establir compte d\'origen', @@ -2715,8 +2723,8 @@ return [ 'ale_action_add_tag' => 'Etiqueta afegida', // dashboard - 'enable_auto_convert' => 'Enable currency conversion', - 'disable_auto_convert' => 'Disable currency conversion', + 'enable_auto_convert' => 'Habilita la conversió de moneda', + 'disable_auto_convert' => 'Deshabilita la conversió de moneda', ]; diff --git a/resources/lang/ca_ES/form.php b/resources/lang/ca_ES/form.php index 9af75921b2..7d68840f73 100644 --- a/resources/lang/ca_ES/form.php +++ b/resources/lang/ca_ES/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Inici del rang', 'end_date' => 'Fi del rang', 'enddate' => 'Data de fi', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Inici del rang', 'end' => 'Fi del rang', 'delete_account' => 'Eliminar compte ":name"', diff --git a/resources/lang/cs_CZ/firefly.php b/resources/lang/cs_CZ/firefly.php index f11d115341..b50549342e 100644 --- a/resources/lang/cs_CZ/firefly.php +++ b/resources/lang/cs_CZ/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transakce je typu „:trigger_value“', 'rule_trigger_category_is_choice' => 'Kategorie je…', 'rule_trigger_category_is' => 'Kategorie je „:trigger_value“', - 'rule_trigger_amount_less_choice' => 'Částka je nižší než…', - 'rule_trigger_amount_less' => 'Částka je nižší než :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Částka je vyšší než…', - 'rule_trigger_amount_more' => 'Částka je vyšší než :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Popis začíná na…', 'rule_trigger_description_starts' => 'Popis začíná na „:trigger_value“', 'rule_trigger_description_ends_choice' => 'Popis končí na…', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaction journal ID is..', 'rule_trigger_journal_id' => 'Transaction journal ID is ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Nastavit kategorii na „:action_value“', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Link to bill ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Nastavit poznámky na „:action_value“', 'rule_action_convert_deposit_choice' => 'Přeměnit tuto transakci na vklad', 'rule_action_convert_deposit' => 'Přeměnit tuto transakci z vkladu na „:action_value“', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/cs_CZ/form.php b/resources/lang/cs_CZ/form.php index 743edc176f..4e990fe15c 100644 --- a/resources/lang/cs_CZ/form.php +++ b/resources/lang/cs_CZ/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Začátek rozsahu', 'end_date' => 'Konec rozsahu', 'enddate' => 'Datum ukončení', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Začátek rozsahu', 'end' => 'Konec rozsahu', 'delete_account' => 'Smazat účet „:name“', diff --git a/resources/lang/da_DK/firefly.php b/resources/lang/da_DK/firefly.php index 002a874940..570d5d028d 100644 --- a/resources/lang/da_DK/firefly.php +++ b/resources/lang/da_DK/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transaktionen er af typen ":trigger_value"', 'rule_trigger_category_is_choice' => 'Kategorien er..', 'rule_trigger_category_is' => 'Kategori er ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Beløbet er mindre end..', - 'rule_trigger_amount_less' => 'Beløbet er mindre end :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Beløbet er mere end..', - 'rule_trigger_amount_more' => 'Beløbet er mere end :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Beskrivelsen starter med..', 'rule_trigger_description_starts' => 'Beskrivelsen starter med ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Beskrivelsen slutter med..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaktionsjournal ID er..', 'rule_trigger_journal_id' => 'Transaktionsjournal ID er ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaktion har ikke noget eksternt URL', - 'rule_trigger_any_external_url' => 'Transaktion har et eksternt URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaktion har ikke noget eksternt URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Sæt kategori til ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Link til regning ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Sæt noter til ":action_value"', 'rule_action_convert_deposit_choice' => 'Konverter transaktionen til et indskud', 'rule_action_convert_deposit' => 'Konverter transaktionen til et indskud fra ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/da_DK/form.php b/resources/lang/da_DK/form.php index 47dc11b2a2..2ed47386d9 100644 --- a/resources/lang/da_DK/form.php +++ b/resources/lang/da_DK/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Start på området', 'end_date' => 'Slut på området', 'enddate' => 'Slut dato', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Start på området', 'end' => 'Slut på området', 'delete_account' => 'Slet konto ":name"', diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index f29deee99b..a4868bf03b 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Buchung ist vom Typ ":trigger_value"', 'rule_trigger_category_is_choice' => 'Kategorie ist..', 'rule_trigger_category_is' => 'Kategorie ist ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Betrag ist geringer als..', - 'rule_trigger_amount_less' => 'Betrag ist kleiner als :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Betrag ist..', 'rule_trigger_amount_is' => 'Betrag lautet :trigger_value', - 'rule_trigger_amount_more_choice' => 'Betrag ist mehr als..', - 'rule_trigger_amount_more' => 'Betrag ist größer als :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Beschreibung beginnt mit..', 'rule_trigger_description_starts' => 'Beschreibung beginnt mit ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Beschreibung endet mit..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Interne Referenz ist ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaktions-Journal-ID ist..', 'rule_trigger_journal_id' => 'Transaktions-Journal-ID ist „:trigger_value”', - 'rule_trigger_no_external_url' => 'Buchung hat keine externe URL', - 'rule_trigger_any_external_url' => 'Buchung hat eine externe URL', - 'rule_trigger_any_external_url_choice' => 'Buchung hat eine externe URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Buchung hat keine externe URL', + 'rule_trigger_no_external_url' => 'Buchung hat keine externe URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Buchungskennung lautet..', 'rule_trigger_id' => 'Buchungskennung lautet „:trigger_value”', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT ist...', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'Buchung LÖSCHEN(!)', 'rule_action_delete_transaction' => 'Buchung LÖSCHEN(!)', 'rule_action_set_category' => 'Kategorie auf ":action_value" setzen', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Setze Notizen auf ..', 'rule_action_link_to_bill_choice' => 'Mit einer Rechnung verknüpfen..', 'rule_action_link_to_bill' => 'Mit Rechnung „:action_value” verknüpfen', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Notizen auf „:action_value” setzen', 'rule_action_convert_deposit_choice' => 'Buchung in eine Einnahme umwandeln', 'rule_action_convert_deposit' => 'Buchung von ":action_value" in eine Einnahme umwandeln', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Schlagwort geleert', 'ale_action_clear_all_tags' => 'Alle Schlagwörter geleert', 'ale_action_set_bill' => 'Verknüpft mit Rechnung', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Budget festlegen', 'ale_action_set_category' => 'Kategorie festlegen', 'ale_action_set_source' => 'Quellkonto festlegen', @@ -2715,8 +2723,8 @@ return [ 'ale_action_add_tag' => 'Schlagwort hinzugefügt', // dashboard - 'enable_auto_convert' => 'Enable currency conversion', - 'disable_auto_convert' => 'Disable currency conversion', + 'enable_auto_convert' => 'Währungsumrechnung aktivieren', + 'disable_auto_convert' => 'Währungsumrechnung deaktivieren', ]; diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php index 93edcf382d..665095b333 100644 --- a/resources/lang/de_DE/form.php +++ b/resources/lang/de_DE/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Anfang des Bereichs', 'end_date' => 'Ende des Bereichs', 'enddate' => 'Endet am', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Anfang des Bereichs', 'end' => 'Ende des Bereichs', 'delete_account' => 'Konto „:name” löschen', diff --git a/resources/lang/el_GR/firefly.php b/resources/lang/el_GR/firefly.php index 6e7ecf70dc..c1379635e8 100644 --- a/resources/lang/el_GR/firefly.php +++ b/resources/lang/el_GR/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Η συναλλαγή είναι τύπου ":trigger_value"', 'rule_trigger_category_is_choice' => 'Η κατηγορία είναι..', 'rule_trigger_category_is' => 'Η κατηγορία είναι ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Το ποσό είναι μικρότερο από..', - 'rule_trigger_amount_less' => 'Το ποσό είναι μικρότερο από :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Το ποσό είναι μεγαλύτερο από..', - 'rule_trigger_amount_more' => 'Το ποσό είναι μεγαλύτερο από :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Η περιγραφή αρχίζει με..', 'rule_trigger_description_starts' => 'Η περιγραφή αρχίζει με ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Η περιγραφή τελειώνει με..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Το ημερολογιακό ID της συναλλαγής είναι..', 'rule_trigger_journal_id' => 'Το ημερολογιακό ID της συναλλαγής είναι ":trigger_value"', - 'rule_trigger_no_external_url' => 'Η συναλλαγή δεν έχει εξωτερικό URL', - 'rule_trigger_any_external_url' => 'Η συναλλαγή έχει ένα εξωτερικό URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Η συναλλαγή δεν έχει εξωτερικό URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Ορίστε την κατηγορία σε ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Σύνδεση στο πάγιο έξοδο ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Ορισμός σημειώσεων σε ":action_value"', 'rule_action_convert_deposit_choice' => 'Μετατροπή της συναλλαγής σε μία κατάθεση', 'rule_action_convert_deposit' => 'Μετατροπή της συναλλαγής σε μία κατάθεση από ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Αφαίρεση ετικέτας', 'ale_action_clear_all_tags' => 'Αφαίρεση όλων των ετικετών', 'ale_action_set_bill' => 'Σύνδεση με πάγιο έξοδο', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Ορισμός προϋπολογισμού', 'ale_action_set_category' => 'Ορισμός κατηγορίας', 'ale_action_set_source' => 'Ορισμός λογαριασμού προέλευσης', diff --git a/resources/lang/el_GR/form.php b/resources/lang/el_GR/form.php index 71c4bd2ebc..094f3ee898 100644 --- a/resources/lang/el_GR/form.php +++ b/resources/lang/el_GR/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Αρχή του εύρους', 'end_date' => 'Τέλος του εύρους', 'enddate' => 'Ημερομηνία λήξης', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Αρχή του εύρους', 'end' => 'Τέλος του εύρους', 'delete_account' => 'Διαγραφή λογαριασμού ":name"', diff --git a/resources/lang/en_GB/firefly.php b/resources/lang/en_GB/firefly.php index f0523b0f0b..736d0fac72 100644 --- a/resources/lang/en_GB/firefly.php +++ b/resources/lang/en_GB/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transaction is of type ":trigger_value"', 'rule_trigger_category_is_choice' => 'Category is..', 'rule_trigger_category_is' => 'Category is ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Amount is less than..', - 'rule_trigger_amount_less' => 'Amount is less than :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Amount is more than..', - 'rule_trigger_amount_more' => 'Amount is more than :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Description starts with..', 'rule_trigger_description_starts' => 'Description starts with ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Description ends with..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaction journal ID is..', 'rule_trigger_journal_id' => 'Transaction journal ID is ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Set category to ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Link to bill ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Set notes to ":action_value"', 'rule_action_convert_deposit_choice' => 'Convert the transaction to a deposit', 'rule_action_convert_deposit' => 'Convert the transaction to a deposit from ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/en_GB/form.php b/resources/lang/en_GB/form.php index 6ca929dd77..f97fe082b3 100644 --- a/resources/lang/en_GB/form.php +++ b/resources/lang/en_GB/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Start of range', 'end_date' => 'End of range', 'enddate' => 'End date', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Start of range', 'end' => 'End of range', 'delete_account' => 'Delete account ":name"', diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 6cbb72ae9f..22b49f5654 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'La transacción es de tipo ":trigger_value"', 'rule_trigger_category_is_choice' => 'Categoría es..', 'rule_trigger_category_is' => 'Categoría es ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Cantidad es menos de..', - 'rule_trigger_amount_less' => 'La cantidad es menor que :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Cantidad es..', 'rule_trigger_amount_is' => 'Cantidad es :trigger_value', - 'rule_trigger_amount_more_choice' => 'Cantidad es mas de..', - 'rule_trigger_amount_more' => 'Cantidad es más de :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Descripción comienza con..', 'rule_trigger_description_starts' => 'La descripción comienza con ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Descripción termina con..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'La referencia interna es ":trigger_value"', 'rule_trigger_journal_id_choice' => 'El ID del diario de transacciones es..', 'rule_trigger_journal_id' => 'El ID del diario de transacciones es ":trigger_value"', - 'rule_trigger_no_external_url' => 'La transacción no tiene URL externa', - 'rule_trigger_any_external_url' => 'La transacción tiene una URL externa', - 'rule_trigger_any_external_url_choice' => 'La transacción tiene una URL externa', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'La transacción no tiene URL externa', + 'rule_trigger_no_external_url' => 'La transacción no tiene URL externa', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'La ID de la transacción es..', 'rule_trigger_id' => 'La ID de la transacción es ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'El SEPA CT es..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'ELIMINAR transacción(!)', 'rule_action_delete_transaction' => 'ELIMINAR transacción(!)', 'rule_action_set_category' => 'Establecer categoría en ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Establecer nota ..', 'rule_action_link_to_bill_choice' => 'Enlazar a una factura ..', 'rule_action_link_to_bill' => 'Enlace a una factura ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Establecer notas para:action_value', 'rule_action_convert_deposit_choice' => 'Convertir transacción en un ingreso', 'rule_action_convert_deposit' => 'Convertir transacción en un ingreso de ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Etiqueta limpiada', 'ale_action_clear_all_tags' => 'Limpiar todas las etiquetas', 'ale_action_set_bill' => 'Vinculado a la factura', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Establecer presupuesto', 'ale_action_set_category' => 'Establecer categoría', 'ale_action_set_source' => 'Establecer cuenta de origen', @@ -2715,8 +2723,8 @@ return [ 'ale_action_add_tag' => 'Etiqueta añadida', // dashboard - 'enable_auto_convert' => 'Enable currency conversion', - 'disable_auto_convert' => 'Disable currency conversion', + 'enable_auto_convert' => 'Habilitar conversión de moneda', + 'disable_auto_convert' => 'Deshabilitar conversión de moneda', ]; diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php index f5906226cc..e8198cb62d 100644 --- a/resources/lang/es_ES/form.php +++ b/resources/lang/es_ES/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Inicio del rango', 'end_date' => 'Final del rango', 'enddate' => 'Fecha fin', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Inicio del rango', 'end' => 'Final del rango', 'delete_account' => 'Borrar cuenta ":name"', diff --git a/resources/lang/fi_FI/firefly.php b/resources/lang/fi_FI/firefly.php index 63a5657da5..ade78a0116 100644 --- a/resources/lang/fi_FI/firefly.php +++ b/resources/lang/fi_FI/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Tapahtuman tyyppi on ":trigger_value"', 'rule_trigger_category_is_choice' => 'Kategoria on ...', 'rule_trigger_category_is' => 'Kategoria on ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Summa on vähemmän kuin ...', - 'rule_trigger_amount_less' => 'Summa on vähemmän kuin :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Summa on..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Summa on enemmän kuin ...', - 'rule_trigger_amount_more' => 'Summa on enemmän kuin :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Kuvaus alkaa tekstillä ...', 'rule_trigger_description_starts' => 'Kuvaus alkaa tekstillä ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Kuvaus päättyy tekstiin ...', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Tapahtumatietueen tunnus on..', 'rule_trigger_journal_id' => 'Tapahtumatietueen tunnus on ":trigger_value"', - 'rule_trigger_no_external_url' => 'Tapahtumalla ei ole ulkoista URL-osoitetta', - 'rule_trigger_any_external_url' => 'Tapahtumalla on ulkoinen URL-osoite', - 'rule_trigger_any_external_url_choice' => 'Tapahtumalla on ulkoinen URL-osoite', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Tapahtumalla ei ole ulkoista URL-osoitetta', + 'rule_trigger_no_external_url' => 'Tapahtumalla ei ole ulkoista URL-osoitetta', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Tapahtuman tunnus on..', 'rule_trigger_id' => 'Tapahtumatunnus on ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Aseta kategoriaksi ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Yhdistä laskuun ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Aseta muistiinpano tapahtumalle ":action_value"', 'rule_action_convert_deposit_choice' => 'Muuta tapahtuma talletukseksi', 'rule_action_convert_deposit' => 'Muuta ":action_value" talletukseksi', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/fi_FI/form.php b/resources/lang/fi_FI/form.php index 80363da9cd..43bf59d2c7 100644 --- a/resources/lang/fi_FI/form.php +++ b/resources/lang/fi_FI/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Valikoiman alku', 'end_date' => 'Valikoiman loppu', 'enddate' => 'Loppupäivä', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Valikoiman alku', 'end' => 'Valikoiman loppu', 'delete_account' => 'Poista tili ":name"', diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index b14fdaf4f3..e79f4571fe 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'L\'opération est du type ":trigger_value"', 'rule_trigger_category_is_choice' => 'La catégorie est..', 'rule_trigger_category_is' => 'La catégorie est ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Le montant est inférieur à..', - 'rule_trigger_amount_less' => 'Le montant est inférieur à :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Le montant est..', 'rule_trigger_amount_is' => 'Le montant est :trigger_value', - 'rule_trigger_amount_more_choice' => 'Le montant est supérieur à..', - 'rule_trigger_amount_more' => 'Le montant est supérieur à :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Le description commence par..', 'rule_trigger_description_starts' => 'La description commence par ":trigger_value"', 'rule_trigger_description_ends_choice' => 'La description se termine par..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'La référence interne est ":trigger_value"', 'rule_trigger_journal_id_choice' => 'L\'ID du journal d\'opérations est..', 'rule_trigger_journal_id' => 'L\'ID du journal d\'opérations est ":trigger_value"', - 'rule_trigger_no_external_url' => 'L\'opération n\'a pas d\'URL externe', - 'rule_trigger_any_external_url' => 'L\'opération a une URL externe', - 'rule_trigger_any_external_url_choice' => 'L\'opération a une URL externe', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'L\'opération n\'a pas d\'URL externe', + 'rule_trigger_no_external_url' => 'L\'opération n\'a pas d\'URL externe', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'L\'ID de l\'opération est..', 'rule_trigger_id' => 'L\'ID de l\'opération est ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'Le virement SEPA est..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'SUPPRIMER l\'opération(!)', 'rule_action_delete_transaction' => 'SUPPRIMER l\'opération(!)', 'rule_action_set_category' => 'Définir la catégorie à ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Remplacer les notes par..', 'rule_action_link_to_bill_choice' => 'Lier à une facture..', 'rule_action_link_to_bill' => 'Lien vers la facture ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Remplacer les notes par ":action_value"', 'rule_action_convert_deposit_choice' => 'Convertir cette opération en dépôt', 'rule_action_convert_deposit' => 'Convertir cette opération en dépôt depuis ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Tag retiré', 'ale_action_clear_all_tags' => 'Tous les tags ont été retirés', 'ale_action_set_bill' => 'Lié à la facture', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Budget défini', 'ale_action_set_category' => 'Catégorie définie', 'ale_action_set_source' => 'Compte source défini', @@ -2715,8 +2723,8 @@ return [ 'ale_action_add_tag' => 'Tag ajouté', // dashboard - 'enable_auto_convert' => 'Enable currency conversion', - 'disable_auto_convert' => 'Disable currency conversion', + 'enable_auto_convert' => 'Activer la conversion des devises', + 'disable_auto_convert' => 'Désactiver la conversion des devises', ]; diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php index 8bf51a8f45..c1a50a3ab2 100644 --- a/resources/lang/fr_FR/form.php +++ b/resources/lang/fr_FR/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Début de l\'étendue', 'end_date' => 'Fin de l\'étendue', 'enddate' => 'Date de fin', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Début de l\'étendue', 'end' => 'Fin de l\'étendue', 'delete_account' => 'Supprimer le compte ":name"', diff --git a/resources/lang/hu_HU/firefly.php b/resources/lang/hu_HU/firefly.php index 8bd1e9c29c..eeed4e8e33 100644 --- a/resources/lang/hu_HU/firefly.php +++ b/resources/lang/hu_HU/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Tranzakció típusa ":trigger_value"', 'rule_trigger_category_is_choice' => 'A kategória..', 'rule_trigger_category_is' => 'A kategória ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Összeg kevesebb mint..', - 'rule_trigger_amount_less' => 'Mennyiség kevesebb mint :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Összeg több, mint..', - 'rule_trigger_amount_more' => 'Összeg több mint :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Leírás eleje..', 'rule_trigger_description_starts' => 'Leírás eleje: ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Leírás vége..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaction journal ID is..', 'rule_trigger_journal_id' => 'Transaction journal ID is ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Kategória beállítása ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Számlához csatolás: ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Jegyzetek megadása: ":action_value"', 'rule_action_convert_deposit_choice' => 'A tranzakció bevétellé konvertálása', 'rule_action_convert_deposit' => 'Tranzakció bevétellé konvertálása innen: ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/hu_HU/form.php b/resources/lang/hu_HU/form.php index b8ef22bc68..c5bbbb5a0b 100644 --- a/resources/lang/hu_HU/form.php +++ b/resources/lang/hu_HU/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Tartomány kezdete', 'end_date' => 'Tartomány vége', 'enddate' => 'End date', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Tartomány kezdete', 'end' => 'Tartomány vége', 'delete_account' => '":name" bankszámla törlése', diff --git a/resources/lang/id_ID/firefly.php b/resources/lang/id_ID/firefly.php index cb02aefc83..399e151a5b 100644 --- a/resources/lang/id_ID/firefly.php +++ b/resources/lang/id_ID/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transaksi adalah tipe ":trigger_value"', 'rule_trigger_category_is_choice' => 'Kategori adalah..', 'rule_trigger_category_is' => 'Kategori adalah ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Jumlahnya kurang dari..', - 'rule_trigger_amount_less' => 'Jumlahnya kurang dari :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Jumlahnya lebih dari..', - 'rule_trigger_amount_more' => 'Jumlahnya lebih dari :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Deskripsi dimulai dengan..', 'rule_trigger_description_starts' => 'Deskripsi dimulai dengan ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Deskripsi diakhiri dengan..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaction journal ID is..', 'rule_trigger_journal_id' => 'Transaction journal ID is ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Tetapkan kategori ke ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Link to bill ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Tetapkan catatan ke ":action_value"', 'rule_action_convert_deposit_choice' => 'Convert the transaction to a deposit', 'rule_action_convert_deposit' => 'Convert the transaction to a deposit from ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/id_ID/form.php b/resources/lang/id_ID/form.php index 967113586a..b84224792a 100644 --- a/resources/lang/id_ID/form.php +++ b/resources/lang/id_ID/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Mulai dari jangkauan', 'end_date' => 'Akhir rentang', 'enddate' => 'Tanggal selesai', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Awal rentang', 'end' => 'Akhir rentang', 'delete_account' => 'Delete account ":name"', diff --git a/resources/lang/it_IT/firefly.php b/resources/lang/it_IT/firefly.php index 8f2b03761c..53dfa8c95f 100644 --- a/resources/lang/it_IT/firefly.php +++ b/resources/lang/it_IT/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'La transazione è di tipo ":trigger_value"', 'rule_trigger_category_is_choice' => 'La categoria è...', 'rule_trigger_category_is' => 'La categoria è ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'L\'importo è inferiore a...', - 'rule_trigger_amount_less' => 'L\'importo è inferiore a :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'L\'importo è..', 'rule_trigger_amount_is' => 'L\'importo è :trigger_value', - 'rule_trigger_amount_more_choice' => 'L\'importo è più di...', - 'rule_trigger_amount_more' => 'L\'importo è superiore a :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'La descrizione inizia con...', 'rule_trigger_description_starts' => 'La descrizione inizia con ":trigger_value"', 'rule_trigger_description_ends_choice' => 'La descrizione termina con...', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'L\'ID journal della transazione è...', 'rule_trigger_journal_id' => 'L\'ID journal della transazione è ":trigger_value"', - 'rule_trigger_no_external_url' => 'La transazione non ha URL esterno', - 'rule_trigger_any_external_url' => 'La transazione ha un URL esterno', - 'rule_trigger_any_external_url_choice' => 'La transazione ha un URL esterno', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'La transazione non ha URL esterno', + 'rule_trigger_no_external_url' => 'La transazione non ha URL esterno', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'L\'ID della transazione è...', 'rule_trigger_id' => 'L\'ID della transazione è ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Imposta categoria a ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Collegamento alla bolletta ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Imposta le note su ":action_value"', 'rule_action_convert_deposit_choice' => 'Converti la transazione in un deposito', 'rule_action_convert_deposit' => 'Converti la transazione in un deposito da ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Etichette cancellate', 'ale_action_clear_all_tags' => 'Tutte le etichette sono state cancellate', 'ale_action_set_bill' => 'Collegato alla fattura', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Imposta un budget', 'ale_action_set_category' => 'Imposta una categoria', 'ale_action_set_source' => 'Imposta un conto di origine', diff --git a/resources/lang/it_IT/form.php b/resources/lang/it_IT/form.php index 68c0ee3a86..b98148eb5c 100644 --- a/resources/lang/it_IT/form.php +++ b/resources/lang/it_IT/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Inizio intervallo', 'end_date' => 'Fine intervallo', 'enddate' => 'Data di scadenza', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Inizio intervallo', 'end' => 'Fine intervallo', 'delete_account' => 'Elimina conto ":name"', diff --git a/resources/lang/ja_JP/breadcrumbs.php b/resources/lang/ja_JP/breadcrumbs.php index 447e07e9f2..012e4883b7 100644 --- a/resources/lang/ja_JP/breadcrumbs.php +++ b/resources/lang/ja_JP/breadcrumbs.php @@ -47,7 +47,7 @@ return [ 'title_transfers' => '送金', 'edit_currency' => '通貨「:name」を編集する', 'delete_currency' => '通貨「:name」を削除する', - 'newPiggyBank' => '貯金箱を作成', + 'newPiggyBank' => '新しい貯金箱を作成', 'edit_piggyBank' => '貯金箱 ":name" を編集する', 'preferences' => '設定', 'profile' => 'プロフィール', diff --git a/resources/lang/ja_JP/firefly.php b/resources/lang/ja_JP/firefly.php index d4e92d6d13..88e570bdfd 100644 --- a/resources/lang/ja_JP/firefly.php +++ b/resources/lang/ja_JP/firefly.php @@ -90,7 +90,7 @@ return [ 'new_asset_account' => '新しい資産口座', 'new_expense_account' => '新しい支出口座', 'new_revenue_account' => '新しい収入口座', - 'new_liabilities_account' => '新しい借金', + 'new_liabilities_account' => '新しい債務', 'new_budget' => '新しい予算', 'new_bill' => '新しい請求', 'block_account_logout' => 'あなたはログアウトしました。ブロックされたアカウントはこのサイトを使うことが出来ません。有効なメールアドレスで登録しましたか？', @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => '取引種別が「:trigger_value」', 'rule_trigger_category_is_choice' => 'カテゴリが…', 'rule_trigger_category_is' => 'カテゴリが「:trigger_value」', - 'rule_trigger_amount_less_choice' => '金額が…より小さい', - 'rule_trigger_amount_less' => '金額が:trigger_valueより小さい', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => '金額が…', 'rule_trigger_amount_is' => '金額が「:trigger_value」', - 'rule_trigger_amount_more_choice' => '金額が…より大きい', - 'rule_trigger_amount_more' => '金額が:trigger_valueより大きい', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => '説明が…で始まる', 'rule_trigger_description_starts' => '説明が「:trigger_value」で始まる', 'rule_trigger_description_ends_choice' => '説明が…で終わる', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => '内部参照が「:trigger_value」', 'rule_trigger_journal_id_choice' => '取引IDが…', 'rule_trigger_journal_id' => '取引IDが「:trigger_value」', - 'rule_trigger_no_external_url' => '外部 URL がない取引', - 'rule_trigger_any_external_url' => '外部 URL がある取引', - 'rule_trigger_any_external_url_choice' => '取引に外部 URL がある', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => '取引に外部 URL がない', + 'rule_trigger_no_external_url' => '外部 URL がない取引', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => '取引IDが…', 'rule_trigger_id' => '取引IDが「:trigger_value」', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CTが...', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => '取引を削除 (!)', 'rule_action_delete_transaction' => '取引を削除 (!)', 'rule_action_set_category' => 'カテゴリを「:action_value」に設定', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => '備考に...を設定', 'rule_action_link_to_bill_choice' => '請求...にリンク', 'rule_action_link_to_bill' => '請求「:action_value」にリンク', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => '備考に「:action_value」を設定', 'rule_action_convert_deposit_choice' => '取引を入金に変換', 'rule_action_convert_deposit' => '取引を「:action_value」からの入金に変換する', @@ -2132,7 +2139,7 @@ return [ 'debt_start_date' => '借金の開始日', 'debt_start_amount' => '借金の開始金額', 'debt_start_amount_help' => 'この値は負の値に設定すべきです。詳細については、ヘルプページ (右上？アイコン) をご覧ください。', - 'interest_period_help' => 'この項目は表面的であり、計算はされません。 銀行はとてもずるいので、Firefly III は正しく理解できません。', + 'interest_period_help' => 'この項目は表面的であり計算はされません。 銀行はとてもずるいので、Firefly III は正しく理解できません。', 'store_new_liabilities_account' => '債務を保存', 'edit_liabilities_account' => '貯金箱「:name」を編集', 'financial_control' => '財務管理', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => '削除されたタグ', 'ale_action_clear_all_tags' => '削除されたすべてのタグ', 'ale_action_set_bill' => '請求にリンクされました', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => '予算を設定する', 'ale_action_set_category' => 'カテゴリを設定する', 'ale_action_set_source' => '引き出し口座を設定', @@ -2715,8 +2723,8 @@ return [ 'ale_action_add_tag' => '追加したタグ', // dashboard - 'enable_auto_convert' => 'Enable currency conversion', - 'disable_auto_convert' => 'Disable currency conversion', + 'enable_auto_convert' => '通貨の変換を有効にする', + 'disable_auto_convert' => '通貨の変換を無効にする', ]; diff --git a/resources/lang/ja_JP/form.php b/resources/lang/ja_JP/form.php index 07b752ccd4..b4baab00f5 100644 --- a/resources/lang/ja_JP/form.php +++ b/resources/lang/ja_JP/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => '期間の開始', 'end_date' => '期間の終了', 'enddate' => '終了日', + 'move_rules_before_delete' => 'Rule group', 'start' => '期間の開始', 'end' => '期間の終了', 'delete_account' => '口座「:name」を削除', diff --git a/resources/lang/ko_KR/firefly.php b/resources/lang/ko_KR/firefly.php index 13d998d0b5..4103cbc21c 100644 --- a/resources/lang/ko_KR/firefly.php +++ b/resources/lang/ko_KR/firefly.php @@ -151,7 +151,7 @@ return [ 'destination_account' => '대상 계정', 'destination_account_reconciliation' => '조정 거래의 대상 계정은 편집할 수 없습니다.', 'sum_of_expenses_in_budget' => '":budget" 예산에서 총 지출', - 'left_in_budget_limit' => '예산 책정에 따라 지출', + 'left_in_budget_limit' => '예산 책정에 따른 남은 지출', 'current_period' => '현재 기간', 'show_the_current_period_and_overview' => '현재 기간 및 걔요 표시', 'pref_languages_locale' => '영어 외의 언어가 제대로 동작하려면 운영 체제에 올바른 로케일 정보가 있어야 합니다. 그렇지 않은 경우 통화 데이터, 날짜 및 금액의 형식이 잘못 지정될 수 있습니다.', @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => '거래는 ":trigger_value" 유형입니다', 'rule_trigger_category_is_choice' => '카테고리는 ..', 'rule_trigger_category_is' => '카테고리는 ":trigger_value"입니다', - 'rule_trigger_amount_less_choice' => '금액이 ... 미만입니다', - 'rule_trigger_amount_less' => '금액이 :trigger_value 미만입니다.', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => '금액은..', 'rule_trigger_amount_is' => '금액은 :trigger_value입니다', - 'rule_trigger_amount_more_choice' => '금액이 ... 이상입니다', - 'rule_trigger_amount_more' => '금액이 :trigger_value 이상입니다', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => '설명이 ..로 시작합니다', 'rule_trigger_description_starts' => '설명이 ":trigger_value"로 시작합니다', 'rule_trigger_description_ends_choice' => '설명이 ..로 끝납니다', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => '내부 참조는 ":trigger_value"임', 'rule_trigger_journal_id_choice' => '거래 저널 ID는..', 'rule_trigger_journal_id' => '거래 저널 ID는 ":trigger_value"임', - 'rule_trigger_no_external_url' => '거래에 외부 URL이 없습니다', - 'rule_trigger_any_external_url' => '거래에 외부 URL이 없습니다', - 'rule_trigger_any_external_url_choice' => '거래에 외부 URL이 없습니다', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => '거래에 외부 URL이 없습니다', + 'rule_trigger_no_external_url' => '거래에 외부 URL이 없습니다', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => '거래 ID는..', 'rule_trigger_id' => '거래 ID는 ":trigger_value"임', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT는..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => '거래 삭제(!)', 'rule_action_delete_transaction' => '거래 삭제(!)', 'rule_action_set_category' => '카테고리를 ":action_value"로 설정', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => '노트를 ..로 설정', 'rule_action_link_to_bill_choice' => '청구서 링크 ..', 'rule_action_link_to_bill' => '청구서 링크 ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => '노트를 ":action_value"로 설정', 'rule_action_convert_deposit_choice' => '거래를 입금으로 전환', 'rule_action_convert_deposit' => '":action_value"에서 거래를 입금으로 전환합니다', @@ -2280,7 +2287,7 @@ return [ 'left_to_spend' => '남은 지출', 'earned' => '수입', 'overspent' => '초과 지출', - 'left' => '왼쪽', + 'left' => '남음', 'max-amount' => '최대 금액', 'min-amount' => '최소 금액', 'journal-amount' => '현재 청구서 항목', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => '삭제된 태그', 'ale_action_clear_all_tags' => '모든 태그 지우기', 'ale_action_set_bill' => '청구서에 연결됨', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => '예산 설정', 'ale_action_set_category' => '카테고리 설정', 'ale_action_set_source' => '소스 계정 설정', @@ -2715,8 +2723,8 @@ return [ 'ale_action_add_tag' => '태그 추가', // dashboard - 'enable_auto_convert' => 'Enable currency conversion', - 'disable_auto_convert' => 'Disable currency conversion', + 'enable_auto_convert' => '통화 변환 활성화', + 'disable_auto_convert' => '통화 변환 비활성화', ]; diff --git a/resources/lang/ko_KR/form.php b/resources/lang/ko_KR/form.php index 25c61d88a7..2295f95158 100644 --- a/resources/lang/ko_KR/form.php +++ b/resources/lang/ko_KR/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => '범위의 시작', 'end_date' => '범위의 끝', 'enddate' => '종료 날짜', + 'move_rules_before_delete' => 'Rule group', 'start' => '범위의 시작', 'end' => '범위의 끝', 'delete_account' => '":name" 계정 삭제', diff --git a/resources/lang/nb_NO/firefly.php b/resources/lang/nb_NO/firefly.php index 30b4ccdc6e..2be2596210 100644 --- a/resources/lang/nb_NO/firefly.php +++ b/resources/lang/nb_NO/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transaksjonen er av typen ":trigger_value"', 'rule_trigger_category_is_choice' => 'Kategori er..', 'rule_trigger_category_is' => 'Kategori er ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Beløpet er mindre enn..', - 'rule_trigger_amount_less' => 'Beløpet er mindre enn :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Beløpet er..', 'rule_trigger_amount_is' => 'Beløpet er :trigger_value', - 'rule_trigger_amount_more_choice' => 'Beløpet er mer enn..', - 'rule_trigger_amount_more' => 'Beløpet er mer enn :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Beskrivelse starter med..', 'rule_trigger_description_starts' => 'Beskrivelse starter med ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Beskrivelse slutter med..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Ekstern referanse er ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaksjonens journal ID er..', 'rule_trigger_journal_id' => 'Transaksjonens journal ID er ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaksjonen har ingen ekstern URL', - 'rule_trigger_any_external_url' => 'Transaksjonen har en ekstern URL', - 'rule_trigger_any_external_url_choice' => 'Transaksjonen har en ekstern URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaksjonen har ingen ekstern URL', + 'rule_trigger_no_external_url' => 'Transaksjonen har ingen ekstern URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaksjons-ID er', 'rule_trigger_id' => 'Transaksjons ID er ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT er..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'SLETT transaksjon(!)', 'rule_action_delete_transaction' => 'SLETT transaksjon(!)', 'rule_action_set_category' => 'Sett kategori til ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Sett notater til ..', 'rule_action_link_to_bill_choice' => 'Koble til en regning ..', 'rule_action_link_to_bill' => 'Link til regning ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Sett notater til ":action_value"', 'rule_action_convert_deposit_choice' => 'Konverter transaksjonen til et innskudd', 'rule_action_convert_deposit' => 'Konverter transaksjonen til et innskudd fra ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Fjernet tagg', 'ale_action_clear_all_tags' => 'Fjernet alle tagger', 'ale_action_set_bill' => 'Koblet til regning', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Sett budsjett', 'ale_action_set_category' => 'Sett kategori', 'ale_action_set_source' => 'Sett kildekonto', diff --git a/resources/lang/nb_NO/form.php b/resources/lang/nb_NO/form.php index f7a8dd32c0..5b0b611824 100644 --- a/resources/lang/nb_NO/form.php +++ b/resources/lang/nb_NO/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Startgrense', 'end_date' => 'Sluttgrense', 'enddate' => 'Sluttdato', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Start område', 'end' => 'Slutt område', 'delete_account' => 'Slett konto ":name"', diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 7b6e8da018..bf5a0ae878 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transactiesoort is ":trigger_value" (Engels)', 'rule_trigger_category_is_choice' => 'Categorie is..', 'rule_trigger_category_is' => 'Categorie is ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Bedrag is minder dan..', - 'rule_trigger_amount_less' => 'Bedrag is minder dan :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Bedrag is..', 'rule_trigger_amount_is' => 'Bedrag is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Bedrag is meer dan..', - 'rule_trigger_amount_more' => 'Bedrag is meer dan :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Omschrijving begint met..', 'rule_trigger_description_starts' => 'Omschrijving begint met ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Omschrijving eindigt op..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Interne referentie is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transactiejournaal ID is..', 'rule_trigger_journal_id' => 'Transactiejournaal ID is ":trigger_value"', - 'rule_trigger_no_external_url' => 'De transactie heeft geen externe URL', - 'rule_trigger_any_external_url' => 'De transactie heeft een externe URL', - 'rule_trigger_any_external_url_choice' => 'De transactie heeft een externe URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'De transactie heeft geen externe URL', + 'rule_trigger_no_external_url' => 'De transactie heeft geen externe URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transactie-ID is..', 'rule_trigger_id' => 'Transactie-ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'VERWIJDER transactie(!)', 'rule_action_delete_transaction' => 'VERWIJDER transactie(!)', 'rule_action_set_category' => 'Verander categorie naar ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Stel notities in op ..', 'rule_action_link_to_bill_choice' => 'Link naar een contract ..', 'rule_action_link_to_bill' => 'Link naar contract ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Verander notitie in ":action_value"', 'rule_action_convert_deposit_choice' => 'Verander de transactie in inkomsten', 'rule_action_convert_deposit' => 'Verander de transactie in inkomsten van ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Tag gewist', 'ale_action_clear_all_tags' => 'Alle tags gewist', 'ale_action_set_bill' => 'Gekoppeld aan contract', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Budget ingesteld', 'ale_action_set_category' => 'Categorie ingesteld', 'ale_action_set_source' => 'Bronrekening veranderd', diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php index ac0a5fcc32..bf2b0cbb4c 100644 --- a/resources/lang/nl_NL/form.php +++ b/resources/lang/nl_NL/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Start van bereik', 'end_date' => 'Einde van bereik', 'enddate' => 'Einddatum', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Start van bereik', 'end' => 'Einde van bereik', 'delete_account' => 'Verwijder rekening ":name"', diff --git a/resources/lang/nn_NO/firefly.php b/resources/lang/nn_NO/firefly.php index ed66487319..430e00f632 100644 --- a/resources/lang/nn_NO/firefly.php +++ b/resources/lang/nn_NO/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transaksjonen er av typen ":trigger_value"', 'rule_trigger_category_is_choice' => 'Kategori er..', 'rule_trigger_category_is' => 'Kategori er ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Beløpet er mindre enn..', - 'rule_trigger_amount_less' => 'Beløpet er mindre enn :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Beløpet er..', 'rule_trigger_amount_is' => 'Beløpet er :trigger_value', - 'rule_trigger_amount_more_choice' => 'Beløpet er meir enn..', - 'rule_trigger_amount_more' => 'Beløpet er meir enn :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Beskrivinga byrjar med..', 'rule_trigger_description_starts' => 'Beskrivinga byrjar med ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Beskrivinga sluttar med..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Ekstern referanse er ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaksjonens journal ID er..', 'rule_trigger_journal_id' => 'Transaksjonens journal ID er ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaksjonen har ingen ekstern URL', - 'rule_trigger_any_external_url' => 'Transaksjonen har ein ekstern URL', - 'rule_trigger_any_external_url_choice' => 'Transaksjonen har ein ekstern URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaksjonen har ingen ekstern URL', + 'rule_trigger_no_external_url' => 'Transaksjonen har ingen ekstern URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaksjons-ID er', 'rule_trigger_id' => 'Transaksjons ID er ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT er..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'SLETT transaksjon(!)', 'rule_action_delete_transaction' => 'SLETT transaksjon(!)', 'rule_action_set_category' => 'Sett kategori til ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Sett notat til ..', 'rule_action_link_to_bill_choice' => 'Koble til ein rekning ..', 'rule_action_link_to_bill' => 'Link til rekning ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Sett notat til ":action_value"', 'rule_action_convert_deposit_choice' => 'Konverter transaksjonen til eit innskot', 'rule_action_convert_deposit' => 'Konverter transaksjonen til eit innskot frå ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Fjerna tagg', 'ale_action_clear_all_tags' => 'Fjerna alle tagger', 'ale_action_set_bill' => 'Kopla til rekning', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Sett budsjett', 'ale_action_set_category' => 'Sett kategori', 'ale_action_set_source' => 'Sett kjeldekonto', diff --git a/resources/lang/nn_NO/form.php b/resources/lang/nn_NO/form.php index 29324fadb7..cc4f18ce4a 100644 --- a/resources/lang/nn_NO/form.php +++ b/resources/lang/nn_NO/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Startgrense', 'end_date' => 'Sluttgrense', 'enddate' => 'Sluttdato', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Start område', 'end' => 'Slutt område', 'delete_account' => 'Slett konto ":name"', diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index 6379fc230f..bec3d00251 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transakcja jest typu ":trigger_value"', 'rule_trigger_category_is_choice' => 'Kategoria to..', 'rule_trigger_category_is' => 'Kategoria to ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Kwota jest mniejsza niż..', - 'rule_trigger_amount_less' => 'Kwota jest mniejsza niż :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Kwota to..', 'rule_trigger_amount_is' => 'Kwota to :trigger_value', - 'rule_trigger_amount_more_choice' => 'Kwota jest większa niż..', - 'rule_trigger_amount_more' => 'Kwota jest większa niż :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Opis zaczyna się od..', 'rule_trigger_description_starts' => 'Opis się zaczyna od ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Opis kończy się na..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Wewnętrzne odwołanie to ":trigger_value"', 'rule_trigger_journal_id_choice' => 'ID dziennika transakcji to..', 'rule_trigger_journal_id' => 'ID dziennika transakcji to ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transakcja nie ma zewnętrznego adresu URL', - 'rule_trigger_any_external_url' => 'Transakcja ma zewnętrzny adres URL', - 'rule_trigger_any_external_url_choice' => 'Transakcja ma zewnętrzny adres URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transakcja nie ma zewnętrznego adresu URL', + 'rule_trigger_no_external_url' => 'Transakcja nie ma zewnętrznego adresu URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Identyfikator transakcji to..', 'rule_trigger_id' => 'Identyfikator transakcji to ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT to..', @@ -1087,8 +1091,8 @@ return [ 'rule_trigger_not_description_contains' => 'Description does not contain', 'rule_trigger_not_description_ends' => 'Description does not end with ":trigger_value"', 'rule_trigger_not_description_starts' => 'Description does not start with ":trigger_value"', - 'rule_trigger_not_notes_is' => 'Notes are not ":trigger_value"', - 'rule_trigger_not_notes_contains' => 'Notes do not contain ":trigger_value"', + 'rule_trigger_not_notes_is' => 'Notatki to nie ":trigger_value"', + 'rule_trigger_not_notes_contains' => 'Notatki nie zawierają ":trigger_value"', 'rule_trigger_not_notes_ends' => 'Notes do not end on ":trigger_value"', 'rule_trigger_not_notes_starts' => 'Notes do not start with ":trigger_value"', 'rule_trigger_not_source_account_is' => 'Source account is not ":trigger_value"', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'USUŃ transakcję(!)', 'rule_action_delete_transaction' => 'USUŃ transakcję(!)', 'rule_action_set_category' => 'Ustaw kategorię na ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Ustaw notatki na ..', 'rule_action_link_to_bill_choice' => 'Powiąż z rachunkiem ..', 'rule_action_link_to_bill' => 'Powiąż z rachunkiem ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Ustaw notatki na ":action_value"', 'rule_action_convert_deposit_choice' => 'Konwertuj transakcję na wpłatę', 'rule_action_convert_deposit' => 'Konwertuj transakcję na wpłatę od ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Wyczyszczono tag', 'ale_action_clear_all_tags' => 'Wyczyszczono wszystkie tagi', 'ale_action_set_bill' => 'Powiązano z rachunkiem', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Ustawiono budżet', 'ale_action_set_category' => 'Ustawiono kategorię', 'ale_action_set_source' => 'Ustawiono konto źródłowe', @@ -2715,8 +2723,8 @@ return [ 'ale_action_add_tag' => 'Dodano tag', // dashboard - 'enable_auto_convert' => 'Enable currency conversion', - 'disable_auto_convert' => 'Disable currency conversion', + 'enable_auto_convert' => 'Włącz przeliczenie walut', + 'disable_auto_convert' => 'Wyłącz przeliczanie walut', ]; diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php index 8675583f49..b70bad4742 100644 --- a/resources/lang/pl_PL/form.php +++ b/resources/lang/pl_PL/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Początek zakresu', 'end_date' => 'Koniec zakresu', 'enddate' => 'Data końcowa', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Początek zakresu', 'end' => 'Koniec zakresu', 'delete_account' => 'Usuń konto ":name"', diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 5704798793..24c143a9f5 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transação é do tipo ":trigger_value"', 'rule_trigger_category_is_choice' => 'A categoria é..', 'rule_trigger_category_is' => 'A categoria é ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Quantia é inferior a..', - 'rule_trigger_amount_less' => 'Quantia é inferior :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Quantia é..', 'rule_trigger_amount_is' => 'Quantia é :trigger_value', - 'rule_trigger_amount_more_choice' => 'Quantia é mais do que..', - 'rule_trigger_amount_more' => 'Quantia é mais de :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Descrição começa com..', 'rule_trigger_description_starts' => 'Descrição começa com ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Descrição termina com..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Referência interna é ":trigger_value"', 'rule_trigger_journal_id_choice' => 'ID do livro de transação é..', 'rule_trigger_journal_id' => 'ID do livro de transação é ":trigger_value"', - 'rule_trigger_no_external_url' => 'A transação não tem URL externa', - 'rule_trigger_any_external_url' => 'A transação tem uma URL externa', - 'rule_trigger_any_external_url_choice' => 'A transação tem um link externo', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'A transação não tem um link externo', + 'rule_trigger_no_external_url' => 'A transação não tem URL externa', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'O identificador da transação é..', 'rule_trigger_id' => 'O identificador da transação é ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT é..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'EXCLUIR transação(!)', 'rule_action_delete_transaction' => 'EXCLUIR transação(!)', 'rule_action_set_category' => 'Definir categoria para ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Defina notas para..', 'rule_action_link_to_bill_choice' => 'Vincular a uma fatura ..', 'rule_action_link_to_bill' => 'Vincular à fatura ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Defina notas para ":action_value"', 'rule_action_convert_deposit_choice' => 'Converter esta transferência em entrada', 'rule_action_convert_deposit' => 'Converter a transação em uma entrada de ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Etiquetas apagadas', 'ale_action_clear_all_tags' => 'Todas as etiquetas foram apagadas', 'ale_action_set_bill' => 'Ligado à fatura', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Definir orçamento', 'ale_action_set_category' => 'Definir categoria', 'ale_action_set_source' => 'Definir conta de origem', diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php index ca8787a277..7e64aa1050 100644 --- a/resources/lang/pt_BR/form.php +++ b/resources/lang/pt_BR/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Início do intervalo', 'end_date' => 'Final do intervalo', 'enddate' => 'Data final', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Início do intervalo', 'end' => 'Término do intervalo', 'delete_account' => 'Apagar conta ":name"', diff --git a/resources/lang/pt_PT/firefly.php b/resources/lang/pt_PT/firefly.php index 883924c148..80e0bf39f5 100644 --- a/resources/lang/pt_PT/firefly.php +++ b/resources/lang/pt_PT/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transação é do tipo ":trigger_value"', 'rule_trigger_category_is_choice' => 'A categoria é..', 'rule_trigger_category_is' => 'A categoria é ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'O montante é menos de..', - 'rule_trigger_amount_less' => 'Quantia é menor que :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'O montante é..', 'rule_trigger_amount_is' => 'O montante é :trigger_value', - 'rule_trigger_amount_more_choice' => 'O montante é maior que..', - 'rule_trigger_amount_more' => 'O montante é maior que :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'A descrição começa com..', 'rule_trigger_description_starts' => 'A descrição começa com ":trigger_value"', 'rule_trigger_description_ends_choice' => 'A descrição termina com..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'A referência interna é ":trigger_value"', 'rule_trigger_journal_id_choice' => 'O ID do diário de transações é..', 'rule_trigger_journal_id' => 'O ID do diário de transações é ":trigger_value"', - 'rule_trigger_no_external_url' => 'A transação não tem nenhum URL externo', - 'rule_trigger_any_external_url' => 'A transação tem um URL externo', - 'rule_trigger_any_external_url_choice' => 'A transação tem um URL externo', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'A transação não tem nenhum URL externo', + 'rule_trigger_no_external_url' => 'A transação não tem nenhum URL externo', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'ID da transação é..', 'rule_trigger_id' => 'O ID da transação é ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT é..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'APAGAR transação(!)', 'rule_action_delete_transaction' => 'APAGAR transação(!)', 'rule_action_set_category' => 'Definir categoria para ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Atribuir as notas..', 'rule_action_link_to_bill_choice' => 'Ligar a encargo..', 'rule_action_link_to_bill' => 'Ligar a um encargo ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Defina notas para ":action_value"', 'rule_action_convert_deposit_choice' => 'Converter a transação num depósito', 'rule_action_convert_deposit' => 'Converter a transação para um depósito a partir de ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Etiqueta limpa', 'ale_action_clear_all_tags' => 'Apagadas todas as etiquetas', 'ale_action_set_bill' => 'Ligado a encargo', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Definir orçamento', 'ale_action_set_category' => 'Definir categoria', 'ale_action_set_source' => 'Definir conta de origem', diff --git a/resources/lang/pt_PT/form.php b/resources/lang/pt_PT/form.php index 61bc701764..9f39d6f4f5 100644 --- a/resources/lang/pt_PT/form.php +++ b/resources/lang/pt_PT/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Início do intervalo', 'end_date' => 'Fim do intervalo', 'enddate' => 'Data do término', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Início do intervalo', 'end' => 'Fim do intervalo', 'delete_account' => 'Apagar conta ":name"', diff --git a/resources/lang/ro_RO/firefly.php b/resources/lang/ro_RO/firefly.php index adf7f3a09d..55d5668a51 100644 --- a/resources/lang/ro_RO/firefly.php +++ b/resources/lang/ro_RO/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Tranzacția este de tip ":trigger_value"', 'rule_trigger_category_is_choice' => 'Categoria este..', 'rule_trigger_category_is' => 'Categoria este ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Suma este mai mică decât..', - 'rule_trigger_amount_less' => 'Suma este mai mică decât :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Suma este mai mare decât..', - 'rule_trigger_amount_more' => 'Suma este mai mare decât :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Descrierea începe cu..', 'rule_trigger_description_starts' => 'Descrierea începe cu ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Descrierea se termină cu..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'ID-ul jurnalului de tranzacție este..', 'rule_trigger_journal_id' => 'ID-ul jurnalului de tranzacții este ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Setați categoria la ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Legați la factură ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Setați notițele la ":action_value"', 'rule_action_convert_deposit_choice' => 'Transformați tranzacția într-un depozit', 'rule_action_convert_deposit' => 'Transformați tranzacția într-un depozit de la ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/ro_RO/form.php b/resources/lang/ro_RO/form.php index b096c15715..f03a87d8d5 100644 --- a/resources/lang/ro_RO/form.php +++ b/resources/lang/ro_RO/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Start de interval', 'end_date' => 'Șfârșit de interval', 'enddate' => 'Data de sfârșit', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Începutul intervalului', 'end' => 'Sfârșit de interval', 'delete_account' => 'Șterge cont ":name"', diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index 8942fc36a9..eba8567a0e 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Тип транзакции = ":trigger_value"', 'rule_trigger_category_is_choice' => 'Категория =', 'rule_trigger_category_is' => 'Категория = ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Сумма меньше, чем...', - 'rule_trigger_amount_less' => 'Сумма меньше, чем ":trigger_value"', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Сумма..', 'rule_trigger_amount_is' => 'Сумма :trigger_value', - 'rule_trigger_amount_more_choice' => 'Сумма больше, чем...', - 'rule_trigger_amount_more' => 'Сумма больше, чем ":trigger_value"', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Описание начинается с...', 'rule_trigger_description_starts' => 'Описание начинается с ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Описание заканчивается на...', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Внутренняя ссылка - ":trigger_value"', 'rule_trigger_journal_id_choice' => 'ID журнала транзакций..', 'rule_trigger_journal_id' => 'ID журнала транзакций ":trigger_value"', - 'rule_trigger_no_external_url' => 'У транзакции нет внешнего URL', - 'rule_trigger_any_external_url' => 'Транзакция имеет внешний URL', - 'rule_trigger_any_external_url_choice' => 'Транзакция имеет внешний URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'У транзакции нет внешнего URL', + 'rule_trigger_no_external_url' => 'У транзакции нет внешнего URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'ID транзакции..', 'rule_trigger_id' => 'ID транзакции ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Назначить категорию ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Ссылка на счёт к оплате ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Назначить примечания ":action_value"', 'rule_action_convert_deposit_choice' => 'Преобразовать транзакцию в доход', 'rule_action_convert_deposit' => 'Преобразовать транзакцию в доход с помощью ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', @@ -2715,8 +2723,8 @@ return [ 'ale_action_add_tag' => 'Добавленный тег', // dashboard - 'enable_auto_convert' => 'Enable currency conversion', - 'disable_auto_convert' => 'Disable currency conversion', + 'enable_auto_convert' => 'Включить конвертацию валюты', + 'disable_auto_convert' => 'Отключить конвертацию валюты', ]; diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php index 8dd373999c..c00b1b79a9 100644 --- a/resources/lang/ru_RU/form.php +++ b/resources/lang/ru_RU/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Начало диапазона', 'end_date' => 'Конец диапазона', 'enddate' => 'Дата окончания', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Начало диапазона', 'end' => 'Конец диапазона', 'delete_account' => 'Удалить счёт ":name"', diff --git a/resources/lang/sk_SK/firefly.php b/resources/lang/sk_SK/firefly.php index 0b60eec345..7a02bc6aa5 100644 --- a/resources/lang/sk_SK/firefly.php +++ b/resources/lang/sk_SK/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transakcia je typu ":trigger_value“', 'rule_trigger_category_is_choice' => 'Kategória je..', 'rule_trigger_category_is' => 'Kategória je „:trigger_value“', - 'rule_trigger_amount_less_choice' => 'Suma je nižšia než..', - 'rule_trigger_amount_less' => 'Suma je nižšia než :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Suma je vyššia než..', - 'rule_trigger_amount_more' => 'Suma je vyššia než :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Popis začína..', 'rule_trigger_description_starts' => 'Popis začína ":trigger_value“', 'rule_trigger_description_ends_choice' => 'Popis končí..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'ID denníka transakcií je..', 'rule_trigger_journal_id' => 'ID denníka transakcií je ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Nastaviť kategóriu na „:action_value“', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Prepojiť s účtom ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Nastavit poznámky na „:action_value“', 'rule_action_convert_deposit_choice' => 'Zmeniť túto transakciu na vklad', 'rule_action_convert_deposit' => 'Zmeniť túto transakciu z vkladu na „:action_value“', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/sk_SK/form.php b/resources/lang/sk_SK/form.php index 90986f5ce6..1a83fe8b5e 100644 --- a/resources/lang/sk_SK/form.php +++ b/resources/lang/sk_SK/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Začiatok rozsahu', 'end_date' => 'Koniec rozsahu', 'enddate' => 'End date', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Začiatok rozsahu', 'end' => 'Koniec rozsahu', 'delete_account' => 'Odstrániť účet „:name“', diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php index 78157f3ce4..ef0d88dc8e 100644 --- a/resources/lang/sl_SI/firefly.php +++ b/resources/lang/sl_SI/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Tip transakcije je ":trigger_value"', 'rule_trigger_category_is_choice' => 'Kategorija je..', 'rule_trigger_category_is' => 'Kategorija je ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Znesek je manjši od..', - 'rule_trigger_amount_less' => 'Znesek je manjši od :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Znesek je..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Znesek je več kot..', - 'rule_trigger_amount_more' => 'Znesek je več kot :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Opis se začne s/z..', 'rule_trigger_description_starts' => 'Opis se začne s/z ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Opis se konča z..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaction journal ID is..', 'rule_trigger_journal_id' => 'Transaction journal ID is ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Nastavi kategorijo na ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Poveži s trajnikom ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Nastavi opombe na ":action_value"', 'rule_action_convert_deposit_choice' => 'Pretvori transakcijo v polog', 'rule_action_convert_deposit' => 'Pretvori transakcijo v polog iz ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Povezano z računom', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Določite proračun', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/sl_SI/form.php b/resources/lang/sl_SI/form.php index 383461797f..c725768089 100644 --- a/resources/lang/sl_SI/form.php +++ b/resources/lang/sl_SI/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Začetek obsega', 'end_date' => 'Konec obsega', 'enddate' => 'End date', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Začetek obsega', 'end' => 'End of range', 'delete_account' => 'Izbriši račun ":name"', diff --git a/resources/lang/sv_SE/firefly.php b/resources/lang/sv_SE/firefly.php index 6c5c115377..d910bdd9d3 100644 --- a/resources/lang/sv_SE/firefly.php +++ b/resources/lang/sv_SE/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transaktion är av typen ":trigger_value"', 'rule_trigger_category_is_choice' => 'Kategori är..', 'rule_trigger_category_is' => 'Kategori är ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Beloppet är mindre än..', - 'rule_trigger_amount_less' => 'Beloppet är mindre än :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Belopp är mer än..', - 'rule_trigger_amount_more' => 'Belopp är mer än :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Beskrivning börjar med..', 'rule_trigger_description_starts' => 'Beskrivning börjar med ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Beskrivning slutar med..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaktionsjournal-ID är..', 'rule_trigger_journal_id' => 'Transaktionsjournal-ID är ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaktionen saknar extern URL', - 'rule_trigger_any_external_url' => 'Transaktionen har en extern URL', - 'rule_trigger_any_external_url_choice' => 'Transaktionen har en extern URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaktionen saknar extern URL', + 'rule_trigger_no_external_url' => 'Transaktionen saknar extern URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaktions-ID är..', 'rule_trigger_id' => 'Transaktions-ID är ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Sätt kategori till ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Länka till nota ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Sätt anteckningar till ":action_value"', 'rule_action_convert_deposit_choice' => 'Konvertera transaktionen till en insättning', 'rule_action_convert_deposit' => 'Konvertera transaktionen till en insättning från ":action_value"', @@ -2704,6 +2711,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/sv_SE/form.php b/resources/lang/sv_SE/form.php index 525cc0f6b5..3666db79b1 100644 --- a/resources/lang/sv_SE/form.php +++ b/resources/lang/sv_SE/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Start område', 'end_date' => 'Slut område', 'enddate' => 'Slutdatum', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Start område', 'end' => 'Slut område', 'delete_account' => 'Ta bort konto ":name"', diff --git a/resources/lang/th_TH/firefly.php b/resources/lang/th_TH/firefly.php index b59b954ea4..9b194c491b 100644 --- a/resources/lang/th_TH/firefly.php +++ b/resources/lang/th_TH/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Transaction is of type ":trigger_value"', 'rule_trigger_category_is_choice' => 'Category is..', 'rule_trigger_category_is' => 'Category is ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Amount is less than..', - 'rule_trigger_amount_less' => 'Amount is less than :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Amount is more than..', - 'rule_trigger_amount_more' => 'Amount is more than :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Description starts with..', 'rule_trigger_description_starts' => 'Description starts with ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Description ends with..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaction journal ID is..', 'rule_trigger_journal_id' => 'Transaction journal ID is ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Set category to ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Link to bill ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Set notes to ":action_value"', 'rule_action_convert_deposit_choice' => 'Convert the transaction to a deposit', 'rule_action_convert_deposit' => 'Convert the transaction to a deposit from ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/th_TH/form.php b/resources/lang/th_TH/form.php index 9ba144fb7b..7c00e1e48b 100644 --- a/resources/lang/th_TH/form.php +++ b/resources/lang/th_TH/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Start of range', 'end_date' => 'End of range', 'enddate' => 'End date', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Start of range', 'end' => 'End of range', 'delete_account' => 'Delete account ":name"', diff --git a/resources/lang/tr_TR/firefly.php b/resources/lang/tr_TR/firefly.php index 4dd89ae26a..fc425c9136 100644 --- a/resources/lang/tr_TR/firefly.php +++ b/resources/lang/tr_TR/firefly.php @@ -865,12 +865,12 @@ return [ 'rule_trigger_transaction_type' => 'İşlem türü ":trigger_value"', 'rule_trigger_category_is_choice' => 'Kategori..', 'rule_trigger_category_is' => 'Kategori ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Miktar şundan az..', - 'rule_trigger_amount_less' => 'Miktar :trigger_value \'den daha düşük', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Miktar fazla..', - 'rule_trigger_amount_more' => 'Miktar :trigger_value \'den daha büyük', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Açıklama başlıyor..', 'rule_trigger_description_starts' => 'Açıklama ":trigger_value" ile başlar', 'rule_trigger_description_ends_choice' => 'Açıklama bitiyor..', @@ -935,10 +935,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'İşlem günlüğü kimliğidir..', 'rule_trigger_journal_id' => 'İşlem günlüğü kimliği:trigger_value', - 'rule_trigger_no_external_url' => 'İşlemin harici URL\'si yok', - 'rule_trigger_any_external_url' => 'İşlemin harici bir URL\'si var', - 'rule_trigger_any_external_url_choice' => 'İşlemin harici bir URL\'si var', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'İşlemin harici URL\'si yok', + 'rule_trigger_no_external_url' => 'İşlemin harici URL\'si yok', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'İşlem kimliğidir..', 'rule_trigger_id' => 'İşlem kimliği:trigger_value', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1219,6 +1223,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Kategoriyi ":action_value" olarak ayarla', @@ -1256,6 +1261,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Fatura linki ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Notları ":action_value" olarak ayarla', 'rule_action_convert_deposit_choice' => 'İşlemi mevduata dönüştür', 'rule_action_convert_deposit' => 'İşlemi ":action_value" mevduatına dönüştür', @@ -2704,6 +2711,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/tr_TR/form.php b/resources/lang/tr_TR/form.php index ba7408356f..97c63b4d81 100644 --- a/resources/lang/tr_TR/form.php +++ b/resources/lang/tr_TR/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Sayfa başlangıcı', 'end_date' => 'Kapsama alanı dışında', 'enddate' => 'End date', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Start of range', 'end' => 'End of range', 'delete_account' => '":name" adlı hesabı sil', diff --git a/resources/lang/uk_UA/firefly.php b/resources/lang/uk_UA/firefly.php index 79aa6f7dc4..a1195a365d 100644 --- a/resources/lang/uk_UA/firefly.php +++ b/resources/lang/uk_UA/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Тип операції ":trigger_value"', 'rule_trigger_category_is_choice' => 'Категорія є..', 'rule_trigger_category_is' => 'Категорія дорівнює ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Сума більше ніж..', - 'rule_trigger_amount_less' => 'Сума менша за :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Сума..', 'rule_trigger_amount_is' => 'Сума :trigger_value', - 'rule_trigger_amount_more_choice' => 'Сума більше ніж..', - 'rule_trigger_amount_more' => 'Сума більше :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Опис починається з..', 'rule_trigger_description_starts' => 'Опис починається з ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Опис закінчується на..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Внутрішнє посилання ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Ідентифікатор журналу операцій є..', 'rule_trigger_journal_id' => 'Ідентифікатор журналу операцій є ":trigger_value"', - 'rule_trigger_no_external_url' => 'Операція не має зовнішньої URL-адреси', - 'rule_trigger_any_external_url' => 'Операція має зовнішню URL-адресу', - 'rule_trigger_any_external_url_choice' => 'Операція має зовнішню URL-адресу', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Операція не має зовнішньої URL-адреси', + 'rule_trigger_no_external_url' => 'Операція не має зовнішньої URL-адреси', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Ідентифікатор операції..', 'rule_trigger_id' => 'Ідентифікатор операції: ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'ВИДАЛИТИ операцію(!)', 'rule_action_delete_transaction' => 'ВИДАЛИТИ операцію(!)', 'rule_action_set_category' => 'Вибрати категорію ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Виберіть нотатки до ..', 'rule_action_link_to_bill_choice' => 'Посилання на рахунок до сплати ..', 'rule_action_link_to_bill' => 'Посилання на рахунок до сплати ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Вказати примітки до ":action_value"', 'rule_action_convert_deposit_choice' => 'Перетворити операцію в депозит', 'rule_action_convert_deposit' => 'Перетворити операцію в депозит з ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/uk_UA/form.php b/resources/lang/uk_UA/form.php index 14c795038c..05d6bd57a9 100644 --- a/resources/lang/uk_UA/form.php +++ b/resources/lang/uk_UA/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Початок діапазону', 'end_date' => 'Кінець діапазону', 'enddate' => 'End date', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Початок діапазону', 'end' => 'Кінець діапазону', 'delete_account' => 'Видалити акаунт ":name"', diff --git a/resources/lang/vi_VN/firefly.php b/resources/lang/vi_VN/firefly.php index 28c49d66cd..67e8be7649 100644 --- a/resources/lang/vi_VN/firefly.php +++ b/resources/lang/vi_VN/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => 'Giao dịch thuộc loại ":trigger_value"', 'rule_trigger_category_is_choice' => 'Danh mục là..', 'rule_trigger_category_is' => 'Danh mục là ":trigger_value"', - 'rule_trigger_amount_less_choice' => 'Số tiền ít hơn..', - 'rule_trigger_amount_less' => 'Số tiền ít hơn :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => 'Số tiền nhiều hơn..', - 'rule_trigger_amount_more' => 'Số tiền nhiều hơn :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => 'Mô tả bắt đầu bằng..', 'rule_trigger_description_starts' => 'Mô tả bắt đầu bằng ":trigger_value"', 'rule_trigger_description_ends_choice' => 'Mô tả kết thúc bằng..', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaction journal ID is..', 'rule_trigger_journal_id' => 'Transaction journal ID is ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => 'Đặt danh mục thành ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => 'Liên kết đến một hóa đơn ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => 'Đặt ghi chú cho ":action_value"', 'rule_action_convert_deposit_choice' => 'Chuyển đổi giao dịch thành tiền gửi', 'rule_action_convert_deposit' => 'Chuyển đổi giao dịch thành tiền gửi từ ":action_value"', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/vi_VN/form.php b/resources/lang/vi_VN/form.php index 6dfb3df775..40ab63ec0a 100644 --- a/resources/lang/vi_VN/form.php +++ b/resources/lang/vi_VN/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => 'Bắt đầu', 'end_date' => 'Kết thúc', 'enddate' => 'Ngày kết thúc', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Bắt đầu phạm vi', 'end' => 'Kết thúc phạm vi', 'delete_account' => 'Xóa tài khoản ":name"', diff --git a/resources/lang/zh_CN/firefly.php b/resources/lang/zh_CN/firefly.php index aeb235a123..a84dae18fb 100644 --- a/resources/lang/zh_CN/firefly.php +++ b/resources/lang/zh_CN/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => '转账类型为“:trigger_value”', 'rule_trigger_category_is_choice' => '分类为...', 'rule_trigger_category_is' => '分类为 ":trigger_value"', - 'rule_trigger_amount_less_choice' => '金额小于…', - 'rule_trigger_amount_less' => '金额小于 :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => '金额是...', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => '金额大于…', - 'rule_trigger_amount_more' => '金额大于 :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => '描述开头为...', 'rule_trigger_description_starts' => '描述开头为 ":trigger_value"', 'rule_trigger_description_ends_choice' => '描述结尾为...', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => '内部引用为":trigger_value"', 'rule_trigger_journal_id_choice' => '交易日志 ID 为...', 'rule_trigger_journal_id' => '交易日志 ID 为“:trigger_value”', - 'rule_trigger_no_external_url' => '交易没有外部URL', - 'rule_trigger_any_external_url' => '交易有一个外部URL', - 'rule_trigger_any_external_url_choice' => '交易有一个外部URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => '交易没有外部链接', + 'rule_trigger_no_external_url' => '交易没有外部URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => '交易ID为...', 'rule_trigger_id' => '交易ID为":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => '设定分类为 ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => '设置备注为..', 'rule_action_link_to_bill_choice' => '关联至账单…', 'rule_action_link_to_bill' => '关联至账单“:action_value”', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => '设定备注至“:action_value”', 'rule_action_convert_deposit_choice' => '转换交易为收入', 'rule_action_convert_deposit' => '转换交易为来自“:action_value”的收入', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => '清除标签', 'ale_action_clear_all_tags' => '清除所有标签', 'ale_action_set_bill' => '关联账单', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => '设置预算', 'ale_action_set_category' => '设置分类', 'ale_action_set_source' => '设置来源账户', diff --git a/resources/lang/zh_CN/form.php b/resources/lang/zh_CN/form.php index 75bc9b1848..a83183c752 100644 --- a/resources/lang/zh_CN/form.php +++ b/resources/lang/zh_CN/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => '范围起始', 'end_date' => '范围结束', 'enddate' => '结束日期', + 'move_rules_before_delete' => 'Rule group', 'start' => '范围起始', 'end' => '范围结束', 'delete_account' => '删除账户“:name”', diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index a338c163b2..788d407fed 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -864,12 +864,12 @@ return [ 'rule_trigger_transaction_type' => '轉帳類型為 ":trigger_value"', 'rule_trigger_category_is_choice' => '類別...', 'rule_trigger_category_is' => '分類為 ":trigger_value"', - 'rule_trigger_amount_less_choice' => '金額小於…', - 'rule_trigger_amount_less' => '金額小於 :trigger_value', + 'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..', + 'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value', 'rule_trigger_amount_is_choice' => 'Amount is..', 'rule_trigger_amount_is' => 'Amount is :trigger_value', - 'rule_trigger_amount_more_choice' => '金額大於…', - 'rule_trigger_amount_more' => '金額大於 :trigger_value', + 'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..', + 'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value', 'rule_trigger_description_starts_choice' => '描述以…開頭', 'rule_trigger_description_starts' => '描述開頭為 ":trigger_value"', 'rule_trigger_description_ends_choice' => '描述以…作結', @@ -934,10 +934,14 @@ return [ 'rule_trigger_internal_reference_is' => 'Internal reference is ":trigger_value"', 'rule_trigger_journal_id_choice' => 'Transaction journal ID is..', 'rule_trigger_journal_id' => 'Transaction journal ID is ":trigger_value"', - 'rule_trigger_no_external_url' => 'Transaction has no external URL', - 'rule_trigger_any_external_url' => 'Transaction has an external URL', - 'rule_trigger_any_external_url_choice' => 'Transaction has an external URL', + 'rule_trigger_any_external_url' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_url_choice' => 'Transaction has an (any) external URL', + 'rule_trigger_any_external_id' => 'Transaction has an (any) external ID', + 'rule_trigger_any_external_id_choice' => 'Transaction has an (any) external ID', 'rule_trigger_no_external_url_choice' => 'Transaction has no external URL', + 'rule_trigger_no_external_url' => 'Transaction has no external URL', + 'rule_trigger_no_external_id_choice' => 'Transaction has no external ID', + 'rule_trigger_no_external_id' => 'Transaction has no external ID', 'rule_trigger_id_choice' => 'Transaction ID is..', 'rule_trigger_id' => 'Transaction ID is ":trigger_value"', 'rule_trigger_sepa_ct_is_choice' => 'SEPA CT is..', @@ -1218,6 +1222,7 @@ return [ // actions + // set, clear, add, remove, append/prepend 'rule_action_delete_transaction_choice' => 'DELETE transaction(!)', 'rule_action_delete_transaction' => 'DELETE transaction(!)', 'rule_action_set_category' => '設定分類為 ":action_value"', @@ -1255,6 +1260,8 @@ return [ 'rule_action_set_notes_choice' => 'Set notes to ..', 'rule_action_link_to_bill_choice' => 'Link to a bill ..', 'rule_action_link_to_bill' => '連結至帳單 ":action_value"', + 'rule_action_switch_accounts_choice' => 'Switch source and destination accounts (transfers only!)', + 'rule_action_switch_accounts' => 'Switch source and destination ', 'rule_action_set_notes' => '設定註釋至 ":action_value"', 'rule_action_convert_deposit_choice' => '轉換交易為存款', 'rule_action_convert_deposit' => '轉換交易至來自 ":action_value" 的存款', @@ -2703,6 +2710,7 @@ return [ 'ale_action_clear_tag' => 'Cleared tag', 'ale_action_clear_all_tags' => 'Cleared all tags', 'ale_action_set_bill' => 'Linked to bill', + 'ale_action_switch_accounts' => 'Switched source and destination account', 'ale_action_set_budget' => 'Set budget', 'ale_action_set_category' => 'Set category', 'ale_action_set_source' => 'Set source account', diff --git a/resources/lang/zh_TW/form.php b/resources/lang/zh_TW/form.php index aa667830be..9e61185aa0 100644 --- a/resources/lang/zh_TW/form.php +++ b/resources/lang/zh_TW/form.php @@ -147,6 +147,7 @@ return [ 'start_date' => '範圍起點', 'end_date' => '範圍終點', 'enddate' => 'End date', + 'move_rules_before_delete' => 'Rule group', 'start' => 'Start of range', 'end' => 'End of range', 'delete_account' => '刪除帳戶 ":name"', From a9bd0f551d99a1630211e4f1b9dae88d44eb99b9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 11 Aug 2023 19:37:28 +0200 Subject: [PATCH 5/7] Make sure all objects also add user group --- .../Integrity/UpdateGroupInformation.php | 2 ++ app/Factory/AccountFactory.php | 2 ++ app/Factory/BillFactory.php | 1 + app/Factory/CategoryFactory.php | 5 +++-- app/Factory/RecurrenceFactory.php | 1 + app/Factory/TagFactory.php | 17 +++++++++-------- .../Events/Model/BudgetLimitHandler.php | 9 +++++---- app/Models/Account.php | 6 +++--- app/Models/AvailableBudget.php | 4 ++-- app/Models/Bill.php | 5 +++-- app/Models/Category.php | 2 +- app/Models/ObjectGroup.php | 2 +- app/Models/Rule.php | 8 ++++++++ app/Models/Tag.php | 2 +- app/Models/Webhook.php | 2 +- .../Budget/AvailableBudgetRepository.php | 1 + .../ObjectGroup/CreatesObjectGroups.php | 7 ++++--- app/Repositories/Rule/RuleRepository.php | 3 ++- app/Repositories/Webhook/WebhookRepository.php | 17 +++++++++-------- config/firefly.php | 2 +- 20 files changed, 60 insertions(+), 38 deletions(-) diff --git a/app/Console/Commands/Integrity/UpdateGroupInformation.php b/app/Console/Commands/Integrity/UpdateGroupInformation.php index af6c979311..7b0d80f31d 100644 --- a/app/Console/Commands/Integrity/UpdateGroupInformation.php +++ b/app/Console/Commands/Integrity/UpdateGroupInformation.php @@ -32,6 +32,7 @@ use FireflyIII\Models\Bill; use FireflyIII\Models\Budget; use FireflyIII\Models\Category; use FireflyIII\Models\CurrencyExchangeRate; +use FireflyIII\Models\ObjectGroup; use FireflyIII\Models\Recurrence; use FireflyIII\Models\Rule; use FireflyIII\Models\RuleGroup; @@ -93,6 +94,7 @@ class UpdateGroupInformation extends Command Bill::class, Budget::class, Category::class, + ObjectGroup::class, CurrencyExchangeRate::class, Recurrence::class, RuleGroup::class, diff --git a/app/Factory/AccountFactory.php b/app/Factory/AccountFactory.php index ca8b583b20..82519e0eff 100644 --- a/app/Factory/AccountFactory.php +++ b/app/Factory/AccountFactory.php @@ -92,6 +92,7 @@ class AccountFactory $return = $this->create( [ 'user_id' => $this->user->id, + 'user_group_id' => $this->user->user_group_id, 'name' => $accountName, 'account_type_id' => $type->id, 'account_type_name' => null, @@ -199,6 +200,7 @@ class AccountFactory $active = array_key_exists('active', $data) ? $data['active'] : true; $databaseData = [ 'user_id' => $this->user->id, + 'user_group_id' => $this->user->user_group_id, 'account_type_id' => $type->id, 'name' => $data['name'], 'order' => 25000, diff --git a/app/Factory/BillFactory.php b/app/Factory/BillFactory.php index cff8187735..c2bf305d3a 100644 --- a/app/Factory/BillFactory.php +++ b/app/Factory/BillFactory.php @@ -67,6 +67,7 @@ class BillFactory 'match' => 'MIGRATED_TO_RULES', 'amount_min' => $data['amount_min'], 'user_id' => $this->user->id, + 'user_group_id' => $this->user->user_group_id, 'transaction_currency_id' => $currency->id, 'amount_max' => $data['amount_max'], 'date' => $data['date'], diff --git a/app/Factory/CategoryFactory.php b/app/Factory/CategoryFactory.php index 2695b0edf1..affe1abf52 100644 --- a/app/Factory/CategoryFactory.php +++ b/app/Factory/CategoryFactory.php @@ -70,8 +70,9 @@ class CategoryFactory try { return Category::create( [ - 'user_id' => $this->user->id, - 'name' => $categoryName, + 'user_id' => $this->user->id, + 'user_group_id' => $this->user->user_group_id, + 'name' => $categoryName, ] ); } catch (QueryException $e) { diff --git a/app/Factory/RecurrenceFactory.php b/app/Factory/RecurrenceFactory.php index 2b6b86653f..6c5be3c1d3 100644 --- a/app/Factory/RecurrenceFactory.php +++ b/app/Factory/RecurrenceFactory.php @@ -107,6 +107,7 @@ class RecurrenceFactory $recurrence = new Recurrence( [ 'user_id' => $this->user->id, + 'user_group_id' => $this->user->user_group_id, 'transaction_type_id' => $type->id, 'title' => $title, 'description' => $description, diff --git a/app/Factory/TagFactory.php b/app/Factory/TagFactory.php index 0c12f37348..dcfd9b8741 100644 --- a/app/Factory/TagFactory.php +++ b/app/Factory/TagFactory.php @@ -83,14 +83,15 @@ class TagFactory $latitude = 0.0 === (float)$data['latitude'] ? null : (float)$data['latitude']; // intentional float $longitude = 0.0 === (float)$data['longitude'] ? null : (float)$data['longitude']; // intentional float $array = [ - 'user_id' => $this->user->id, - 'tag' => trim($data['tag']), - 'tagMode' => 'nothing', - 'date' => $data['date'], - 'description' => $data['description'], - 'latitude' => null, - 'longitude' => null, - 'zoomLevel' => null, + 'user_id' => $this->user->id, + 'user_group_id' => $this->user->user_group_id, + 'tag' => trim($data['tag']), + 'tagMode' => 'nothing', + 'date' => $data['date'], + 'description' => $data['description'], + 'latitude' => null, + 'longitude' => null, + 'zoomLevel' => null, ]; $tag = Tag::create($array); if (null !== $tag && null !== $latitude && null !== $longitude) { diff --git a/app/Handlers/Events/Model/BudgetLimitHandler.php b/app/Handlers/Events/Model/BudgetLimitHandler.php index 49e0b2ecec..5a45dc41e0 100644 --- a/app/Handlers/Events/Model/BudgetLimitHandler.php +++ b/app/Handlers/Events/Model/BudgetLimitHandler.php @@ -131,6 +131,7 @@ class BudgetLimitHandler $availableBudget = new AvailableBudget( [ 'user_id' => $budgetLimit->budget->user->id, + 'user_group_id' => $budgetLimit->budget->user->user_group_id, 'transaction_currency_id' => $budgetLimit->transaction_currency_id, 'start_date' => $current, 'end_date' => $currentEnd, @@ -180,8 +181,8 @@ class BudgetLimitHandler ); // overlap in days: $limitPeriod = Period::make( - $budgetLimit->start_date, - $budgetLimit->end_date, + $budgetLimit->start_date, + $budgetLimit->end_date, precision : Precision::DAY(), boundaries: Boundaries::EXCLUDE_NONE() ); @@ -223,8 +224,8 @@ class BudgetLimitHandler return '0'; } $limitPeriod = Period::make( - $budgetLimit->start_date, - $budgetLimit->end_date, + $budgetLimit->start_date, + $budgetLimit->end_date, precision : Precision::DAY(), boundaries: Boundaries::EXCLUDE_NONE() ); diff --git a/app/Models/Account.php b/app/Models/Account.php index 5ef09f8ef0..799e05ef4a 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -125,9 +125,9 @@ class Account extends Model 'encrypted' => 'boolean', ]; /** @var array Fields that can be filled */ - protected $fillable = ['user_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban']; + protected $fillable = ['user_id', 'user_group_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban']; /** @var array Hidden from view */ - protected $hidden = ['encrypted']; + protected $hidden = ['encrypted']; private bool $joinedAccountTypes = false; /** @@ -291,7 +291,7 @@ class Account extends Model protected function virtualBalance(): Attribute { return Attribute::make( - get: fn ($value) => (string)$value, + get: fn($value) => (string)$value, ); } } diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index c3e114b436..f80a962f9a 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -85,7 +85,7 @@ class AvailableBudget extends Model 'transaction_currency_id' => 'int', ]; /** @var array Fields that can be filled */ - protected $fillable = ['user_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date']; + protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date']; /** * Route binder. Converts the key in the URL to the specified object (or throw 404). @@ -132,7 +132,7 @@ class AvailableBudget extends Model protected function amount(): Attribute { return Attribute::make( - get: fn ($value) => (string)$value, + get: fn($value) => (string)$value, ); } } diff --git a/app/Models/Bill.php b/app/Models/Bill.php index d7ef58b2bf..160d83ae3e 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -130,6 +130,7 @@ class Bill extends Model 'match', 'amount_min', 'user_id', + 'user_group_id', 'amount_max', 'date', 'repeat_freq', @@ -241,7 +242,7 @@ class Bill extends Model protected function amountMax(): Attribute { return Attribute::make( - get: fn ($value) => (string)$value, + get: fn($value) => (string)$value, ); } @@ -253,7 +254,7 @@ class Bill extends Model protected function amountMin(): Attribute { return Attribute::make( - get: fn ($value) => (string)$value, + get: fn($value) => (string)$value, ); } } diff --git a/app/Models/Category.php b/app/Models/Category.php index 84ac0c3038..dc52f22bbb 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -89,7 +89,7 @@ class Category extends Model 'encrypted' => 'boolean', ]; /** @var array Fields that can be filled */ - protected $fillable = ['user_id', 'name']; + protected $fillable = ['user_id', 'user_group_id', 'name']; /** @var array Hidden from view */ protected $hidden = ['encrypted']; diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php index ec1aa89410..a4c86b72d0 100644 --- a/app/Models/ObjectGroup.php +++ b/app/Models/ObjectGroup.php @@ -77,7 +77,7 @@ class ObjectGroup extends Model 'user_id' => 'integer', 'deleted_at' => 'datetime', ]; - protected $fillable = ['title', 'order', 'user_id']; + protected $fillable = ['title', 'order', 'user_id', 'user_group_id']; /** * Route binder. Converts the key in the URL to the specified object (or throw 404). diff --git a/app/Models/Rule.php b/app/Models/Rule.php index 7660de859a..5e8807863a 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -165,4 +165,12 @@ class Rule extends Model { $this->attributes['description'] = e($value); } + + /** + * @return BelongsTo + */ + public function userGroup(): BelongsTo + { + return $this->belongsTo(UserGroup::class); + } } diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 6d1ffd2cfa..1e0e28fd14 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -99,7 +99,7 @@ class Tag extends Model 'longitude' => 'float', ]; /** @var array Fields that can be filled */ - protected $fillable = ['user_id', 'tag', 'date', 'description', 'tagMode']; + protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'description', 'tagMode']; protected $hidden = ['zoomLevel', 'latitude', 'longitude']; diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index c928d35758..4d8a64bf7f 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -88,7 +88,7 @@ class Webhook extends Model 'response' => 'integer', 'delivery' => 'integer', ]; - protected $fillable = ['active', 'trigger', 'response', 'delivery', 'user_id', 'url', 'title', 'secret']; + protected $fillable = ['active', 'trigger', 'response', 'delivery', 'user_id', 'user_group_id', 'url', 'title', 'secret']; /** * @return array diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.php index 9553a6f243..a17b17d4e2 100644 --- a/app/Repositories/Budget/AvailableBudgetRepository.php +++ b/app/Repositories/Budget/AvailableBudgetRepository.php @@ -249,6 +249,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface return AvailableBudget::create( [ 'user_id' => $this->user->id, + 'user_group_id' => $this->user->user_group_id, 'transaction_currency_id' => $data['currency_id'], 'amount' => $data['amount'], 'start_date' => $start, diff --git a/app/Repositories/ObjectGroup/CreatesObjectGroups.php b/app/Repositories/ObjectGroup/CreatesObjectGroups.php index 7cf5550675..5258479fbf 100644 --- a/app/Repositories/ObjectGroup/CreatesObjectGroups.php +++ b/app/Repositories/ObjectGroup/CreatesObjectGroups.php @@ -53,9 +53,10 @@ trait CreatesObjectGroups if (!$this->hasObjectGroup($title)) { return ObjectGroup::create( [ - 'user_id' => $this->user->id, - 'title' => $title, - 'order' => $maxOrder + 1, + 'user_id' => $this->user->id, + 'user_group_id' => $this->user->user_group_id, + 'title' => $title, + 'order' => $maxOrder + 1, ] ); } diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 46e8a84afb..09e02cbe75 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -280,7 +280,8 @@ class RuleRepository implements RuleRepositoryInterface // start by creating a new rule: $rule = new Rule(); - $rule->user()->associate($this->user->id); + $rule->user()->associate($this->user); + $rule->userGroup()->associate($this->user->userGroup); $rule->rule_group_id = $ruleGroup->id; $rule->order = 31337; diff --git a/app/Repositories/Webhook/WebhookRepository.php b/app/Repositories/Webhook/WebhookRepository.php index 931638aecd..451e376bae 100644 --- a/app/Repositories/Webhook/WebhookRepository.php +++ b/app/Repositories/Webhook/WebhookRepository.php @@ -121,14 +121,15 @@ class WebhookRepository implements WebhookRepositoryInterface { $secret = Str::random(24); $fullData = [ - 'user_id' => $this->user->id, - 'active' => $data['active'] ?? false, - 'title' => $data['title'] ?? null, - 'trigger' => $data['trigger'], - 'response' => $data['response'], - 'delivery' => $data['delivery'], - 'secret' => $secret, - 'url' => $data['url'], + 'user_id' => $this->user->id, + 'user_group_id' => $this->user->user_group_id, + 'active' => $data['active'] ?? false, + 'title' => $data['title'] ?? null, + 'trigger' => $data['trigger'], + 'response' => $data['response'], + 'delivery' => $data['delivery'], + 'secret' => $secret, + 'url' => $data['url'], ]; return Webhook::create($fullData); diff --git a/config/firefly.php b/config/firefly.php index 3ded7995ae..8f537d9c42 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -112,7 +112,7 @@ return [ ], 'version' => '6.0.20', 'api_version' => '2.0.5', - 'db_version' => 19, + 'db_version' => 20, // generic settings 'maxUploadSize' => 1073741824, // 1 GB From db94f18d465bc88f58c22d63a5cbe8d4cac0a260 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 11 Aug 2023 19:37:52 +0200 Subject: [PATCH 6/7] Clean up migrations --- ...016_06_16_000000_create_support_tables.php | 40 +++---- .../2016_06_16_000001_create_users_table.php | 4 +- .../2016_06_16_000002_create_main_tables.php | 104 +++++++++--------- .../2016_08_25_091522_changes_for_3101.php | 8 +- .../2016_09_12_121359_fix_nullables.php | 12 +- ...10_09_150037_expand_transactions_table.php | 8 +- .../2016_10_22_075804_changes_for_v410.php | 4 +- .../2016_11_24_210552_changes_for_v420.php | 8 +- .../2016_12_22_150431_changes_for_v430.php | 4 +- .../2016_12_28_203205_changes_for_v431.php | 40 +++---- .../2017_04_13_163623_changes_for_v440.php | 12 +- .../2017_06_02_105232_changes_for_v450.php | 20 ++-- .../2017_08_20_062014_changes_for_v470.php | 8 +- .../2017_11_04_170844_changes_for_v470a.php | 8 +- ...1_000001_create_oauth_auth_codes_table.php | 4 +- ...00002_create_oauth_access_tokens_table.php | 4 +- ...0003_create_oauth_refresh_tokens_table.php | 4 +- ...1_01_000004_create_oauth_clients_table.php | 4 +- ...te_oauth_personal_access_clients_table.php | 4 +- .../2018_03_19_141348_changes_for_v472.php | 16 +-- .../2018_04_07_210913_changes_for_v473.php | 16 +-- .../2018_04_29_174524_changes_for_v474.php | 8 +- .../2018_06_08_200526_changes_for_v475.php | 20 ++-- .../2018_09_05_195147_changes_for_v477.php | 8 +- .../2018_11_06_172532_changes_for_v479.php | 8 +- .../2019_01_28_193833_changes_for_v4710.php | 8 +- .../2019_02_05_055516_changes_for_v4711.php | 8 +- .../2019_02_11_170529_changes_for_v4712.php | 4 +- ...19_03_11_223700_fix_ldap_configuration.php | 8 +- .../2019_03_22_183214_changes_for_v480.php | 44 ++++---- ...2019_12_28_191351_make_locations_table.php | 4 +- .../2020_03_13_201950_changes_for_v520.php | 4 +- .../2020_06_07_063612_changes_for_v530.php | 8 +- .../2020_06_30_202620_changes_for_v530a.php | 8 +- .../2020_07_24_162820_changes_for_v540.php | 32 +++--- .../2020_11_12_070604_changes_for_v550.php | 44 ++++---- .../2021_03_12_061213_changes_for_v550b2.php | 8 +- ...064644_add_ldap_columns_to_users_table.php | 8 +- ...2021_05_13_053836_extend_currency_info.php | 4 +- .../2021_08_28_073733_user_groups.php | 31 +++--- ...ate_local_personal_access_tokens_table.php | 4 +- .../2022_08_21_104626_add_user_groups.php | 9 +- ...9_18_123911_create_notifications_table.php | 5 +- .../2022_10_01_074908_invited_users.php | 5 +- .../2022_10_01_210238_audit_log_entries.php | 5 +- .../2023_08_11_192521_upgrade_og_table.php | 58 ++++++++++ database/seeders/ExchangeRateSeeder.php | 36 +++--- 47 files changed, 383 insertions(+), 338 deletions(-) create mode 100644 database/migrations/2023_08_11_192521_upgrade_og_table.php 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 3845d7b6c7..14d5c53c2f 100644 --- a/database/migrations/2016_06_16_000000_create_support_tables.php +++ b/database/migrations/2016_06_16_000000_create_support_tables.php @@ -89,8 +89,8 @@ class CreateSupportTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'account_types', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'account_types', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -117,8 +117,8 @@ class CreateSupportTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'transaction_currencies', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'transaction_currencies', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -143,8 +143,8 @@ class CreateSupportTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'transaction_types', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'transaction_types', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -172,8 +172,8 @@ class CreateSupportTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'jobs', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'jobs', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -195,8 +195,8 @@ class CreateSupportTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'password_resets', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'password_resets', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -219,8 +219,8 @@ class CreateSupportTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'permissions', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'permissions', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -243,8 +243,8 @@ class CreateSupportTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'roles', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'roles', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -269,8 +269,8 @@ class CreateSupportTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'permission_role', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'permission_role', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -294,8 +294,8 @@ class CreateSupportTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'sessions', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'sessions', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -318,8 +318,8 @@ class CreateSupportTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'configuration', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'configuration', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } 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 12cc7dfdb9..1e0aece1d0 100644 --- a/database/migrations/2016_06_16_000001_create_users_table.php +++ b/database/migrations/2016_06_16_000001_create_users_table.php @@ -65,8 +65,8 @@ class CreateUsersTable extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'users', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'users', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } 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 cf4284e8d0..65c8d18219 100644 --- a/database/migrations/2016_06_16_000002_create_main_tables.php +++ b/database/migrations/2016_06_16_000002_create_main_tables.php @@ -111,8 +111,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'accounts', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'accounts', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } @@ -130,8 +130,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'account_meta', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'account_meta', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -158,8 +158,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'piggy_banks', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'piggy_banks', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } @@ -178,8 +178,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'piggy_bank_repetitions', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'piggy_bank_repetitions', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -211,8 +211,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'attachments', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'attachments', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -245,8 +245,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'bills', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'bills', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -271,8 +271,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'budgets', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'budgets', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } if (!Schema::hasTable('budget_limits')) { @@ -291,8 +291,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'budget_limits', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'budget_limits', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } if (!Schema::hasTable('limit_repetitions')) { @@ -310,8 +310,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'limit_repetitions', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'limit_repetitions', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -338,8 +338,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'categories', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'categories', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -361,8 +361,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'preferences', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'preferences', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -387,8 +387,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'role_user', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'role_user', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -414,8 +414,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'rule_groups', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'rule_groups', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } if (!Schema::hasTable('rules')) { @@ -442,8 +442,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'rules', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'rules', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } if (!Schema::hasTable('rule_actions')) { @@ -467,8 +467,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'rule_actions', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'rule_actions', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } if (!Schema::hasTable('rule_triggers')) { @@ -492,8 +492,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'rule_triggers', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'rule_triggers', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -526,8 +526,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'tags', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'tags', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } @@ -565,8 +565,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'transaction_journals', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'transaction_journals', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } @@ -585,8 +585,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'journal_meta', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'journal_meta', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } @@ -606,8 +606,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'tag_transaction_journal', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'tag_transaction_journal', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } @@ -624,8 +624,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'budget_transaction_journal', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'budget_transaction_journal', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } @@ -642,8 +642,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'category_transaction_journal', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'category_transaction_journal', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } @@ -664,8 +664,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'piggy_bank_events', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'piggy_bank_events', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } @@ -687,8 +687,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'transactions', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'transactions', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } @@ -706,8 +706,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'budget_transaction', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'budget_transaction', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } @@ -725,8 +725,8 @@ class CreateMainTables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_ERROR, 'category_transaction', $e->getMessage())); - Log::error(self::TABLE_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_ERROR, 'category_transaction', $e->getMessage())); + app('log')->error(self::TABLE_ALREADY_EXISTS); } } } 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 5b32bada7f..be2b8cf0c7 100644 --- a/database/migrations/2016_08_25_091522_changes_for_3101.php +++ b/database/migrations/2016_08_25_091522_changes_for_3101.php @@ -33,15 +33,11 @@ class ChangesFor3101 extends Migration /** * Reverse the migrations. */ - public function down(): void - { - } + public function down(): void {} /** * Run the migrations. * */ - public function up(): void - { - } + public function up(): void {} } diff --git a/database/migrations/2016_09_12_121359_fix_nullables.php b/database/migrations/2016_09_12_121359_fix_nullables.php index 9a112b1bea..bb389daa45 100644 --- a/database/migrations/2016_09_12_121359_fix_nullables.php +++ b/database/migrations/2016_09_12_121359_fix_nullables.php @@ -38,9 +38,7 @@ class FixNullables extends Migration /** * Reverse the migrations. */ - public function down(): void - { - } + public function down(): void {} /** * Run the migrations. @@ -57,8 +55,8 @@ class FixNullables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_UPDATE_ERROR, 'rule_groups', $e->getMessage())); - Log::error(self::COLUMN_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_UPDATE_ERROR, 'rule_groups', $e->getMessage())); + app('log')->error(self::COLUMN_ALREADY_EXISTS); } } @@ -71,8 +69,8 @@ class FixNullables extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf(self::TABLE_UPDATE_ERROR, 'rules', $e->getMessage())); - Log::error(self::COLUMN_ALREADY_EXISTS); + app('log')->error(sprintf(self::TABLE_UPDATE_ERROR, 'rules', $e->getMessage())); + app('log')->error(self::COLUMN_ALREADY_EXISTS); } } } diff --git a/database/migrations/2016_10_09_150037_expand_transactions_table.php b/database/migrations/2016_10_09_150037_expand_transactions_table.php index 90729f7f0a..256a3bb5ca 100644 --- a/database/migrations/2016_10_09_150037_expand_transactions_table.php +++ b/database/migrations/2016_10_09_150037_expand_transactions_table.php @@ -47,8 +47,8 @@ class ExpandTransactionsTable extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not drop column "identifier": %s', $e->getMessage())); - Log::error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not drop column "identifier": %s', $e->getMessage())); + app('log')->error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -68,8 +68,8 @@ class ExpandTransactionsTable extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2016_10_22_075804_changes_for_v410.php b/database/migrations/2016_10_22_075804_changes_for_v410.php index 5d3993d2e0..7faabd92e2 100644 --- a/database/migrations/2016_10_22_075804_changes_for_v410.php +++ b/database/migrations/2016_10_22_075804_changes_for_v410.php @@ -61,8 +61,8 @@ class ChangesForV410 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "notes": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "notes": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2016_11_24_210552_changes_for_v420.php b/database/migrations/2016_11_24_210552_changes_for_v420.php index 48f23e4561..3283c06112 100644 --- a/database/migrations/2016_11_24_210552_changes_for_v420.php +++ b/database/migrations/2016_11_24_210552_changes_for_v420.php @@ -46,8 +46,8 @@ class ChangesForV420 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -67,8 +67,8 @@ class ChangesForV420 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2016_12_22_150431_changes_for_v430.php b/database/migrations/2016_12_22_150431_changes_for_v430.php index 36e49e1118..272d3b2a63 100644 --- a/database/migrations/2016_12_22_150431_changes_for_v430.php +++ b/database/migrations/2016_12_22_150431_changes_for_v430.php @@ -65,8 +65,8 @@ class ChangesForV430 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "available_budgets": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "available_budgets": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } 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 661337aad8..7da1ee7968 100644 --- a/database/migrations/2016_12_28_203205_changes_for_v431.php +++ b/database/migrations/2016_12_28_203205_changes_for_v431.php @@ -48,8 +48,8 @@ class ChangesForV431 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } if (!Schema::hasColumn('budget_limits', 'repeats')) { @@ -61,8 +61,8 @@ class ChangesForV431 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } // change field "start_date" to "startdate" @@ -75,8 +75,8 @@ class ChangesForV431 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -90,8 +90,8 @@ class ChangesForV431 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } // remove decimal places @@ -104,8 +104,8 @@ class ChangesForV431 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -126,8 +126,8 @@ class ChangesForV431 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -141,8 +141,8 @@ class ChangesForV431 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -156,8 +156,8 @@ class ChangesForV431 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -171,8 +171,8 @@ class ChangesForV431 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } if (Schema::hasColumn('budget_limits', 'repeat_freq')) { @@ -184,8 +184,8 @@ class ChangesForV431 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2017_04_13_163623_changes_for_v440.php b/database/migrations/2017_04_13_163623_changes_for_v440.php index 17a461f0ac..0caad0e92b 100644 --- a/database/migrations/2017_04_13_163623_changes_for_v440.php +++ b/database/migrations/2017_04_13_163623_changes_for_v440.php @@ -53,8 +53,8 @@ class ChangesForV440 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -85,8 +85,8 @@ class ChangesForV440 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "notifications": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "notifications": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } if (!Schema::hasColumn('transactions', 'transaction_currency_id')) { @@ -101,8 +101,8 @@ class ChangesForV440 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2017_06_02_105232_changes_for_v450.php b/database/migrations/2017_06_02_105232_changes_for_v450.php index 0e13a3d6ff..d9b025e8d7 100644 --- a/database/migrations/2017_06_02_105232_changes_for_v450.php +++ b/database/migrations/2017_06_02_105232_changes_for_v450.php @@ -48,8 +48,8 @@ class ChangesForV450 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -64,8 +64,8 @@ class ChangesForV450 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } if (Schema::hasColumn('transactions', 'foreign_currency_id')) { try { @@ -76,8 +76,8 @@ class ChangesForV450 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -98,8 +98,8 @@ class ChangesForV450 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -114,8 +114,8 @@ class ChangesForV450 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2017_08_20_062014_changes_for_v470.php b/database/migrations/2017_08_20_062014_changes_for_v470.php index dc6270e238..a6a4a52f72 100644 --- a/database/migrations/2017_08_20_062014_changes_for_v470.php +++ b/database/migrations/2017_08_20_062014_changes_for_v470.php @@ -65,8 +65,8 @@ class ChangesForV470 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "link_types": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "link_types": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } @@ -90,8 +90,8 @@ class ChangesForV470 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "journal_links": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "journal_links": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2017_11_04_170844_changes_for_v470a.php b/database/migrations/2017_11_04_170844_changes_for_v470a.php index fcde3e5f20..10f2bb0aa9 100644 --- a/database/migrations/2017_11_04_170844_changes_for_v470a.php +++ b/database/migrations/2017_11_04_170844_changes_for_v470a.php @@ -48,8 +48,8 @@ class ChangesForV470a extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -69,8 +69,8 @@ class ChangesForV470a extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php b/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php index a498667e14..75cd6c65dc 100644 --- a/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php +++ b/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php @@ -61,8 +61,8 @@ class CreateOauthAuthCodesTable extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "oauth_auth_codes": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "oauth_auth_codes": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php b/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php index 2d177fe642..3b2950b92c 100644 --- a/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php +++ b/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php @@ -63,8 +63,8 @@ class CreateOauthAccessTokensTable extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "oauth_access_tokens": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "oauth_access_tokens": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php b/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php index 0b6b178976..5108372473 100644 --- a/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php +++ b/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php @@ -59,8 +59,8 @@ class CreateOauthRefreshTokensTable extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "oauth_refresh_tokens": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "oauth_refresh_tokens": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2018_01_01_000004_create_oauth_clients_table.php b/database/migrations/2018_01_01_000004_create_oauth_clients_table.php index c0087c7c25..c95a1f8eb6 100644 --- a/database/migrations/2018_01_01_000004_create_oauth_clients_table.php +++ b/database/migrations/2018_01_01_000004_create_oauth_clients_table.php @@ -64,8 +64,8 @@ class CreateOauthClientsTable extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "oauth_clients": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "oauth_clients": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php b/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php index 970363809f..a66f2f5387 100644 --- a/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php +++ b/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php @@ -58,8 +58,8 @@ class CreateOauthPersonalAccessClientsTable extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "oauth_personal_access_clients": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "oauth_personal_access_clients": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2018_03_19_141348_changes_for_v472.php b/database/migrations/2018_03_19_141348_changes_for_v472.php index 5d512b366d..888cdb9f91 100644 --- a/database/migrations/2018_03_19_141348_changes_for_v472.php +++ b/database/migrations/2018_03_19_141348_changes_for_v472.php @@ -50,8 +50,8 @@ class ChangesForV472 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -64,8 +64,8 @@ class ChangesForV472 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -86,8 +86,8 @@ class ChangesForV472 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -100,8 +100,8 @@ class ChangesForV472 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2018_04_07_210913_changes_for_v473.php b/database/migrations/2018_04_07_210913_changes_for_v473.php index 0e641b93d4..5d59bc094f 100644 --- a/database/migrations/2018_04_07_210913_changes_for_v473.php +++ b/database/migrations/2018_04_07_210913_changes_for_v473.php @@ -55,8 +55,8 @@ class ChangesForV473 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -69,8 +69,8 @@ class ChangesForV473 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -92,8 +92,8 @@ class ChangesForV473 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } if (!Schema::hasColumn('rules', 'strict')) { @@ -105,8 +105,8 @@ class ChangesForV473 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2018_04_29_174524_changes_for_v474.php b/database/migrations/2018_04_29_174524_changes_for_v474.php index f7d5ce28dc..d5bae260d7 100644 --- a/database/migrations/2018_04_29_174524_changes_for_v474.php +++ b/database/migrations/2018_04_29_174524_changes_for_v474.php @@ -36,16 +36,12 @@ class ChangesForV474 extends Migration * * @return void */ - public function down(): void - { - } + public function down(): void {} /** * Run the migrations. * * @return void */ - public function up(): void - { - } + public function up(): void {} } diff --git a/database/migrations/2018_06_08_200526_changes_for_v475.php b/database/migrations/2018_06_08_200526_changes_for_v475.php index 249f6f76ec..96f58a0eb2 100644 --- a/database/migrations/2018_06_08_200526_changes_for_v475.php +++ b/database/migrations/2018_06_08_200526_changes_for_v475.php @@ -81,8 +81,8 @@ class ChangesForV475 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "recurrences": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "recurrences": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } if (!Schema::hasTable('recurrences_transactions')) { @@ -111,8 +111,8 @@ class ChangesForV475 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "recurrences_transactions": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "recurrences_transactions": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } @@ -134,8 +134,8 @@ class ChangesForV475 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "recurrences_repetitions": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "recurrences_repetitions": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } @@ -156,8 +156,8 @@ class ChangesForV475 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "recurrences_meta": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "recurrences_meta": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } @@ -178,8 +178,8 @@ class ChangesForV475 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "rt_meta": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "rt_meta": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2018_09_05_195147_changes_for_v477.php b/database/migrations/2018_09_05_195147_changes_for_v477.php index dd7be70042..8ba83d4dd5 100644 --- a/database/migrations/2018_09_05_195147_changes_for_v477.php +++ b/database/migrations/2018_09_05_195147_changes_for_v477.php @@ -55,8 +55,8 @@ class ChangesForV477 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -78,8 +78,8 @@ class ChangesForV477 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2018_11_06_172532_changes_for_v479.php b/database/migrations/2018_11_06_172532_changes_for_v479.php index 64bcf11901..1d48a17273 100644 --- a/database/migrations/2018_11_06_172532_changes_for_v479.php +++ b/database/migrations/2018_11_06_172532_changes_for_v479.php @@ -50,8 +50,8 @@ class ChangesForV479 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -72,8 +72,8 @@ class ChangesForV479 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2019_01_28_193833_changes_for_v4710.php b/database/migrations/2019_01_28_193833_changes_for_v4710.php index ae6e0f543e..9f2352be76 100644 --- a/database/migrations/2019_01_28_193833_changes_for_v4710.php +++ b/database/migrations/2019_01_28_193833_changes_for_v4710.php @@ -67,8 +67,8 @@ class ChangesForV4710 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "transaction_groups": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "transaction_groups": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } @@ -89,8 +89,8 @@ class ChangesForV4710 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "group_journals": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "group_journals": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2019_02_05_055516_changes_for_v4711.php b/database/migrations/2019_02_05_055516_changes_for_v4711.php index 291bcdbd8d..f410dad84d 100644 --- a/database/migrations/2019_02_05_055516_changes_for_v4711.php +++ b/database/migrations/2019_02_05_055516_changes_for_v4711.php @@ -67,8 +67,8 @@ class ChangesForV4711 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } try { @@ -79,8 +79,8 @@ class ChangesForV4711 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2019_02_11_170529_changes_for_v4712.php b/database/migrations/2019_02_11_170529_changes_for_v4712.php index f455d5174d..c0ce9bf969 100644 --- a/database/migrations/2019_02_11_170529_changes_for_v4712.php +++ b/database/migrations/2019_02_11_170529_changes_for_v4712.php @@ -66,8 +66,8 @@ class ChangesForV4712 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2019_03_11_223700_fix_ldap_configuration.php b/database/migrations/2019_03_11_223700_fix_ldap_configuration.php index d9939f83d5..617d58dfbb 100644 --- a/database/migrations/2019_03_11_223700_fix_ldap_configuration.php +++ b/database/migrations/2019_03_11_223700_fix_ldap_configuration.php @@ -50,8 +50,8 @@ class FixLdapConfiguration extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -76,8 +76,8 @@ class FixLdapConfiguration extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2019_03_22_183214_changes_for_v480.php b/database/migrations/2019_03_22_183214_changes_for_v480.php index 1c0a1cf35f..ae51522ab7 100644 --- a/database/migrations/2019_03_22_183214_changes_for_v480.php +++ b/database/migrations/2019_03_22_183214_changes_for_v480.php @@ -52,21 +52,21 @@ class ChangesForV480 extends Migration try { $table->dropForeign('transaction_journals_transaction_group_id_foreign'); } catch (QueryException $e) { - Log::error(sprintf('Could not drop foreign ID: %s', $e->getMessage())); - Log::error('If the foreign ID does not exist (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not drop foreign ID: %s', $e->getMessage())); + app('log')->error('If the foreign ID does not exist (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } try { $table->dropColumn('transaction_group_id'); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not drop column: %s', $e->getMessage())); - Log::error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not drop column: %s', $e->getMessage())); + app('log')->error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.'); } } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -79,14 +79,14 @@ class ChangesForV480 extends Migration try { $table->dropColumn('stop_processing'); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not drop column: %s', $e->getMessage())); - Log::error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not drop column: %s', $e->getMessage())); + app('log')->error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.'); } } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -99,14 +99,14 @@ class ChangesForV480 extends Migration try { $table->dropColumn('mfa_secret'); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not drop column: %s', $e->getMessage())); - Log::error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not drop column: %s', $e->getMessage())); + app('log')->error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.'); } } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -134,16 +134,16 @@ class ChangesForV480 extends Migration try { $table->foreign('transaction_group_id')->references('id')->on('transaction_groups')->onDelete('cascade'); } catch (QueryException $e) { - Log::error(sprintf('Could not create foreign index: %s', $e->getMessage())); - Log::error( + app('log')->error(sprintf('Could not create foreign index: %s', $e->getMessage())); + app('log')->error( 'If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.' ); } } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -157,8 +157,8 @@ class ChangesForV480 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -172,8 +172,8 @@ class ChangesForV480 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2019_12_28_191351_make_locations_table.php b/database/migrations/2019_12_28_191351_make_locations_table.php index 22b80e8c36..921f3ad92d 100644 --- a/database/migrations/2019_12_28_191351_make_locations_table.php +++ b/database/migrations/2019_12_28_191351_make_locations_table.php @@ -69,8 +69,8 @@ class MakeLocationsTable extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "locations": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "locations": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2020_03_13_201950_changes_for_v520.php b/database/migrations/2020_03_13_201950_changes_for_v520.php index 90be1d4789..98a9df31a6 100644 --- a/database/migrations/2020_03_13_201950_changes_for_v520.php +++ b/database/migrations/2020_03_13_201950_changes_for_v520.php @@ -69,8 +69,8 @@ class ChangesForV520 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "auto_budgets": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "auto_budgets": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2020_06_07_063612_changes_for_v530.php b/database/migrations/2020_06_07_063612_changes_for_v530.php index aaa97f39ef..270aadd088 100644 --- a/database/migrations/2020_06_07_063612_changes_for_v530.php +++ b/database/migrations/2020_06_07_063612_changes_for_v530.php @@ -66,8 +66,8 @@ class ChangesForV530 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "object_groups": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "object_groups": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } @@ -82,8 +82,8 @@ class ChangesForV530 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "object_groupables": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "object_groupables": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2020_06_30_202620_changes_for_v530a.php b/database/migrations/2020_06_30_202620_changes_for_v530a.php index 4c39d12788..df4691b311 100644 --- a/database/migrations/2020_06_30_202620_changes_for_v530a.php +++ b/database/migrations/2020_06_30_202620_changes_for_v530a.php @@ -51,8 +51,8 @@ class ChangesForV530a extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -73,8 +73,8 @@ class ChangesForV530a extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2020_07_24_162820_changes_for_v540.php b/database/migrations/2020_07_24_162820_changes_for_v540.php index 5db1c0e99a..55f025a56c 100644 --- a/database/migrations/2020_07_24_162820_changes_for_v540.php +++ b/database/migrations/2020_07_24_162820_changes_for_v540.php @@ -51,8 +51,8 @@ class ChangesForV540 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -65,8 +65,8 @@ class ChangesForV540 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } // in two steps for sqlite @@ -79,8 +79,8 @@ class ChangesForV540 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } if (Schema::hasColumn('bills', 'extension_date')) { @@ -92,8 +92,8 @@ class ChangesForV540 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -114,8 +114,8 @@ class ChangesForV540 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -128,8 +128,8 @@ class ChangesForV540 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -143,8 +143,8 @@ class ChangesForV540 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -157,8 +157,8 @@ class ChangesForV540 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2020_11_12_070604_changes_for_v550.php b/database/migrations/2020_11_12_070604_changes_for_v550.php index 47f304ac71..0e4292a1ec 100644 --- a/database/migrations/2020_11_12_070604_changes_for_v550.php +++ b/database/migrations/2020_11_12_070604_changes_for_v550.php @@ -61,8 +61,8 @@ class ChangesForV550 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "jobs": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "jobs": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } @@ -79,8 +79,8 @@ class ChangesForV550 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -98,8 +98,8 @@ class ChangesForV550 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } if (Schema::hasColumn('budget_limits', 'generated')) { @@ -111,8 +111,8 @@ class ChangesForV550 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -147,8 +147,8 @@ class ChangesForV550 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "jobs": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "jobs": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } // drop failed jobs table. @@ -170,8 +170,8 @@ class ChangesForV550 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "failed_jobs": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "failed_jobs": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } @@ -188,8 +188,8 @@ class ChangesForV550 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -209,8 +209,8 @@ class ChangesForV550 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } // new webhooks table @@ -235,8 +235,8 @@ class ChangesForV550 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "webhooks": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "webhooks": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } @@ -260,8 +260,8 @@ class ChangesForV550 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "webhook_messages": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "webhook_messages": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } @@ -283,8 +283,8 @@ class ChangesForV550 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "webhook_attempts": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "webhook_attempts": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2021_03_12_061213_changes_for_v550b2.php b/database/migrations/2021_03_12_061213_changes_for_v550b2.php index 0487be2f7f..d3364a7b84 100644 --- a/database/migrations/2021_03_12_061213_changes_for_v550b2.php +++ b/database/migrations/2021_03_12_061213_changes_for_v550b2.php @@ -54,8 +54,8 @@ class ChangesForV550b2 extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -80,8 +80,8 @@ class ChangesForV550b2 extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php b/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php index d54bb6b1b3..330f76bf5f 100644 --- a/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php +++ b/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php @@ -44,8 +44,8 @@ class AddLdapColumnsToUsersTable extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -64,8 +64,8 @@ class AddLdapColumnsToUsersTable extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2021_05_13_053836_extend_currency_info.php b/database/migrations/2021_05_13_053836_extend_currency_info.php index b2982f6154..962016e894 100644 --- a/database/migrations/2021_05_13_053836_extend_currency_info.php +++ b/database/migrations/2021_05_13_053836_extend_currency_info.php @@ -58,8 +58,8 @@ class ExtendCurrencyInfo extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2021_08_28_073733_user_groups.php b/database/migrations/2021_08_28_073733_user_groups.php index 86ba5f08ff..761eac84c0 100644 --- a/database/migrations/2021_08_28_073733_user_groups.php +++ b/database/migrations/2021_08_28_073733_user_groups.php @@ -42,6 +42,7 @@ class UserGroups extends Migration 'budgets', 'categories', 'recurrences', + 'object_groups', 'rule_groups', 'rules', 'tags', @@ -74,8 +75,8 @@ class UserGroups extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } @@ -94,8 +95,8 @@ class UserGroups extends Migration } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -129,8 +130,8 @@ class UserGroups extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "user_groups": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "user_groups": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } if (!Schema::hasTable('user_roles')) { @@ -147,8 +148,8 @@ class UserGroups extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "user_roles": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "user_roles": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } if (!Schema::hasTable('group_memberships')) { @@ -170,8 +171,8 @@ class UserGroups extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "group_memberships": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "group_memberships": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } try { @@ -187,10 +188,10 @@ class UserGroups extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } - // ADD columns from tables + // ADD columns to tables /** @var string $tableName */ foreach ($this->tables as $tableName) { try { @@ -206,8 +207,8 @@ class UserGroups extends Migration } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } } diff --git a/database/migrations/2021_12_27_000001_create_local_personal_access_tokens_table.php b/database/migrations/2021_12_27_000001_create_local_personal_access_tokens_table.php index dcfd29b2e9..2e012562f8 100644 --- a/database/migrations/2021_12_27_000001_create_local_personal_access_tokens_table.php +++ b/database/migrations/2021_12_27_000001_create_local_personal_access_tokens_table.php @@ -61,8 +61,8 @@ class CreateLocalPersonalAccessTokensTable extends Migration $table->timestamps(); }); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "personal_access_tokens": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "personal_access_tokens": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2022_08_21_104626_add_user_groups.php b/database/migrations/2022_08_21_104626_add_user_groups.php index 6a67c21b21..236db80847 100644 --- a/database/migrations/2022_08_21_104626_add_user_groups.php +++ b/database/migrations/2022_08_21_104626_add_user_groups.php @@ -26,7 +26,6 @@ use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist; use Illuminate\Database\Migrations\Migration; use Illuminate\Database\QueryException; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Schema; /** @@ -51,8 +50,8 @@ return new class () extends Migration { } ); } catch (QueryException $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } @@ -76,8 +75,8 @@ return new class () extends Migration { } ); } catch (QueryException | ColumnDoesNotExist $e) { - Log::error(sprintf('Could not execute query: %s', $e->getMessage())); - Log::error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); } } }; diff --git a/database/migrations/2022_09_18_123911_create_notifications_table.php b/database/migrations/2022_09_18_123911_create_notifications_table.php index af4becdadb..c5a4fd1599 100644 --- a/database/migrations/2022_09_18_123911_create_notifications_table.php +++ b/database/migrations/2022_09_18_123911_create_notifications_table.php @@ -25,7 +25,6 @@ declare(strict_types=1); use Illuminate\Database\Migrations\Migration; use Illuminate\Database\QueryException; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Schema; return new class () extends Migration { @@ -47,8 +46,8 @@ return new class () extends Migration { $table->timestamps(); }); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "notifications": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "notifications": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2022_10_01_074908_invited_users.php b/database/migrations/2022_10_01_074908_invited_users.php index 884ce92476..4a6246d4e5 100644 --- a/database/migrations/2022_10_01_074908_invited_users.php +++ b/database/migrations/2022_10_01_074908_invited_users.php @@ -25,7 +25,6 @@ declare(strict_types=1); use Illuminate\Database\Migrations\Migration; use Illuminate\Database\QueryException; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Schema; return new class () extends Migration { @@ -49,8 +48,8 @@ return new class () extends Migration { $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); }); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "invited_users": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "invited_users": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2022_10_01_210238_audit_log_entries.php b/database/migrations/2022_10_01_210238_audit_log_entries.php index a4c9e82163..98d8170e72 100644 --- a/database/migrations/2022_10_01_210238_audit_log_entries.php +++ b/database/migrations/2022_10_01_210238_audit_log_entries.php @@ -25,7 +25,6 @@ declare(strict_types=1); use Illuminate\Database\Migrations\Migration; use Illuminate\Database\QueryException; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Schema; return new class () extends Migration { @@ -54,8 +53,8 @@ return new class () extends Migration { $table->text('after')->nullable(); }); } catch (QueryException $e) { - Log::error(sprintf('Could not create table "audit_log_entries": %s', $e->getMessage())); - Log::error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); + app('log')->error(sprintf('Could not create table "audit_log_entries": %s', $e->getMessage())); + app('log')->error('If this table exists already (see the error message), this is not a problem. Other errors? Please open a discussion on GitHub.'); } } } diff --git a/database/migrations/2023_08_11_192521_upgrade_og_table.php b/database/migrations/2023_08_11_192521_upgrade_og_table.php new file mode 100644 index 0000000000..adfd61346a --- /dev/null +++ b/database/migrations/2023_08_11_192521_upgrade_og_table.php @@ -0,0 +1,58 @@ +bigInteger('user_group_id', false, true)->nullable()->after('user_id'); + $table->foreign('user_group_id', sprintf('%s_to_ugi', 'object_groups'))->references('id')->on('user_groups')->onDelete( + 'set null' + )->onUpdate('cascade'); + } + } + ); + } catch (QueryException $e) { + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + } + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + try { + Schema::table( + 'object_groups', + function (Blueprint $table) { + if ('sqlite' !== config('database.default')) { + $table->dropForeign(sprintf('%s_to_ugi', 'object_groups')); + } + if (Schema::hasColumn('object_groups', 'user_group_id')) { + $table->dropColumn('user_group_id'); + } + } + ); + } catch (QueryException | ColumnDoesNotExist $e) { + app('log')->error(sprintf('Could not execute query: %s', $e->getMessage())); + app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.'); + } + } +}; diff --git a/database/seeders/ExchangeRateSeeder.php b/database/seeders/ExchangeRateSeeder.php index a46b56148e..4ed2e1630e 100644 --- a/database/seeders/ExchangeRateSeeder.php +++ b/database/seeders/ExchangeRateSeeder.php @@ -47,11 +47,11 @@ class ExchangeRateSeeder extends Seeder app('log')->debug('Will not seed exchange rates yet.'); return; } - $users = User::get(); - $date = config('cer.date'); - $rates = config('cer.rates'); + $users = User::get(); + $date = config('cer.date'); + $rates = config('cer.rates'); $usable = []; - $euro = $this->getCurrency('EUR'); + $euro = $this->getCurrency('EUR'); if (null === $euro) { return; } @@ -88,28 +88,28 @@ class ExchangeRateSeeder extends Seeder } /** - * @param User $user + * @param User $user * @param TransactionCurrency $from * @param TransactionCurrency $to - * @param string $date + * @param string $date * * @return bool */ private function hasRate(User $user, TransactionCurrency $from, TransactionCurrency $to, string $date): bool { return $user->currencyExchangeRates() - ->where('from_currency_id', $from->id) - ->where('to_currency_id', $to->id) - ->where('date', $date) - ->count() > 0; + ->where('from_currency_id', $from->id) + ->where('to_currency_id', $to->id) + ->where('date', $date) + ->count() > 0; } /** - * @param User $user + * @param User $user * @param TransactionCurrency $from * @param TransactionCurrency $to - * @param string $date - * @param float $rate + * @param string $date + * @param float $rate * * @return void */ @@ -117,12 +117,12 @@ class ExchangeRateSeeder extends Seeder { CurrencyExchangeRate::create( [ - 'user_id' => $user->id, - 'user_group_id' => $user->user_group_id ?? null, + 'user_id' => $user->id, + 'user_group_id' => $user->user_group_id ?? null, 'from_currency_id' => $from->id, - 'to_currency_id' => $to->id, - 'date' => $date, - 'rate' => $rate, + 'to_currency_id' => $to->id, + 'date' => $date, + 'rate' => $rate, ] ); } From 4c90f6657866da590d0a2a1ee94ed4111e81c0ad Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 11 Aug 2023 19:40:44 +0200 Subject: [PATCH 7/7] Minor code cleanup --- app/Handlers/Events/Model/BudgetLimitHandler.php | 8 ++++---- app/Models/Account.php | 4 ++-- app/Models/AvailableBudget.php | 2 +- app/Models/Bill.php | 4 ++-- .../migrations/2016_08_25_091522_changes_for_3101.php | 8 ++++++-- database/migrations/2016_09_12_121359_fix_nullables.php | 4 +++- .../migrations/2018_04_29_174524_changes_for_v474.php | 8 ++++++-- .../migrations/2023_08_11_192521_upgrade_og_table.php | 4 +++- 8 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/Handlers/Events/Model/BudgetLimitHandler.php b/app/Handlers/Events/Model/BudgetLimitHandler.php index 5a45dc41e0..e03058c385 100644 --- a/app/Handlers/Events/Model/BudgetLimitHandler.php +++ b/app/Handlers/Events/Model/BudgetLimitHandler.php @@ -181,8 +181,8 @@ class BudgetLimitHandler ); // overlap in days: $limitPeriod = Period::make( - $budgetLimit->start_date, - $budgetLimit->end_date, + $budgetLimit->start_date, + $budgetLimit->end_date, precision : Precision::DAY(), boundaries: Boundaries::EXCLUDE_NONE() ); @@ -224,8 +224,8 @@ class BudgetLimitHandler return '0'; } $limitPeriod = Period::make( - $budgetLimit->start_date, - $budgetLimit->end_date, + $budgetLimit->start_date, + $budgetLimit->end_date, precision : Precision::DAY(), boundaries: Boundaries::EXCLUDE_NONE() ); diff --git a/app/Models/Account.php b/app/Models/Account.php index 799e05ef4a..c44881ef38 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -127,7 +127,7 @@ class Account extends Model /** @var array Fields that can be filled */ protected $fillable = ['user_id', 'user_group_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban']; /** @var array Hidden from view */ - protected $hidden = ['encrypted']; + protected $hidden = ['encrypted']; private bool $joinedAccountTypes = false; /** @@ -291,7 +291,7 @@ class Account extends Model protected function virtualBalance(): Attribute { return Attribute::make( - get: fn($value) => (string)$value, + get: fn ($value) => (string)$value, ); } } diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index f80a962f9a..eac01d5043 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -132,7 +132,7 @@ class AvailableBudget extends Model protected function amount(): Attribute { return Attribute::make( - get: fn($value) => (string)$value, + get: fn ($value) => (string)$value, ); } } diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 160d83ae3e..f9f2510fc2 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -242,7 +242,7 @@ class Bill extends Model protected function amountMax(): Attribute { return Attribute::make( - get: fn($value) => (string)$value, + get: fn ($value) => (string)$value, ); } @@ -254,7 +254,7 @@ class Bill extends Model protected function amountMin(): Attribute { return Attribute::make( - get: fn($value) => (string)$value, + get: fn ($value) => (string)$value, ); } } 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 be2b8cf0c7..5b32bada7f 100644 --- a/database/migrations/2016_08_25_091522_changes_for_3101.php +++ b/database/migrations/2016_08_25_091522_changes_for_3101.php @@ -33,11 +33,15 @@ class ChangesFor3101 extends Migration /** * Reverse the migrations. */ - public function down(): void {} + public function down(): void + { + } /** * Run the migrations. * */ - public function up(): void {} + public function up(): void + { + } } diff --git a/database/migrations/2016_09_12_121359_fix_nullables.php b/database/migrations/2016_09_12_121359_fix_nullables.php index bb389daa45..fbb3a63012 100644 --- a/database/migrations/2016_09_12_121359_fix_nullables.php +++ b/database/migrations/2016_09_12_121359_fix_nullables.php @@ -38,7 +38,9 @@ class FixNullables extends Migration /** * Reverse the migrations. */ - public function down(): void {} + public function down(): void + { + } /** * Run the migrations. diff --git a/database/migrations/2018_04_29_174524_changes_for_v474.php b/database/migrations/2018_04_29_174524_changes_for_v474.php index d5bae260d7..f7d5ce28dc 100644 --- a/database/migrations/2018_04_29_174524_changes_for_v474.php +++ b/database/migrations/2018_04_29_174524_changes_for_v474.php @@ -36,12 +36,16 @@ class ChangesForV474 extends Migration * * @return void */ - public function down(): void {} + public function down(): void + { + } /** * Run the migrations. * * @return void */ - public function up(): void {} + public function up(): void + { + } } diff --git a/database/migrations/2023_08_11_192521_upgrade_og_table.php b/database/migrations/2023_08_11_192521_upgrade_og_table.php index adfd61346a..0ff4508b5c 100644 --- a/database/migrations/2023_08_11_192521_upgrade_og_table.php +++ b/database/migrations/2023_08_11_192521_upgrade_og_table.php @@ -1,5 +1,7 @@