QT/sure
1
0
Fork 0
mirror of https://github.com/we-promise/sure.git synced 2026-04-18 11:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transfer and Payment auto-matching, model and UI improvements (#1585)

Browse Source 
* Transfer data model migration

* Transfers and payment modeling and UI improvements

* Fix CI

* Transfer matching flow

* Better UI for transfers

* Auto transfer matching, approve, reject flow

* Mark transfers created from form as confirmed

* Account filtering

* Excluded rejected transfers from calculations

* Calculation tweaks with transfer exclusions

* Clean up migration
This commit is contained in:
Zach Gollwitzer
2025-01-07 09:41:24 -05:00
committed by GitHub
parent 46e129308f
commit 307a3687e8
78 changed files with 1161 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/transactions_controller.rb
View File

@@ -6,10 +6,15 @@ class TransactionsController < ApplicationController
search_query = Current.family.transactions.search(@q).includes(:entryable).reverse_chronological
@pagy, @transaction_entries = pagy(search_query, limit: params[:per_page] || "50")
totals_query = search_query.incomes_and_expenses
family_currency = Current.family.currency
count_with_transfers = search_query.count
count_without_transfers = totals_query.count
@totals = {
count: search_query.select { |t| t.currency == Current.family.currency }.count,
income: search_query.income_total(Current.family.currency).abs,
expense: search_query.expense_total(Current.family.currency)
count: ((count_with_transfers - count_without_transfers) / 2) + count_without_transfers,
income: totals_query.income_total(family_currency).abs,
expense: totals_query.expense_total(family_currency)
}
end