From 7a26b77606e8ba9dd738056ec98cd0852768104b Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Fri, 26 Jun 2015 11:36:41 +0300 Subject: [PATCH] Automatic invoice cancelling #2539 --- app/models/invoice.rb | 2 +- spec/models/invoice_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/invoice.rb b/app/models/invoice.rb index aa5a8c430..323af56b9 100644 --- a/app/models/invoice.rb +++ b/app/models/invoice.rb @@ -40,7 +40,7 @@ class Invoice < ActiveRecord::Base cr_at = Time.zone.now - Setting.days_to_keep_overdue_invoices_active.days invoices = Invoice.unbinded.where( - 'due_date < ? AND created_at < ? AND cancelled_at IS NULL', Time.zone.now, cr_at + 'due_date < ? AND cancelled_at IS NULL', cr_at ) count = invoices.update_all(cancelled_at: Time.zone.now) diff --git a/spec/models/invoice_spec.rb b/spec/models/invoice_spec.rb index 54a640d2d..b4f1d3908 100644 --- a/spec/models/invoice_spec.rb +++ b/spec/models/invoice_spec.rb @@ -71,7 +71,7 @@ describe Invoice do end it 'should cancel overdue invoices' do - Fabricate(:invoice, created_at: Time.zone.now - 35.days, due_date: Time.zone.now - 1.days) + Fabricate(:invoice, created_at: Time.zone.now - 35.days, due_date: Time.zone.now - 30.days) Invoice.cancel_overdue_invoices Invoice.where(cancelled_at: nil).count.should == 1 end