mirror of
https://github.com/we-promise/sure.git
synced 2026-04-12 16:47: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.
66 lines
2.7 KiB
Plaintext
66 lines
2.7 KiB
Plaintext
<%# locals: (transactions:, projected_recurring:, q:, pagy:) %>
|
|
<div id="transactions"
|
|
data-controller="bulk-select checkbox-toggle drag-and-drop-import"
|
|
data-bulk-select-singular-label-value="<%= t(".transaction") %>"
|
|
data-bulk-select-plural-label-value="<%= t(".transactions") %>"
|
|
class="flex flex-col bg-container rounded-xl shadow-border-xs px-3 py-4 lg:p-4 relative group">
|
|
|
|
<%= form_with url: imports_path, method: :post, class: "hidden", data: { drag_and_drop_import_target: "form", turbo: false } do |f| %>
|
|
<%= f.hidden_field "import[type]", value: "TransactionImport" %>
|
|
<%= f.file_field "import[import_file]", class: "hidden", data: { drag_and_drop_import_target: "input" }, accept: ".csv" %>
|
|
<% end %>
|
|
|
|
<%= render "imports/drag_drop_overlay", title: t(".drag_drop_title"), subtitle: t(".drag_drop_subtitle") %>
|
|
|
|
<%= render "transactions/searches/search" %>
|
|
|
|
<div id="entry-selection-bar" data-bulk-select-target="selectionBar" class="flex justify-center hidden">
|
|
<%= render "transactions/selection_bar" %>
|
|
</div>
|
|
|
|
<% if @pagy.count > 0 || (@projected_recurring.any? && @q.blank?) %>
|
|
<div class="grow overflow-y-auto">
|
|
<% if @transactions.any? %>
|
|
<div class="grid-cols-12 bg-container-inset rounded-xl px-5 py-3 text-xs uppercase font-medium text-secondary items-center mb-4 grid">
|
|
<div class="pl-0.5 col-span-8 flex items-center gap-4">
|
|
<%= check_box_tag "selection_entry",
|
|
class: "checkbox checkbox--light hidden lg:block",
|
|
data: {
|
|
action: "bulk-select#togglePageSelection",
|
|
checkbox_toggle_target: "selectionEntry"
|
|
} %>
|
|
<p>transaction</p>
|
|
</div>
|
|
|
|
<p class="col-span-2 md:block hidden"><%= t("transactions.form.category_label") %></p>
|
|
<p class="col-span-2 col-start-11 md:col-start-auto justify-self-end md:block"><%= t("transactions.show.amount") %></p>
|
|
</div>
|
|
<% end %>
|
|
|
|
<div class="space-y-6">
|
|
<%= entries_by_date(@transactions.map(&:entry), totals: true) do |entries| %>
|
|
<% if Current.user.show_split_grouped? %>
|
|
<% group_split_entries(entries, @split_parents).each do |item| %>
|
|
<% if item.is_a?(EntriesHelper::SplitGroup) %>
|
|
<%= render "entries/split_group", split_group: item %>
|
|
<% else %>
|
|
<%= render item %>
|
|
<% end %>
|
|
<% end %>
|
|
<% else %>
|
|
<% entries.each do |entry| %>
|
|
<%= render entry %>
|
|
<% end %>
|
|
<% end %>
|
|
<% end %>
|
|
</div>
|
|
</div>
|
|
<% else %>
|
|
<%= render "entries/empty" %>
|
|
<% end %>
|
|
|
|
<div class="pt-4">
|
|
<%= render "shared/pagination", pagy: @pagy %>
|
|
</div>
|
|
</div>
|