Merge pull request #2796 from internetee/fix-end-to-end-problem

end-to-end problem: added account activity checker
This commit is contained in:
Timo Võhmar 2025-06-06 16:32:22 +03:00 committed by GitHub
commit eb0c6e2ffb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -16,6 +16,7 @@ module TransactionPaidInvoices
.order(created_at: :asc) .order(created_at: :asc)
.non_cancelled .non_cancelled
.where(total: sum) .where(total: sum)
paid_invoices.any? do |invoice| paid_invoices.any? do |invoice|
return true if invoice.paid? && fresh_admin_paid_invoice(invoice) return true if invoice.paid? && fresh_admin_paid_invoice(invoice)
end end
@ -28,10 +29,12 @@ module TransactionPaidInvoices
end end
def check_for_date_paid_invoice(invoice) def check_for_date_paid_invoice(invoice)
return false if invoice.account_activity.nil?
invoice.account_activity.created_at > Time.zone.today - 2.days invoice.account_activity.created_at > Time.zone.today - 2.days
end end
def does_invoice_created_by_admin?(invoice) def does_invoice_created_by_admin?(invoice)
invoice.account_activity.creator_str&.include? 'Admin' invoice&.account_activity&.creator_str&.include? 'Admin'
end end
end end