From bea73e2a0c16713b1104833623b770a10efbdb4f Mon Sep 17 00:00:00 2001
From: paulcc <paulcc.two@gmail.com>
Date: Mon, 6 Jul 2009 12:22:06 +0100
Subject: [PATCH] fixed bug - mentions to old gateway sub-module removed

---
 app/controllers/admin/paypal_payments_controller.rb | 5 +++--
 config/locales/en-GB.yml                            | 1 +
 lib/spree/paypal_express.rb                         | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/paypal_payments_controller.rb b/app/controllers/admin/paypal_payments_controller.rb
index 1adac44..9b1dcc5 100644
--- a/app/controllers/admin/paypal_payments_controller.rb
+++ b/app/controllers/admin/paypal_payments_controller.rb
@@ -11,8 +11,9 @@ class Admin::PaypalPaymentsController < Admin::BaseController
 
   def country_changed
   end
-         
-  include Spree::PaypalExpress::Gateway
+        
+  # to allow capture (NB also included in order controller...)
+  include Spree::PaypalExpress
 
   def capture
     if !@order.paypal_payments.empty? && (payment = @order.paypal_payments.last).can_capture?
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 027403c..d947c67 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1,5 +1,6 @@
 ---
 en-GB:
+  edit_paypal_info: Edit Paypal Express Payment
   paypal_payment: Paypal Express Payment
   paypal_txn_id: Transaction Code
   paypal_capture_complete: Paypal Transaction has been captured.
diff --git a/lib/spree/paypal_express.rb b/lib/spree/paypal_express.rb
index 2347b85..9c5cc62 100644
--- a/lib/spree/paypal_express.rb
+++ b/lib/spree/paypal_express.rb
@@ -3,7 +3,6 @@
 module Spree::PaypalExpress
   include ERB::Util
   include Spree::PaymentGateway
-  include Spree::PaypalExpress::Gateway
 
   def fixed_opts
     { :description             => "Goods from a Spree-based site", # site details...