raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-09 23:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Process proxy orders even if underlying subscription has been paused or cancelled

Browse Source
This commit is contained in:
Rob Harrington
2018-03-14 16:22:39 +11:00
parent 184bf9ce36
commit e3ea60fda5
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/jobs/subscription_confirm_job.rb
View File

@@ -25,7 +25,6 @@ class SubscriptionConfirmJob
def proxy_orders
ProxyOrder.not_canceled.where('confirmed_at IS NULL AND placed_at IS NOT NULL')
.joins(:order_cycle).merge(recently_closed_order_cycles)
.joins(:subscription).merge(Subscription.not_canceled.not_paused)
.joins(:order).merge(Spree::Order.complete)
end

20
spec/jobs/subscription_confirm_job_spec.rb
View File

@@ -16,21 +16,21 @@ describe SubscriptionConfirmJob do
expect(proxy_orders).to include proxy_order
end
it "returns proxy orders for paused subscriptions" do
subscription.update_attributes!(paused_at: 1.minute.ago)
expect(proxy_orders).to include proxy_order
end
it "returns proxy orders for cancelled subscriptions" do
subscription.update_attributes!(canceled_at: 1.minute.ago)
expect(proxy_orders).to include proxy_order
end
it "ignores proxy orders where the OC closed more than 1 hour ago" do
proxy_order.update_attributes!(order_cycle_id: order_cycle2.id)
expect(proxy_orders).to_not include proxy_order
end
it "ignores proxy orders for paused subscriptions" do
subscription.update_attributes!(paused_at: 1.minute.ago)
expect(proxy_orders).to_not include proxy_order
end
it "ignores proxy orders for cancelled subscriptions" do
subscription.update_attributes!(canceled_at: 1.minute.ago)
expect(proxy_orders).to_not include proxy_order
end
it "ignores cancelled proxy orders" do
proxy_order.update_attributes!(canceled_at: 5.minutes.ago)
expect(proxy_orders).to_not include proxy_order