spree_core 1.3.2 → 1.3.3

data/app/views/spree/admin/shared/_order_details.html.erb

@@ -8,10 +8,10 @@
     </tr>
   </thead>
   <tbody>
-    <% @order.line_items.each do |item| %>
+    <% order.line_items.each do |item| %>
       <tr data-hook="order_details_line_item_row" class="<%= cycle('odd', 'even')%>">
         <td width="300"><%= item.variant.product.name %> <%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %></td>
-        <td class="price"><%= item.variant.display_amount %></td>
+        <td class="price"><%= item.single_money %></td>
         <td class="qty"><%= item.quantity %></td>
         <td class="total"><span><%= item.display_amount %></span></td>
       </tr>
@@ -20,11 +20,11 @@
   <tbody id="subtotal" data-hook="order_details_subtotal"  class="with-border">
     <tr class="total" id="subtotal-row">
       <td colspan="3"><b><%= t(:subtotal) %>:</b></td>
-      <td class="total"><span><%= @order.display_item_total %></span></td>
+      <td class="total"><span><%= order.display_item_total %></span></td>
     </tr>
   </tbody>
   <tbody id="order-charges" data-hook="order_details_adjustments"  class="with-border">
-    <% @order.adjustments.eligible.each do |adjustment| %>
+    <% order.adjustments.eligible.each do |adjustment| %>
     <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
       <tr class="total">
         <td colspan="3"><strong><%= adjustment.label %>:</strong></td>
@@ -35,12 +35,12 @@
   <tbody id="order-total" data-hook="order_details_total" class="with-border grand-total">
     <tr>
       <td colspan="3" ><%= t(:order_total) %>:</td>
-      <td class="total" id="order-total"><span id="order_total"><%= @order.display_total %></span></td>
+      <td class="total" id="order-total"><span id="order_display_total"><%= order.display_total %></span></td>
     </tr>
   </tbody>
   <% if order.price_adjustment_totals.present? %>
     <tbody id="price-adjustments" data-hook="order_details_price_adjustments">
-      <% @order.price_adjustment_totals.each do |label, total| %>
+      <% order.price_adjustment_totals.each do |label, total| %>
         <tr>
           <td colspan="3"><strong><%= label %></strong></td>
           <td class="total"><span><%= total %></span></td>

data/app/views/spree/admin/shared/_order_tabs.html.erb

@@ -12,7 +12,7 @@
       <dt id="order_status" data-hook><%= t(:status) %>:</dt>
       <dd><span class="state <%= @order.state %>"><%= t(@order.state, :scope => :order_state) %></span></dd>
       <dt data-hook><%= t(:total) %>:</dt>
-      <dd id='order_total'><%= @order.display_total %></dd>
+      <dd id='order_total'><%= @order.display_total.to_html %></dd>
     
       <% if @order.completed? %>
         <dt><%= t(:shipment) %>: </dt>
@@ -20,51 +20,34 @@
         <dt><%= t(:payment) %>: </dt>
         <dd id='payment_status'><span class="state <%= @order.payment_state %>"><%= t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></span></dd>
         <dt data-hook><%= t(:date_completed) %>:</dt>
-        <dd id='date_complete'><%= pretty_time(@order.completed? ? @order.completed_at : @order.created_at) %></dd>
+        <dd id='date_complete'><%= pretty_time(@order.completed_at) %></dd>
       <% end %>
     </dl>
   </header>
 
   <nav class="menu">
     <ul data-hook="admin_order_tabs">
