piggybak 0.4.24 → 0.4.25

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/VERSION +1 -1
  2. data/app/assets/javascripts/piggybak.js +19 -0
  3. data/app/views/piggybak/orders/_address_form.html.erb +8 -8
  4. data/piggybak.gemspec +2 -2
  5. metadata +43 -43
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.24
1
+ 0.4.25
data/app/assets/javascripts/piggybak.js CHANGED
@@ -41,9 +41,28 @@ var piggybak = {
41
41
  $('#piggybak_order_shipping_address_attributes_state_id').val(state);
42
42
  });
43
43
  },
44
+ valid_shipping_address: function() {
45
+ var empty = 0;
46
+ $('#shipping_address input.required, #shipping_address select.required').each(function(i, j) {
47
+ if($(j).val() == '') {
48
+ empty+=1;
49
+ }
50
+ });
51
+ if(empty > 0) {
52
+ return false;
53
+ } else {
54
+ return true;
55
+ }
56
+ },
44
57
  update_shipping_options: function(field, block) {
45
58
  var shipping_field = $('#piggybak_order_shipments_attributes_0_shipping_method_id');
46
59
  shipping_field.hide();
60
+ if(page_load && !piggybak.valid_shipping_address()) {
61
+ page_load = 0;
62
+ shipping_field.hide();
63
+ $('#shipping_default').show();
64
+ return;
65
+ }
47
66
  $('#shipping_spinner').show();
48
67
  $('#shipping_empty,#shipping_default').hide();
49
68
  var shipping_data = {};
data/app/views/piggybak/orders/_address_form.html.erb CHANGED
@@ -1,14 +1,14 @@
1
1
  <div class="item">
2
2
  <%= address.label :firstname %>
3
- <%= address.text_field :firstname %>
3
+ <%= address.text_field :firstname, :class => "required" %>
4
4
  </div>
5
5
  <div class="item">
6
6
  <%= address.label :lastname %>
7
- <%= address.text_field :lastname %>
7
+ <%= address.text_field :lastname, :class => "required" %>
8
8
  </div>
9
9
  <div class="item">
10
10
  <%= address.label :address1, "Address" %>
11
- <%= address.text_field :address1 %>
11
+ <%= address.text_field :address1, :class => "required" %>
12
12
  </div>
13
13
  <div class="item">
14
14
  <%= address.label :address2, "Address cont." %>
@@ -16,21 +16,21 @@
16
16
  </div>
17
17
  <div class="item">
18
18
  <%= address.label :city %>
19
- <%= address.text_field :city %>
19
+ <%= address.text_field :city, :class => "required" %>
20
20
  </div>
21
21
  <div class="item">
22
22
  <%= address.label :country_id %>
23
- <%= address.collection_select :country_id, Piggybak::Country.send(type), :id, :name, { :selected => address.object.country_id.to_s } %>
23
+ <%= address.collection_select :country_id, Piggybak::Country.send(type), :id, :name, { :selected => address.object.country_id.to_s }, :class => "required" %>
24
24
  </div>
25
25
  <div class="item">
26
26
  <%= address.label :state_id %>
27
27
  <% if address.object.country.states.any? -%>
28
- <%= address.collection_select :state_id, address.object.country.states, :id, :name, { :selected => address.object.state_id.to_s } %>
28
+ <%= address.collection_select :state_id, address.object.country.states, :id, :name, { :selected => address.object.state_id.to_s }, :class => "required" %>
29
29
  <% else -%>
30
- <%= address.text_field :state_id %>
30
+ <%= address.text_field :state_id, :class => "required" %>
31
31
  <% end -%>
32
32
  </div>
33
33
  <div class="item">
34
34
  <%= address.label :zip %>
35
- <%= address.text_field :zip %>
35
+ <%= address.text_field :zip, :class => "required" %>
36
36
  </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.24"
8
+ s.version = "0.4.25"
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-30"
12
+ s.date = "2012-08-02"
13
13
  s.description = "Mountable ecommerce"
14
14
  s.email = "steph@endpoint.com"
15
15
  s.extra_rdoc_files = [
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.24
4
+ version: 0.4.25
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-30 00:00:00.000000000 Z
13
+ date: 2012-08-02 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: countries
17
- requirement: &24191480 !ruby/object:Gem::Requirement
17
+ requirement: &15473840 !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: *24191480
25
+ version_requirements: *15473840
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: bundler
28
- requirement: &24190920 !ruby/object:Gem::Requirement
28
+ requirement: &15473340 !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: *24190920
36
+ version_requirements: *15473340
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: jeweler
39
- requirement: &24189540 !ruby/object:Gem::Requirement
39
+ requirement: &15472800 !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: *24189540
47
+ version_requirements: *15472800
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: rspec
50
- requirement: &24189060 !ruby/object:Gem::Requirement
50
+ requirement: &15472260 !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: *24189060
58
+ version_requirements: *15472260
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: rspec-rails
61
- requirement: &24188580 !ruby/object:Gem::Requirement
61
+ requirement: &15471780 !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: *24188580
69
+ version_requirements: *15471780
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: factory_girl
72
- requirement: &24188080 !ruby/object:Gem::Requirement
72
+ requirement: &15471300 !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: *24188080
80
+ version_requirements: *15471300
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: diff-lcs
83
- requirement: &24187540 !ruby/object:Gem::Requirement
83
+ requirement: &15470820 !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: *24187540
91
+ version_requirements: *15470820
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: shoulda
94
- requirement: &24187040 !ruby/object:Gem::Requirement
94
+ requirement: &15470300 !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: *24187040
102
+ version_requirements: *15470300
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: simplecov
105
- requirement: &24186500 !ruby/object:Gem::Requirement
105
+ requirement: &15469800 !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: *24186500
113
+ version_requirements: *15469800
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: tzinfo
116
- requirement: &24185960 !ruby/object:Gem::Requirement
116
+ requirement: &15469320 !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: *24185960
124
+ version_requirements: *15469320
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: devise
127
- requirement: &24185480 !ruby/object:Gem::Requirement
127
+ requirement: &15468820 !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: *24185480
135
+ version_requirements: *15468820
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: rails_admin
138
- requirement: &24185000 !ruby/object:Gem::Requirement
138
+ requirement: &15468300 !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: *24185000
146
+ version_requirements: *15468300
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: devise
149
- requirement: &24184520 !ruby/object:Gem::Requirement
149
+ requirement: &15467780 !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: *24184520
157
+ version_requirements: *15467780
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: activemerchant
160
- requirement: &24184000 !ruby/object:Gem::Requirement
160
+ requirement: &15467260 !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: *24184000
168
+ version_requirements: *15467260
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: countries
171
- requirement: &24183500 !ruby/object:Gem::Requirement
171
+ requirement: &15483160 !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: *24183500
179
+ version_requirements: *15483160
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: rspec
182
- requirement: &24335720 !ruby/object:Gem::Requirement
182
+ requirement: &15482660 !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: *24335720
190
+ version_requirements: *15482660
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: rspec-rails
193
- requirement: &24335220 !ruby/object:Gem::Requirement
193
+ requirement: &15482180 !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: *24335220
201
+ version_requirements: *15482180
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: diff-lcs
204
- requirement: &24334700 !ruby/object:Gem::Requirement
204
+ requirement: &15481680 !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: *24334700
212
+ version_requirements: *15481680
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: factory_girl
215
- requirement: &24334180 !ruby/object:Gem::Requirement
215
+ requirement: &15481200 !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: *24334180
223
+ version_requirements: *15481200
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: shoulda
226
- requirement: &24333660 !ruby/object:Gem::Requirement
226
+ requirement: &15480720 !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: *24333660
234
+ version_requirements: *15480720
235
235
  description: Mountable ecommerce
236
236
  email: steph@endpoint.com
237
237
  executables: []
@@ -400,7 +400,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
400
400
  version: '0'
401
401
  segments:
402
402
  - 0
403
- hash: 2497995189155694243
403
+ hash: 2243278405720579316
404
404
  required_rubygems_version: !ruby/object:Gem::Requirement
405
405
  none: false
406
406
  requirements: