QT/sure
1
0
Fork 0
mirror of https://github.com/we-promise/sure.git synced 2026-06-08 20:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Recurring scoping implementation (#1300)

Browse Source 
* Recurring scoping implementation

* FIX tests and reviews
This commit is contained in:
soky srm
2026-03-26 19:01:35 +01:00
committed by GitHub
parent 9410e5b38d
commit f1991eaefe
11 changed files with 232 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/recurring_transactions_controller.rb
View File

@@ -3,6 +3,7 @@ class RecurringTransactionsController < ApplicationController
def index
@recurring_transactions = Current.family.recurring_transactions
.accessible_by(Current.user)
.includes(:merchant)
.order(status: :asc, next_expected_date: :asc)
@family = Current.family
@@ -42,7 +43,7 @@ class RecurringTransactionsController < ApplicationController
end
def toggle_status
@recurring_transaction = Current.family.recurring_transactions.find(params[:id])
@recurring_transaction = Current.family.recurring_transactions.accessible_by(Current.user).find(params[:id])
if @recurring_transaction.active?
@recurring_transaction.mark_inactive!
@@ -61,7 +62,7 @@ class RecurringTransactionsController < ApplicationController
end
def destroy
@recurring_transaction = Current.family.recurring_transactions.find(params[:id])
@recurring_transaction = Current.family.recurring_transactions.accessible_by(Current.user).find(params[:id])
@recurring_transaction.destroy!
flash[:notice] = t("recurring_transactions.deleted")

2
app/controllers/transactions_controller.rb
View File

@@ -54,6 +54,7 @@ class TransactionsController < ApplicationController
# Load projected recurring transactions for next 10 days
@projected_recurring = Current.family.recurring_transactions
.accessible_by(Current.user)
.active
.where("next_expected_date <= ? AND next_expected_date >= ?",
10.days.from_now.to_date,
@@ -304,6 +305,7 @@ class TransactionsController < ApplicationController
# Check if a recurring transaction already exists for this pattern
existing = Current.family.recurring_transactions.find_by(
account_id: transaction.entry.account_id,
merchant_id: transaction.merchant_id,
name: transaction.merchant_id.present? ? nil : transaction.entry.name,
currency: transaction.entry.currency,