spreecommerce
/
spree_paypal_express
1
0
Fork 0
Code Pull Requests Releases Activity

rendering view in controller specs improved paypal confirm template

This commit is contained in:
Bounmy Stephane 2012-05-24 21:15:02 +02:00
parent f544581f76
commit 06a81e1c64
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/spree/checkout_controller_decorator.rb
View File

@ -147,7 +147,7 @@ module Spree
@order.update_attribute(:state, "complete")
state_callback(:after) # So that after_complete is called, setting session[:order_id] to nil
@order.send(:consume_users_credit) #since we dont rely on state machine callback, we just explicitly call this method for spree_store_credits
@order.send(:consume_users_credit) if @order.respond_to?(:consume_users_credit)#since we dont rely on state machine callback, we just explicitly call this method for spree_store_credits
@order.finalize!
flash[:notice] = I18n.t(:order_processed_successfully)

23
app/views/spree/shared/paypal_express_confirm.html.erb
View File

@ -3,8 +3,23 @@
<%= raw t("order_not_yet_placed") %>
</p>
<%= render :partial => 'spree/shared/order_details', :locals => {:order => @order} -%>
<div class="form-buttons">
<%= button_to t('place_order'), paypal_finish_order_checkout_url(@order, {:token => params[:token] , :PayerID => params[:PayerID], :payment_method_id =>
params[:payment_method_id] } ), :class => "button primary" %>
<div id="checkout" data-hook>
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
<div class="row" data-hook="checkout_header">
<h1 class="columns three alpha" data-hook="checkout_title"><%= t(:checkout) %></h1>
<div class="columns thirteen omega" data-hook="checkout_progress"><%= checkout_progress %></div>
</div>
<div class="row" data-hook="checkout_content">
<div class="columns <%= if @order.state != 'confirm' then 'alpha twelve' else 'alpha omega sixteen' end %>" data-hook="checkout_form_wrapper">
<%= render :partial => 'spree/shared/order_details', :locals => {:order => @order} -%>
<div class="form-buttons">
<%= button_to t('place_order'), paypal_finish_order_checkout_url(@order, {:token => params[:token] , :PayerID => params[:PayerID], :payment_method_id =>
params[:payment_method_id] } ), :class => "button primary" %>
</div>
</div>
</div>

4
spec/controllers/checkout_controller_spec.rb
View File

@ -2,8 +2,10 @@ require File.dirname(__FILE__) + '/../spec_helper'
module Spree
describe CheckoutController do
render_views
let(:token) { "EC-2OPN7UJGFWK9OYFV" }
let(:order) { Factory(:ppx_order_with_totals, :state => "payment") }
let(:order) { Factory(:ppx_order_with_totals, :state => "payment", :shipping_method => shipping_method) }
let(:shipping_method) { FactoryGirl.create(:shipping_method, :zone => Spree::Zone.find_by_name('North America')) }
let(:order_total) { (order.total * 100).to_i }
let(:gateway_provider) { mock(ActiveMerchant::Billing::PaypalExpressGateway) }
let(:paypal_gateway) { mock(BillingIntegration::PaypalExpress, :id => 123, :preferred_review => false, :preferred_no_shipping => true, :provider => gateway_provider, :preferred_currency => "US", :preferred_allow_guest_checkout => true