mirror of
https://github.com/we-promise/sure.git
synced 2026-04-08 14:54:49 +00:00
* Add pending transaction handling and duplicate reconciliation logic - Implemented logic to exclude pending transactions from budgets and analytics calculations. - Introduced mechanisms for reconciling pending transactions with posted versions. - Added duplicate detection with support for merging or dismissing matches. - Updated transaction search filters to include a `status_filter` for pending/confirmed transactions. - Introduced UI elements for reviewing and resolving duplicates. - Enhanced `ProviderSyncSummary` with stats for reconciled and stale pending transactions. * Refactor translation handling and enhance transaction and sync logic - Moved hardcoded strings to locale files for improved translation support. - Refined styling for duplicate transaction indicators and sync summaries. - Improved logic for excluding stale pending transactions and updating timestamps on batch exclusion. - Added unique IDs to status filters for better element targeting in UI. - Optimized database queries to avoid N+1 issues in stale pending calculations. * Add sync settings and enhance pending transaction handling - Introduced a new "Sync Settings" section in hosting settings with UI to toggle inclusion of pending transactions. - Updated handling of pending transactions with improved inference logic for `posted=0` and `transacted_at` in processors. - Added priority order for pending transaction inclusion: explicit argument > environment variable > runtime configurable setting. - Refactored settings and controllers to store updated sync preferences. * Refactor sync settings and pending transaction reconciliation - Extracted logic for pending transaction reconciliation, stale exclusion, and unmatched tracking into dedicated methods for better maintainability. - Updated sync settings to infer defaults from multiple provider environment variables (`SIMPLEFIN_INCLUDE_PENDING`, `PLAID_INCLUDE_PENDING`). - Refined UI and messaging to handle multi-provider configurations in sync settings. # Conflicts: # app/models/simplefin_item/importer.rb * Debounce transaction reconciliation during imports - Added per-run reconciliation debouncing to prevent repeated scans for the same account during chunked history imports. - Trimmed size of reconciliation stats to retain recent details only. - Introduced error tracking for reconciliation steps to improve UI visibility of issues. * Apply ABS() in pending transaction queries and improve error handling - Updated pending transaction logic to use ABS() for consistent handling of negative amounts. - Adjusted amount bounds calculations to ensure accuracy for both positive and negative values. - Refined exception handling in `merge_duplicate` to log failures and update user alert. - Replaced `Date.today` with `Date.current` in tests to ensure timezone consistency. - Minor optimization to avoid COUNT queries by loading limited records directly. * Improve error handling in duplicate suggestion and dismissal logic - Added exception handling for `store_duplicate_suggestion` to log failures and prevent crashes during fuzzy/low-confidence matches. - Enhanced `dismiss_duplicate` action to handle `ActiveRecord::RecordInvalid` and display appropriate user alerts. --------- Co-authored-by: Josh Waldrep <joshua.waldrep5+github@gmail.com>
278 lines
11 KiB
Plaintext
278 lines
11 KiB
Plaintext
<%= render DS::Dialog.new(variant: "drawer") do |dialog| %>
|
|
<% dialog.with_header do %>
|
|
<%= render "transactions/header", entry: @entry %>
|
|
<% end %>
|
|
|
|
<% dialog.with_body do %>
|
|
<%# Potential duplicate alert %>
|
|
<% if @entry.transaction.has_potential_duplicate? %>
|
|
<% potential_match = @entry.transaction.potential_duplicate_entry %>
|
|
<% if potential_match %>
|
|
<div class="mx-4 my-3 p-4 rounded-lg border border-warning bg-warning/5">
|
|
<div class="flex items-start gap-3">
|
|
<%= icon "alert-triangle", size: "md", color: "warning" %>
|
|
<div class="flex-1 space-y-2">
|
|
<h4 class="text-sm font-medium text-primary"><%= t("transactions.show.potential_duplicate_title") %></h4>
|
|
<p class="text-sm text-secondary"><%= t("transactions.show.potential_duplicate_description") %></p>
|
|
|
|
<div class="mt-3 p-3 rounded bg-container border border-primary">
|
|
<div class="flex items-center justify-between">
|
|
<div>
|
|
<p class="text-sm font-medium text-primary"><%= potential_match.name %></p>
|
|
<p class="text-xs text-secondary"><%= potential_match.date.strftime("%b %d, %Y") %> • <%= potential_match.account.name %></p>
|
|
</div>
|
|
<p class="text-sm font-medium <%= potential_match.amount.negative? ? 'text-green-600' : 'text-primary' %>">
|
|
<%= format_money(-potential_match.amount_money) %>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="flex items-center gap-2 mt-3">
|
|
<%= button_to t("transactions.show.merge_duplicate"),
|
|
merge_duplicate_transaction_path(@entry.transaction),
|
|
method: :post,
|
|
class: "btn btn--primary btn--sm",
|
|
data: { turbo_frame: "_top" } %>
|
|
<%= button_to t("transactions.show.keep_both"),
|
|
dismiss_duplicate_transaction_path(@entry.transaction),
|
|
method: :post,
|
|
class: "btn btn--outline btn--sm",
|
|
data: { turbo_frame: "_top" } %>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<% dialog.with_section(title: t(".overview"), open: true) do %>
|
|
<div class="pb-4">
|
|
<%= styled_form_with model: @entry,
|
|
url: transaction_path(@entry),
|
|
class: "space-y-2",
|
|
data: { controller: "auto-submit-form" } do |f| %>
|
|
|
|
<%= f.text_field :name,
|
|
label: t(".name_label"),
|
|
"data-auto-submit-form-target": "auto" %>
|
|
|
|
<%= f.date_field :date,
|
|
label: t(".date_label"),
|
|
max: Date.current,
|
|
disabled: @entry.linked?,
|
|
"data-auto-submit-form-target": "auto" %>
|
|
|
|
<% unless @entry.transaction.transfer? %>
|
|
<div class="flex items-center gap-2">
|
|
<%= f.select :nature,
|
|
[["Expense", "outflow"], ["Income", "inflow"]],
|
|
{ container_class: "w-1/3", label: t(".nature"), selected: @entry.amount.negative? ? "inflow" : "outflow" },
|
|
{ data: { "auto-submit-form-target": "auto" }, disabled: @entry.linked? } %>
|
|
|
|
<%= f.money_field :amount, label: t(".amount"),
|
|
container_class: "w-2/3",
|
|
auto_submit: true,
|
|
min: 0,
|
|
value: @entry.amount.abs,
|
|
disabled: @entry.linked?,
|
|
disable_currency: @entry.linked? %>
|
|
</div>
|
|
|
|
<%= f.fields_for :entryable do |ef| %>
|
|
<%= ef.collection_select :category_id,
|
|
Current.family.categories.alphabetically,
|
|
:id, :name,
|
|
{ label: t(".category_label"),
|
|
class: "text-subdued", include_blank: t(".uncategorized") },
|
|
"data-auto-submit-form-target": "auto" %>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<% end %>
|
|
</div>
|
|
<% end %>
|
|
|
|
<% dialog.with_section(title: t(".details")) do %>
|
|
<div class="pb-4">
|
|
<%= styled_form_with model: @entry,
|
|
url: transaction_path(@entry),
|
|
class: "space-y-2",
|
|
data: { controller: "auto-submit-form" } do |f| %>
|
|
<% unless @entry.transaction.transfer? %>
|
|
<%= f.select :account,
|
|
options_for_select(
|
|
Current.family.accounts.alphabetically.pluck(:name, :id),
|
|
@entry.account_id
|
|
),
|
|
{ label: t(".account_label") },
|
|
{ disabled: true } %>
|
|
|
|
<%= f.fields_for :entryable do |ef| %>
|
|
|
|
<%= ef.collection_select :merchant_id,
|
|
Current.family.available_merchants.alphabetically,
|
|
:id, :name,
|
|
{ include_blank: t(".none"),
|
|
label: t(".merchant_label"),
|
|
class: "text-subdued" },
|
|
"data-auto-submit-form-target": "auto" %>
|
|
|
|
<%= ef.select :tag_ids,
|
|
Current.family.tags.alphabetically.pluck(:name, :id),
|
|
{
|
|
include_blank: t(".none"),
|
|
multiple: true,
|
|
label: t(".tags_label")
|
|
},
|
|
{ "data-controller": "multi-select", "data-auto-submit-form-target": "auto" } %>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<%= f.text_area :notes,
|
|
label: t(".note_label"),
|
|
placeholder: t(".note_placeholder"),
|
|
rows: 5,
|
|
"data-auto-submit-form-target": "auto" %>
|
|
|
|
<% end %>
|
|
</div>
|
|
<% end %>
|
|
|
|
<% if (details = build_transaction_extra_details(@entry)) %>
|
|
<% dialog.with_section(title: "Additional details", open: false) do %>
|
|
<div class="px-3 py-2 space-y-3">
|
|
<% if details[:kind] == :simplefin %>
|
|
<% sf = details[:simplefin] %>
|
|
<% if sf.present? %>
|
|
<dl class="space-y-2">
|
|
<% if sf[:payee].present? %>
|
|
<div class="flex items-center justify-between gap-2">
|
|
<dt class="text-secondary text-sm">Payee</dt>
|
|
<dd class="text-sm text-primary"><%= sf[:payee] %></dd>
|
|
</div>
|
|
<% end %>
|
|
<% if sf[:description].present? %>
|
|
<div class="flex items-center justify-between gap-2">
|
|
<dt class="text-secondary text-sm">Description</dt>
|
|
<dd class="text-sm text-primary"><%= sf[:description] %></dd>
|
|
</div>
|
|
<% end %>
|
|
<% if sf[:memo].present? %>
|
|
<div class="flex items-center justify-between gap-2">
|
|
<dt class="text-secondary text-sm">Memo</dt>
|
|
<dd class="text-sm text-primary"><%= sf[:memo] %></dd>
|
|
</div>
|
|
<% end %>
|
|
</dl>
|
|
<% end %>
|
|
|
|
<% if details[:provider_extras].present? %>
|
|
<div class="pt-2">
|
|
<h4 class="text-sm text-secondary mb-1">Provider extras</h4>
|
|
<dl class="space-y-2">
|
|
<% details[:provider_extras].each do |ex| %>
|
|
<div class="flex items-center justify-between gap-2">
|
|
<dt class="text-secondary text-sm"><%= ex[:key] %></dt>
|
|
<dd class="text-sm text-primary truncate max-w-[60%]" title="<%= ex[:title] %>"><%= ex[:value] %></dd>
|
|
</div>
|
|
<% end %>
|
|
</dl>
|
|
</div>
|
|
<% end %>
|
|
<% else %>
|
|
<pre class="text-xs text-secondary bg-surface-inset rounded p-2 overflow-auto"><%= details[:raw] %></pre>
|
|
<% end %>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<% dialog.with_section(title: t(".settings")) do %>
|
|
<div class="pb-4">
|
|
<%= styled_form_with model: @entry,
|
|
url: transaction_path(@entry),
|
|
class: "p-3",
|
|
data: { controller: "auto-submit-form" } do |f| %>
|
|
<div class="flex cursor-pointer items-center gap-4 justify-between">
|
|
<div class="text-sm space-y-1">
|
|
<h4 class="text-primary">Exclude</h4>
|
|
<p class="text-secondary">Excluded transactions will be removed from budgeting calculations and reports.</p>
|
|
</div>
|
|
|
|
<%= f.toggle :excluded, { data: { auto_submit_form_target: "auto" } } %>
|
|
</div>
|
|
<% end %>
|
|
</div>
|
|
|
|
<div class="pb-4">
|
|
<%= styled_form_with model: @entry,
|
|
url: transaction_path(@entry),
|
|
class: "p-3",
|
|
data: { controller: "auto-submit-form" } do |f| %>
|
|
<%= f.fields_for :entryable do |ef| %>
|
|
<div class="flex cursor-pointer items-center gap-4 justify-between">
|
|
<div class="text-sm space-y-1">
|
|
<h4 class="text-primary">One-time <%= @entry.amount.negative? ? "Income" : "Expense" %></h4>
|
|
<p class="text-secondary">One-time transactions will be excluded from certain budgeting calculations and reports to help you see what's really important.</p>
|
|
</div>
|
|
|
|
<%= ef.toggle :kind, {
|
|
checked: @entry.transaction.one_time?,
|
|
data: { auto_submit_form_target: "auto" }
|
|
}, "one_time", "standard" %>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<div class="flex items-center justify-between gap-4 p-3">
|
|
<div class="text-sm space-y-1">
|
|
<h4 class="text-primary">Transfer or Debt Payment?</h4>
|
|
<p class="text-secondary">Transfers and payments are special types of transactions that indicate money movement between 2 accounts.</p>
|
|
</div>
|
|
|
|
<%= render DS::Link.new(
|
|
text: "Open matcher",
|
|
icon: "arrow-left-right",
|
|
variant: "outline",
|
|
href: new_transaction_transfer_match_path(@entry),
|
|
frame: :modal
|
|
) %>
|
|
</div>
|
|
|
|
<!-- Mark as Recurring Form -->
|
|
<div class="flex items-center justify-between gap-2 p-3">
|
|
<div class="text-sm space-y-1">
|
|
<h4 class="text-primary"><%= t(".mark_recurring_title") %></h4>
|
|
<p class="text-secondary"><%= t(".mark_recurring_subtitle") %></p>
|
|
</div>
|
|
|
|
<%= render DS::Button.new(
|
|
text: t(".mark_recurring"),
|
|
variant: "outline",
|
|
icon: "repeat",
|
|
href: mark_as_recurring_transaction_path(@entry.transaction),
|
|
method: :post,
|
|
frame: "_top"
|
|
) %>
|
|
</div>
|
|
|
|
<!-- Delete Transaction Form -->
|
|
<div class="flex items-center justify-between gap-2 p-3">
|
|
<div class="text-sm space-y-1">
|
|
<h4 class="text-primary"><%= t(".delete_title") %></h4>
|
|
<p class="text-secondary"><%= t(".delete_subtitle") %></p>
|
|
</div>
|
|
|
|
<%= render DS::Button.new(
|
|
text: t(".delete"),
|
|
variant: "outline-destructive",
|
|
href: entry_path(@entry),
|
|
method: :delete,
|
|
confirm: CustomConfirm.for_resource_deletion("transaction"),
|
|
frame: "_top"
|
|
) %>
|
|
</div>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
<% end %>
|