RubyGems - spree - Versions diffs - 0.10.2 → 0.11.0 - Mend

spree 0.10.2 → 0.11.0

Potentially problematic release.

This version of spree might be problematic. Click here for more details.

Files changed (536) hide show

data/vendor/extensions/theme_default/app/views/admin/product_groups/update.js.erb CHANGED

@@ -1,7 +1,7 @@
 jQuery('#preview_container').html('<%= escape_javascript( render('admin/product_groups/preview') ) %>');
 flash_notice = jQuery('.flash.notice');
 if (flash_notice) {
-  flash_notice.html('<%= flash[:notice] %>');
+  flash_notice.html('<%= self.notice %>');
 } else {
-  jQuery('#content').prepend('<div class="flash notice"><%= flash[:notice] %></div>');
+  jQuery('#content').prepend('<div class="flash notice"><%= self.notice %></div>');
 }

data/vendor/extensions/theme_default/app/views/admin/products/_form.html.erb CHANGED

@@ -46,10 +46,12 @@
         <%= f.text_field :sku, :size => 16 %>
       </p>
       <% unless @product.has_variants? %>
-        <p>
-          <%= f.label :on_hand, t("on_hand")%><br />
-          <%= f.text_field :on_hand, :size => 4 %>
-        </p>
+        <% if Spree::Config[:track_inventory_levels] %>
+          <p>
+            <%= f.label :on_hand, t("on_hand")%><br />
+            <%= f.text_field :on_hand, :size => 4 %>
+          </p>
+        <% end %>
         <ul id="shipping-specs">
           <li>
             <%= f.label :weight, t("weight")%>

data/vendor/extensions/theme_default/app/views/admin/shared/_address_form.html.erb CHANGED

@@ -1,60 +1,69 @@
 <table class="index">
