spree_core 1.1.3 → 1.1.4

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

@@ -20,8 +20,8 @@
           <% elsif units.select(&:shipped?).empty? %>
             0
           <% else %>
-            <%= text_field_tag "return_quantity[#{variant.id}]",
-                @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0, {:style => 'width:30px;'} %>
+            <%= number_field_tag "return_quantity[#{variant.id}]",
+                @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0, {:style => 'width:50px;', :min => 0} %>
           <% end %>
         </td>
       </tr>
@@ -33,7 +33,7 @@
     <% if @return_authorization.received? %>
       <%= number_to_currency @return_authorization.amount %>
     <% else %>
-      <%= f.text_field :amount, {:style => 'width:80px;'} %> <%= t(:rma_value) %>: <span id="rma_value"></span>
+      <%= f.text_field :amount, {:style => 'width:80px;'} %> <%= t(:rma_value) %>: <span id="rma_value">0.00</span>
       <%= f.error_message_on :amount %>
     <% end %>
   <% end %>
@@ -45,35 +45,19 @@
   <% end %>
 
 
-  <% content_for :head do %>
-    <%= javascript_tag do -%>
-      var variant_prices = new Array();
-      <% @return_authorization.order.inventory_units.group_by(&:variant).each do | variant, units| %>
-        variant_prices[<%= variant.id.to_s %>] = <%= variant.price %>;
-      <% end %>
-
-      function calculate_rma_price(object, value){
-        var rma_amount = 0;
-
-        $.each($("td.return_quantity input"), function(i, inpt){
-          var variant_id = $(inpt).attr('id').replace("return_quantity_", "");
-           rma_amount += variant_prices[variant_id] * $(inpt).val()
-        });
+<script>
+  $(document).ready(function(){
+    var rma_amount = 0;
+    $("td.return_quantity input").on('change', function() {
+      var rma_amount = 0;
+      $.each($("td.return_quantity input"), function(i, input) {
+        var variant_id = $(input).attr('id').replace("return_quantity_", "");
+         rma_amount += variant_prices[variant_id] * $(input).val()
+      });
 
-        if(!isNaN(rma_amount)){
-          $("span#rma_value").html(rma_amount.toFixed(2));
-        }
+      if(!isNaN(rma_amount)){
+        $("span#rma_value").html(rma_amount.toFixed(2));
       }
-
-      $(document).ready(function(){
-        $.each($("td.return_quantity input"), function(i, inpt){
-          $(inpt).delayedObserver(function() {
-            calculate_rma_price();
-          }, 0.5);
-        });
-
-        calculate_rma_price();
-      });
-    <% end -%>
-  <% end %>
-</div>
+    })
+  });
+</script>

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

@@ -6,21 +6,8 @@
 <%= stylesheet_link_tag 'admin/all' %>
 <%= javascript_include_tag 'admin/all' %>
 
-<%= javascript_tag do %>
-  var Spree = {
-    routes: <%== {
-    :product_search       => spree.admin_products_path(:format => 'json'),
-    :product_search_basic => spree.admin_products_path(:format => 'json', :json_format => 'basic', :limit => 10),
-    :user_search          => spree.admin_users_path(:format => 'json', :limit => 10)
-  }.to_json %>,
-
-    strings: {
-      no_results: '<%== t(:no_results) %>',
-      type_to_search: '<%== t(:type_to_search) %>',
-      searching: '<%== t(:searching) %>'
-    }
-  }
-<% end %>
+<%= render "spree/admin/shared/translations" %>
+<%= render "spree/admin/shared/routes" %>
 
 <%= javascript_tag do -%>
   jQuery.alerts.dialogClass = 'spree';

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

@@ -26,7 +26,7 @@
     <% @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>
+        <td colspan="3"><strong><%= adjustment.label %>:</strong></td>
         <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
       </tr>
     <% end %>

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

@@ -0,0 +1,8 @@
+<script>
+  Spree.routes = <%== {
+    :product_search       => spree.admin_products_path(:format => 'json'),
+    :product_search_basic => spree.admin_products_path(:format => 'json', :json_format => 'basic', :limit => 10),
+    :user_search          => spree.admin_users_path(:format => 'json', :limit => 10)
+  }.to_json 
+%>
+</script>

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

@@ -0,0 +1,17 @@
+<script>
+  Spree.translations = <%==
+  { :date_picker    => I18n.t(:format, 
+                              :scope => 'spree.date_picker',
+                              :default => 'yy/mm/dd'),
+    :abbr_day_names => I18n.t(:abbr_day_names, :scope => :date),
+    :month_names    => I18n.t(:month_names, :scope => :date).delete_if(&:blank?),
+    :previous       => I18n.t(:previous),
+    :next           => I18n.t(:next),
+    :no_results     => I18n.t(:no_results),
+    :type_to_search => I18n.t(:type_to_search),
+    :searching      => I18n.t(:searching),
+    :sku            => I18n.t(:sku),
+    :on_hand        => I18n.t(:on_hand)
+  }.to_json
+%>
+</script>

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

@@ -21,8 +21,8 @@
   <tbody>
     <% @tax_rates.each do |tax_rate|%>
     <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">
-      <td><%=tax_rate.zone.name %></td>
-      <td><%=tax_rate.tax_category.try(:name) || "N/A" %></td>
+      <td><%=tax_rate.zone.try(:name) || t(:not_available) %></td>
+      <td><%=tax_rate.tax_category.try(:name) || t(:not_available) %></td>
       <td><%=tax_rate.amount %></td>
       <td><%=tax_rate.included_in_price %></td>
       <td><%=tax_rate.calculator.to_s %></td>

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

@@ -21,10 +21,10 @@
       <%= f.text_field :sku %></p>
 
       <p data-hook="price"><%= f.label :price, t(:price) %>:<br />
-      <%= f.text_field :price, :value => number_with_precision(@variant.price, :precision => 2) %></p>
+      <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => '') %></p>
 
       <p data-hook="cost_price"><%= f.label :cost_price, t(:cost_price) %>:<br />
