spree_pxpay_paymentmethod 1.0.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7f645e0b00d472f1025931be9f2c0ca76db24920
+  data.tar.gz: 486c54536cca522fb8c59e0c3509f945f387c953
+SHA512:
+  metadata.gz: 7ab938e559ca0d1c01fb4f78855bab6de175350855a79245d611b4ffb9ad8ec5c3effe439c06a1928a819554a2e11deafddc0630ea8bbef86de6c5ba9753b185
+  data.tar.gz: c40baf3343672e169ee7d9c85a1b58e99e2a1c0724a84b3afb5b359b7fde33928f2907929d092df662edb842a4d7ea64e53a957d0f152a94ea0cfc394c54c5e2

data/README.md

@@ -1,6 +1,6 @@
 # Spree PxPay Gateway
 
-This is a gem for Spree > 1.1 which adds PXPay (paymentexpress.com - a NZ and
+This is a gem for Spree 2.1.7 which adds PXPay (paymentexpress.com - a NZ and
 Australian Payment Processor) as a Payment Method.
 
 This is does not use Active Merchant - this is not the version of the gateway
@@ -19,18 +19,21 @@ this. You can manually create payments on the back-end as per usual.
 
  1. Add the gem to your Gemfile
  2. `bundle install`
- 3. Add a new Payment Method in the admin section using the `Spree::Gateway::PxPay`
- 4. Set the relevant configuration details
+ 3. Add `Spree::Gateway::PxPay` to the spree.payment_methods Array in your Spree initializer (`config/initializers/spree.rb`)
+ 4. Add a new Payment Method in the admin section using the `Spree::Gateway::PxPay`
+ 5. Set the relevant configuration details
 
 ## TODO
 
-The DPS documentation talks of being able to embed as an iframe. I'd like to
-see if it is possible within Spree's checkout process somewhere. Have to look
-into the states within the state machine, I imagine.
-
 Specs, obviously ;)
 
 ## THANKS
 
 Inspired by the [spree-hosted-gateway gem](https://github.com/joshmcarthur/spree-hosted-gateway) and the work done by
 @bradleypriest who wrote the [PXPay gem](https://github.com/bradleypriest/pxpay).
+
+## CONTRIBUTORS
+
+@jstirk
+@Michael1969
+@lukes

data/app/controllers/checkout_controller_decorator.rb

@@ -1,45 +1,55 @@
 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.
+  # 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 payment then
       if response[:success] == '1'
-        payment.started_processing
+        payment.process!
         payment.response_code = response[:auth_code]
         payment.save
         payment.complete
-        @order = payment.order
-        @order.next
-
-        state_callback(:after)
-        if @order.state == "complete" || @order.completed?
-          state_callback(:before)
-          flash.notice = t(:order_processed_successfully)
-          flash[:commerce_tracking] = "nothing special"
-          redirect_to completion_route
-        else
-          respond_with(@order, :location => checkout_state_path(@order.state))
-        end
+
+        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
-      # Bad Payment!
       raise Spree::Core::GatewayError, "Unknown merchant_reference: #{response[:merchant_reference]}"
     end
   end
 
-private
+
+  private
 
   alias :before_payment_without_px_pay_redirection :before_payment
+
   def before_payment
     before_payment_without_px_pay_redirection
     redirect_to px_pay_gateway.url(@order, request)
@@ -48,4 +58,5 @@ private
   def px_pay_gateway
     @order.available_payment_methods.find { |x| x.is_a?(Spree::Gateway::PxPay) }
   end
+
 end

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

@@ -15,8 +15,6 @@ module Spree
     preference :key, :string
     preference :currency_input, :string, :default => 'AUD', :description => "3 digit currency code from #{Pxpay::Base.currency_types.join(' ')}"
 
-    attr_accessible :preferred_user_id, :preferred_key, :preferred_currency_input
-
     def source_required?
       false
     end
@@ -31,14 +29,15 @@ module Spree
     end
 
     def url(order, request)
-      callback = callback_url(request.host, request.protocol)
+      callback = callback_url(request.host, request.protocol, request.port)
       px_pay_request(payment(order), callback).url
     end
 
 private
 
-    # Finds the pending payment or creates a new one.
+      # Finds the pending payment or creates a new one.
     def payment(order)
+
       payment = order.payments.pending.first
       return payment if payment.present?
 
@@ -57,8 +56,8 @@ private
     end
 
     # Calculates the url to return to after the PxPay process completes
-    def callback_url(host, protocol)
-      url_for(:controller => 'spree/checkout', :action => 'px_pay_callback', :only_path => false, :host => host, :protocol => protocol)
+    def callback_url(host, protocol, port)
+      url_for(:controller => 'spree/checkout', :action => 'px_pay_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
-  match '/checkout/pay/callback' => 'spree/checkout#px_pay_callback'
+  get '/checkout/pay/callback' => 'spree/checkout#px_pay_callback'
 end

data/lib/spree_pxpay_paymentmethod/version.rb

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

data/spree_pxpay_paymentmethod.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "spree_pxpay_paymentmethod/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'spree_pxpay_paymentmethod/version'
 
 Gem::Specification.new do |s|
-  s.name        = "spree_pxpay_paymentmethod"
+  s.name        = 'spree_pxpay_paymentmethod'
   s.version     = SpreePxpayPaymentmethod::VERSION
-  s.authors     = ["tuttinator"]
-  s.email       = ["caleb.tutty@gmail.com"]
-  s.homepage    = ""
-  s.summary     = ""
-  s.description = "DPS PXPay payment method for Spree"
+  s.authors     = ['tuttinator']
+  s.email       = ['gems@foundryhq.com']
+  s.homepage    = 'https://github.com/localist/spree_pxpay_paymentmethod'
+  s.summary     = 'Spree PXPay payment method'
+  s.description = 'Gem for Spree 2.1.7 which adds PXPay (paymentexpress.com - a NZ and Australian Payment Processor) as a Payment Method.'
 
-  s.rubyforge_project = "spree_pxpay_paymentmethod"
+  s.rubyforge_project = 'spree_pxpay_paymentmethod'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_dependency('spree_core', '~> 1.1.1')
+  s.add_dependency('spree_core', '~> 2.1.7')
   s.add_dependency('pxpay', '~> 0.2.6')
 end

metadata

@@ -1,50 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_pxpay_paymentmethod
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 2.0.0
 platform: ruby
-authors: 
+authors:
 - tuttinator
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-12-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spree_core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: pxpay
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.7
+- !ruby/object:Gem::Dependency
+  name: pxpay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.2.6
   type: :runtime
-  version_requirements: *id002
-description: DPS PXPay payment method for Spree
-email: 
-- caleb.tutty@gmail.com
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.6
+description: Gem for Spree 2.1.7 which adds PXPay (paymentexpress.com - a NZ and Australian
+  Payment Processor) as a Payment Method.
+email:
+- gems@foundryhq.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -55,32 +57,27 @@ files:
 - lib/spree_pxpay_paymentmethod.rb
 - lib/spree_pxpay_paymentmethod/version.rb
 - spree_pxpay_paymentmethod.gemspec
-homepage: ""
+homepage: https://github.com/localist/spree_pxpay_paymentmethod
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: spree_pxpay_paymentmethod
-rubygems_version: 1.8.17
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: ""
+specification_version: 4
+summary: Spree PXPay payment method
 test_files: []
-