diff --git a/app/controllers/pending_duplicate_merges_controller.rb b/app/controllers/pending_duplicate_merges_controller.rb index 80c592f3b..9b690daa5 100644 --- a/app/controllers/pending_duplicate_merges_controller.rb +++ b/app/controllers/pending_duplicate_merges_controller.rb @@ -52,6 +52,10 @@ class PendingDuplicateMergesController < ApplicationController else redirect_back_or_to transactions_path, alert: "Could not merge transactions" end + rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotDestroyed, + ActiveRecord::Deadlocked, ActiveRecord::LockWaitTimeout => e + Rails.logger.error("Failed to manually merge pending transaction: #{e.message}") + redirect_back_or_to transactions_path, alert: t("transactions.merge_duplicate.failure") end private diff --git a/app/controllers/splits_controller.rb b/app/controllers/splits_controller.rb index a62540e9d..e31b64596 100644 --- a/app/controllers/splits_controller.rb +++ b/app/controllers/splits_controller.rb @@ -16,7 +16,7 @@ class SplitsController < ApplicationController raw_splits = raw_splits.values if raw_splits.respond_to?(:values) splits = raw_splits.map do |s| - { name: s[:name], amount: s[:amount].to_d * -1, category_id: s[:category_id].presence } + { name: s[:name], amount: s[:amount].to_d * -1, category_id: s[:category_id].presence, excluded: s[:excluded] } end @entry.split!(splits) @@ -51,7 +51,7 @@ class SplitsController < ApplicationController raw_splits = raw_splits.values if raw_splits.respond_to?(:values) splits = raw_splits.map do |s| - { name: s[:name], amount: s[:amount].to_d * -1, category_id: s[:category_id].presence } + { name: s[:name], amount: s[:amount].to_d * -1, category_id: s[:category_id].presence, excluded: s[:excluded] } end Entry.transaction do @@ -95,6 +95,6 @@ class SplitsController < ApplicationController end def split_params - params.require(:split).permit(splits: [ :name, :amount, :category_id ]) + params.require(:split).permit(splits: [ :name, :amount, :category_id, :excluded ]) end end diff --git a/app/controllers/transaction_categories_controller.rb b/app/controllers/transaction_categories_controller.rb index 6a8ff353a..d9daf436a 100644 --- a/app/controllers/transaction_categories_controller.rb +++ b/app/controllers/transaction_categories_controller.rb @@ -21,6 +21,7 @@ class TransactionCategoriesController < ApplicationController transaction.lock_saved_attributes! @entry.lock_saved_attributes! + in_split_group = helpers.in_split_group?(@entry, params[:grouped]) respond_to do |format| format.html { redirect_back_or_to transaction_path(@entry) } format.turbo_stream do @@ -28,12 +29,12 @@ class TransactionCategoriesController < ApplicationController turbo_stream.replace( dom_id(transaction, "category_menu_mobile"), partial: "transactions/transaction_category", - locals: { transaction: transaction, variant: "mobile" } + locals: { transaction: transaction, variant: "mobile", in_split_group: in_split_group } ), turbo_stream.replace( dom_id(transaction, "category_menu_desktop"), partial: "transactions/transaction_category", - locals: { transaction: transaction, variant: "desktop" } + locals: { transaction: transaction, variant: "desktop", in_split_group: in_split_group } ), turbo_stream.replace( "category_name_mobile_#{transaction.id}", diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb index ce7e32438..d88ee1bcf 100644 --- a/app/controllers/transactions_controller.rb +++ b/app/controllers/transactions_controller.rb @@ -142,6 +142,7 @@ class TransactionsController < ApplicationController respond_to do |format| format.html { redirect_back_or_to account_path(@entry.account), notice: "Transaction updated" } format.turbo_stream do + in_split_group = helpers.in_split_group?(@entry, params[:grouped]) render turbo_stream: [ turbo_stream.replace( dom_id(@entry, :header), @@ -158,7 +159,11 @@ class TransactionsController < ApplicationController partial: "transactions/notes", locals: { entry: @entry, can_annotate: can_annotate_entry? } ) if params[:entry]&.key?(:notes) && notes_changed), - turbo_stream.replace(@entry), + turbo_stream.replace( + dom_id(@entry), + partial: "entries/entry", + locals: { entry: @entry, in_split_group: in_split_group } + ), *flash_notification_stream_items ].compact end @@ -180,7 +185,9 @@ class TransactionsController < ApplicationController end redirect_to transactions_path - rescue ActiveRecord::RecordNotDestroyed, ActiveRecord::RecordInvalid => e + rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordInvalid, + ActiveRecord::RecordNotDestroyed, ActiveRecord::Deadlocked, + ActiveRecord::LockWaitTimeout => e Rails.logger.error("Failed to merge duplicate transaction #{params[:id]}: #{e.message}") flash[:alert] = t("transactions.merge_duplicate.failure") redirect_to transactions_path diff --git a/app/helpers/transactions_helper.rb b/app/helpers/transactions_helper.rb index 92ce26c81..b9ea06d35 100644 --- a/app/helpers/transactions_helper.rb +++ b/app/helpers/transactions_helper.rb @@ -20,6 +20,10 @@ module TransactionsHelper transaction_search_filters[0] end + def in_split_group?(entry, params_grouped) + entry.split_child? && Current.user.show_split_grouped? && params_grouped == "true" + end + # ---- Transaction extra details helpers ---- # Returns a structured hash describing extra details for a transaction. # Input can be a Transaction or an Entry (responds_to :transaction). diff --git a/app/models/enable_banking_account/transactions/processor.rb b/app/models/enable_banking_account/transactions/processor.rb index 831539610..fb50333e0 100644 --- a/app/models/enable_banking_account/transactions/processor.rb +++ b/app/models/enable_banking_account/transactions/processor.rb @@ -15,6 +15,7 @@ class EnableBankingAccount::Transactions::Processor Rails.logger.info "EnableBankingAccount::Transactions::Processor - Processing #{total_count} transactions for enable_banking_account #{enable_banking_account.id}" imported_count = 0 + skipped_count = 0 failed_count = 0 errors = [] @@ -22,8 +23,43 @@ class EnableBankingAccount::Transactions::Processor Account::ProviderImportAdapter.new(enable_banking_account.current_account) end + # Pre-fetch external_ids that were manually merged and must not be re-imported. + # One query per sync; O(1) Set lookup per transaction — avoids N+1. + # Uses a lateral jsonb_array_elements join to extract only the ID strings in SQL, + # avoiding loading full extra blobs into Ruby. Handles both Array (current) and + # Hash (legacy) formats via jsonb_typeof. + excluded_ids = if enable_banking_account.current_account + Transaction.joins(:entry) + .where(entries: { account_id: enable_banking_account.current_account.id }) + .where("transactions.extra ? 'manual_merge'") + .joins( + Arel.sql(<<~SQL.squish) + CROSS JOIN LATERAL jsonb_array_elements( + CASE jsonb_typeof(transactions.extra->'manual_merge') + WHEN 'array' THEN transactions.extra->'manual_merge' + WHEN 'object' THEN jsonb_build_array(transactions.extra->'manual_merge') + ELSE '[]'::jsonb + END + ) AS merge_elem + SQL + ) + .pluck(Arel.sql("merge_elem->>'merged_from_external_id'")) + .compact + .to_set + else + Set.new + end + enable_banking_account.raw_transactions_payload.each_with_index do |transaction_data, index| begin + ext_id = EnableBankingEntry::Processor.compute_external_id(transaction_data) + + if ext_id && excluded_ids.include?(ext_id) + Rails.logger.info("EnableBankingAccount::Transactions::Processor - Skipping re-import of manually merged pending transaction: #{ext_id}") + skipped_count += 1 + next + end + result = EnableBankingEntry::Processor.new( transaction_data, enable_banking_account: enable_banking_account, @@ -56,6 +92,7 @@ class EnableBankingAccount::Transactions::Processor success: failed_count == 0, total: total_count, imported: imported_count, + skipped: skipped_count, failed: failed_count, errors: errors } diff --git a/app/models/enable_banking_entry/processor.rb b/app/models/enable_banking_entry/processor.rb index 1cc2309db..e08d37acc 100644 --- a/app/models/enable_banking_entry/processor.rb +++ b/app/models/enable_banking_entry/processor.rb @@ -10,6 +10,12 @@ class EnableBankingEntry::Processor # transaction_amount: { amount, currency }, # creditor_name, debtor_name, remittance_information, ... # } + def self.compute_external_id(raw_transaction_data) + data = raw_transaction_data.with_indifferent_access + id = data[:transaction_id].presence || data[:entry_reference].presence + id ? "enable_banking_#{id}" : nil + end + def initialize(enable_banking_transaction, enable_banking_account:, import_adapter: nil) @enable_banking_transaction = enable_banking_transaction @enable_banking_account = enable_banking_account @@ -17,8 +23,12 @@ class EnableBankingEntry::Processor end def process + # Cache a safe diagnostic id upfront — used in all logging paths so rescue + # blocks never call the potentially-raising private external_id method. + safe_id = self.class.compute_external_id(@enable_banking_transaction) || "unknown" + unless account.present? - Rails.logger.warn "EnableBankingEntry::Processor - No linked account for enable_banking_account #{enable_banking_account.id}, skipping transaction #{external_id}" + Rails.logger.warn "EnableBankingEntry::Processor - No linked account for enable_banking_account #{enable_banking_account.id}, skipping transaction #{safe_id}" return nil end @@ -35,13 +45,13 @@ class EnableBankingEntry::Processor extra: extra ) rescue ArgumentError => e - Rails.logger.error "EnableBankingEntry::Processor - Validation error for transaction #{external_id}: #{e.message}" + Rails.logger.error "EnableBankingEntry::Processor - Validation error for transaction #{safe_id}: #{e.message}" raise rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e - Rails.logger.error "EnableBankingEntry::Processor - Failed to save transaction #{external_id}: #{e.message}" + Rails.logger.error "EnableBankingEntry::Processor - Failed to save transaction #{safe_id}: #{e.message}" raise StandardError.new("Failed to import transaction: #{e.message}") rescue => e - Rails.logger.error "EnableBankingEntry::Processor - Unexpected error processing transaction #{external_id}: #{e.class} - #{e.message}" + Rails.logger.error "EnableBankingEntry::Processor - Unexpected error processing transaction #{safe_id}: #{e.class} - #{e.message}" Rails.logger.error e.backtrace.join("\n") raise StandardError.new("Unexpected error importing transaction: #{e.message}") end @@ -64,9 +74,9 @@ class EnableBankingEntry::Processor end def external_id - id = data[:transaction_id].presence || data[:entry_reference].presence + id = self.class.compute_external_id(data) raise ArgumentError, "Enable Banking transaction missing required field 'transaction_id'" unless id - "enable_banking_#{id}" + id end def name @@ -220,7 +230,8 @@ class EnableBankingEntry::Processor end def log_invalid_currency(currency_value) - Rails.logger.warn("Invalid currency code '#{currency_value}' in Enable Banking transaction #{external_id}, falling back to account currency") + safe_id = self.class.compute_external_id(data) || "unknown" + Rails.logger.warn("Invalid currency code '#{currency_value}' in Enable Banking transaction #{safe_id}, falling back to account currency") end def date diff --git a/app/models/entry.rb b/app/models/entry.rb index 042ea6957..5dbcf2090 100644 --- a/app/models/entry.rb +++ b/app/models/entry.rb @@ -1,6 +1,9 @@ class Entry < ApplicationRecord include Monetizable, Enrichable + TRUTHY_VALUES = [ true, "true", "1", 1 ].freeze + private_constant :TRUTHY_VALUES + attr_accessor :unsplitting monetize :amount @@ -48,27 +51,20 @@ class Entry < ApplicationRecord # Pending transaction scopes - check Transaction.extra for provider pending flags # Works with any provider that stores pending status in extra["provider_name"]["pending"] scope :pending, -> { + conditions = Transaction::PENDING_PROVIDERS.map { |p| "(transactions.extra -> '#{p}' ->> 'pending')::boolean = true" } joins("INNER JOIN transactions ON transactions.id = entries.entryable_id AND entries.entryable_type = 'Transaction'") - .where(<<~SQL.squish) - (transactions.extra -> 'simplefin' ->> 'pending')::boolean = true - OR (transactions.extra -> 'plaid' ->> 'pending')::boolean = true - OR (transactions.extra -> 'lunchflow' ->> 'pending')::boolean = true - SQL + .where(conditions.join(" OR ")) } scope :excluding_pending, -> { # For non-Transaction entries (Trade, Valuation), always include - # For Transaction entries, exclude if pending flag is true + # For Transaction entries, exclude if any provider marks it pending where(<<~SQL.squish) entries.entryable_type != 'Transaction' OR NOT EXISTS ( SELECT 1 FROM transactions t WHERE t.id = entries.entryable_id - AND ( - (t.extra -> 'simplefin' ->> 'pending')::boolean = true - OR (t.extra -> 'plaid' ->> 'pending')::boolean = true - OR (t.extra -> 'lunchflow' ->> 'pending')::boolean = true - ) + AND (#{Transaction::PENDING_CHECK_SQL}) ) SQL } @@ -148,6 +144,10 @@ class Entry < ApplicationRecord def self.reconcile_pending_duplicates(account: nil, dry_run: false, date_window: 8, amount_tolerance: 0.25) stats = { checked: 0, reconciled: 0, details: [] } + not_pending_sql = Transaction::PENDING_PROVIDERS + .map { |p| "(transactions.extra -> '#{p}' ->> 'pending')::boolean IS NOT TRUE" } + .join(" AND ") + # Get pending entries to check scope = Entry.pending.where(excluded: false) scope = scope.where(account: account) if account @@ -164,11 +164,7 @@ class Entry < ApplicationRecord .where(currency: pending_entry.currency) .where(amount: pending_entry.amount) .where(date: pending_entry.date..(pending_entry.date + date_window.days)) # Posted must be ON or AFTER pending date - .where(<<~SQL.squish) - (transactions.extra -> 'simplefin' ->> 'pending')::boolean IS NOT TRUE - AND (transactions.extra -> 'plaid' ->> 'pending')::boolean IS NOT TRUE - AND (transactions.extra -> 'lunchflow' ->> 'pending')::boolean IS NOT TRUE - SQL + .where(not_pending_sql) .limit(2) # Only need to know if 0, 1, or 2+ candidates .to_a # Load limited records to avoid COUNT(*) on .size @@ -211,11 +207,7 @@ class Entry < ApplicationRecord .where(currency: pending_entry.currency) .where(date: pending_entry.date..(pending_entry.date + fuzzy_date_window.days)) # Posted ON or AFTER pending .where("ABS(entries.amount) BETWEEN ? AND ?", min_amount, max_amount) - .where(<<~SQL.squish) - (transactions.extra -> 'simplefin' ->> 'pending')::boolean IS NOT TRUE - AND (transactions.extra -> 'plaid' ->> 'pending')::boolean IS NOT TRUE - AND (transactions.extra -> 'lunchflow' ->> 'pending')::boolean IS NOT TRUE - SQL + .where(not_pending_sql) # Match by name similarity (first 3 words) name_words = pending_entry.name.downcase.gsub(/[^a-z0-9\s]/, "").split.first(3).join(" ") @@ -253,10 +245,12 @@ class Entry < ApplicationRecord pending_transaction.update!( extra: existing_extra.merge( "potential_posted_match" => { - "entry_id" => fuzzy_match.id, - "reason" => "fuzzy_amount_match", + "entry_id" => fuzzy_match.id, + "reason" => "fuzzy_amount_match", "posted_amount" => fuzzy_match.amount.to_s, - "detected_at" => Date.current.to_s + "confidence" => "medium", + "dismissed" => false, + "detected_at" => Date.current.to_s } ) ) @@ -370,7 +364,7 @@ class Entry < ApplicationRecord # Splits this entry into child entries. Marks parent as excluded. # - # @param splits [Array] array of { name:, amount:, category_id: } hashes + # @param splits [Array] array of { name:, amount:, category_id:, excluded: } hashes # @return [Array] the created child entries def split!(splits) total = splits.sum { |s| s[:amount].to_d } @@ -392,6 +386,7 @@ class Entry < ApplicationRecord name: split_attrs[:name], amount: split_attrs[:amount], currency: currency, + excluded: TRUTHY_VALUES.include?(split_attrs[:excluded]), entryable: child_transaction ) end diff --git a/app/models/transaction.rb b/app/models/transaction.rb index e20370ead..6ebc807be 100644 --- a/app/models/transaction.rb +++ b/app/models/transaction.rb @@ -95,6 +95,13 @@ class Transaction < ApplicationRecord # Providers that support pending transaction flags PENDING_PROVIDERS = %w[simplefin plaid lunchflow enable_banking].freeze + # Pre-computed SQL fragment for subqueries that check if a transaction (aliased as "t") is pending. + # Stored as a constant so static analysis can verify it contains no user input. + PENDING_CHECK_SQL = PENDING_PROVIDERS + .map { |p| "(t.extra -> '#{p}' ->> 'pending')::boolean = true" } + .join(" OR ") + .freeze + # Pending transaction scopes - filter based on provider pending flags in extra JSONB # Works with any provider that stores pending status in extra["provider_name"]["pending"] scope :pending, -> { @@ -140,7 +147,7 @@ class Transaction < ApplicationRecord PENDING_PROVIDERS.any? do |provider| ActiveModel::Type::Boolean.new.cast(extra_data.dig(provider, "pending")) end - rescue + rescue StandardError false end @@ -176,22 +183,106 @@ class Transaction < ApplicationRecord potential_posted_match_data&.dig("dismissed") == true end - # Merge this pending transaction with its suggested posted match - # This DELETES the pending entry since the posted version is canonical + # Merge this pending transaction with its suggested posted match. + # The pending entry is destroyed; the posted entry survives with attributes inherited from both sides. + # Attribute inheritance: Date + Category from pending, Name + Merchant from posted (booked). def merge_with_duplicate! + return false unless pending? return false unless has_potential_duplicate? posted_entry = potential_duplicate_entry return false unless posted_entry - pending_entry_id = entry.id - pending_entry_name = entry.name + pending_entry = entry - # Delete this pending entry completely (no need to keep it around) - entry.destroy! + # Guard: cross-account merges are never valid + if posted_entry.account_id != pending_entry.account_id + Rails.logger.warn("merge_with_duplicate! rejected: posted_entry #{posted_entry.id} belongs to different account than pending entry #{pending_entry.id}") + return false + end - Rails.logger.info("User merged pending entry #{pending_entry_id} (#{pending_entry_name}) with posted entry #{posted_entry.id}") - true + pending_entry_id = pending_entry.id + merge_succeeded = false + + ApplicationRecord.transaction(requires_new: true) do + # Row-level locks prevent concurrent merges on the same pair of entries. + # If a concurrent request already destroyed the pending entry, lock! raises + # RecordNotFound — treat that as an idempotent success. + begin + pending_entry.lock! + rescue ActiveRecord::RecordNotFound + Rails.logger.info("Pending entry #{pending_entry_id} already destroyed (concurrent merge), skipping") + return true + end + + begin + posted_entry.lock! + rescue ActiveRecord::RecordNotFound + Rails.logger.info("Posted entry #{posted_entry.id} deleted concurrently; aborting merge") + raise ActiveRecord::Rollback + end + + # Capture after lock! (which reloads) to guarantee DB-fresh values and avoid + # stale in-memory cached associations (e.g., loaded via touch: true). + external_id = pending_entry.external_id + pending_entry_date = pending_entry.date + + # Batch all changes to the surviving posted Transaction into a single update! + # to avoid firing after_save callbacks twice on the same row. + # Lock the Transaction row so concurrent merges into the same posted entry + # cannot race on reading/writing extra (e.g., the manual_merge array). + posted_tx = posted_entry.entryable + posted_tx.lock! if posted_tx.is_a?(Transaction) + if posted_tx.is_a?(Transaction) + tx_attrs = {} + + # Merge metadata — always written so the sync engine can skip re-importing. + # Stored as an array so multiple pending entries merged into the same posted + # transaction each preserve their external_id for future sync exclusion. + # Legacy records written as a plain Hash are migrated to a single-element array + # on first append, maintaining backward compatibility. + if external_id.present? + new_record = { + "merged_from_entry_id" => pending_entry_id, + "merged_from_external_id" => external_id, + "merged_at" => Time.current.iso8601, + "source" => pending_entry.source + } + prior = case posted_tx.extra["manual_merge"] + when Array then posted_tx.extra["manual_merge"] + when Hash then [ posted_tx.extra["manual_merge"] ] + else [] + end + tx_attrs[:extra] = posted_tx.extra.merge("manual_merge" => prior + [ new_record ]) + end + + # Attribute inheritance — only when the posted entry is not already user-protected. + unless posted_entry.protected_from_sync? + pending_transaction = pending_entry.entryable + if pending_transaction.is_a?(Transaction) && pending_transaction.category_id.present? + tx_attrs[:category_id] = pending_transaction.category_id + end + end + + posted_tx.update!(tx_attrs) if tx_attrs.any? + end + + # Date inheritance on the Entry row — separate from the Transaction update above. + unless posted_entry.protected_from_sync? + # Date: pending dates reflect actual transaction initiation time + posted_entry.update!(date: pending_entry_date) if posted_entry.date != pending_entry_date + # Name + Merchant intentionally NOT inherited — booked values are canonical + end + + # Lock the posted entry so future syncs cannot overwrite the merged state + posted_entry.mark_user_modified! + + Rails.logger.info("User merged pending entry #{pending_entry_id} (ext: #{external_id}) into posted entry #{posted_entry.id}") + pending_entry.destroy! + merge_succeeded = true + end + + merge_succeeded end # Dismiss the duplicate suggestion - user says these are NOT the same transaction diff --git a/app/views/categories/_menu.html.erb b/app/views/categories/_menu.html.erb index 6af5a8ce8..e3f8598b6 100644 --- a/app/views/categories/_menu.html.erb +++ b/app/views/categories/_menu.html.erb @@ -1,4 +1,4 @@ -<%# locals: (transaction:) %> +<%# locals: (transaction:, in_split_group: false) %> <%= render DS::Menu.new(variant: "button") do |menu| %> <% menu.with_button(class: "block w-full overflow-hidden") do %> @@ -11,7 +11,7 @@ <% end %> <% menu.with_custom_content do %> - <%= turbo_frame_tag "category_dropdown", src: category_dropdown_path(category_id: transaction.category_id, transaction_id: transaction.id), loading: :lazy do %> + <%= turbo_frame_tag "category_dropdown", src: category_dropdown_path(category_id: transaction.category_id, transaction_id: transaction.id, grouped: in_split_group), loading: :lazy do %>

