spree_pxpay_paymentmethod 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f645e0b00d472f1025931be9f2c0ca76db24920
-  data.tar.gz: 486c54536cca522fb8c59e0c3509f945f387c953
+  metadata.gz: d0ed69196f2d762ffc7af8d7713c2ccff87f75ea
+  data.tar.gz: 41b316335c8dc8c4d0d291b31b35fd84154a0845
 SHA512:
-  metadata.gz: 7ab938e559ca0d1c01fb4f78855bab6de175350855a79245d611b4ffb9ad8ec5c3effe439c06a1928a819554a2e11deafddc0630ea8bbef86de6c5ba9753b185
-  data.tar.gz: c40baf3343672e169ee7d9c85a1b58e99e2a1c0724a84b3afb5b359b7fde33928f2907929d092df662edb842a4d7ea64e53a957d0f152a94ea0cfc394c54c5e2
+  metadata.gz: 94100f96e04359d35946de612f7bf6f0fc3e1d46ae39386ec9c116977479be9161e1859bf0ffa48d39e9ceac1ed4c0cdaa8ac976615764b5365caab9ac52cdf1
+  data.tar.gz: 9e480e8474e2423f4074d99ca9eb4fb4986126871c5868b33d4a52e1897d37ef20b5e7bcddfd17e3414e30443ac8eaa95839f3ad8bb53d3724ba630e6fab725c

data/README.md

@@ -34,6 +34,7 @@ Inspired by the [spree-hosted-gateway gem](https://github.com/joshmcarthur/spree
 
 ## CONTRIBUTORS
 
-@jstirk
-@Michael1969
-@lukes
+* @tuttinator
+* @jstirk
+* @Michael1969
+* @lukes

data/app/controllers/checkout_controller_decorator.rb

@@ -1,51 +1,5 @@
 Spree::CheckoutController.class_eval do
 
-  skip_before_filter :verify_authenticity_token, :only => [:dps_callback]
-  skip_before_filter :load_order, :only => :px_pay_callback
-  skip_before_filter :ensure_order_not_completed, :only => :px_pay_callback
-  skip_before_filter :ensure_checkout_allowed  , :only => :px_pay_callback
-  skip_before_filter :ensure_sufficient_stock_lines, :only => :px_pay_callback
-  skip_before_filter :ensure_valid_state , :only => :px_pay_callback
-
-  skip_before_filter :associate_user , :only => :px_pay_callback
-  skip_before_filter :check_authorization , :only => :px_pay_callback
-  skip_before_filter :apply_coupon_code , :only => :px_pay_callback
-  skip_before_filter :setup_for_current_state , :only => :px_pay_callback
-
-  # Handles the response from PxPay (success or failure) and updates the
-  # relevant Payment record. works with spree 2.1.7
-  def px_pay_callback
-    response = Pxpay::Response.new(params).response.to_hash
-
-    payment = Spree::Payment.find(response[:merchant_reference])
-    if payment
-
-      if response[:success] == '1'
-        payment.process!
-        payment.response_code = response[:auth_code]
-        payment.save
-        payment.complete
-
-        order = payment.order
-        order.state = 'complete'
-        order.completed_at  = Time.now
-        order.save
-
-        order.deliver_order_confirmation_email
-
-        flash.notice = Spree.t(:order_processed_successfully)
-        redirect_to order_path(order, :token => order.token)
-      else
-        payment.void
-        redirect_to cart_path, :notice => 'Your credit card details were declined. Please check your details and try again.'
-      end
-
-    else
-      raise Spree::Core::GatewayError, "Unknown merchant_reference: #{response[:merchant_reference]}"
-    end
-  end
-
-
   private
 
   alias :before_payment_without_px_pay_redirection :before_payment

data/app/controllers/px_pay_gateway_callback_controller.rb

@@ -0,0 +1,39 @@
+class PxPayGatewayCallbackController < ActionController::Base
+
+  include Spree::Core::Engine.routes.url_helpers
+
+  # Handles the response from PxPay (success or failure) and updates the
+  # relevant Payment record. works with spree 2.1.7
+  def callback
+    response = Pxpay::Response.new(params).response.to_hash
+
+    payment = Spree::Payment.find(response[:merchant_reference])
+    order = payment.order
+
+    if payment.checkout?
+
+      if response[:success] == '1'
+        payment.process!
+        payment.response_code = response[:auth_code]
+        payment.save
+        payment.complete
+
+        order.state = 'complete'
+        order.completed_at  = Time.now
+        order.save
+
+        order.deliver_order_confirmation_email
+      else
+        payment.void
+        redirect_to cart_path, :notice => 'Your credit card details were declined. Please check your details and try again.'
+        return
+      end
+
+    end
+
+    flash.notice = Spree.t(:order_processed_successfully)
+    redirect_to order_path(order, :token => order.token)
+  end
+
+
+end

data/app/models/spree/gateway/px_pay.rb

@@ -57,7 +57,7 @@ private
 
     # Calculates the url to return to after the PxPay process completes
     def callback_url(host, protocol, port)
-      url_for(:controller => 'spree/checkout', :action => 'px_pay_callback', :only_path => false, :host => host, :protocol => protocol, :port => port)
+      url_for(:controller => 'px_pay_gateway_callback', :action => 'callback', :only_path => false, :host => host, :protocol => protocol, :port => port)
     end
   end
 end

data/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  get '/checkout/pay/callback' => 'spree/checkout#px_pay_callback'
+  get '/checkout/pay/callback' => 'px_pay_gateway_callback#callback'
 end

data/lib/spree_pxpay_paymentmethod/version.rb

@@ -1,3 +1,3 @@
 module SpreePxpayPaymentmethod
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/spree_pxpay_paymentmethod.gemspec

@@ -5,7 +5,7 @@ require 'spree_pxpay_paymentmethod/version'
 Gem::Specification.new do |s|
   s.name        = 'spree_pxpay_paymentmethod'
   s.version     = SpreePxpayPaymentmethod::VERSION
-  s.authors     = ['tuttinator']
+  s.authors     = ['The Foundry']
   s.email       = ['gems@foundryhq.com']
   s.homepage    = 'https://github.com/localist/spree_pxpay_paymentmethod'
   s.summary     = 'Spree PXPay payment method'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_pxpay_paymentmethod
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
-- tuttinator
+- The Foundry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -51,6 +51,7 @@ files:
 - README.md
 - Rakefile
 - app/controllers/checkout_controller_decorator.rb
+- app/controllers/px_pay_gateway_callback_controller.rb
 - app/models/spree/gateway/px_pay.rb
 - app/views/spree/admin/payments/source_views/_pxpay.html.erb
 - config/routes.rb