mirror of
https://github.com/we-promise/sure.git
synced 2026-04-18 03:24:09 +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.
65 lines
1.8 KiB
Ruby
65 lines
1.8 KiB
Ruby
module EntriesHelper
|
|
SplitGroup = Data.define(:parent, :children)
|
|
|
|
def group_split_entries(entries, split_parents)
|
|
return entries if split_parents.blank?
|
|
|
|
result = []
|
|
seen_parent_ids = Set.new
|
|
|
|
entries.each do |entry|
|
|
if entry.split_child? && split_parents[entry.parent_entry_id]
|
|
parent_id = entry.parent_entry_id
|
|
next if seen_parent_ids.include?(parent_id)
|
|
|
|
seen_parent_ids.add(parent_id)
|
|
children = entries.select { |e| e.parent_entry_id == parent_id }
|
|
result << SplitGroup.new(parent: split_parents[parent_id], children: children)
|
|
else
|
|
result << entry
|
|
end
|
|
end
|
|
|
|
result
|
|
end
|
|
|
|
def entries_by_date(entries, totals: false)
|
|
transfer_groups = entries.group_by do |entry|
|
|
# Only check for transfer if it's a transaction
|
|
next nil unless entry.entryable_type == "Transaction"
|
|
entry.entryable.transfer&.id
|
|
end
|
|
|
|
# For a more intuitive UX, we do not want to show the same transfer twice in the list
|
|
deduped_entries = transfer_groups.flat_map do |transfer_id, grouped_entries|
|
|
if transfer_id.nil? || grouped_entries.size == 1
|
|
grouped_entries
|
|
else
|
|
grouped_entries.reject do |e|
|
|
e.entryable_type == "Transaction" &&
|
|
e.entryable.transfer_as_inflow.present?
|
|
end
|
|
end
|
|
end
|
|
|
|
deduped_entries.group_by(&:date).sort.reverse_each.map do |date, grouped_entries|
|
|
content = capture do
|
|
yield grouped_entries
|
|
end
|
|
|
|
next if content.blank?
|
|
|
|
render partial: "entries/entry_group", locals: { date:, entries: grouped_entries, content:, totals: }
|
|
end.compact.join.html_safe
|
|
end
|
|
|
|
def entry_name_detailed(entry)
|
|
[
|
|
entry.date,
|
|
format_money(entry.amount_money),
|
|
entry.account.name,
|
|
entry.name
|
|
].join(" • ")
|
|
end
|
|
end
|