spree_core 1.1.4 → 1.1.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.
Files changed (8) hide show
  1. data/app/models/spree/product.rb +1 -1
  2. data/app/views/spree/admin/products/_form.html.erb +0 -0
  3. data/app/views/spree/admin/shared/_order_tabs.html.erb +1 -1
  4. data/app/views/spree/admin/shipping_methods/_form.html.erb +1 -1
  5. data/app/views/spree/checkout/payment/_gateway.html.erb +2 -2
  6. data/lib/spree/core/controller_helpers.rb +2 -2
  7. data/lib/spree/core/version.rb +1 -1
  8. metadata +127 -40
data/app/models/spree/product.rb CHANGED
@@ -37,7 +37,7 @@ module Spree
37
37
  has_many :variants,
38
38
  :class_name => 'Spree::Variant',
39
39
  :conditions => { :is_master => false, :deleted_at => nil },
40
- :order => :position
40
+ :order => "#{::Spree::Variant.quoted_table_name}.position ASC"
41
41
 
42
42
  has_many :variants_including_master,
43
43
  :class_name => 'Spree::Variant',
data/app/views/spree/admin/products/_form.html.erb CHANGED
File without changes
data/app/views/spree/admin/shared/_order_tabs.html.erb CHANGED
@@ -6,7 +6,7 @@
6
6
  <h5 id="order_status" data-hook><%= t(:status) %>: <%= t(@order.state, :scope => :order_state) %></h5>
7
7
  <h5 id="order_total" data-hook><%= t(:total) %>: <%= number_to_currency @order.total %></h5>
8
8
  <% if @order.completed? %>
9
- <h5 id="shipment_status"><%= t(:shipment) %>: <%= t(@order.shipment_state, :scope => :shipment_state, :default => [:missing, "none"]) %></h5>
9
+ <h5 id="shipment_status"><%= t(:shipment) %>: <%= t(@order.shipment_state, :scope => :shipment_states, :default => [:missing, "none"]) %></h5>
10
10
  <h5 id="payment_status"><%= t(:payment) %>: <%= t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></h5>
11
11
  <% end %>
12
12
  <br class="clear" />
data/app/views/spree/admin/shipping_methods/_form.html.erb CHANGED
@@ -18,7 +18,7 @@
18
18
  <% end %>
19
19
  </div>
20
20
 
21
- <div data-hook"admin_shipping_method_form_availability_fields">
21
+ <div data-hook="admin_shipping_method_form_availability_fields">
22
22
  <fieldset class="categories">
23
23
  <legend><%= t(:availability) %></legend>
24
24
  <%= f.field_container :shipping_category do %>
data/app/views/spree/checkout/payment/_gateway.html.erb CHANGED
@@ -15,8 +15,8 @@
15
15
  </p>
16
16
  <p class="field" data-hook="card_expiration">
17
17
  <%= label_tag nil, t(:expiration) %><br />
18
- <%= select_month(Date.today, :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true, :class => 'required') %>
19
- <%= select_year(Date.today, :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') %>
18
+ <%= select_month(Date.today, { :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true }, :class => 'required') %>
19
+ <%= select_year(Date.today, { :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15 }, :class => 'required') %>
20
20
  <span class="required">*</span>
21
21
  </p>
22
22
  <p class="field" data-hook="card_code">
data/lib/spree/core/controller_helpers.rb CHANGED
@@ -87,8 +87,8 @@ module Spree
87
87
  locale = session[:locale]
88
88
  locale ||= Spree::Config[:default_locale] unless Spree::Config[:default_locale].blank?
89
89
  locale ||= Rails.application.config.i18n.default_locale
90
- locale ||= I18n.default_locale unless I18n.available_locales.include?(locale.to_sym)
91
- I18n.locale = locale.to_sym
90
+ locale ||= I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale)
91
+ I18n.locale = locale
92
92
  end
93
93
 
94
94
  # Returns which layout to render.
data/lib/spree/core/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Spree
2
2
  def self.version
3
- "1.1.4"
3
+ "1.1.5"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.4
4
+ version: 1.1.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,33 +9,43 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-11-19 00:00:00.000000000 Z
12
+ date: 2013-02-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: acts_as_list
16
- requirement: &70334457829140 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
- - - =
19
+ - - '='
20
20
  - !ruby/object:Gem::Version
21
21
  version: 0.1.4
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70334457829140
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - '='
28
+ - !ruby/object:Gem::Version
29
+ version: 0.1.4
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: nested_set
27
- requirement: &70334457846380 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
- - - =
35
+ - - '='
31
36
  - !ruby/object:Gem::Version
