spree_pxpay_paymentmethod 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0ed69196f2d762ffc7af8d7713c2ccff87f75ea
-  data.tar.gz: 41b316335c8dc8c4d0d291b31b35fd84154a0845
+  metadata.gz: bb70ac53343268347d4e2cf601bbbce53124a00a
+  data.tar.gz: 5f8e1f9299603dc3f1bad1fd205c957169a4ac88
 SHA512:
-  metadata.gz: 94100f96e04359d35946de612f7bf6f0fc3e1d46ae39386ec9c116977479be9161e1859bf0ffa48d39e9ceac1ed4c0cdaa8ac976615764b5365caab9ac52cdf1
-  data.tar.gz: 9e480e8474e2423f4074d99ca9eb4fb4986126871c5868b33d4a52e1897d37ef20b5e7bcddfd17e3414e30443ac8eaa95839f3ad8bb53d3724ba630e6fab725c
+  metadata.gz: c7cfefae656794b58dbdc03c4285e6236c1ae522f11ff5c4ca09eefd2cf7b048f78e085f439abcb4a2099801212d36f4e6008aa7f8c1f6d5b1d1f1ef34b77c63
+  data.tar.gz: a4aa2a2e8e957965bb51fa035e60ef6865f896f43d4dcbfa846635431514dbc09a6fee1f5fa4aa73fe4eefa7c2d05a74b0e8294138304937dd655be40f000049

data/app/controllers/px_pay_gateway_callback_controller.rb

@@ -18,11 +18,16 @@ class PxPayGatewayCallbackController < ActionController::Base
         payment.save
         payment.complete
 
-        order.state = 'complete'
-        order.completed_at  = Time.now
-        order.save
+        unless order.next
+          flash[:error] = order.errors[:base].join("\n")
+          redirect_to checkout_state_path(order.state) and return
+        end
+
+        if order.complete?
+          order.reload
+          order.update!
+        end
 
-        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.'
@@ -31,8 +36,9 @@ class PxPayGatewayCallbackController < ActionController::Base
 
     end
 
+    session[:order_id] = nil
     flash.notice = Spree.t(:order_processed_successfully)
-    redirect_to order_path(order, :token => order.token)
+    redirect_to order_path(order)
   end
 
 

data/app/models/spree/order_decorator.rb

@@ -0,0 +1,8 @@
+Spree::Order.class_eval do
+
+  # Override this method to do nothing, as no payments will need to be processed
+  def process_payments!
+    Rails.logger.info('process_payments! has been overridden by spree_pxpay_paymentmethod gem to do nothing')
+  end
+
+end

data/lib/spree_pxpay_paymentmethod/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_pxpay_paymentmethod
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - The Foundry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -53,6 +53,7 @@ files:
 - app/controllers/checkout_controller_decorator.rb
 - app/controllers/px_pay_gateway_callback_controller.rb
 - app/models/spree/gateway/px_pay.rb
+- app/models/spree/order_decorator.rb
 - app/views/spree/admin/payments/source_views/_pxpay.html.erb
 - config/routes.rb
 - lib/spree_pxpay_paymentmethod.rb
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: spree_pxpay_paymentmethod
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Spree PXPay payment method