-      <%= f.text_field :cost_price, :value => number_with_precision(@variant.cost_price, :precision => 2) %></p>
+      <%= f.text_field :cost_price, :value => number_to_currency(@variant.cost_price, :unit => '') %></p>
 
       <% if Spree::Config[:track_inventory_levels] %>
         <p data-hook="on_hand"><%= f.label :on_hand, t(:on_hand) %>: <br />

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -19,7 +19,7 @@
   <%= select_year(Date.today, :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') %>
   <span class="required">*</span>
 </p>
-<p class="field" data-hook="cart_code">
+<p class="field" data-hook="card_code">
   <%= label_tag nil, t(:card_code) %><br />
   <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'required', :size => 5) %>
   <span class="required">*</span>

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -1,16 +1,16 @@
-Dear Customer,
+<%= t('order_mailer.cancel_email.dear_customer') %>
 
-Your order has been CANCELED.  Please retain this cancellation information for your records.
+<%= t('order_mailer.cancel_email.instructions') %>
 
 ============================================================
-Order Summary [CANCELED]
+<%= t('order_mailer.cancel_email.order_summary_canceled') %>
 ============================================================
 <% @order.line_items.each do |item| %>
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
 <% end %>
 ============================================================
-Subtotal: <%= number_to_currency @order.item_total %>
+<%= t('order_mailer.cancel_email.subtotal') %> <%= number_to_currency @order.item_total %>
 <% @order.adjustments.eligible.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= number_to_currency(adjustment.amount) %>
 <% end %>
-Order Total: <%= number_to_currency(@order.total) %>
+<%= t('order_mailer.cancel_email.total') %> <%= number_to_currency(@order.total) %>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -1,19 +1,20 @@
-Dear Customer,
+<%= t('order_mailer.confirm_email.dear_customer') %>
 
-Please review and retain the following order information for your records.
+<%= t('order_mailer.confirm_email.instructions') %>
 
 ============================================================
-Order Summary
+<%= t('order_mailer.confirm_email.order_summary') %>
 ============================================================
 <% @order.line_items.each do |item| %>
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
 <% end %>
 ============================================================
-Subtotal: <%= number_to_currency @order.item_total %>
+<%= t('order_mailer.confirm_email.subtotal') %>: <%= number_to_currency @order.item_total %>
+
 <% @order.adjustments.eligible.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= number_to_currency(adjustment.amount) %>
 <% end %>
-Order Total: <%= number_to_currency(@order.total) %>
 
+<%= t('order_mailer.confirm_email.total') %>: <%= number_to_currency(@order.total) %>
 
-Thank you for your business.
+<%= t('order_mailer.confirm_email.thanks') %>

data/app/views/spree/products/_thumbnails.html.erb

@@ -1,5 +1,5 @@
 <!-- no need for thumnails unless there is more then one image -->
