From 3bb7beba22c1e21ad7a1e4bc1049658d8f13ed61 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Tue, 27 May 2025 15:33:41 +0300 Subject: [PATCH] end-to-end problem: added account activity checker --- app/models/concerns/transaction_paid_invoices.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/transaction_paid_invoices.rb b/app/models/concerns/transaction_paid_invoices.rb index 19d632c1d..b9c1bf064 100644 --- a/app/models/concerns/transaction_paid_invoices.rb +++ b/app/models/concerns/transaction_paid_invoices.rb @@ -16,6 +16,7 @@ module TransactionPaidInvoices .order(created_at: :asc) .non_cancelled .where(total: sum) + paid_invoices.any? do |invoice| return true if invoice.paid? && fresh_admin_paid_invoice(invoice) end @@ -28,10 +29,12 @@ module TransactionPaidInvoices end def check_for_date_paid_invoice(invoice) + return false if invoice.account_activity.nil? + invoice.account_activity.created_at > Time.zone.today - 2.days end def does_invoice_created_by_admin?(invoice) - invoice.account_activity.creator_str&.include? 'Admin' + invoice&.account_activity&.creator_str&.include? 'Admin' end end