spree_core 0.60.4 → 0.60.5

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.
@@ -69,9 +69,15 @@ class Payment < ActiveRecord::Base
69
69
  end
70
70
 
71
71
  def process!
72
- if !processing? and source and source.respond_to?(:process!)
73
- started_processing!
74
- source.process!(self) # source is responsible for updating the payment state when it's done processing
72
+ if payment_method && payment_method.source_required?
73
+ if source
74
+ if !processing? && source.respond_to?(:process!)
75
+ started_processing!
76
+ source.process!(self) # source is responsible for updating the payment state when it's done processing
77
+ end
78
+ else
79
+ raise Spree::GatewayError.new(I18n.t(:payment_processing_failed))
80
+ end
75
81
  end
76
82
  end
77
83
 
@@ -1,5 +1,5 @@
1
1
  module Spree
2
2
  def self.version
3
- "0.60.4"
3
+ "0.60.5"
4
4
  end
5
5
  end
@@ -12,29 +12,28 @@ $j(function() {
12
12
  })
13
13
 
14
14
  var show_country = function() {
15
- $j('#state_members :input').each(function() { $(this).disable(); })
15
+ $j('#state_members :input').each(function() { $(this).attr('disabled','disabled'); })
16
16
  $j('#state_members').hide();
17
- $j('#zone_members :input').each(function() { $(this).disable(); })
17
+ $j('#zone_members :input').each(function() { $(this).attr('disabled','disabled'); })
18
18
  $j('#zone_members').hide();
19
- $j('#country_members :input').each(function() { $(this).enable(); })
19
+ $j('#country_members :input').each(function() { $(this).removeAttr('disabled'); })
20
20
  $j('#country_members').show();
21
21
  };
22
22
 
23
23
  var show_state = function() {
24
- $j('#country_members :input').each(function() { $(this).disable(); })
24
+ $j('#country_members :input').each(function() { $(this).attr('disabled','disabled'); })
25
25
  $j('#country_members').hide();
26
- $j('#zone_members :input').each(function() { $(this).disable(); })
26
+ $j('#zone_members :input').each(function() { $(this).attr('disabled','disabled'); })
27
27
  $j('#zone_members').hide();
28
- $j('#state_members :input').each(function() { $(this).enable(); })
28
+ $j('#state_members :input').each(function() { $(this).removeAttr('disabled'); })
29
29
  $j('#state_members').show();
30
30
  };
31
31
 
32
32
  var show_zone = function() {
33
- $j('#state_members :input').each(function() { $(this).disable(); })
33
+ $j('#state_members :input').each(function() { $(this).attr('disabled','disabled'); })
34
34
  $j('#state_members').hide();
35
- $j('#country_members :input').each(function() { $(this).disable(); })
35
+ $j('#country_members :input').each(function() { $(this).attr('disabled','disabled'); })
36
36
  $j('#country_members').hide();
37
- $j('#zone_members :input').each(function() { $(this).enable(); })
37
+ $j('#zone_members :input').each(function() { $(this).removeAttr('disabled'); })
38
38
  $j('#zone_members').show();
39
- };
40
-
39
+ };
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- hash: 231
4
+ hash: 229
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 60
9
- - 4
10
- version: 0.60.4
9
+ - 5
10
+ version: 0.60.5
11
11
  platform: ruby
12
12
  authors:
13
13
  - Sean Schofield
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-10-21 00:00:00 Z
18
+ date: 2012-03-04 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  version_requirements: &id001 !ruby/object:Gem::Requirement
@@ -213,13 +213,12 @@ dependencies:
213
213
  requirements:
214
214
  - - "="
215
215
  - !ruby/object:Gem::Version
216
- hash: 1923831917
216
+ hash: 3
217
217
  segments:
218
218
  - 3
219
219
  - 0
220
- - pre
221
220
  - 2
222
- version: 3.0.pre2
221
+ version: 3.0.2
223
222
  requirement: *id013
224
223
  type: :runtime
225
224
  prerelease: false
@@ -228,7 +227,7 @@ dependencies:
228
227
  version_requirements: &id014 !ruby/object:Gem::Requirement
229
228
  none: false
230
229
  requirements:
231
- - - "="
230
+ - - ">="
232
231
  - !ruby/object:Gem::Version
233
232
  hash: 19
234
233
  segments:
@@ -236,6 +235,14 @@ dependencies:
236
235
  - 0
237
236
  - 10
238
237
  version: 3.0.10
238
+ - - <=
239
+ - !ruby/object:Gem::Version
240
+ hash: 31
241
+ segments:
242
+ - 3
243
+ - 0
244
+ - 12
245
+ version: 3.0.12
239
246
  requirement: *id014
240
247
  type: :runtime
241
248
  prerelease: false