spree_pxpay_paymentmethod 2.1.0 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d0ed69196f2d762ffc7af8d7713c2ccff87f75ea
4
- data.tar.gz: 41b316335c8dc8c4d0d291b31b35fd84154a0845
3
+ metadata.gz: bb70ac53343268347d4e2cf601bbbce53124a00a
4
+ data.tar.gz: 5f8e1f9299603dc3f1bad1fd205c957169a4ac88
5
5
  SHA512:
6
- metadata.gz: 94100f96e04359d35946de612f7bf6f0fc3e1d46ae39386ec9c116977479be9161e1859bf0ffa48d39e9ceac1ed4c0cdaa8ac976615764b5365caab9ac52cdf1
7
- data.tar.gz: 9e480e8474e2423f4074d99ca9eb4fb4986126871c5868b33d4a52e1897d37ef20b5e7bcddfd17e3414e30443ac8eaa95839f3ad8bb53d3724ba630e6fab725c
6
+ metadata.gz: c7cfefae656794b58dbdc03c4285e6236c1ae522f11ff5c4ca09eefd2cf7b048f78e085f439abcb4a2099801212d36f4e6008aa7f8c1f6d5b1d1f1ef34b77c63
7
+ data.tar.gz: a4aa2a2e8e957965bb51fa035e60ef6865f896f43d4dcbfa846635431514dbc09a6fee1f5fa4aa73fe4eefa7c2d05a74b0e8294138304937dd655be40f000049
@@ -18,11 +18,16 @@ class PxPayGatewayCallbackController < ActionController::Base
18
18
  payment.save
19
19
  payment.complete
20
20
 
21
- order.state = 'complete'
22
- order.completed_at = Time.now
23
- order.save
21
+ unless order.next
22
+ flash[:error] = order.errors[:base].join("\n")
23
+ redirect_to checkout_state_path(order.state) and return
24
+ end
25
+
26
+ if order.complete?
27
+ order.reload
28
+ order.update!
29
+ end
24
30
 
25
- order.deliver_order_confirmation_email
26
31
  else
27
32
  payment.void
28
33
  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
31
36
 
32
37
  end
33
38
 
39
+ session[:order_id] = nil
34
40
  flash.notice = Spree.t(:order_processed_successfully)
35
- redirect_to order_path(order, :token => order.token)
41
+ redirect_to order_path(order)
36
42
  end
37
43
 
38
44
 
@@ -0,0 +1,8 @@
1
+ Spree::Order.class_eval do
2
+
3
+ # Override this method to do nothing, as no payments will need to be processed
4
+ def process_payments!
5
+ Rails.logger.info('process_payments! has been overridden by spree_pxpay_paymentmethod gem to do nothing')
6
+ end
7
+
8
+ end
@@ -1,3 +1,3 @@
1
1
  module SpreePxpayPaymentmethod
2
- VERSION = '2.1.0'
2
+ VERSION = '2.2.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_pxpay_paymentmethod
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0
4
+ version: 2.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - The Foundry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-07 00:00:00.000000000 Z
11
+ date: 2015-01-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_core
@@ -53,6 +53,7 @@ files:
53
53
  - app/controllers/checkout_controller_decorator.rb
54
54
  - app/controllers/px_pay_gateway_callback_controller.rb
55
55
  - app/models/spree/gateway/px_pay.rb
56
+ - app/models/spree/order_decorator.rb
56
57
  - app/views/spree/admin/payments/source_views/_pxpay.html.erb
57
58
  - config/routes.rb
58
59
  - lib/spree_pxpay_paymentmethod.rb
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
77
78
  version: '0'
78
79
  requirements: []
79
80
  rubyforge_project: spree_pxpay_paymentmethod
80
- rubygems_version: 2.2.2
81
+ rubygems_version: 2.2.0
81
82
  signing_key:
82
83
  specification_version: 4
83
84
  summary: Spree PXPay payment method