-      <% unless @order.completed? %>
-        <li<%== ' class="active"' if current == 'Order Details' %>>
-          <%= link_to_with_icon 'icon-edit', t(:order_details), edit_admin_order_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == 'Customer Details' %>>
-          <%= link_to_with_icon 'icon-user', t(:customer_details), admin_order_customer_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == 'Shipments' %>>
-          <%=link_to_with_icon 'icon-road', t(:shipments), @order.line_items.empty? || !@order.completed? ? 'javascript:$("form").submit();' : edit_admin_order_shipment_url(@order, @order.shipment) %>
-        </li>
-        <li<%== ' class="active"' if current == 'Adjustments' %>>
-           <%= link_to_with_icon 'icon-cogs', t(:adjustments), @order.line_items.empty? || !@order.completed? ? 'javascript:$("form").submit();' : admin_order_adjustments_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == 'Payments' %>>
-           <%= link_to_with_icon 'icon-credit-card', t(:payments), @order.line_items.empty? || !@order.completed? ? 'javascript:$("form").submit();' : new_admin_order_payment_url(@order) %>
-        </li>
-
-      <% else %>
-        <li<%== ' class="active"' if current == 'Order Details' %>>
-          <%= link_to_with_icon 'icon-edit', t(:order_details), edit_admin_order_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == 'Customer Details' %>>
-          <%= link_to_with_icon 'icon-user', t(:customer_details), admin_order_customer_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == 'Adjustments' %>>
-          <%= link_to_with_icon 'icon-cogs', t(:adjustments), admin_order_adjustments_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == 'Payments' %>>
-          <%= link_to_with_icon 'icon-credit-card', t(:payments), admin_order_payments_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == 'Shipments' %>>          
-          <%= link_to_with_icon 'icon-road', t(:shipments), admin_order_shipments_url(@order) %>
-        </li>
-        <li<%== ' class="active"' if current == 'Return Authorizations' %>>          
+      <li<%== ' class="active"' if current == 'Order Details' %>>
+        <%= link_to_with_icon 'icon-edit', t(:order_details), edit_admin_order_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == 'Customer Details' %>>
+        <%= link_to_with_icon 'icon-user', t(:customer_details), admin_order_customer_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == 'Adjustments' %>>
+        <%= link_to_with_icon 'icon-cogs', t(:adjustments), admin_order_adjustments_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == 'Payments' %>>
+        <%= link_to_with_icon 'icon-credit-card', t(:payments), admin_order_payments_url(@order) %>
+      </li>
+      <li<%== ' class="active"' if current == 'Shipments' %>>
+        <%= link_to_with_icon 'icon-road', t(:shipments), admin_order_shipments_url(@order) %>
+      </li>
+      <% if @order.completed? %>
+        <li<%== ' class="active"' if current == 'Return Authorizations' %>>
           <%= link_to_with_icon 'icon-share-alt', t(:return_authorizations), admin_order_return_authorizations_url(@order) %>
         </li>
       <% end %>
-    </ul>  
+    </ul>
   </nav>
   
 

data/app/views/spree/admin/shared/_routes.html.erb

@@ -1,7 +1,7 @@
 <script>
   Spree.routes = <%== {
     :variants_search       => spree.admin_search_variants_path(:format => 'json'),
-    :taxon_search          => spree.search_admin_taxons_path(:format => 'json'),
+    :taxon_search          => spree.search_admin_taxons_url(:format => 'json'),
     :user_search           => spree.admin_search_users_path(:format => 'json'),
     :product_search        => spree.search_admin_products_path(:format => 'json')
   }.to_json %>;

data/app/views/spree/admin/shared/_tabs.html.erb

@@ -1,5 +1,4 @@
-<%= tab :overview, :route => :admin, :icon => 'icon-dashboard' %>
 <%= tab :orders, :payments, :creditcard_payments, :shipments, :credit_cards, :return_authorizations, :icon => 'icon-shopping-cart' %>
-<%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :taxons, :icon => 'icon-th-large' %>
+<%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :icon => 'icon-th-large' %>
 <%= tab :reports, :icon => 'icon-file'  %>
 <%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, :states, :payment_methods, :inventory_settings, :taxonomies, :shipping_methods, :trackers, :label => 'configuration', :icon => 'icon-wrench', :url => spree.edit_admin_general_settings_path %>

data/app/views/spree/admin/shared/_update_order_state.js

@@ -1,5 +1,5 @@
 $('#order_tab_summary h5#order_status').html('<%= j t(:status) %>: <%= j t(@order.state, :scope => :order_state) %>');
-$('#order_tab_summary h5#order_total').html('<%= j t(:total) %>: <%= j @order.display_total.to_s %>');
+$('#order_tab_summary h5#order_total').html('<%= j t(:total) %>: <%= j @order.display_total.to_html %>');
 
 <% if @order.completed? %>
   $('#order_tab_summary h5#payment_status').html('<%= j t(:payment) %>: <%= j t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %>');

data/app/views/spree/admin/shipments/_form.html.erb

@@ -8,24 +8,24 @@
           <th><%= t(:item_description) %></th>
           <th><%= t(:status) %></th>
           <th><%= t(:note) %></th>
-        </tr>  
+        </tr>
       </thead>
       <tbody>
         <% @shipment.order.inventory_units.each do |inventory_unit| %>
           <tr data-hook="shipments_row" class="<%= cycle('odd', 'even')%>">
-            <td style="text-align:center;">
+            <td class="align-center">
               <%= check_box_tag "inventory_units[#{inventory_unit.id}]",
                                 :true,
                                 (inventory_unit.shipment == @shipment),
