mirror of
https://github.com/we-promise/sure.git
synced 2026-05-29 23:39:03 +00:00
fix(api): include disabled-account transaction history (#1723)
* fix(api): include disabled-account transaction history * fix(api): hide pending deletion transaction history
This commit is contained in:
@@ -10,8 +10,11 @@ class Api::V1::TransactionsController < Api::V1::BaseController
|
||||
|
||||
def index
|
||||
family = current_resource_owner.family
|
||||
accessible_account_ids = family.accounts.accessible_by(current_resource_owner).select(:id)
|
||||
transactions_query = family.transactions.visible
|
||||
accessible_account_ids = family.accounts
|
||||
.accessible_by(current_resource_owner)
|
||||
.where.not(status: "pending_deletion")
|
||||
.select(:id)
|
||||
transactions_query = family.transactions
|
||||
.joins(:entry).where(entries: { account_id: accessible_account_ids })
|
||||
|
||||
# Apply filters
|
||||
@@ -198,6 +201,8 @@ end
|
||||
private
|
||||
|
||||
def set_transaction
|
||||
raise ActiveRecord::RecordNotFound unless valid_uuid?(params[:id])
|
||||
|
||||
family = current_resource_owner.family
|
||||
@transaction = family.transactions
|
||||
.joins(entry: :account)
|
||||
|
||||
Reference in New Issue
Block a user