Spree 1.1 compatibility. Minor fix to shipping option filtering in checkout process
This commit is contained in:
1 parent
c5f0c79a03
commit
a8c27750ef
2 files changed
+2
-3
No files matched your search
@@ -20,10 +20,9 @@ Deface::Override.new(:virtual_path => "spree/checkout/_delivery",
|
|||||||
<%== t 'digital_shipping', :email => @order.email %> (<%= number_to_currency @order.digital_shipping_method[:cost] %>)
|
<%== t 'digital_shipping', :email => @order.email %> (<%= number_to_currency @order.digital_shipping_method[:cost] %>)
|
||||||
</label>
|
</label>
|
||||||
<% else %>
|
<% else %>
|
||||||
<% filtered_rate_hash = @order.rate_hash.select { |m| !(@order.digital_shipping_method && shipping_method[:id] == @order.digital_shipping_method[:id]) } %>
|
<% filtered_rate_hash = @order.rate_hash.select { |m| !(@order.digital_shipping_method && m[:id] == @order.digital_shipping_method[:id]) } %>
|
||||||
<% if filtered_rate_hash.count > 0 %>
|
<% if filtered_rate_hash.count > 0 %>
|
||||||
<% filtered_rate_hash.each do |shipping_method| %>
|
<% filtered_rate_hash.each do |shipping_method| %>
|
||||||
<% next if @order.digital_shipping_method && shipping_method[:id] == @order.digital_shipping_method[:id] %>
|
|
||||||
<label>
|
<label>
|
||||||
<%= radio_button(:order, :shipping_method_id, shipping_method[:id]) %>
|
<%= radio_button(:order, :shipping_method_id, shipping_method[:id]) %>
|
||||||
<% if Spree::Config[:shipment_inc_vat] %>
|
<% if Spree::Config[:shipment_inc_vat] %>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
|
|||||||
s.require_path = 'lib'
|
s.require_path = 'lib'
|
||||||
s.requirements << 'none'
|
s.requirements << 'none'
|
||||||
s.required_ruby_version = '>= 1.8.7'
|
s.required_ruby_version = '>= 1.8.7'
|
||||||
s.add_dependency('spree_core', '~> 1.0.0')
|
s.add_dependency('spree_core', '>= 1.0.0')
|
||||||
|
|
||||||
# test suite
|
# test suite
|
||||||
s.add_development_dependency 'shoulda-matchers'
|
s.add_development_dependency 'shoulda-matchers'
|
||||||
|
|||||||
Reference in new issue
Block a user