<%= t(".loading") %>

diff --git a/app/views/category/dropdowns/_row.html.erb b/app/views/category/dropdowns/_row.html.erb index fbf6cf421..d9fab35e5 100644 --- a/app/views/category/dropdowns/_row.html.erb +++ b/app/views/category/dropdowns/_row.html.erb @@ -10,6 +10,7 @@ data: { filter_name: category.name } do %> <%= button_to transaction_category_path( @transaction.entry, + grouped: params[:grouped], entry: { entryable_type: "Transaction", entryable_attributes: { id: @transaction.id, category_id: category.id } diff --git a/app/views/category/dropdowns/show.html.erb b/app/views/category/dropdowns/show.html.erb index 234c31463..91ada562e 100644 --- a/app/views/category/dropdowns/show.html.erb +++ b/app/views/category/dropdowns/show.html.erb @@ -51,7 +51,7 @@ <%= button_to transaction_path(@transaction.entry), method: :patch, data: { turbo_frame: dom_id(@transaction.entry) }, - params: { entry: { entryable_type: "Transaction", entryable_attributes: { id: @transaction.id, category_id: nil } } }, + params: { grouped: params[:grouped], entry: { entryable_type: "Transaction", entryable_attributes: { id: @transaction.id, category_id: nil } } }, class: "flex text-sm font-medium items-center gap-2 text-secondary w-full rounded-lg p-2 hover:bg-container-inset-hover" do %> <%= icon("minus") %> @@ -85,6 +85,7 @@ method: :patch, data: { controller: "auto-submit-form" } do |f| %> <%= f.hidden_field "entry[excluded]", value: !@transaction.entry.excluded %> + <%= hidden_field_tag :grouped, "true" if params[:grouped] == "true" %> <%= f.check_box "entry[excluded]", checked: @transaction.entry.excluded, class: "checkbox checkbox--light", diff --git a/app/views/entries/_entry.html.erb b/app/views/entries/_entry.html.erb index 3c3f83fa3..5ba08622e 100644 --- a/app/views/entries/_entry.html.erb +++ b/app/views/entries/_entry.html.erb @@ -1,6 +1,6 @@ -<%# locals: (entry:, balance_trend: nil, view_ctx: "global") %> +<%# locals: (entry:, balance_trend: nil, view_ctx: "global", in_split_group: false) %> <% if entry.entryable.present? %> <%= render partial: entry.entryable.to_partial_path, - locals: { entry: entry, balance_trend: balance_trend, view_ctx: view_ctx } %> + locals: { entry: entry, balance_trend: balance_trend, view_ctx: view_ctx, in_split_group: in_split_group } %> <% end %> diff --git a/app/views/transactions/_notes.html.erb b/app/views/transactions/_notes.html.erb index 2d6114c0b..7e32b9156 100644 --- a/app/views/transactions/_notes.html.erb +++ b/app/views/transactions/_notes.html.erb @@ -3,6 +3,7 @@ <%= styled_form_with model: entry, url: transaction_path(entry), data: { controller: "auto-submit-form" } do |f| %> + <%= hidden_field_tag :grouped, "true" if params[:grouped] == "true" %> <%= f.text_area :notes, label: t("transactions.show.note_label"), placeholder: t("transactions.show.note_placeholder"), diff --git a/app/views/transactions/_transaction.html.erb b/app/views/transactions/_transaction.html.erb index 551c56138..8ee5761c1 100644 --- a/app/views/transactions/_transaction.html.erb +++ b/app/views/transactions/_transaction.html.erb @@ -19,7 +19,7 @@ } %>
- <%= render "transactions/transaction_category", transaction: transaction, variant: "mobile" %> + <%= render "transactions/transaction_category", transaction: transaction, variant: "mobile", in_split_group: in_split_group %> <% if transaction.merchant&.logo_url.present? %> <%= image_tag Setting.transform_brand_fetch_url(transaction.merchant.logo_url), class: "w-5 h-5 rounded-full absolute -bottom-1 -right-1 border border-secondary pointer-events-none", @@ -70,7 +70,7 @@ <% else %> <%= link_to( entry.name, - entry_path(entry), + in_split_group ? entry_path(entry, grouped: true) : entry_path(entry), data: { turbo_frame: "drawer", turbo_prefetch: false @@ -163,7 +163,7 @@ <%# For investment accounts, show activity label instead of category %> <%= render "investment_activity/quick_edit_badge", entry: entry, entryable: transaction %> <% else %> - <%= render "transactions/transaction_category", transaction: transaction, variant: "desktop" %> + <%= render "transactions/transaction_category", transaction: transaction, variant: "desktop", in_split_group: in_split_group %> <% end %>
diff --git a/app/views/transactions/_transaction_category.html.erb b/app/views/transactions/_transaction_category.html.erb index 434e422af..0d7301633 100644 --- a/app/views/transactions/_transaction_category.html.erb +++ b/app/views/transactions/_transaction_category.html.erb @@ -1,8 +1,8 @@ -<%# locals: (transaction:, variant:) %> +<%# locals: (transaction:, variant:, in_split_group: false) %>
" class="min-w-0 overflow-hidden"> <% if transaction.transfer&.categorizable? || transaction.transfer.nil? %> - <%= render "categories/menu", transaction: transaction %> + <%= render "categories/menu", transaction: transaction, in_split_group: in_split_group %> <% else %>