piggybak 0.4.21 → 0.4.22

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/VERSION +1 -1
  2. data/app/assets/images/ajax-loader.gif +0 -0
  3. data/app/assets/javascripts/piggybak.js +9 -1
  4. data/app/views/piggybak/orders/submit.html.erb +6 -0
  5. data/piggybak.gemspec +3 -2
  6. metadata +44 -43
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.21
1
+ 0.4.22
data/app/assets/javascripts/piggybak.js CHANGED
@@ -43,6 +43,8 @@ var piggybak = {
43
43
  update_shipping_options: function(field, block) {
44
44
  var shipping_field = $('#piggybak_order_shipments_attributes_0_shipping_method_id');
45
45
  shipping_field.hide();
46
+ $('#shipping_spinner').show();
47
+ $('#shipping_empty').hide();
46
48
  var shipping_data = {};
47
49
  $('#shipping_address input, #shipping_address select').each(function(i, j) {
48
50
  var id = $(j).attr('id');
@@ -65,11 +67,17 @@ var piggybak = {
65
67
  $.each(data, function(i, j) {
66
68
  shipping_field.append($('<option>').html(j.label).val(j.id).data('rate', j.rate));
67
69
  });
68
- shipping_field.show();
70
+ if(data.length == 0) {
71
+ shipping_field.hide();
72
+ $('#shipping_empty').show();
73
+ } else {
74
+ shipping_field.show();
75
+ }
69
76
  piggybak.update_totals();
70
77
  if(block) {
71
78
  block();
72
79
  }
80
+ $('#shipping_spinner').hide();
73
81
  }
74
82
  });
75
83
  },
data/app/views/piggybak/orders/submit.html.erb CHANGED
@@ -54,6 +54,12 @@
54
54
  <div class="item">
55
55
  <%= shipment.label :shipping_method_id %>
56
56
  <%= shipment.select :shipping_method_id, [] %>
57
+ <div id="shipping_spinner" style="display:none;">
58
+ <%= image_tag "ajax-loader.gif" %>
59
+ </div>
60
+ <div id="shipping_empty" style="display:none;">
61
+ No shipping methods found.
62
+ </div>
57
63
  </div>
58
64
  <% end -%>
59
65
  </div>
data/piggybak.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "piggybak"
8
- s.version = "0.4.21"
8
+ s.version = "0.4.22"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Steph Skardal", "Brian Buchalter"]
12
- s.date = "2012-07-23"
12
+ s.date = "2012-07-24"
13
13
  s.description = "Mountable ecommerce"
14
14
  s.email = "steph@endpoint.com"
15
15
  s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
24
24
  "README.md",
25
25
  "Rakefile",
26
26
  "VERSION",
27
+ "app/assets/images/ajax-loader.gif",
27
28
  "app/assets/javascripts/piggybak.js",
28
29
  "app/assets/javascripts/piggybak.states.js",
29
30
  "app/controllers/piggybak/cart_controller.rb",
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: piggybak
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.21
4
+ version: 0.4.22
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-07-23 00:00:00.000000000 Z
13
+ date: 2012-07-24 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: countries
17
- requirement: &22533300 !ruby/object:Gem::Requirement
17
+ requirement: &20041980 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: '0'
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *22533300
25
+ version_requirements: *20041980
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: bundler
28
- requirement: &22547360 !ruby/object:Gem::Requirement
28
+ requirement: &20040640 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: 1.0.0
34
34
  type: :development
35
35
  prerelease: false
36
- version_requirements: *22547360
36
+ version_requirements: *20040640
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: jeweler
39
- requirement: &22546120 !ruby/object:Gem::Requirement
39
+ requirement: &20039320 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: 1.6.4
45
45
  type: :development
46
46
  prerelease: false
47
- version_requirements: *22546120
47
+ version_requirements: *20039320
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: rspec
50
- requirement: &22544860 !ruby/object:Gem::Requirement
50
+ requirement: &20054320 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: '0'
56
56
  type: :development
57
57
  prerelease: false
58
- version_requirements: *22544860
58
+ version_requirements: *20054320
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: rspec-rails
61
- requirement: &22543840 !ruby/object:Gem::Requirement
61
+ requirement: &20053320 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ~>
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: 2.7.0
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *22543840
69
+ version_requirements: *20053320
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: factory_girl
72
- requirement: &22542960 !ruby/object:Gem::Requirement
72
+ requirement: &20051260 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: '0'
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *22542960
80
+ version_requirements: *20051260
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: diff-lcs
83
- requirement: &22542200 !ruby/object:Gem::Requirement
83
+ requirement: &20050480 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: '0'
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *22542200
91
+ version_requirements: *20050480
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: shoulda
94
- requirement: &22541440 !ruby/object:Gem::Requirement
94
+ requirement: &20049580 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: '0'
100
100
  type: :development
101
101
  prerelease: false
102
- version_requirements: *22541440
102
+ version_requirements: *20049580
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: simplecov
105
- requirement: &22540500 !ruby/object:Gem::Requirement
105
+ requirement: &20047800 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: '0'
111
111
  type: :development
112
112
  prerelease: false
113
- version_requirements: *22540500
113
+ version_requirements: *20047800
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: tzinfo
116
- requirement: &22539560 !ruby/object:Gem::Requirement
116
+ requirement: &20062460 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: '0'
122
122
  type: :development
123
123
  prerelease: false
124
- version_requirements: *22539560
124
+ version_requirements: *20062460
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: devise
127
- requirement: &22554460 !ruby/object:Gem::Requirement
127
+ requirement: &20061440 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
132
132
  version: '0'
133
133
  type: :development
134
134
  prerelease: false
135
- version_requirements: *22554460
135
+ version_requirements: *20061440
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: rails_admin
138
- requirement: &22553360 !ruby/object:Gem::Requirement
138
+ requirement: &20060400 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
143
143
  version: '0'
144
144
  type: :runtime
145
145
  prerelease: false
146
- version_requirements: *22553360
146
+ version_requirements: *20060400
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: devise
149
- requirement: &22551700 !ruby/object:Gem::Requirement
149
+ requirement: &20059380 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
154
154
  version: '0'
155
155
  type: :runtime
156
156
  prerelease: false
157
- version_requirements: *22551700
157
+ version_requirements: *20059380
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: activemerchant
160
- requirement: &22550000 !ruby/object:Gem::Requirement
160
+ requirement: &20058720 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
165
165
  version: '0'
166
166
  type: :runtime
167
167
  prerelease: false
168
- version_requirements: *22550000
168
+ version_requirements: *20058720
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: countries
171
- requirement: &22548840 !ruby/object:Gem::Requirement
171
+ requirement: &20057880 !ruby/object:Gem::Requirement
172
172
  none: false
173
173
  requirements:
174
174
  - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
176
176
  version: '0'
177
177
  type: :runtime
178
178
  prerelease: false
179
- version_requirements: *22548840
179
+ version_requirements: *20057880
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: rspec
182
- requirement: &22563100 !ruby/object:Gem::Requirement
182
+ requirement: &20056300 !ruby/object:Gem::Requirement
183
183
  none: false
184
184
  requirements:
185
185
  - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
187
187
  version: '0'
188
188
  type: :development
189
189
  prerelease: false
190
- version_requirements: *22563100
190
+ version_requirements: *20056300
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: rspec-rails
193
- requirement: &22561740 !ruby/object:Gem::Requirement
193
+ requirement: &20069240 !ruby/object:Gem::Requirement
194
194
  none: false
195
195
  requirements:
196
196
  - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
198
198
  version: '0'
199
199
  type: :development
200
200
  prerelease: false
201
- version_requirements: *22561740
201
+ version_requirements: *20069240
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: diff-lcs
204
- requirement: &22560500 !ruby/object:Gem::Requirement
204
+ requirement: &20064740 !ruby/object:Gem::Requirement
205
205
  none: false
206
206
  requirements:
207
207
  - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
209
209
  version: '0'
210
210
  type: :development
211
211
  prerelease: false
212
- version_requirements: *22560500
212
+ version_requirements: *20064740
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: factory_girl
215
- requirement: &22558980 !ruby/object:Gem::Requirement
215
+ requirement: &20077280 !ruby/object:Gem::Requirement
216
216
  none: false
217
217
  requirements:
218
218
  - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
220
220
  version: '0'
221
221
  type: :development
222
222
  prerelease: false
223
- version_requirements: *22558980
223
+ version_requirements: *20077280
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: shoulda
226
- requirement: &22557620 !ruby/object:Gem::Requirement
226
+ requirement: &20073660 !ruby/object:Gem::Requirement
227
227
  none: false
228
228
  requirements:
229
229
  - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
231
231
  version: '0'
232
232
  type: :development
233
233
  prerelease: false
234
- version_requirements: *22557620
234
+ version_requirements: *20073660
235
235
  description: Mountable ecommerce
236
236
  email: steph@endpoint.com
237
237
  executables: []
@@ -247,6 +247,7 @@ files:
247
247
  - README.md
248
248
  - Rakefile
249
249
  - VERSION
250
+ - app/assets/images/ajax-loader.gif
250
251
  - app/assets/javascripts/piggybak.js
251
252
  - app/assets/javascripts/piggybak.states.js
252
253
  - app/controllers/piggybak/cart_controller.rb
@@ -399,7 +400,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
399
400
  version: '0'
400
401
  segments:
401
402
  - 0
402
- hash: 3721385586488353139
403
+ hash: 519102918301470051
403
404
  required_rubygems_version: !ruby/object:Gem::Requirement
404
405
  none: false
405
406
  requirements: