dinislage/spree_digital
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating copied templates from spree

Browse Source
This commit is contained in:
Michael Bianco
2012-05-01 11:45:53 -04:00
parent 648f412ceb
commit 596006e8e1
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/spree/checkout/_delivery_digital.html.erb
View File

@@ -1,9 +1,12 @@
<fieldset id='shipping_method'>
<legend><%= t("shipping_method") %></legend>
<%= radio_button :order, :shipping_method_id, @order.digital_shipping_method[:id] %>
<%==t 'digital_shipping', :email => current_user.email %> (<%= number_to_currency @order.digital_shipping_method[:cost] %>)
<div class="inner" data-hook="shipping_method_inner">
<div id="methods">
<p class="field radios">
<%= radio_button :order, :shipping_method_id, @order.digital_shipping_method[:id] %>
<%==t 'digital_shipping', :email => current_user.email %> (<%= number_to_currency @order.digital_shipping_method[:cost] %>)
</p>
</div>
</div>
</fieldset>

26
app/views/spree/checkout/_delivery_original.html.erb
View File

@@ -4,29 +4,35 @@
Feel free to update the code below according to the original if needed!
%>
<fieldset id='shipping_method'>
<legend><%= t("shipping_method") %></legend>
<div class="inner">
<fieldset id='shipping_method' data-hook>
<legend><%= t(:shipping_method) %></legend>
<div class="inner" data-hook="shipping_method_inner">
<div id="methods">
<p class="field radios">
<% @order.rate_hash.each do |shipping_method| %>
<% next if @order.digital_shipping_method && shipping_method[:id] == @order.digital_shipping_method[:id] %>
<% next if @order.digital_shipping_method && shipping_method[:id] == @order.digital_shipping_method[:id] %>
<label>
<%= radio_button(:order, :shipping_method_id, shipping_method[:id]) %>
<% if Spree::Config[:shipment_inc_vat] %>
<%= shipping_method[:name] %> <%= format_price (1 + Spree::TaxRate.default) * shipping_method[:cost] %>
<% else %>
<%= shipping_method[:name] %> <%= number_to_currency shipping_method[:cost] %>
</label><br />
<% end %>
</label>
<% end %>
</p>
</div>
<% if Spree::Config[:shipping_instructions] && @order.rate_hash.present? %>
<p id="minstrs">
<%= form.label :special_instructions, t("shipping_instructions") %><br />
<p id="minstrs" data-hook>
<%= form.label :special_instructions, t(:shipping_instructions) %><br />
<%= form.text_area :special_instructions, :cols => 40, :rows => 7 %>
</p>
<% end %>
</div>
</fieldset>
<div class="form-buttons">
<input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>"/>
</div>
<br />
<div class="form-buttons" data-hook="buttons">
<%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
</div>