-<% if product.images.size > 1 %>
+<% if product.images.size > 1 || product.variant_images.size > 0 %>
   <ul id="product-thumbnails" class="thumbnails inline" data-hook>
     <% product.images.each do |i| %>
       <li class="tmb-all" id="tmb-<%= i.id.to_s %>"><%= link_to image_tag(i.attachment.url(:mini)), i.attachment.url(:product) %></li>

data/app/views/spree/shared/_google_analytics.html.erb

@@ -6,27 +6,28 @@
     _gaq.push(['_trackPageview']);
 
     <% if flash[:commerce_tracking] %>
-     <%# report e-commerce transaction information when applicable %>
+      <%# more info: https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce %>
       _gaq.push(['_addTrans',
-        "<%= @order.number %>",                           <%# Order Number %>
-        "",                                               <%# Affiliation %>
-        "<%= @order.total %>",                            <%# Order total %>
-        "<%= @order.adjustments.tax.sum(:amount) %>",     <%# Tax Amount %>
-        "<%= @order.adjustments.shipping.sum(:amount) %>",<%# Ship Amount %>
-        "",                                               <%# City %>
-        "",                                               <%# State %>
-        ""                                                <%# Country %>
+        "<%= @order.number %>",
+        "",
+        "<%= @order.total %>",
+        "<%= @order.adjustments.tax.sum(:amount) %>",
+        "<%= @order.adjustments.shipping.sum(:amount) %>",
+        "<%= @order.bill_address.city %>",
+        "<%= @order.bill_address.state_text %>",
+        "<%= @order.bill_address.country.name %>"
       ]);
       <% @order.line_items.each do |line_item| %>
         _gaq.push(['_addItem',
-          "<%= @order.number %>",                 <%# order ID - required %>
-          "<%= line_item.variant.sku %>",         <%# SKU/code - required %>
-          "<%= line_item.variant.product.name %>",<%# product name %>
-          "",                                     <%# category or variation, Product Category %>
-          "<%= line_item.price %>",               <%# unit price - required %>
-          "<%= line_item.quantity %>"             <%# quantity - required %>
+          "<%= @order.number %>",
+          "<%= line_item.variant.sku %>",
+          "<%= line_item.variant.product.name %>",
+          "",
+          "<%= line_item.price %>",
+          "<%= line_item.quantity %>"
         ]);
       <% end %>
