mirror of
https://github.com/we-promise/sure.git
synced 2026-08-05 08:32:15 +00:00
c5ca0431c9
* feat(goals): earmark a portion of an account toward a goal Goals currently count each linked account's whole balance, so an account shared across goals double-counts and one account can't fund several goals in distinct slices. Add a per-account earmark — the "GoalBacking" the v1 model already foreshadowed (goal.rb). - goal_accounts.allocated_amount (nullable). NULL = "dedicate the whole balance" (the v1 default: no backfill, existing goals unchanged); a set amount reserves a fixed slice. - Goal#current_balance is now the single chokepoint computing each account's backing under a family-wide shared pool: fixed earmarks take their slice, an unallocated link takes the remainder, and when fixed earmarks exceed the balance every slice is scaled down pro-rata so the goals' shares can never sum past the account balance (no double-counting). - Account#free_to_earmark / #goal_earmarked_total (mirror Budget's available_to_allocate) back a soft, non-blocking over-allocation hint. - GoalsController threads a goal[allocations] hash through create/update. Phase 1 of the goals earmarking work; investment-backed goals follow. * feat(goals): earmark UI on the goal form + backing-aware funding breakdown - Goal form: a per-account "earmark amount" input (blank = whole balance) next to each funding-account checkbox, prefilled from the saved allocation on edit. - Goal#account_backing exposes a single linked account's share so the funding-accounts breakdown shows each account's earmarked contribution and percent instead of its whole balance — keeping the show page consistent with the (now allocation-aware) progress ring. - English strings for the earmark controls and the "earmarked of balance" breakdown line. * fix(goals): address review on the earmark shared-pool math - Overdrawn (<= 0 balance) accounts now back nothing on both the fixed and whole-balance paths. The fixed path previously produced negative backing and let a goal claim money the account doesn't hold. - An archived goal reads its OWN earmark from its own goal_accounts instead of the shared pool (which excludes archived goals), so it no longer mis-reports the whole account balance for itself. - goals#index injects one family-wide earmark pool into every card (Goal.pooled_allocations_for) instead of querying once per goal (N+1), and preloads goal_accounts. - The projection chart scales its whole-account historical series by the backing ratio so the saved line meets current_balance at "today" rather than dropping off a cliff for earmarked goals. - Honest comments: free_to_earmark no longer claims a form warning that doesn't exist yet; pace documents its deliberate whole-account basis. * fix(goals): widen the earmark input so the 'Whole balance' placeholder isn't clipped * fix(goals): address review on #2490 - autosave: true on goal_accounts so earmark edits to already-linked accounts persist through goal.save! (Rails only auto-saves newly built children, so changing/clearing an existing earmark was silently dropped). + test. - Reset the balance/progress memos on AASM transitions, not just the status memos, so a same-instance render after complete!/archive! isn't stale. + test. - backing_ratio is 0 (not 1) when the linked-account total is non-positive, so the projection saved series ends at 0 to match the forced-zero current_balance. - Localize the funding-row subtype label via goals.form.subtypes.*. - Add the earmark strings to zh-CN (the maintained second locale; goals has no ca locale, so Catalan keeps falling back to en like the rest of goals). * feat(goals): investment-backed goals (Phase 2) Goals can now be funded by investment accounts, not just depository. - Relax linked_accounts_must_be_depository -> _must_be_fundable (depository || investment); the funding picker + counts include investment accounts. - Add goals.progress_basis ('balance' | 'contributions', default 'balance'). Investment-backed goals default to 'contributions' so a market swing doesn't move the goal: current_balance = value - cumulative market gain (Sum of balances.net_market_flows); depository accounts have zero net_market_flows, so they're unchanged. Goal#market_value_money shows what it's worth today next to the contributed figure on the show page. - Pledge false-match guard: investment accounts never use manual_save / valuation-delta matching (a market move isn't a deposit) - they resolve on transfer (cash-inflow) entries only. Guarded in both Account#default_pledge_kind and GoalPledge#matches?. - Add a `reopen` AASM event (completed -> active) + route/action/menu item so a manually-completed goal whose value later dips can be reopened. Stacked on the earmarking branch (#2490). Full suite green; +6 goal tests. * fix(goals): address Phase 2 review — allocation-aware contributions, N+1, basis-on-update - Contributions basis now goes through the same earmark/shared-pool logic as the balance basis: backing_balance_for -> backing_share_for(account, base), where base is the live balance (balance basis) or net contributions (contributions basis). Earmarks are respected and shared accounts no longer double-count on contributions goals; market_value_money stays consistent. - Batch the per-account net_market_flows sum (Goal.market_flows_for) and inject it on index like pooled_allocations, killing the N+1 for contributions goals. - Default the basis on update too (not just create), so adding an investment account to an existing depository goal flips it to contributions instead of silently tracking market value. - Fix the stale reconciliation_manager comment (renamed validation) and the orphaned zh-CN must_be_depository key. * fix(goals): address review on #2491 - before_save (not before_validation) for the progress_basis default, so a goal can be inspected via valid? without its basis flipping as a side effect (jjmata). - Pledge copy keys off default_pledge_kind, not manual?, so a manual investment account — which pledges via transfer — shows the transfer prompt instead of the "update your manual balance" flow (codex). pledge_action_label_key and the pledge modal's per-account helper flag both use it. - Add the Phase 2 strings (reopen success/invalid_transition, show.reopen, ring.market_value) to zh-CN. --------- Signed-off-by: Juan José Mata <juanjo.mata@gmail.com> Co-authored-by: Juan José Mata <juanjo.mata@gmail.com>
70 lines
2.9 KiB
Plaintext
70 lines
2.9 KiB
Plaintext
<%= render DS::Dialog.new do |dialog| %>
|
|
<% dialog.with_header(title: t(@goal.pledge_action_label_key)) %>
|
|
<% dialog.with_body do %>
|
|
<% if @pledge.errors.any? %>
|
|
<%= render "shared/form_errors", model: @pledge %>
|
|
<% end %>
|
|
|
|
<%
|
|
account_options = @goal.linked_accounts.map do |a|
|
|
# `manual` drives the "update your manual balance" helper copy. Key it
|
|
# off the pledge kind actually saved (default_pledge_kind), so a manual
|
|
# investment account — which pledges via transfer — shows the transfer
|
|
# helper, not the manual one.
|
|
[ a.name, a.id, { data: { manual: (a.default_pledge_kind == "manual_save").to_s } } ]
|
|
end
|
|
%>
|
|
|
|
<%= styled_form_with model: @pledge,
|
|
url: goal_pledges_path(@goal),
|
|
class: "space-y-3",
|
|
data: {
|
|
controller: "goal-pledge-preview",
|
|
goal_pledge_preview_current_balance_value: @goal.current_balance.to_f,
|
|
goal_pledge_preview_target_amount_value: @goal.target_amount.to_f,
|
|
goal_pledge_preview_currency_value: @goal.currency,
|
|
goal_pledge_preview_template_zero_value: t(".preview_zero"),
|
|
goal_pledge_preview_template_nonzero_value: t(".preview_nonzero"),
|
|
goal_pledge_preview_template_reached_value: t(".preview_reached")
|
|
} do |f| %>
|
|
<p class="text-sm text-secondary"
|
|
data-goal-pledge-preview-target="helperConnected"
|
|
hidden>
|
|
<%= t(".helper_transfer") %>
|
|
</p>
|
|
<p class="text-sm text-secondary"
|
|
data-goal-pledge-preview-target="helperManual"
|
|
hidden>
|
|
<%= t(".helper_manual") %>
|
|
</p>
|
|
|
|
<%= f.money_field :amount,
|
|
label: t(".amount_label"),
|
|
hide_currency: true,
|
|
autofocus: true,
|
|
required: true,
|
|
amount_data: {
|
|
goal_pledge_preview_target: "amountInput",
|
|
action: "input->goal-pledge-preview#update"
|
|
} %>
|
|
|
|
<p class="text-xs text-secondary tabular-nums -mt-1 privacy-sensitive"
|
|
data-goal-pledge-preview-target="preview"></p>
|
|
|
|
<%= f.select :account_id,
|
|
options_for_select(account_options, @pledge.account_id),
|
|
{ label: t(".account_label") },
|
|
{
|
|
data: {
|
|
goal_pledge_preview_target: "accountSelect",
|
|
action: "change->goal-pledge-preview#accountChanged"
|
|
}
|
|
} %>
|
|
|
|
<div class="flex justify-end pt-2">
|
|
<%= f.submit t(".submit") %>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
<% end %>
|