From 6079fc97ca11a7c2aee25798046b6bc71d5c68ce Mon Sep 17 00:00:00 2001
From: Jeff Squires <jeff.squires@gmail.com>
Date: Tue, 29 May 2012 12:07:44 -0400
Subject: [PATCH 1/2] [Fixes 64] Fixes missing leading 'spree/' in partial name

---
 app/views/spree/admin/paypal_payments/refund.html.erb  | 2 +-
 app/views/spree/shared/paypal_express_confirm.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 6acd7ef..879fb42 100644
--- a/app/views/spree/shared/paypal_express_confirm.html.erb
+++ b/app/views/spree/shared/paypal_express_confirm.html.erb
@@ -3,7 +3,7 @@
   <%= raw t("order_not_yet_placed") %>
 </p>
 
-<%= render :partial => 'shared/order_details', :locals => {:order => @order} -%>
+<%= 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" %>

From d48f4649506e876b88244dcb4e5a86250e4ef8f0 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Wed, 30 May 2012 12:43:52 +1000
Subject: [PATCH 2/2] Add paypalexpress partials to source_forms and
 source_views

---
 .../source_forms/_paypalexpressuk.html.erb    |   9 ++
 .../source_views/_paypalexpressuk.html.erb    | 110 ++++++++++++++++++
 2 files changed, 119 insertions(+)
 create mode 100644 app/views/spree/admin/payments/source_forms/_paypalexpressuk.html.erb
 create mode 100644 app/views/spree/admin/payments/source_views/_paypalexpressuk.html.erb

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 %>
+  <script type="text/javascript">
+    jQuery(document).ready(function(){
+      $("label:contains('<%= payment_method.name %>')").hide();
+      $("label:contains('<%= payment_method.name %>') input").disable();
+    });
+  </script>
+<% 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 @@
+<fieldset>
+  <legend><%= t('paypal_account') %></legend>
+
+  <table class="index">
+    <tr>
+      <th colspan="6"><%= t('account_details') %></th>
+    </tr>
+    <tr>
+      <td><label><%= t("email") %>:</label></td>
+      <td>
+        <%= payment.source.email %>
+      </td>
+      <td><label><%= t("payer_id") %>:</label></td>
+      <td>
+        <%= payment.source.payer_id %>
+      </td>
+      <td><label><%= t("payer_country") %>:</label></td>
+      <td>
+        <%= payment.source.payer_country %>
+      </td>
+    </tr>
+    <tr>
+      <td><label><%= t("payer_status") %>:</label></td>
+      <td colspan="5">
+        <%= payment.source.payer_status %>
+      </td>
+    </tr>
+  </table>
+</fieldset>
+
+<fieldset>
+  <legend><%= t('transactions') %></legend>
+
+  <% payment.log_entries.reverse.each do |log| %>
+  <% details = YAML.load(log.details) rescue "" %>
+    <table class="index">
+
+      <% if details.is_a? ActiveMerchant::Billing::PaypalExpressResponse %>
+        <tr>
+          <th colspan="6"><%= t('transaction') %> <%= details.params["transaction_id"] %> -  <%= log.created_at.to_s(:date_time24) %></th>
+        </tr>
+        <tr>
+          <td width="12%;"><label><%= t('type') %>:</label></td>
+          <td width="20%;">
+            <%= details.params["transaction_type"] %>
+          </td>
+          <td width="8%;"><label><%= t("result") %>:</label></td>
+          <td width="20%;">
+            <%= details.message %>
+          </td>
+          <td width="15%;"><label><%= t("amount") %>:</label></td>
+          <td width="20%;">
+            <%= number_to_currency details.params["gross_amount"] %>
+          </td>
+        </tr>
+        <tr>
+          <td><label><%= t("comment") %>:</label></td>
+          <td colspan="3">
+            <%= details.params["message"] %>
+          </td>
+          <td><label><%= t("status") %>:</label></td>
+          <td>
+            <%= details.params["payment_status"] %>
+          </td>
+        </tr>
+        <% if details.params["payment_status"] == "Pending" %>
+          <tr>
+            <td><label><%= t("pending_reason") %>:</label></td>
+            <td colspan="5">
+              <%= details.params["pending_reason"] %>
+            </td>
+          </tr>
+        <% end %>
+      <% elsif details.is_a? ActiveMerchant::Billing::Integrations::Paypal::Notification %>
+        <tr>
+          <th colspan="6"><%= t('ipn_transaction') %> <%= details.params["txn_id"] %> -  <%= log.created_at.to_s(:date_time24) %></th>
+        </tr>
+        <tr>
+          <td width="12%;"><label><%= t('type') %>:</label></td>
+          <td width="20%;">
+            <%= details.params["txn_type"] %>
+          </td>
+          <td width="8%;"><label><%= t("result") %>:</label></td>
+          <td width="20%;">
+            <%= details.params["payment_status"] %>
+          </td>
+          <td width="15%;"><label><%= t("amount") %>:</label></td>
+          <td width="20%;">
+            <%= number_to_currency details.params["mc_gross"] %>
+          </td>
+        </tr>
+        <tr>
+          <td><label><%= t("status") %>:</label></td>
+          <td colspan="5">
+            <%= details.params["payment_status"] %>
+          </td>
+        </tr>
+      <% else %>
+        <tr>
+          <th colspan="6"><%= t('unknown_transaction') %> -  <%= log.created_at.to_s(:date_time24) %></th>
+        </tr>
+        <tr>
+          <td colspan="6"><pre style="overflow: hidden; width:600px;"><%= log.details %></pre></th>
+        </tr>
+
+      <% end %>
+    </table>
+  <% end %>
+
+</fieldset>