32
37
  version: 1.7.0
33
38
  type: :runtime
34
39
  prerelease: false
35
- version_requirements: *70334457846380
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - '='
44
+ - !ruby/object:Gem::Version
45
+ version: 1.7.0
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: jquery-rails
38
- requirement: &70334457842160 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ~>
@@ -43,32 +53,47 @@ dependencies:
43
53
  version: '2.0'
44
54
  type: :runtime
45
55
  prerelease: false
46
- version_requirements: *70334457842160
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: '2.0'
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: highline
49
- requirement: &70334457856540 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
- - - =
67
+ - - '='
53
68
  - !ruby/object:Gem::Version
54
69
  version: 1.6.11
55
70
  type: :runtime
56
71
  prerelease: false
57
- version_requirements: *70334457856540
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - '='
76
+ - !ruby/object:Gem::Version
77
+ version: 1.6.11
58
78
  - !ruby/object:Gem::Dependency
59
79
  name: state_machine
60
- requirement: &70334457855080 !ruby/object:Gem::Requirement
80
+ requirement: !ruby/object:Gem::Requirement
61
81
  none: false
62
82
  requirements:
63
- - - =
83
+ - - '='
64
84
  - !ruby/object:Gem::Version
65
85
  version: 1.1.2
66
86
  type: :runtime
67
87
  prerelease: false
68
- version_requirements: *70334457855080
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - '='
92
+ - !ruby/object:Gem::Version
93
+ version: 1.1.2
69
94
  - !ruby/object:Gem::Dependency
70
95
  name: ffaker
71
- requirement: &70334457852720 !ruby/object:Gem::Requirement
96
+ requirement: !ruby/object:Gem::Requirement
72
97
  none: false
73
98
  requirements:
74
99
  - - ~>
@@ -76,10 +101,15 @@ dependencies:
76
101
  version: 1.12.0
77
102
  type: :runtime
78
103
  prerelease: false
79
- version_requirements: *70334457852720
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ~>
108
+ - !ruby/object:Gem::Version
109
+ version: 1.12.0
80
110
  - !ruby/object:Gem::Dependency
81
111
  name: paperclip
82
- requirement: &70334457878300 !ruby/object:Gem::Requirement
112
+ requirement: !ruby/object:Gem::Requirement
83
113
  none: false
84
114
  requirements:
85
115
  - - ~>
@@ -87,10 +117,15 @@ dependencies:
87
117
  version: '2.8'
88
118
  type: :runtime
89
119
  prerelease: false
90
- version_requirements: *70334457878300
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - ~>
124
+ - !ruby/object:Gem::Version
125
+ version: '2.8'
91
126
  - !ruby/object:Gem::Dependency
92
127
  name: aws-sdk
93
- requirement: &70334457876360 !ruby/object:Gem::Requirement
128
+ requirement: !ruby/object:Gem::Requirement
94
129
  none: false
95
130
  requirements:
96
131
  - - ~>
@@ -98,10 +133,15 @@ dependencies:
98
133
  version: 1.3.4
99
134
  type: :runtime
100
135
  prerelease: false
101
- version_requirements: *70334457876360
136
+ version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
138
+ requirements:
139
+ - - ~>
140
+ - !ruby/object:Gem::Version
141
+ version: 1.3.4
102
142
  - !ruby/object:Gem::Dependency
103
143
  name: ransack
104
- requirement: &70334457875260 !ruby/object:Gem::Requirement
144
+ requirement: !ruby/object:Gem::Requirement
105
145
  none: false
106
146
  requirements:
107
147
  - - ~>
@@ -109,43 +149,79 @@ dependencies:
109
149
  version: 0.6.0
110
150
  type: :runtime
111
151
  prerelease: false
112
- version_requirements: *70334457875260
152
+ version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
154
+ requirements:
155
+ - - ~>
156
+ - !ruby/object:Gem::Version
157
+ version: 0.6.0
113
158
  - !ruby/object:Gem::Dependency
114
159
  name: activemerchant
115
- requirement: &70334457874320 !ruby/object:Gem::Requirement
160
+ requirement: !ruby/object:Gem::Requirement
161
+ none: false
162
+ requirements:
163
+ - - '='
164
+ - !ruby/object:Gem::Version
165
+ version: 1.28.0
166
+ type: :runtime
167
+ prerelease: false
168
+ version_requirements: !ruby/object:Gem::Requirement
116
169
  none: false
117
170
  requirements:
118
- - - =
171
+ - - '='
119
172
  - !ruby/object:Gem::Version
