@@ -104,7 +104,11 @@ class CheckoutsController < Spree::BaseController end end - end + + #mark checkout as confirmed (if applicable) + @checkout.confirmed = (params[:final_answer] == "yes") + + end update.after do @order.save! # expect messages here app/controllers/checkouts_controller.rb @@ -13,6 +13,7 @@ class Checkout < ActiveRecord::Base # for memory-only storage of creditcard details attr_accessor :creditcard attr_accessor :coupon_code + attr_accessor :confirmed validates_presence_of :order_id @@ -40,7 +41,7 @@ class Checkout < ActiveRecord::Base end def process_creditcard? - order and creditcard and not creditcard[:number].blank? + order and creditcard and confirmed and not creditcard[:number].blank? end def process_coupon_code app/models/checkout.rb @@ -1,5 +1,6 @@ Factory.define(:checkout) do |record| record.email { Faker::Internet.email } + record.confirmed true record.special_instructions { Faker::Lorem.paragraphs(rand(5)+1).join("\n") } # associations: test/factories/checkout_factory.rb @@ -15,9 +15,8 @@ class CheckoutsControllerTest < ActionController::TestCase end context "post" do setup do - @params = { :final_answer => true, :order_id => @order.number } + @params = { :final_answer => "yes", :order_id => @order.number } @shipping_method = Factory(:shipping_method) - @params[:final_answer] = true @params[:checkout] = { :bill_address_attributes => @address.attributes.symbolize_keys, :shipment_attributes => { test/functional/checkouts_controller_test.rb @@ -44,6 +44,19 @@ class IncompleteCheckoutTest < ActiveSupport::TestCase should_change("CreditcardTxn.count", :by => 1) { CreditcardTxn.count } should_change("@checkout.order.state", :from => 'in_progress', :to => 'paid') { @checkout.order.state } end + context "save with confirmed = false" do + setup do + @checkout.confirmed = false + @checkout.save + end + should_not_change("Creditcard.count") { Creditcard.count } + should_not_change("CreditcardPayment.count") { CreditcardPayment.count } + should_not_change("CreditcardTxn.count") { CreditcardTxn.count } + should_not_change("@checkout.order.state") { @checkout.order.state } + should 'not require processing' do + assert !@checkout.send(:process_creditcard?) + end + end end context "save with declineable creditcard" do setup do test/unit/incomplete_checkout_test.rb 86f23cff8c4b6a0666e42f6a6e54f2aec8e702ce Brian Quinn briandquinn@gmail.com http://github.com/railsdog/spree/commit/72e92dc5faccc836b3f9d53325dd3549675da630 72e92dc5faccc836b3f9d53325dd3549675da630 2009-11-01T12:44:14-08:00 2009-11-01T12:44:14-08:00 Ensures that checkout doesn't charge creditcard before user Confirms order. [#860 state:resolved] 047afcdbc8f475673681d2f3de0c2f761e4f1624 Brian Quinn briandquinn@gmail.com