mirror of
https://github.com/we-promise/sure.git
synced 2026-04-13 00:57:22 +00:00
0cda69ebb0
* Initial split transaction support
* Add support to unsplit and edit split
* Update show.html.erb
* FIX address reviews
* Improve UX
* Update show.html.erb
* Reviews
* Update edit.html.erb
* Add parent category to dialog
* Update en.yml
* Add UI indication to totals
* FIX ui update
* Add category select like rest of app
* Add split ui
* Add settings configuration for split transactions
- Adds a new settings section for appearance changes
- Also adds extra checks for delete and API calls
- Also adds checks for parent/child changes
* fixes
- split transactions dark mode fix
- add split transactions to context menu
* Update entry.rb
1. New validation split_child_date_matches_parent — prevents saving a split child with a date different from its parent. This is the root-cause fix that
protects all flows at once.
2. Bulk update guard — bulk_update! now strips :date from attributes when processing split children, preventing the validation from raising and silently
skipping the date change instead.
* N+1 fix for split_parent?
* Update entry.rb
Problem: In bulk_update!, when a split child has :date removed from attrs (line 432) and the remaining attrs is empty (e.g., the bulk update only
changed the date), entry.update! {} still ran as a no-op. But lock_saved_attributes! and mark_user_modified! at lines 443-444 executed unconditionally,
incorrectly marking untouched split children as user-modified and opting them out of future syncs.
Fix:
1. Added a changed flag to track whether any actual modification happened
2. Wrapped entry.update! in an if attrs.present? check so no-op updates are skipped
3. Gated lock_saved_attributes! and mark_user_modified! behind if changed, so they only run when the entry was actually modified (either via attribute
update or tag update)
* fixes
1. Indentation in show.html.erb Settings section — The split button block and delete block had extra indentation making them appear nested inside guard
blocks they weren't part of. Fixed to match actual nesting.
2. Skip @split_parents query when grouping is off — The controller now only loads split parent entries when show_split_grouped? is true, saving a query
with joins when the feature is disabled.
100 lines
4.4 KiB
Plaintext
100 lines
4.4 KiB
Plaintext
<%= turbo_frame_tag "category_dropdown" do %>
|
|
<div class="flex flex-col relative" data-controller="list-filter">
|
|
<div class="grow p-1.5">
|
|
<div class="relative flex items-center bg-container border border-secondary rounded-lg">
|
|
<input
|
|
placeholder="<%= t(".search_placeholder") %>"
|
|
autocomplete="nope"
|
|
type="search"
|
|
class="bg-container placeholder:text-sm placeholder:text-secondary font-normal h-10 relative pl-10 w-full border-none rounded-lg focus:outline-hidden focus:ring-0"
|
|
data-list-filter-target="input"
|
|
data-action="list-filter#filter">
|
|
<%= icon("search", class: "absolute inset-0 ml-2 transform top-1/2 -translate-y-1/2") %>
|
|
</div>
|
|
</div>
|
|
<div data-list-filter-target="list" class="flex flex-col gap-0.5 p-1.5 mt-0.5 mr-2 max-h-64 overflow-y-scroll scrollbar">
|
|
<div class="pb-2 pl-4 mr-2 text-secondary hidden" data-list-filter-target="emptyMessage">
|
|
<%= t(".no_categories") %>
|
|
</div>
|
|
<% if @categories.any? %>
|
|
<% Category::Group.for(@categories).each do |group| %>
|
|
<%= render "category/dropdowns/row", category: group.category %>
|
|
|
|
<% group.subcategories.each do |category| %>
|
|
<%= render "category/dropdowns/row", category: category %>
|
|
<% end %>
|
|
<% end %>
|
|
<% else %>
|
|
<div class="flex justify-center items-center py-12">
|
|
<div class="text-center flex flex-col items-center max-w-[500px]">
|
|
<p class="text-sm text-secondary font-normal mb-4"><%= t(".empty") %></p>
|
|
|
|
<%= render DS::Button.new(
|
|
text: t(".bootstrap"),
|
|
variant: "outline",
|
|
href: bootstrap_categories_path,
|
|
method: :post,
|
|
data: { turbo_frame: :_top }) %>
|
|
</div>
|
|
</div>
|
|
<% end %>
|
|
</div>
|
|
|
|
<%= render "shared/ruler", classes: "my-2" %>
|
|
|
|
<div class="relative p-1.5 w-full">
|
|
<% if @transaction.category %>
|
|
<%= 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 } } },
|
|
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") %>
|
|
|
|
<%= t(".clear") %>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<% unless @transaction.transfer? %>
|
|
<%= link_to new_transaction_transfer_match_path(@transaction.entry),
|
|
class: "flex text-sm font-medium items-center gap-2 text-secondary w-full rounded-lg p-2 hover:bg-container-inset-hover",
|
|
data: { turbo_frame: "modal" } do %>
|
|
<%= icon("refresh-cw") %>
|
|
|
|
<p>Match transfer/payment</p>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<% if @transaction.splittable? %>
|
|
<%= link_to new_transaction_split_path(@transaction.entry),
|
|
class: "flex text-sm font-medium items-center gap-2 text-secondary w-full rounded-lg p-2 hover:bg-container-inset-hover",
|
|
data: { turbo_frame: "modal" } do %>
|
|
<%= icon("split") %>
|
|
|
|
<p><%= t("splits.show.button") %></p>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<div class="flex text-sm font-medium items-center gap-2 text-secondary w-full rounded-lg p-2">
|
|
<div class="flex items-center gap-2">
|
|
<%= form_with url: transaction_path(@transaction.entry),
|
|
method: :patch,
|
|
data: { controller: "auto-submit-form" } do |f| %>
|
|
<%= f.hidden_field "entry[excluded]", value: !@transaction.entry.excluded %>
|
|
<%= f.check_box "entry[excluded]",
|
|
checked: @transaction.entry.excluded,
|
|
class: "checkbox checkbox--light",
|
|
data: { auto_submit_form_target: "auto", autosubmit_trigger_event: "change" } %>
|
|
<% end %>
|
|
</div>
|
|
|
|
<p>One-time <%= @transaction.entry.amount.negative? ? "income" : "expense" %></p>
|
|
|
|
<span class="text-orange-500 ml-auto">
|
|
<%= icon("asterisk", color: "current") %>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<% end %>
|