From cc0f1ccfa7d3960b2922cb4dbf4d3e301d61b8fa Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Thu, 2 Jul 2015 16:26:53 +0800 Subject: [PATCH] Update Billable Periods automatically runs Update User Invoices immediately afterwards --- .../admin/accounts_and_billing_settings_controller.rb | 2 +- app/jobs/update_billable_periods.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/accounts_and_billing_settings_controller.rb b/app/controllers/admin/accounts_and_billing_settings_controller.rb index 86754ce571..9e22fb48b1 100644 --- a/app/controllers/admin/accounts_and_billing_settings_controller.rb +++ b/app/controllers/admin/accounts_and_billing_settings_controller.rb @@ -19,7 +19,7 @@ class Admin::AccountsAndBillingSettingsController < Spree::Admin::BaseController Spree::Config.set(params[:settings]) if params[:button] == "update_and_run_job" - Delayed::Job.enqueue UpdateBillablePeriods.new({create_invoices: true}) + Delayed::Job.enqueue UpdateBillablePeriods.new end flash[:success] = t(:successfully_updated, :resource => t(:billing_and_account_settings)) diff --git a/app/jobs/update_billable_periods.rb b/app/jobs/update_billable_periods.rb index c3229f52f0..23709a25cc 100644 --- a/app/jobs/update_billable_periods.rb +++ b/app/jobs/update_billable_periods.rb @@ -91,4 +91,8 @@ UpdateBillablePeriods = Struct.new("UpdateBillablePeriods") do obsolete_billable_periods.each(&:delete) end + + def success(job) + Delayed::Job.enqueue UpdateUserInvoices.new + end end