diff --git a/app/views/spree/admin/payments/source_forms/_paypalexpressuk.html.erb b/app/views/spree/admin/payments/source_forms/_paypalexpressuk.html.erb new file mode 100644 index 0000000..02ce32a --- /dev/null +++ b/app/views/spree/admin/payments/source_forms/_paypalexpressuk.html.erb @@ -0,0 +1,9 @@ +<% content_for :head do %> + +<% end %> + diff --git a/app/views/spree/admin/payments/source_views/_paypalexpressuk.html.erb b/app/views/spree/admin/payments/source_views/_paypalexpressuk.html.erb new file mode 100644 index 0000000..1443b93 --- /dev/null +++ b/app/views/spree/admin/payments/source_views/_paypalexpressuk.html.erb @@ -0,0 +1,110 @@ +
+ <%= t('paypal_account') %> + + + + + + + + + + + + + + + + + +
<%= t('account_details') %>
+ <%= payment.source.email %> + + <%= payment.source.payer_id %> + + <%= payment.source.payer_country %> +
+ <%= payment.source.payer_status %> +
+
+ +
+ <%= t('transactions') %> + + <% payment.log_entries.reverse.each do |log| %> + <% details = YAML.load(log.details) rescue "" %> + + + <% if details.is_a? ActiveMerchant::Billing::PaypalExpressResponse %> + + + + + + + + + + + + + + + + + + <% if details.params["payment_status"] == "Pending" %> + + + + + <% end %> + <% elsif details.is_a? ActiveMerchant::Billing::Integrations::Paypal::Notification %> + + + + + + + + + + + + + + + + <% else %> + + + + + + + <% end %> +
<%= t('transaction') %> <%= details.params["transaction_id"] %> - <%= log.created_at.to_s(:date_time24) %>
+ <%= details.params["transaction_type"] %> + + <%= details.message %> + + <%= number_to_currency details.params["gross_amount"] %> +
+ <%= details.params["message"] %> + + <%= details.params["payment_status"] %> +
+ <%= details.params["pending_reason"] %> +
<%= t('ipn_transaction') %> <%= details.params["txn_id"] %> - <%= log.created_at.to_s(:date_time24) %>
+ <%= details.params["txn_type"] %> + + <%= details.params["payment_status"] %> + + <%= number_to_currency details.params["mc_gross"] %> +
+ <%= details.params["payment_status"] %> +
<%= t('unknown_transaction') %> - <%= log.created_at.to_s(:date_time24) %>
<%= log.details %>
+
+ <% end %> + +
diff --git a/app/views/spree/admin/paypal_payments/refund.html.erb b/app/views/spree/admin/paypal_payments/refund.html.erb index b9ff81b..b854498 100644 --- a/app/views/spree/admin/paypal_payments/refund.html.erb +++ b/app/views/spree/admin/paypal_payments/refund.html.erb @@ -1,4 +1,4 @@ -<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Payments"} %> +<%= render :partial => 'spree/admin/shared/order_tabs', :locals => {:current => "Payments"} %> <% form_tag do %> diff --git a/app/views/spree/shared/paypal_express_confirm.html.erb b/app/views/spree/shared/paypal_express_confirm.html.erb index 7e0762d..2956f44 100644 --- a/app/views/spree/shared/paypal_express_confirm.html.erb +++ b/app/views/spree/shared/paypal_express_confirm.html.erb @@ -15,9 +15,9 @@ <%= render :partial => 'spree/shared/order_details', :locals => {:order => @order} -%>
- <%= 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" %> + <%= 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" %>
- + - + + \ No newline at end of file