summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Denny <SEAND7565@GMAIL.COM>2021-04-07 11:53:35 -0500
committerGitHub <noreply@github.com>2021-04-07 11:53:35 -0500
commitd462e8eaaf6481f6e5434de575290442673fc538 (patch)
tree83328c3b949822ebf7b1dac57497c196f3b23904
parent6a150092cdd35008d7ddeee4f8354ff4db088616 (diff)
parent565e8f737146a51b160a3d00c2abd07bc932ca2d (diff)
Merge pull request #220 from seand7565/add_reload_to_finalize
Reload order during finalize action
-rw-r--r--app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb2
-rw-r--r--spec/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions_spec.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb b/app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb
index 568e5a8..3f83b82 100644
--- a/app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb
+++ b/app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb
@@ -13,6 +13,8 @@ module SolidusSubscriptions
SolidusSubscriptions::SubscriptionGenerator.activate(line_items)
end
+ reload
+
super
end
end
diff --git a/spec/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions_spec.rb b/spec/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions_spec.rb
index 121afbf..0ca34d9 100644
--- a/spec/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions_spec.rb
+++ b/spec/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe SolidusSubscriptions::Spree::Order::FinalizeCreatesSubscriptions
let(:order) { create :order, :with_subscription_line_items }
let(:subscription_line_item) { order.subscription_line_items.last }
- let(:expected_actionable_date) { Time.zone.today + subscription_line_item.interval }
+ let(:expected_actionable_date) { Time.zone.today + subscription_line_item.subscription.interval }
around { |e| Timecop.freeze { e.run } }