120
173
  version: 1.28.0
174
+ - !ruby/object:Gem::Dependency
175
+ name: money
176
+ requirement: !ruby/object:Gem::Requirement
177
+ none: false
178
+ requirements:
179
+ - - '='
180
+ - !ruby/object:Gem::Version
181
+ version: 5.0.0
121
182
  type: :runtime
122
183
  prerelease: false
123
- version_requirements: *70334457874320
184
+ version_requirements: !ruby/object:Gem::Requirement
185
+ none: false
186
+ requirements:
187
+ - - '='
188
+ - !ruby/object:Gem::Version
189
+ version: 5.0.0
124
190
  - !ruby/object:Gem::Dependency
125
191
  name: rails
126
- requirement: &70334457873700 !ruby/object:Gem::Requirement
192
+ requirement: !ruby/object:Gem::Requirement
127
193
  none: false
128
194
  requirements:
129
195
  - - ~>
130
196
  - !ruby/object:Gem::Version
131
- version: 3.2.9
197
+ version: 3.2.11
132
198
  type: :runtime
133
199
  prerelease: false
134
- version_requirements: *70334457873700
200
+ version_requirements: !ruby/object:Gem::Requirement
201
+ none: false
202
+ requirements:
203
+ - - ~>
204
+ - !ruby/object:Gem::Version
205
+ version: 3.2.11
135
206
  - !ruby/object:Gem::Dependency
136
207
  name: kaminari
137
- requirement: &70334457873080 !ruby/object:Gem::Requirement
208
+ requirement: !ruby/object:Gem::Requirement
138
209
  none: false
139
210
  requirements:
140
- - - =
211
+ - - '='
141
212
  - !ruby/object:Gem::Version
142
213
  version: 0.13.0
143
214
  type: :runtime
144
215
  prerelease: false
145
- version_requirements: *70334457873080
216
+ version_requirements: !ruby/object:Gem::Requirement
217
+ none: false
218
+ requirements:
219
+ - - '='
220
+ - !ruby/object:Gem::Version
221
+ version: 0.13.0
146
222
  - !ruby/object:Gem::Dependency
147
223
  name: deface
148
- requirement: &70334457872360 !ruby/object:Gem::Requirement
224
+ requirement: !ruby/object:Gem::Requirement
149
225
  none: false
150
226
  requirements:
151
227
  - - ! '>='
@@ -153,10 +229,15 @@ dependencies:
153
229
  version: 0.9.0
154
230
  type: :runtime
155
231
  prerelease: false
156
- version_requirements: *70334457872360
232
+ version_requirements: !ruby/object:Gem::Requirement
233
+ none: false
234
+ requirements:
235
+ - - ! '>='
236
+ - !ruby/object:Gem::Version
237
+ version: 0.9.0
157
238
  - !ruby/object:Gem::Dependency
158
239
  name: stringex
159
- requirement: &70334457871700 !ruby/object:Gem::Requirement
240
+ requirement: !ruby/object:Gem::Requirement
160
241
  none: false
161
242
  requirements:
162
243
  - - ~>
@@ -164,7 +245,12 @@ dependencies:
164
245
  version: 1.3.2
165
246
  type: :runtime
166
247
  prerelease: false
167
- version_requirements: *70334457871700
248
+ version_requirements: !ruby/object:Gem::Requirement
249
+ none: false
250
+ requirements:
251
+ - - ~>
252
+ - !ruby/object:Gem::Version
253
+ version: 1.3.2
168
254
  description: Required dependency for Spree
169
255
  email: sean@spreecommerce.com
170
256
  executables: []
@@ -953,7 +1039,8 @@ files:
953
1039
  - vendor/assets/stylesheets/jquery.formalize.css.erb
954
1040
  - vendor/assets/stylesheets/skeleton.css
955
1041
  homepage: http://spreecommerce.com
956
- licenses: []
1042
+ licenses:
1043
+ - BSD-3
957
1044
  post_install_message:
958
1045
  rdoc_options: []
959
1046
  require_paths:
@@ -972,11 +1059,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
972
1059
  version: '0'
973
1060
  segments:
974
1061
  - 0
975
- hash: -1981517253698531698
1062
+ hash: 498938973800097223
976
1063
  requirements:
977
1064
  - none
978
1065
  rubyforge_project: spree_core
979
- rubygems_version: 1.8.10
1066
+ rubygems_version: 1.8.23
980
1067
  signing_key:
981
1068
  specification_version: 3
982
1069
  summary: Core e-commerce functionality for the Spree project.