-                                { :disabled => %w(shipped backordered).include?(inventory_unit.state),
+                                { :disabled => %w(shipped backordered returned).include?(inventory_unit.state),
                                   :class => 'inventory_unit'} %>
             </td>
-            <td style="vertical-align:top; width:120px;"><%= inventory_unit.variant.sku %></td>
-            <td style="width:300px;">
+            <td><%= inventory_unit.variant.sku %></td>
+            <td>
               <%=inventory_unit.variant.product.name %>
               <%= '(' + variant_options(inventory_unit.variant) + ')' unless inventory_unit.variant.option_values.empty? %>
             </td>
-            <td><%= t(inventory_unit.state) %></td>
+            <td class="align-center"><span class="state <%= inventory_unit.state %>"><%= t(inventory_unit.state) %></span></td>
             <td>
               <% if inventory_unit.shipment == @shipment %>
                 <%= t(:included_in_this_shipment) %>
@@ -46,26 +46,26 @@
   </div>
 
   <fieldset data-hook="admin_shipment_form_details" class="no-border-bottom">
-      <legend><%= t(:shipment_details) %></legend>
+    <legend><%= t(:shipment_details) %></legend>
 
-      <div class="block-table">
-        <div class="field table-cell">
-          <%= shipment_form.label :shipping_method_id, t(:shipping_method) + ':' %>
-          <%= shipment_form.select :shipping_method_id, @shipping_methods.map {|sm| ["#{sm.name} - #{sm.zone.name}", sm.id] }, {}, {:class => 'select2 fullwidth'} %>
-        </div>
+    <div class="block-table">
+      <div class="field table-cell">
+        <%= shipment_form.label :shipping_method_id, t(:shipping_method) + ':' %>
+        <%= shipment_form.select :shipping_method_id, @shipping_methods.map {|sm| ["#{sm.name} - #{sm.zone.name}", sm.id] }, {}, {:class => 'select2 fullwidth'} %>
+      </div>
+
+      <div class="field table-cell">
+        <%= shipment_form.label :tracking, t(:tracking) + ':' %>
+        <%= shipment_form.text_field :tracking, :class => 'fullwidth' %>
+      </div>
 
+      <% if Spree::Config[:shipping_instructions] %>
         <div class="field table-cell">
-          <%= shipment_form.label :tracking, t(:tracking) + ':' %>
-          <%= shipment_form.text_field :tracking, :class => 'fullwidth' %>
+          <%= shipment_form.label :special_instructions, t(:special_instructions) + ':' %>
+          <%= shipment_form.text_area :special_instructions, :class => 'fullwidth' %>
         </div>
-          
-        <% if Spree::Config[:shipping_instructions] %>
-          <div class="field table-cell">
-            <%= shipment_form.label :special_instructions, t(:special_instructions) + ':' %>
-            <%= shipment_form.text_area :special_instructions, :class => 'fullwidth' %>
-          </div>
-        <% end %>
-      </div>
-    
-  </div>
+      <% end %>
+    </div>
+
+  </fieldset>
 </div>

data/app/views/spree/admin/shipments/edit.html.erb

@@ -3,18 +3,18 @@
     <li>
       <%= button_link_to t(:ship), fire_admin_order_shipment_path(@order, @shipment, :e => 'ship'), :method => :put, :data => { :confirm => t(:are_you_sure) } %>
     </li>
-  <% end %>  
+  <% end %>
   <li><%= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Shipments' } %>
 
 <% content_for :page_title do %>
-  <i class="icon-arrow-right"></i> <%= t(:shipments) %> <i class="icon-arrow-right"></i> #<%= @shipment.number%> (<%= t(@shipment.state.to_sym, :scope => :state_names, :default => @shipment.state.to_s.humanize) %>)
+  <i class="icon-arrow-right"></i> <%= t(:shipments) %> <i class="icon-arrow-right"></i> #<%= @shipment.number%> (<%= t(@shipment.state.to_sym, :scope => :shipment_states, :default => @shipment.state.to_s.humanize) %>)
 <% end %>
 
 <div data-hook="admin_shipment_edit_header">
-  
+
   <% if @shipment.cost %>
     <h5 class="outstanding-balance"><%= t(:charges) %> <span class="green"><%= @shipment.display_cost %></span></h5>
   <% end %>
@@ -27,17 +27,17 @@
     <fieldset class="no-border-top">
       <%= render :partial => 'form', :locals => { :shipment_form => shipment_form } %>
 
-      <div data-hook="admin_shipment_edit_form_buttons">
-        <div class="filter-actions actions">
-          <% if @shipment.editable_by?(try_spree_current_user) %>
-            <%= button @order.cart? ? t(:continue) : t(:update), @order.cart? ? 'icon-arrow-right' : 'icon-refresh' %>
-            <span class="or"><%= t(:or) %></span>
-            <%= button_link_to t(:cancel), admin_order_shipments_path(@order), :icon => 'icon-remove' %>
-          <% else %>
-            <%= button_link_to t(:back), edit_admin_order_shipment_path(@order), :icon => 'icon-arrow-left' %>
-          <% end %>
-        </div>
+
+      <div class="form-buttons filter-actions actions" data-hook="admin_shipment_edit_form_buttons">
+        <% if @shipment.editable_by?(try_spree_current_user) %>
+          <%= button @order.cart? ? t(:continue) : t(:update), @order.cart? ? 'icon-arrow-right' : 'icon-refresh' %>
+          <span class="or"><%= t(:or) %></span>
+          <%= button_link_to t(:cancel), admin_order_shipments_path(@order), :icon => 'icon-remove' %>
+        <% else %>
+          <%= button_link_to t(:back), edit_admin_order_shipment_path(@order), :icon => 'icon-arrow-left' %>
+        <% end %>
       </div>
+
     </fieldset>
   <% end %>
 </div>

data/app/views/spree/admin/shipments/index.html.erb

@@ -11,35 +11,39 @@
   <i class="icon-arrow-right"></i> <%= t(:shipments) %>
 <% end %>
 
-<table class="index">
-  <thead>
-    <tr data-hook="admin_shipments_index_headers">
-      <th><%= t(:shipment_number) %></th>
-      <th><%= t(:shipping_method) %></th>
-      <th><%= t(:shipping_cost) %></th>
-      <th><%= t(:tracking) %></th>
-      <th><%= t(:status) %></th>
-      <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-      <th data-hook="admin_shipments_index_header_actions" class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @shipments.each do |shipment| %>
-      <tr id="<%= spree_dom_id shipment %>" data-hook="admin_shipments_index_rows" class="<%= cycle('odd', 'even') %>">
-        <td><%= shipment.number %></td>
-        <td><%= shipment.shipping_method.name if shipment.shipping_method %></td>
-        <td><%= shipment.display_cost %></td>
-        <td><%= shipment.tracking %></td>
-        <td><%= t(shipment.state.to_sym, :scope => :state_names, :default => shipment.state.to_s.humanize) %></td>
-        <td><%= shipment.shipped_at.to_s(:date_time24) if shipment.shipped_at %></td>
-        <td class="actions" data-hook="admin_shipments_index_row_actions">
-          <%= link_to_with_icon 'icon-edit', t(:edit), edit_admin_order_shipment_url(@order, shipment), :no_text => true, :data => {:action => 'edit'} %>
-          <%= link_to_delete shipment, :url => admin_order_shipment_url(@order, shipment), :no_text => true %>
-        </td>
+<% if @shipments.any? %>
+  <table class="index">
+    <thead>
+      <tr data-hook="admin_shipments_index_headers">
+        <th><%= t(:shipment_number) %></th>
+        <th><%= t(:shipping_method) %></th>
+        <th><%= t(:shipping_cost) %></th>
+        <th><%= t(:tracking) %></th>
+        <th><%= t(:status) %></th>
+        <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
+        <th data-hook="admin_shipments_index_header_actions" class="actions"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
-<div class="form-actions">
-  <%= button_link_to t(:continue), admin_orders_url, :icon => 'icon-arrow-right' %>
-</div>
+    </thead>
+    <tbody>
+      <% @shipments.each do |shipment| %>
+        <tr id="<%= spree_dom_id shipment %>" data-hook="admin_shipments_index_rows" class="<%= cycle('odd', 'even') %>">
+          <td><%= shipment.number %></td>
+          <td><%= shipment.shipping_method.name if shipment.shipping_method %></td>
+          <td><%= shipment.display_cost %></td>
+          <td><%= shipment.tracking %></td>
+          <td><%= t(shipment.state.to_sym, :scope => :shipment_states, :default => shipment.state.to_s.humanize) %></td>
+          <td><%= shipment.shipped_at.to_s(:date_time24) if shipment.shipped_at %></td>
+          <td class="actions" data-hook="admin_shipments_index_row_actions">
+            <%= link_to_with_icon 'icon-edit', t(:edit), edit_admin_order_shipment_url(@order, shipment), :no_text => true, :data => {:action => 'edit'} %>
+            <%= link_to_delete shipment, :url => admin_order_shipment_url(@order, shipment), :no_text => true %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+  <div class="form-actions">
+    <%= button_link_to t(:continue), admin_orders_url, :icon => 'icon-arrow-right' %>
+  </div>
+<% else %>
+  <div class="alpha twelve columns no-objects-found"><%= t(:no_shipments_for_this_order)%></div>
+<% end %>

data/app/views/spree/admin/shipping_methods/index.html.erb

@@ -10,36 +10,39 @@
   </li>
 <% end %>
 
-<table class="index" id='listing_shipping_methods'>
-  <colgroup>
-    <col style="width: 20%">
-    <col style="width: 15%">
-    <col style="width: 40%">
-    <col style="width: 10%">
-    <col style="width: 15%">
-  </colgroup>
-  <thead>
-    <tr data-hook="admin_shipping_methods_index_headers">
-      <th><%= t(:name) %></th>
-      <th><%= t(:zone) %></th>
-      <th><%= t(:calculator) %></th>
-      <th><%= t(:display) %></th>
-      <th data-hook="admin_shipping_methods_index_header_actions" class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @shipping_methods.each do |shipping_method|%>
-      <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows" class="<%= cycle('odd', 'even')%>">
-        <td><%= shipping_method.name %></td>
-        <td><%= shipping_method.zone.name if shipping_method.zone %></td>
-        <td><%= shipping_method.calculator.description %></td>
-        <td class="align-center"><%= shipping_method.display_on.blank? ? t(:both) : t(shipping_method.display_on) %></td>
-        <td data-hook="admin_shipping_methods_index_row_actions" class="actions">
-          <%= link_to_edit shipping_method, :no_text => true %>
-          <%= link_to_delete shipping_method, :no_text => true %>
-        </td>
+<% if @shipping_methods.any? %>
+  <table class="index" id='listing_shipping_methods'>
+    <colgroup>
+      <col style="width: 20%">
+      <col style="width: 15%">
+      <col style="width: 40%">
+      <col style="width: 10%">
+      <col style="width: 15%">
+    </colgroup>
+    <thead>
+      <tr data-hook="admin_shipping_methods_index_headers">
+        <th><%= t(:name) %></th>
+        <th><%= t(:zone) %></th>
+        <th><%= t(:calculator) %></th>
+        <th><%= t(:display) %></th>
+        <th data-hook="admin_shipping_methods_index_header_actions" class="actions"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
-
+    </thead>
+    <tbody>
+      <% @shipping_methods.each do |shipping_method|%>
+        <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows" class="<%= cycle('odd', 'even')%>">
+          <td><%= shipping_method.name %></td>
+          <td><%= shipping_method.zone.name if shipping_method.zone %></td>
+          <td><%= shipping_method.calculator.description %></td>
+          <td class="align-center"><%= shipping_method.display_on.blank? ? t(:both) : t(shipping_method.display_on) %></td>
+          <td data-hook="admin_shipping_methods_index_row_actions" class="actions">
+            <%= link_to_edit shipping_method, :no_text => true %>
+            <%= link_to_delete shipping_method, :no_text => true %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alpha twelve columns no-objects-found"><%= t(:no_shipping_methods_found) %></div>
+<% end %>

data/app/views/spree/admin/tax_rates/_form.html.erb

@@ -11,6 +11,7 @@
         <div data-hook="rate" class="field">
           <%= f.label :amount, t(:rate) %>
           <%= f.text_field :amount, :class => 'fullwidth' %>
+          <p><em><%= t(:tax_rate_amount_explanation) %></em></p>
         </div>
         <div data-hook="included" class="field">
           <%= f.check_box :included_in_price %>
@@ -38,4 +39,4 @@
   <div class="clear"></div>
 
   <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
-</div>
+</div>

data/app/views/spree/admin/taxons/_form.html.erb

@@ -16,6 +16,22 @@
       <%= f.label :icon, t(:icon) %><br />
       <%= f.file_field :icon %>
     <% end %>
+
+    <%= f.field_container :meta_title do %>
+      <%= f.label :meta_title, t(:meta_title) %><br />
+      <%= f.text_field :meta_title, :class => 'fullwidth', :rows => 6 %>
+    <% end %>
+
+    <%= f.field_container :meta_description do %>
+      <%= f.label :meta_description, t(:meta_description) %><br />
+      <%= f.text_field :meta_description, :class => 'fullwidth', :rows => 6 %>
+    <% end %>
+
+    <%= f.field_container :meta_description do %>
+      <%= f.label :meta_keywords, t(:meta_keywords) %><br />
+      <%= f.text_field :meta_keywords, :class => 'fullwidth', :rows => 6 %>
+    <% end %>
+
   </div>
 
   <div class="omega seven columns">
@@ -24,4 +40,5 @@
       <%= f.text_area :description, :class => 'fullwidth', :rows => 6 %>
     <% end %>
   </div>
+
 </div>