raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing payments when emptying order

Browse Source
This commit is contained in:
Will Marshall
2014-06-10 11:15:04 +10:00
parent dbf4f503a9
commit 4d7fa8b1bf
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/spree/order_decorator.rb
View File

@@ -76,11 +76,12 @@ Spree::Order.class_eval do
end
end
def empty_with_clear_shipping!
empty_without_clear_shipping!
def empty_with_clear_shipping_and_payments!
empty_without_clear_shipping_and_payments!
payments.clear
update_attributes(shipping_method_id: nil)
end
alias_method_chain :empty!, :clear_shipping
alias_method_chain :empty!, :clear_shipping_and_payments
def set_order_cycle!(order_cycle)
unless self.order_cycle == order_cycle

7
spec/models/spree/order_spec.rb
View File

@@ -218,6 +218,13 @@ describe Spree::Order do
subject.empty!
subject.shipping_method.should == nil
end
it "removes payments" do
subject.payments << create(:payment)
subject.save!
subject.empty!
subject.payments.should == []
end
end
describe "setting the order cycle" do