Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix submission options, fix #12862
James Cole2fe8031efc7f
diff --git a/app/Api/V1/Controllers/Models/Transaction/StoreController.php b/app/Api/V1/Controllers/Models/Transaction/StoreController.phpindex e21ae4cf32..c94fa5caa9 100644--- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php+++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php@@ -90,9 +90,6 @@ final class StoreController extends Controller$data = $request->getAll();$data['user'] = auth()->user();$data['user_group'] = $this->userGroup;-- Log::channel('audit')->info('Store new transaction over API.', $data);-try {$transactionGroup = $this->groupRepository->store($data);} catch (DuplicateTransactionException $e) {diff --git a/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php b/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.phpindex c0058e14de..962bc858f2 100644--- a/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php+++ b/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php@@ -94,6 +94,7 @@ trait SupportsGroupProcessingTraitreturn;}if (0 === $objects->accounts->count()) {+ Log::debug('Count is zero, do not continue.');return;}$earliest = today()->subDays(2);diff --git a/app/Support/Models/AccountBalanceCalculator.php b/app/Support/Models/AccountBalanceCalculator.phpindex 73c3bc00fb..6ff086d595 100644--- a/app/Support/Models/AccountBalanceCalculator.php+++ b/app/Support/Models/AccountBalanceCalculator.php@@ -29,6 +29,7 @@ use FireflyIII\Models\Transaction;use FireflyIII\Models\TransactionJournal;use FireflyIII\Support\Facades\AppConfiguration;use FireflyIII\Support\Facades\Steam;+use Illuminate\Database\Eloquent\Builder;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;@@ -53,6 +54,7 @@ class AccountBalanceCalculatorreturn '0';}+ /** @var Builder $query */$query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')->whereNull('transactions.deleted_at')->where('transactions.transaction_currency_id', $currencyId)@@ -60,7 +62,7 @@ class AccountBalanceCalculator// this order is the same as GroupCollector->orderBy('transaction_journals.date', 'DESC')->orderBy('transaction_journals.order', 'ASC')- ->orderBy('transaction_journals.id', 'ASC')+ ->orderBy('transaction_journals.id', 'DESC') // from ASC to DESC to fix #12862->orderBy('transaction_journals.description', 'DESC')->orderBy('transactions.amount', 'DESC')->where('transactions.account_id', $accountId)@@ -84,12 +86,9 @@ class AccountBalanceCalculator}$balance = (string) ($first->balance_after ?? '0');- Log::debug(sprintf(- 'getLatestBalance: found balance: %s in transaction #%d on moment %s',- Steam::bcround($balance, 2),- $first->id ?? 0,- $notBefore->format('Y-m-d H:i:s')- ));+ Log::debug(sprintf('getLatestBalance: found balance: %s in transaction #%d on moment %s', Steam::bcround($balance, 2), $first->id ?? 0, $notBefore->format('Y-m-d H:i:s')));+// Log::debug($query->toSql());+// Log::debug($query->toRawSql());return $balance;}@@ -139,14 +138,7 @@ class AccountBalanceCalculator/** @var Transaction $entry */foreach ($set as $entry) {- // Log::debug(sprintf(- // '[%s] Processing transaction #%d on acount #%d with currency #%d and amount %s',- // $entry->date,- // $entry->id,- // $entry->account_id,- // $entry->transaction_currency_id,- // Steam::bcround($entry->amount, 2)- // ));+// start with empty array:$entry->account_id = (int) $entry->account_id;$entry->transaction_currency_id = (int) $entry->transaction_currency_id;diff --git a/resources/views/partials/form/transaction/submission-options.blade.php b/resources/views/partials/form/transaction/submission-options.blade.phpindex ddf9977e1d..7d2906b50d 100644--- a/resources/views/partials/form/transaction/submission-options.blade.php+++ b/resources/views/partials/form/transaction/submission-options.blade.php@@ -31,11 +31,11 @@--><div class="form-check">- <input class="form-check-input" type="checkbox" id="rulesButton" :checked="formStates.rulesButton">+ <input class="form-check-input" type="checkbox" id="rulesButton" x-model="formStates.rulesButton" :checked="formStates.rulesButton"><label class="form-check-label" for="rulesButton">{{ __('firefly.apply_rules_checkbox') }}</label></div><div class="form-check">- <input class="form-check-input" type="checkbox" id="webhooksButton" :checked="formStates.webhooksButton">+ <input class="form-check-input" type="checkbox" id="webhooksButton" x-model="formStates.webhooksButton" :checked="formStates.webhooksButton"><label class="form-check-label" for="webhooksButton">{{ __('firefly.fire_webhooks_checkbox') }}</label></div>