-  <tr>
-    <th colspan="8"><%= name %></th>
-  </tr>
-  <tr>
-    <td>
-      <%= f.label :firstname, t(:first_name)+':' %>
-    </td>
-    <td colspan="3"><%= f.text_field :firstname %></td>
-    <td>
-      <%= f.label :lastname, t(:last_name)+':' %>
-    </td>
-    <td colspan="3"><%= f.text_field :lastname %></td>
-  </tr>
-  <tr>
-    <td>
-      <%= f.label :address1, t(:street_address)+':' %>
-    </td>
-    <td colspan="3"><%= f.text_field :address1, :class => "fullwidth" %></td>
-    <td>
-      <%= f.label :address2, t(:street_address_2)+':' %>
-    </td>
-    <td colspan="3"><%= f.text_field :address2, :class => "fullwidth" %></td>
-  </tr>
-  <tr>
-    <td>
-      <%= f.label :city, t(:city)+':' %>
-    </td>
-    <td colspan="3"><%= f.text_field :city %></td>
-    <td>
-      <%= f.label :zipcode, t(:zip)+':' %>
-    </td>
-    <td colspan="3"><%= f.text_field :zipcode, :style => "width:100px;" %></td>
-  </tr>
-  <tr>
-    <td>
-      <%= f.label :state_id, t(:state)+':' %>
-    </td>
-    <td colspan="3">
-      <span id="<%= name==t('shipping_address') ? "s" : "b" %>state">
-        <%= f.text_field :state_name, :style => "width:150px;display:#{f.object.country.states.empty? ? 'block' : 'none' };", :disabled => !f.object.country.states.empty? %>
-        <%= f.collection_select :state_id, @states, :id, :name, {:include_blank => true}, {:style=> "width:150px;display:#{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
+  <thead>
+    <th colspan="8">
+      <%= name %>
+      <span class="right">
+        <% if use_billing %>
+          <%= check_box_tag 'checkout[use_billing]', '1', (!(@checkout.bill_address.empty? && @checkout.ship_address.empty?) && @checkout.bill_address.eql?(@checkout.ship_address)) %> <%= t("use_billing_address") %>
+        <% end %>
       </span>
-    </td>
-    <td>
-      <%= f.label :country_id, t(:country)+':' %>
-    </td>
-    <td colspan="3">
-      <span id="<%= name==t('shipping_address') ? "s" : "b" %>country"><%= f.collection_select :country_id, @countries, :id, :name, {}, {:style => 'width:150px;'} %></span>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <%= f.label :phone, t(:phone)+':' %>
-    </td>
-    <td colspan="7"><%= f.text_field :phone %></td>
-  </tr>
+    </th>
+  </thead>
+  <tbody id="<%= name == t('shipping_address') ? "shipping" : "billing" %>" style="display:<%= (use_billing && (!(@checkout.bill_address.empty? && @checkout.ship_address.empty?) && @checkout.bill_address.eql?(@checkout.ship_address))) ? "none" : "" %>">
+    <tr>
+      <td class="lbl-col">
+        <%= f.label :firstname, t(:first_name)+':' %>
+      </td>
+      <td class="val-col" colspan="3"><%= f.text_field :firstname %></td>
+      <td class="lbl-col">
+        <%= f.label :lastname, t(:last_name)+':' %>
+      </td>
+      <td class="val-col" colspan="3"><%= f.text_field :lastname %></td>
+    </tr>
+    <tr>
+      <td class="lbl-col">
+        <%= f.label :address1, t(:street_address)+':' %>
+      </td>
+      <td colspan="3"><%= f.text_field :address1, :class => "fullwidth" %></td>
+      <td class="lbl-col">
+        <%= f.label :address2, t(:street_address_2)+':' %>
+      </td>
+      <td colspan="3"><%= f.text_field :address2, :class => "fullwidth" %></td>
+    </tr>
+    <tr>
+      <td class="lbl-col">
+        <%= f.label :city, t(:city)+':' %>
+      </td>
+      <td colspan="3"><%= f.text_field :city %></td>
+      <td class="lbl-col">
+        <%= f.label :zipcode, t(:zip)+':' %>
+      </td>
+      <td colspan="3"><%= f.text_field :zipcode, :style => "width:100px;" %></td>
+    </tr>
+    <tr>
+      <td class="lbl-col">
+        <%= f.label :state_id, t(:state)+':' %>
+      </td>
+      <td colspan="3">
+        <span id="<%= name==t('shipping_address') ? "s" : "b" %>state">
+          <%= f.text_field :state_name, :style => "width:150px;display:#{f.object.country.states.empty? ? 'block' : 'none' };", :disabled => !f.object.country.states.empty? %>
+          <%= f.collection_select :state_id, @states, :id, :name, {:include_blank => true}, {:style=> "width:150px;display:#{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
+        </span>
+      </td>
+      <td class="lbl-col">
+        <%= f.label :country_id, t(:country)+':' %>
+      </td>
+      <td colspan="3">
+        <span id="<%= name==t('shipping_address') ? "s" : "b" %>country"><%= f.collection_select :country_id, @countries, :id, :name, {}, {:style => 'width:150px;'} %></span>
+      </td>
+    </tr>
+    <tr>
+      <td class="lbl-col">
+        <%= f.label :phone, t(:phone)+':' %>
+      </td>
+      <td colspan="7"><%= f.text_field :phone %></td>
+    </tr>
+  </tbody>
 </table>
 <% content_for :head do %>

data/vendor/extensions/theme_default/app/views/admin/shared/_configuration_menu.html.erb CHANGED

@@ -1,6 +1,6 @@
 <% content_for :sidebar do %>
-  <h3 class="name"><%= t("configurations") -%></h3>
+  <h3><%= t("configurations") -%></h3>
   <br class="clear" />
   <ul class="sidebar">

data/vendor/extensions/theme_default/app/views/admin/shared/_order_tabs.html.erb CHANGED

@@ -1,7 +1,12 @@
 <h1><%= t(:order) + " #{@order.number}" %></h1>
 <% content_for :sidebar do %>
-  <h3 class="name"><%= t(:order) + " ##{@order.number} (#{t(@order.state)})" %></h3>
+  <div id="order_tab_summary">
+    <h3 id="order_number"><%= t(:order) + " ##{@order.number} " %></h3>
+    <h5 id="order_status">Status: <%= t(@order.state) %></h5>
+    <h5 id="order_total">Total: <%= number_to_currency(@order.total) %></h5>
+    <br class="clear" />
+  </div>
   <br class="clear" />
   <ul class="sidebar">
@@ -14,10 +19,13 @@
             <%= link_to t("customer_details"), edit_admin_order_checkout_url(@order) %>
         </li>
         <li <%= ' class="active"' if current == "Shipments" %>>
-           <%= link_to t("shipment"), edit_admin_order_shipment_url(@order, @order.shipment) %>
+           <%= link_to t("shipment"), @order.line_items.empty? || !@order.checkout.valid? ? "javascript:$('form').submit();" : edit_admin_order_shipment_url(@order, @order.shipment) %>
+        </li>
+        <li <%= ' class="active"' if current == "Adjustments" %>>
+           <%= link_to t("adjustments"), @order.line_items.empty? || !@order.checkout.valid? ? "javascript:$('form').submit();" : admin_order_adjustments_url(@order) %>
         </li>
         <li <%= ' class="active"' if current == "Payments" %>>
-           <%= link_to t("payment"),  new_admin_order_payment_url(@order) %>
+           <%= link_to t("payment"), @order.line_items.empty? || !@order.checkout.valid? ? "javascript:$('form').submit();" : new_admin_order_payment_url(@order) %>
         </li>
       <% else %>

data/vendor/extensions/theme_default/app/views/admin/shared/_product_tabs.html.erb CHANGED

@@ -2,7 +2,7 @@
 <% content_for :sidebar do %>
-  <h3 class="name"><%= @product.name %><span class='sku'><%= @product.sku %></span></h3>
+  <h3><%= @product.name %><span class='sku'><%= @product.sku %></span></h3>
   <br class="clear" />
   <ul class="sidebar product-menu">

data/vendor/extensions/theme_default/app/views/admin/shipments/_form.html.erb CHANGED

@@ -1,40 +1,43 @@
 <%- locals = {:shipment_form => shipment_form} -%>
-<% hook :admin_shipment_form_inventory_units, locals do %>
-  <table class="index" style="width:100%;">
-    <tr>
-      <th width="130px"><%= t('include_in_shipment') %></th>
-      <th><%= t('sku') %></th>
-      <th><%= t('item_description') %></th>
-      <th><%= t('status') %></th>
-      <th><%= t('note') %></th>
-    </tr>
-    <% @shipment.order.inventory_units.each do |inventory_unit| %>
+<% unless @shipment.order.in_progress? %>
+  <% hook :admin_shipment_form_inventory_units, locals do %>
+    <table class="index" style="width:100%;">
       <tr>
-        <td style="text-align:center;">
-          <%= check_box_tag "inventory_units[#{inventory_unit.id}]", :true, (inventory_unit.shipment == @shipment),{:disabled => %w(shipped backordered).include?(inventory_unit.state)} %>
-        </td>
-        <td valign="top" width="120px;"><%= inventory_unit.variant.sku %></td>
-        <td width="300">
-          <%=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>
-          <% if inventory_unit.shipment == @shipment %>
-            <%= t('included_in_this_shipment') %>
-          <% elsif !inventory_unit.shipment_id.nil? %>
-            <%= t('included_in_other_shipment') %> - <%= link_to inventory_unit.shipment.number, edit_admin_order_shipment_url(inventory_unit.order, inventory_unit.shipment_id) %>
-          <% end %>
-        </td>
+        <th width="130px"><%= t('include_in_shipment') %></th>
+        <th><%= t('sku') %></th>
+        <th><%= t('item_description') %></th>
+        <th><%= t('status') %></th>
+        <th><%= t('note') %></th>
       </tr>
-    <% end %>
-  </table>
+      <% @shipment.order.inventory_units.each do |inventory_unit| %>
+        <tr>
+          <td style="text-align:center;">
+            <%= check_box_tag "inventory_units[#{inventory_unit.id}]", :true, (inventory_unit.shipment == @shipment),{:disabled => %w(shipped backordered).include?(inventory_unit.state)} %>
+          </td>
+          <td valign="top" width="120px;"><%= inventory_unit.variant.sku %></td>
+          <td width="300">
+            <%=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>
+            <% if inventory_unit.shipment == @shipment %>
+              <%= t('included_in_this_shipment') %>
+            <% elsif !inventory_unit.shipment_id.nil? %>
+              <%= t('included_in_other_shipment') %> - <%= link_to inventory_unit.shipment.number, edit_admin_order_shipment_url(inventory_unit.order, inventory_unit.shipment) %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  <% end %>
 <% end %>
 <% hook :admin_shipment_form_address, locals do %>
   <% shipment_form.fields_for 'address' do |sa_form|  %>
-    <%= render :partial => 'admin/shared/address_form', :locals => {:f => sa_form, :name => t("shipping_address")} %>
+    <%= render :partial => 'admin/shared/address_form', :locals => {:f => sa_form, :name => t("shipping_address"), :use_billing => false} %>
   <% end %>
 <% end %>

data/vendor/extensions/theme_default/app/views/admin/shipments/index.html.erb CHANGED

@@ -22,7 +22,7 @@
     </th>
   </tr>
   <% @shipments.each do |shipment| %>
-    <tr>
+    <tr id="<%= dom_id shipment %>">
       <%- locals = {:shipment => shipment} -%>
       <% hook :admin_shipments_index_rows, locals do %>
         <td><%= shipment.number %></td>
@@ -35,6 +35,7 @@
       <td class="actions">
         <% hook :admin_shipments_index_row_actions, locals do %>
           <%= link_to_with_icon 'edit', t('edit'), edit_admin_order_shipment_url(@order, shipment) %>
+          <%= link_to_delete shipment, :url => admin_order_shipment_url(@order, shipment) %>
         <% end %>
       </td>
     </tr>

data/vendor/extensions/theme_default/app/views/admin/tax_categories/_form.html.erb CHANGED

@@ -2,8 +2,11 @@
   <%= f.label :name, t("name")%><br />
   <%=f.text_field :name %>
 <% end %>
-<p>
+<% f.field_container :description do %>
   <%= f.label :description, t("description")%><br />
   <%=f.text_field :description %>
-</p>
+<% end %>
+<% f.field_container :is_default do %>
+  <%= f.label :is_default, t("default")%><br />
+  <%=f.check_box :is_default %>
+<% end %>

data/vendor/extensions/theme_default/app/views/admin/tax_categories/index.html.erb CHANGED

@@ -16,6 +16,7 @@
     <tr>
       <th><%= t("name") %></th>
       <th><%= t("description") %></th>
+      <th><%= t("default") %></th>
       <th></th>
     </tr>
   </thead>
@@ -24,14 +25,15 @@
       <tr id="<%= dom_id tax_category %>">
         <td><%= tax_category.name %></td>
         <td><%= tax_category.description %></td>
+        <td><%= tax_category.is_default.to_s.titleize %></td>
         <td class="actions">
-          <%=link_to_edit tax_category %> &nbsp;
+          <%=link_to_edit tax_category %> &nbsp;
           <%=link_to_delete tax_category %>
       </tr>
     <% end %>
     <% if @tax_categories.empty? %>
       <tr><td colspan="3"><%= t(:none) %></td></tr>
-    <% end %>
+    <% end %>
   </tbody>
 </table>

data/vendor/extensions/theme_default/app/views/admin/taxonomies/_taxon.html.erb CHANGED

@@ -2,11 +2,11 @@
   <ul>
     <% taxon.children.each do |child| %>
       <li id="<%= child.id %>" rel="taxon">
-        <a href="#"><%= child.name %></a>
+        <a style="background-image: url(<%=child.icon.url%>)" href="#"><%= child.name %></a>
         <% if child.children.length > 0 %>
           <%= render :partial => "taxon", :locals => {:taxon => child} %>
         <% end %>
       </li>
     <% end %>
   </ul>
-<% end %>
+<% end %>

data/vendor/extensions/theme_default/app/views/admin/taxons/_form.html.erb CHANGED

@@ -8,6 +8,16 @@
   <% f.field_container :permalink_part do %>
     <%= f.label :permalink_part, t("permalink") %><span class="required">*</span><br />
     <%= @taxon.permalink.split("/")[0...-1].join("/") + "/" %><%= text_field_tag :permalink_part, @permalink_part  %>
+  <% end %>
+  <% f.field_container :icon do %>
+    <%= f.label :icon, t('icon') %><br />
+    <%= f.file_field :icon %>
+  <% end %>
+  <% f.field_container :icon do %>
+    <%= f.label :description, t(:description) %><br />
+    <%= f.text_area :description %></p>
   <% end %>
-<% end %>
+<% end %>

data/vendor/extensions/theme_default/app/views/admin/taxons/edit.html.erb CHANGED

@@ -2,10 +2,10 @@
 <h1><%= t("taxon_edit")%></h1>
-<% form_for(:taxon, :url => admin_taxonomy_taxon_url, :html => { :method => :put }) do |f| %>
+<% form_for(:taxon, :url => admin_taxonomy_taxon_url, :html => { :method => :put, :multipart => true}) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <p class="form-buttons">
     <%= button t("update") %> <%= t("or") %> <%= link_to t("cancel"), edit_admin_taxonomy_url(@taxonomy) %>
   </p>
-<% end %>
+<% end %>

data/vendor/extensions/theme_default/app/views/admin/users/_form.html.erb CHANGED

@@ -13,7 +13,7 @@
   <% end %>
   <% f.field_container :password do %>
-    <%= f.label :password_confirmation, t("confirm") %><br />
+    <%= f.label :password_confirmation, t(:confirm_password) %><br />
     <%= f.password_field :password_confirmation  %>
     <%= f.error_message_on :password_confirmation %>
   <% end %>

data/vendor/extensions/theme_default/app/views/admin/variants/_form.html.erb CHANGED

@@ -25,8 +25,10 @@
     <p><%= f.label :cost_price, t("cost_price") %>:<br />
     <%= f.text_field :cost_price, :value => number_with_precision(@variant.cost_price, :precision => 2) %></p>
-    <p><%= f.label :on_hand, t("on_hand") %>: <br />
-    <%= f.text_field :on_hand %></p>
+    <% if Spree::Config[:track_inventory_levels] %>
+      <p><%= f.label :on_hand, t("on_hand") %>: <br />
+      <%= f.text_field :on_hand %></p>
+    <% end %>
   </div>
   <div class="yui-u">

data/vendor/extensions/theme_default/app/views/checkouts/_confirm.html.erb CHANGED

@@ -7,5 +7,5 @@
 <hr />
 <div class="form-buttons">
-  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>"/>
+  <input type="submit" class="continue button primary" value="<%=t("place_order") %>"/>
 </div>

data/vendor/extensions/theme_default/app/views/checkouts/_delivery.html.erb CHANGED

@@ -11,7 +11,7 @@
             <% @available_methods.each do |shipping_method| %>
               <label>
                 <%= radio_button(:checkout, :shipping_method_id, shipping_method[:id]) %>
-                <%= shipping_method[:name] %> <%= shipping_method[:rate] %>
+                <%= shipping_method[:name] %> <%= number_to_currency shipping_method[:cost] %>
               </label><br />
             <% end %>
           <% end %>

data/vendor/extensions/theme_default/app/views/checkouts/_summary.html.erb CHANGED

@@ -1,17 +1,17 @@
-<h3><%= t(:order_summary) %></h3>
+<h3><%= t(:order_summary) %></h3>
 <table>
   <tbody>
     <tr>
       <td><strong><%= t('item_total') %>:</strong></td>
       <td><strong><%= number_to_currency @order.item_total %></strong></td>
-    </tr>
+    </tr>
     <tbody id="summary-order-charges">
       <% @order.charges.each do |charge| %>
         <tr>
           <td><%= charge.description %>: </td>
           <td><%= number_to_currency charge.amount -%></td>
         </tr>
-      <% end %>
+      <% end %>
     </tbody>
     <tbody id="summary-order-credits">
       <% @order.credits.each do |credit| %>
@@ -19,7 +19,7 @@
           <td><%= credit.description %>: </td>
           <td>(<%= number_to_currency credit.amount %>)</td>
         </tr>
-      <% end %>
+      <% end %>
     </tbody>
     <tr>
       <td><strong><%= t('order_total') %>:</strong></td>
@@ -28,10 +28,10 @@
   </tbody>
 </table>
 <% unless @prev_state.blank? %>
-  <% form_for @checkout, :url => object_url, :html => { :id => 'checkout-summary-form'} do |summary_form| %>
+  <% form_for @checkout, :url => object_url, :html => { :id => 'checkout-summary-form'} do |summary_form| %>
     <label><%= t(:coupon_code) %></label>
     <%= summary_form.text_field :coupon_code, :id => 'coupon-code', :size => 14 %>
-    <input id="post-summary" type="submit" style="display:none"/>
+    <input id="post-summary" type="submit" value="Apply"/>
     <input type="hidden" name="step" value="<%= @prev_state %>"/>
     <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'coupon_busy_indicator' %>
   <% end -%>