From 16ff3665347ece7bf66dc8b86dcc50b3f2e48902 Mon Sep 17 00:00:00 2001
From: Michael Gall <michael@wakeless.net>
Date: Tue, 20 Dec 2011 11:13:27 +1100
Subject: [PATCH] Fix require directory

---
 app/controllers/spree/checkout_controller_decorator.rb | 10 +++++-----
 lib/spree_paypal_express/engine.rb                     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb
index 9f4867b..ba7389b 100644
--- a/app/controllers/spree/checkout_controller_decorator.rb
+++ b/app/controllers/spree/checkout_controller_decorator.rb
@@ -127,7 +127,7 @@ module Spree
       payment = @order.payments.create(
         :amount => ppx_auth_response.params["gross_amount"].to_f,
         :source => paypal_account,
-        :source_type => 'PaypalAccount',
+        :source_type => 'Spree::PaypalAccount',
         :payment_method_id => params[:payment_method_id],
         :response_code => ppx_auth_response.params["ack"],
         :avs_response => ppx_auth_response.avs_result["code"])
@@ -255,9 +255,9 @@ module Spree
         credits_total = credits.map {|i| i[:amount] * i[:quantity] }.sum
       end
 
-      opts = { #:return_url        => request.protocol + request.host_with_port + "/orders/#{order.number}/checkout/paypal_confirm?payment_method_id=#{payment_method}",
-               :return_url        => "http://"  + request.host_with_port + "/orders/#{order.number}/checkout/paypal_confirm?payment_method_id=#{payment_method}",
-               :cancel_return_url => "http://"  + request.host_with_port + "/orders/#{order.number}/edit",
+      opts = { #:return_url        => request.protocol + request.host_with_port + "/spree/orders/#{order.number}/checkout/paypal_confirm?payment_method_id=#{payment_method}",
+               :return_url        => "http://"  + request.host_with_port + "/spree/orders/#{order.number}/checkout/paypal_confirm?payment_method_id=#{payment_method}",
+               :cancel_return_url => "http://"  + request.host_with_port + "/spree/orders/#{order.number}/edit",
                :order_id          => order.number,
                :custom            => order.number,
                :items             => items,
@@ -272,7 +272,7 @@ module Spree
       if stage == "checkout"
         opts[:handling] = 0
 
-        opts[:callback_url] = "http://"  + request.host_with_port + "/paypal_express_callbacks/#{order.number}"
+        opts[:callback_url] = "http://"  + request.host_with_port + "/spree/paypal_express_callbacks/#{order.number}"
         opts[:callback_timeout] = 3
       elsif stage == "payment"
         #hack to add float rounding difference in as handling fee - prevents PayPal from rejecting orders
diff --git a/lib/spree_paypal_express/engine.rb b/lib/spree_paypal_express/engine.rb
index 2df7a03..c37f8c0 100644
--- a/lib/spree_paypal_express/engine.rb
+++ b/lib/spree_paypal_express/engine.rb
@@ -10,7 +10,7 @@ module SpreePaypalExpress
     end
 
     def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
+      Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
         Rails.env.production? ? require(c) : load(c)
       end
     end