Permalink
Browse files

let's go back to old generic name

  • Loading branch information...
1 parent 6f9feec commit 18347291e072b648c458000055fed51c67d47d5e @tomash tomash committed Dec 12, 2010
@@ -1,4 +1,4 @@
-class PaypalPaymentNotificationsController < CheckoutController
+class PaymentNotificationsController < CheckoutController
protect_from_forgery :except => [:create]
skip_before_filter :restriction_access
@@ -6,7 +6,6 @@
%>
<%= form_tag submit_url do %>
- <!-- display payment summary here -->
<input id="business" name="business" type="hidden" value="<%= Spree::Paypal::Config[:account] %>" />
<input id="invoice" name="invoice" type="hidden" value="<%= @order.number %>" />
@@ -27,32 +26,24 @@
<input id="cmd" name="cmd" type="hidden" value="_cart" />
<input type="hidden" name="upload" value="1" />
- <input id="notify_url" name="notify_url" type="hidden" value="<%= Spree::Paypal::Config[:ipn_notify_host] + order_paypal_payments_path(@order) %>" />
- <input type="hidden" name="rm" value ="2"> <!-- tells paypal that the return should be POST instead of GET -->
+ <input id="notify_url" name="notify_url" type="hidden" value="<%= payment_notifications_url %>" />
+ <input type="hidden" name="rm" value ="2" />
<input id="return" name="return" type="hidden" value="<%= Spree::Paypal::Config[:success_url] %>" />
<input id="charset" name="charset" type="hidden" value="utf-8" />
<% if(Spree::Paypal::Config[:populate_address] && @order.bill_address) %>
- <input type="hidden" name="address1" id="address1" value="<%= @order.bill_address.address1 %>" />
- <input type="hidden" name="address2" id="address2" value="<%= @order.bill_address.address2 %>" />
- <input type="hidden" name="city" id="city" value="<%= @order.bill_address.city %>" />
- <input type="hidden" name="country" id="country" value="<%= @order.bill_address.country.iso %>" />
- <input type="hidden" name="email" id="email" value="<%= @order.email %>" />
+ <input type="hidden" name="address1" id="address1" value="<%= @order.bill_address.address1 %>" />
+ <input type="hidden" name="address2" id="address2" value="<%= @order.bill_address.address2 %>" />
+ <input type="hidden" name="city" id="city" value="<%= @order.bill_address.city %>" />
+ <input type="hidden" name="country" id="country" value="<%= @order.bill_address.country.iso %>" />
+ <input type="hidden" name="email" id="email" value="<%= @order.email %>" />
<input type="hidden" name="first_name" id="first_name" value="<%= @order.bill_address.firstname %>" />
<input type="hidden" name="last_name" id="last_name" value="<%= @order.bill_address.lastname %>" />
- <input type="hidden" name="zip" id="zip" value="<%= @order.bill_address.zipcode %>" />
+ <input type="hidden" name="zip" id="zip" value="<%= @order.bill_address.zipcode %>" />
+ <input type="hidden" name="night_phone_b" id="night_phone_b" value="<%= @order.bill_address.phone %>" />
<% end %>
-
- <!-- input id="address_override" name="address_override" type="hidden" value="0" />
- <input id="no_note" name="no_note" type="hidden" value="1" />
- <input id="no_shipping" name="no_shipping" type="hidden" value="1" />
- <input id="item_name" name="item_name" type="hidden" value="Store purchase" />
- <input id="cancel_return" name="cancel_return" type="hidden" value="http://localhost:3000/account/show" />
- <input id="custom" name="custom" type="hidden" value="11" />
- <input id="item_number" name="item_number" type="hidden" value="11" / -->
- <!-- input id="bn" name="bn" type="hidden" value="ActiveMerchant" /-->
-
+
<%= image_submit_tag "pp_checkout.gif" %>
<% end -%>

0 comments on commit 1834729

Please sign in to comment.