+      _gaq.push(['_trackTrans']);
     <% end %>
 
     (function() {
@@ -35,4 +36,4 @@
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
   <% end %>
-<% end %>
+<% end %>

data/app/views/spree/shared/_head.html.erb

@@ -1,8 +1,5 @@
 <meta charset="utf-8">
 
-<!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame -->
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-
 <title><%= title %></title>
 
 <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />

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

@@ -1,5 +1,4 @@
 <div class="row steps-data">
-  
   <div class="columns alpha four">
     <h6><%= t(:shipping_address) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
     <div class="address">
@@ -71,7 +70,7 @@
         <td data-hook="order_item_description">
           <h4><%= item.variant.product.name %></h4>
           <%= truncate(item.variant.product.description, :length => 100, :omission => "...") %>
-          <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %>
+          <%= "(" + item.variant.options_text + ")" unless item.variant.option_values.empty? %>
         </td>
         <td data-hook="order_item_price" class="price"><span><%= number_to_currency item.price %></span></td>
         <td data-hook="order_item_qty"><%= item.quantity %></td>
@@ -110,4 +109,4 @@
       </tr>
     <% end %>
   </tfoot>
-</table>
+</table>

data/app/views/spree/shipment_mailer/shipped_email.text.erb

@@ -1,15 +1,15 @@
-Dear Customer,
+<%= t('shipment_mailer.shipped_email.dear_customer') %>
 
-Your order has been shipped
+<%= t('shipment_mailer.shipped_email.instructions') %>
 
 ============================================================
-Shipment Summary
+<%= t('shipment_mailer.shipped_email.shipment_summary') %>
 ============================================================
-<% @shipment.line_items.each do |item| %>
-<%= item.variant.sku %> <%= item.variant.product.name %> <%= variant_options(item.variant) %> (<%= item.quantity %>)
+<% @shipment.manifest.each do |item| %>
+  <%= item.variant.sku %> <%= item.variant.product.name %> <%= variant_options(item.variant) %> (<%= item.quantity %>)
 <% end %>
 ============================================================
 
-<%= "Tracking Information: #{@shipment.tracking}" if @shipment.tracking %>
+<%= t('shipment_mailer.shipped_email.track_information', :tracking => @shipment.tracking) if @shipment.tracking %>
 
-Thank you for your business.
+<%= t('shipment_mailer.shipped_email.thanks') %>

data/config/initializers/check_for_orphaned_preferences.rb

@@ -1,5 +1,5 @@
 begin
-  ActiveRecord::Base.connection.execute("select owner_id, owner_type, name, value from spree_preferences where `key` is null").each do |pref|
+  ActiveRecord::Base.connection.execute("SELECT owner_id, owner_type, name, value FROM spree_preferences WHERE 'key' IS NULL").each do |pref|
     warn "[WARNING] Orphaned preference `#{pref[2]}` with value `#{pref[3]}` for #{pref[1]} with id of: #{pref[0]}, you should reset the preference value manually."
   end
 rescue

data/config/initializers/rails_5868.rb

@@ -0,0 +1,8 @@
+# Temporary fix for
+# NoMethodError: undefined method `gsub' for #<Arel::Nodes::Ascending:...>
+# See https://github.com/rails/rails/issues/5868
+class Arel::Nodes::Ordering
+  def gsub(*a, &b)
+    to_sql.gsub(*a, &b)
+  end
+end

data/config/locales/en.yml

@@ -603,8 +603,19 @@ en:
   order_mailer:
     confirm_email:
       subject:  "Order Confirmation"
+      dear_customer: "Dear Customer,"
+      instructions: "Please review and retain the following order information for your records."
+      order_summary: "Order Summary"
+      subtotal: "Subtotal:"
+      total: "Order Total:"
+      thanks: "Thank you for your business."
     cancel_email:
       subject: "Cancellation of Order"
+      dear_customer: "Dear Customer,"
+      instructions: "Your order has been CANCELED.  Please retain this cancellation information for your records."
+      order_summary_canceled: "Order Summary [CANCELED]"
+      subtotal: "Subtotal:"
+      total: "Order Total:"
   order_not_in_system: That order number is not valid on this site.
   order_number: Order
   order_operation_authorize: Authorize
@@ -679,6 +690,7 @@ en:
   please_create_user: "Please create a user account"
   please_define_payment_methods: "Please define some payment methods first."
   powered_by: "Powered by"
+  populate_get_error: "Something went wrong. Please try adding the item again."
   presentation: Presentation
   preview: Preview
   previous: Previous
@@ -892,6 +904,11 @@ en:
   shipment_mailer:
     shipped_email:
       subject: "Shipment Notification"
+      dear_customer: "Dear Customer,"
+      instructions: "Your order has been shipped"
+      shipment_summary: "Shipment Summary"
+      track_information: "Tracking Information: %{tracking}"
+      thanks: "Thank you for your business."
   shipment_number: "Shipment #"
   shipment_state: Shipment State
   shipment_states:

data/config/routes.rb

@@ -15,6 +15,13 @@ Spree::Core::Engine.routes.draw do
   match '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state, :via => :get
   match '/checkout', :to => 'checkout#edit', :state => 'address', :as => :checkout, :via => :get
 
+  populate_redirect = redirect do |params, request|
+    request.flash[:error] = I18n.t(:populate_get_error)
+    request.referer || '/cart'
+  end
+
+  get '/orders/populate', :via => :get, :to => populate_redirect
+
   resources :orders do
     post :populate, :on => :collection
 

data/db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb

@@ -0,0 +1,11 @@
+class RemoveNotNullConstraintFromProductsOnHand < ActiveRecord::Migration
+  def up
+    change_column :spree_products, :count_on_hand, :integer, :null => true
+    change_column :spree_variants, :count_on_hand, :integer, :null => true
+  end
+
+  def down
+    change_column :spree_products, :count_on_hand, :integer, :null => false
+    change_column :spree_variants, :count_on_hand, :integer, :null => false
+  end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -1,7 +1,7 @@
 require "rails/generators/rails/app/app_generator"
 
 module Spree
-  class DummyGenerator  < Rails::Generators::Base
+  class DummyGenerator < Rails::Generators::Base
     desc "Creates blank Rails application, installs Spree and all sample data"
 
     class_option :lib_name, :default => ''

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -28,7 +28,7 @@ production:
 <% when 'postgres' %>
 development:
   adapter: postgresql
-  database: spree_test
+  database: spree_development
   username: postgres
   min_messages: warning
 test:

data/lib/generators/spree/install/templates/app/assets/javascripts/admin/all.js

@@ -4,6 +4,8 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
+//= require jquery
+//= require jquery_ujs
 <% if options[:lib_name] == 'spree' %>
 //= require admin/spree_core
 //= require admin/spree_auth