app/views/payments/_billing_address_form.erb app/views/payments/_contact_information_form.erb app/views/payments/_credit_card_form.erb app/views/payments/new.iphone.erb lib/countries.rb @@ -1,15 +1,25 @@ class PaymentsController < ApplicationController + skip_before_filter :redirect_to_iphone + acts_as_iphone_controller + + def new + @payment_authorizer = PaymentAuthorizer.new + end + def attempt - payment_params = params[:payment_authorizer] + payment_params = params[:payment_authorizer].merge(params[:date]) @payment_authorizer = PaymentAuthorizer.new(payment_params) amount = params[:donation_amount_in_cents].to_i # TODO: create new model & save off transaction ID, name, email, payment amount - if amount > 0 && @payment_authorizer.attempt(amount) - render :template => "receipt" + if amount <= 0 + @error_message = "Your donation amount seems to be incorrect. Please try again." + render :action => "new" + elsif @payment_authorizer.attempt(amount) + render :action => "receipt" else - render :template => "/donations/new" + render :action => "new" end end end app/controllers/payments_controller.rb @@ -36,7 +36,9 @@ class PaymentAuthorizer < ActiveValidations::Base end def credit_card - return ActiveMerchant::Billing::CreditCard.new(:first_name => @first_name, :last_name => @last_name, :number => @credit_card_number, :month => @expiration_month, - :year => @expiration_year, :verification_value => @card_security_code) + return ActiveMerchant::Billing::CreditCard.new( + :first_name => @first_name, :last_name => @last_name, + :number => @credit_card_number, :verification_value => @card_security_code, + :month => @expiration_month, :year => @expiration_year) end end \ No newline at end of file app/models/payment_authorizer.rb @@ -1,2 +1,2 @@ <h1>Welcome to iPhone Donations</h1> -<%= link_to_external "Go to standard page", {:controller => "donations", :action => "view_full_site"} %> \ No newline at end of file +<%= link_to_external "Go to standard page", {:controller => "donations", :action => "view_full_site"} %> app/views/donations/index.iphone.erb @@ -39,6 +39,7 @@ ActionController::Routing::Routes.draw do |map| # Note: These default routes make all actions in every controller accessible via GET requests. You should # consider removing the them or commenting them out if you're using named routes and resources. + map.connect 'cms/:controller/:action/:id' map.connect 'cms/donations', :controller => 'donations', :action => 'index' map.connect 'cms/donations/view_full_site', :controller => 'donations', :action => "view_full_site" map.routes_for_bcms_blog config/routes.rb @@ -7,13 +7,13 @@ describe PaymentsController do end it "should create the payment_authorizer" do - PaymentAuthorizer.should_receive(:new).with(HashWithIndifferentAccess.new({:param_one => "value"})).and_return(@payment_authorizer) - - post :attempt, :payment_authorizer => {:param_one => "value"} + PaymentAuthorizer.should_receive(:new).with(HashWithIndifferentAccess.new({:param_one => "value", :year => "2020"})).and_return(@payment_authorizer) + + post :attempt, :payment_authorizer => {:param_one => "value"}, :date => {:year => "2020"} end it "should assign the payment_gateway" do - post :attempt, :payment_authorizer => {} + post :attempt, :payment_authorizer => {}, :date => {} assigns[:payment_authorizer].should == @payment_authorizer end @@ -21,21 +21,22 @@ describe PaymentsController do it "should attempt payment if the donation is greater than 0" do @payment_authorizer.should_receive(:attempt).with(5000) - post :attempt, :payment_authorizer => {}, :donation_amount_in_cents => 5000 + post :attempt, :payment_authorizer => {}, :date => {}, :donation_amount_in_cents => 5000 end it "should not attempt donation of zero or lower" do @payment_authorizer.should_not_receive(:attempt) - post :attempt, :payment_authorizer => {}, :donation_amount_in_cents => 0 + post :attempt, :payment_authorizer => {}, :date => {}, :donation_amount_in_cents => 0 - response.should render_template("/donations/new") + assigns[:error_message].should_not be_blank + response.should render_template("new") end it "should render the receipt page if the payment is successful" do @payment_authorizer.stub!(:attempt).and_return(true) - post :attempt, :payment_authorizer => {}, :donation_amount_in_cents => 5000 + post :attempt, :payment_authorizer => {}, :date => {}, :donation_amount_in_cents => 5000 response.should render_template("receipt") end @@ -43,8 +44,36 @@ describe PaymentsController do it "should render the donations page if the payment is unsuccessful" do @payment_authorizer.stub!(:attempt).and_return(false) - post :attempt, :payment_authorizer => {}, :donation_amount_in_cents => 5000 + post :attempt, :payment_authorizer => {}, :date => {}, :donation_amount_in_cents => 5000 - response.should render_template("/donations/new") + response.should render_template("new") + end + + describe "using Mobile Safari" do + before(:each) do + request.user_agent = "Mobile Safari" + end + + it "should show the proper iPhone view" do + get :new + + response.should render_template("new.iphone.erb") + end + + it "should have a payment authorizer when starting payment" do + get :new + + assigns[:payment_authorizer].should == @payment_authorizer + end + + # it "should have countries" do + # COUNTRIES.should_not be_nil + # COUNTRIES.should be_instance_of(Array) + # + # get :new + # + # response.should be_success + # response.include?("United States").should == true + # end end end spec/controllers/payments_controller_spec.rb 36462d953b6af1e50c4900615b1e8d5dd1c95d98 Colin Jones trptcolin@gmail.com http://github.com/agiletoolkit/mano_browercms/commit/e8a799597c74cc907b58d642c97a5acc2ae1b698 e8a799597c74cc907b58d642c97a5acc2ae1b698 2009-08-26T06:17:01-07:00 2009-08-26T06:17:01-07:00 payments controller and simple view; no API keys introduced yet, so payment attempt is not quite ready dd94d2124f921cb3a0933154e76f947c509efe60 Colin Jones trptcolin@gmail.com