spree_core 1.2.0 → 1.2.2

data/app/views/spree/admin/search/users.rabl

@@ -0,0 +1,32 @@
+object false
+child @users => :users do
+  attributes :email, :id
+  address_fields = [:firstname, :lastname,
+                    :address1, :address2,
+                    :city, :zipcode,
+                    :phone, :state_name,
+                    :state_id, :country_id,
+                    :company]
+
+  child :ship_address => :ship_address do
+    attributes *address_fields
+    child :state do
+      attributes :name
+    end
+
+    child :country do
+      attributes :name
+    end
+  end
+
+  child :bill_address => :bill_address do
+    attributes *address_fields
+    child :state do
+      attributes :name
+    end
+
+    child :country do
+      attributes :name
+    end
+  end
+end

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

@@ -6,22 +6,12 @@
 <%= stylesheet_link_tag 'admin/all' %>
 <%= javascript_include_tag 'admin/all' %>
 
-<%= javascript_tag do %>
-  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_search_users_path(:format => 'json', :limit => 10)
-  }.to_json %>;
-
-  strings = <%==
-    [:no_results, :type_to_search, :searching].
-    inject({}){|memo, item| {item => t(item) }}.to_json
-  %>
-<% end %>
+<%= render "spree/admin/shared/translations" %>
+<%= render "spree/admin/shared/routes" %>
 
 <%= javascript_tag do -%>
   jQuery.alerts.dialogClass = 'spree';
-  <%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
+  <%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" %>
 <% end -%>
 
 <%= yield :head %>

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

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

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

@@ -0,0 +1,26 @@
+<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),
+    :add            => I18n.t(:add),
+    :paste          => I18n.t(:paste),
+    :edit           => I18n.t(:edit),
+    :rename         => I18n.t(:rename),
+    :remove         => I18n.t(:remove),
+    :cut            => I18n.t(:cut),
+    :loading        => I18n.t(:loading),
+    :confirm_delete => I18n.t(:confirm_delete),
+    :are_you_sure_delete => I18n.t(:are_you_sure_delete)
+  }.to_json
+%>
+</script>

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

@@ -4,6 +4,10 @@
       <td><%= f.label :zone, t(:zone) %></td>
       <td><%= f.collection_select(:zone_id, @available_zones, :id, :name) %></td>
     </tr>
+    <tr data-hook="name">
+      <td><%= f.label :name, t(:name) %></td>
+      <td><%= f.text_field :name %></td>
+    </tr>
     <tr data-hook="category">
       <td><%= f.label :tax_category_id, t(:tax_category) %></td>
       <td><%= f.collection_select(:tax_category_id, @available_categories,:id, :name) %></td>
@@ -16,6 +20,10 @@
       <td><%= f.label :amount, t(:rate) %></td>
       <td><%= f.text_field :amount %></td>
     </tr>
+    <tr data-hook="show_rate">
+      <td><%= f.label :show_rate_in_label, t(:show_rate_in_label) %></td>
+      <td><%= f.check_box :show_rate_in_label %></td>
+    </tr>
   </table>
 
   <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>

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

@@ -11,9 +11,11 @@
   <thead>
     <tr data-hook="rate_header">
       <th><%= t(:zone) %></th>
+      <th><%= t(:name) %></th>
       <th><%= t(:category) %></th>
       <th><%= t(:amount) %></th>
       <th><%= t(:included_in_price) %></th>
+      <th><%= t(:show_rate_in_label) %></th>
       <th><%= t(:calculator) %></th>
       <th><%= t(:action) %></th>
     </tr>
@@ -21,10 +23,12 @@
   <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.zone.try(:name) || t(:not_available) %></td>
+      <td><%=tax_rate.name %></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.show_rate_in_label %></td>
       <td><%=tax_rate.calculator.to_s %></td>
       <td>
         <%= link_to_edit tax_rate %> &nbsp;

data/app/views/spree/admin/taxonomies/edit.erb

@@ -28,14 +28,14 @@
     var initial = [
       { "attr" :
       { "id" : "<%= @taxonomy.root.id %>", "rel" : "root" },
-      "data" : "<%= @taxonomy.root.name %>",
+      "data" : "<%= escape_javascript(raw(@taxonomy.root.name)) %>",
       "state" : "open",
       "children" : [
         <% @taxonomy.root.children.each_with_index do |taxon,i| %>
           {
             "attr" :
             { "id" : "<%= taxon.id %>"},
-            "data" : "<%= taxon.name %>"
+            "data" : "<%= escape_javascript(raw(taxon.name)) %>"
             <% unless taxon.children.empty? %>
               ,"state" : "closed"
             <% end %>

data/app/views/spree/admin/taxonomies/get_children.json.erb

@@ -1,7 +1,7 @@
 [<% @taxons.each_with_index do |t,i| %>
   { "attr" :
     { "id" : "<%= t.id %>" },
-    "data" : "<%= t.name %>"
+    "data" : "<%= escape_javascript(raw(t.name)) %>"
     <% unless t.children.empty? %>
       ,"state" : "closed"
     <% end %>

data/app/views/spree/admin/taxons/search.rabl

@@ -0,0 +1,5 @@
+object false
+child(@taxons => :taxons) do
+  attributes :name, :pretty_name, :id
+end
+

data/app/views/spree/checkout/_confirm.html.erb

@@ -8,4 +8,5 @@
 
 <div class="form-buttons" data-hook="buttons">
   <%= submit_tag t(:place_order), :class => 'continue button primary' %>
+  <script>disableSaveOnClick();</script>
 </div>

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/orders/_adjustments.html.erb

@@ -1,6 +1,6 @@
 <thead>
   <tr data-hook="cart_adjustments_headers">
-    <th class="cart-adjustment-header" colspan="6">Order Adjustments</th>
+    <th class="cart-adjustment-header" colspan="6"><%= t(:order_adjustments) %></th>
   </tr>
 </thead>
 <tbody id="cart_adjustments" data-hook>

data/app/views/spree/orders/edit.html.erb

@@ -26,7 +26,9 @@
           <%= button_tag :class => 'primary', :id => 'update-button' do %>
             <%= t(:update) %>
           <% end %>
-         <%= link_to t(:checkout), checkout_state_path(@order.checkout_steps.first), :class => 'button checkout primary', :id => 'checkout-link' %>
+          <%= button_tag :class => 'button checkout primary', :id => 'checkout-link', :name => 'checkout' do %>
+            <%= t(:checkout) %>
+          <% end %>
         </div>
 
       </div>

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

@@ -1,4 +1,4 @@
-<%= form_for :order, :url => populate_orders_url do |f| %>
+<%= form_for :order, :url => populate_orders_path do |f| %>
   <div id="inside-product-cart-form" data-hook="inside_product_cart_form" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
 
     <% if @product.has_variants? %>
@@ -35,9 +35,9 @@
         </div>
 
         <div class="add-to-cart">
-          <% if @product.has_stock? || Spree::Config[:allow_backorders] %>      
+          <% if @product.on_sale? %>      
             <%= number_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
-              1, :class => 'title', :in => 1..@product.on_hand %>
+              1, :class => 'title', :in => 1..@product.on_hand, :min => 1 %>
             <%= button_tag :class => 'large primary', :id => 'add-to-cart-button', :type => :submit do %>
               <%= t(:add_to_cart) %>
             <% end %>

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/_head.html.erb

@@ -1,6 +1,4 @@
 <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" />
 <meta content="width=device-width, initial-scale=1.0, maximum-scale=1" name="viewport">

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

@@ -1,5 +1,5 @@
 <div class="row steps-data">
-  
+
   <% if order.has_step?("address") %>
     <div class="columns alpha four">
       <h6><%= t(:shipping_address) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
@@ -75,7 +75,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><%= money item.price %></span></td>
         <td data-hook="order_item_qty"><%= item.quantity %></td>

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

@@ -12,7 +12,7 @@
 <ul id="products" class="inline product-listing" data-hook>
   <% reset_cycle('default') %>
   <% products.each do |product| %>
-    <% if Spree::Config[:show_zero_stock_products] || product.has_stock? %>
+    <% if product.on_display? %>
       <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", :name => "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
         <div class="product-image">
           <%= link_to small_image(product, :itemprop => "image"), product, :itemprop => 'url' %>

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

@@ -1,6 +1,6 @@
 <nav id="taxonomies" class="sidebar-item" data-hook>
   <% get_taxonomies.each do |taxonomy| %>
-    <h6 class='taxonomy-root'><%= t(:shop_by_taxonomy, :taxonomy => taxonomy.name.singularize) %></h6>
+    <h6 class='taxonomy-root'><%= t(:shop_by_taxonomy, :taxonomy => taxonomy.name) %></h6>
     <%= taxons_tree(taxonomy.root, @taxon, Spree::Config[:max_level_in_taxons_menu] || 1) %>
   <% end %>
 </nav>

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

@@ -6,7 +6,7 @@
 <%= t('shipment_mailer.shipped_email.shipment_summary') %>
 ============================================================
 <% @shipment.manifest.each do |item| %>
-  <%= item.variant.sku %> <%= item.variant.product.name %> <%= variant_options(item.variant, :include_style => false) %> (<%= item.quantity %>)
+  <%= item.variant.sku %> <%= item.variant.product.name %> <%= item.variant.options_text %>
 <% end %>
 ============================================================
 

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

@@ -108,6 +108,7 @@ en:
       spree/tax_rate:
         amount: Rate
         included_in_price: Included in Price
+        show_rate_in_label: Show rate in label
       spree/taxon:
         name: Name
         permalink: Permalink
@@ -335,6 +336,7 @@ en:
   credits: Credits
   current: Current
   currency: Currency
+  currency_symbol_position: "Put currency symbol before or after dollar amount?"
   customer: Customer
   customer_details: "Customer Details"
   customer_details_updated: "The customer's details have been updated."
@@ -603,6 +605,7 @@ en:
   or: or
   or_over_price: "%{price} or over"
   order: Order
+  order_adjustments: "Order adjustments"
   order_confirmation_note: ""
   order_date: "Order Date"
   order_details: "Order Details"
@@ -697,6 +700,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

data/config/routes.rb

@@ -15,6 +15,13 @@ Spree::Core::Engine.routes.draw do
   get '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
   get '/checkout', :to => 'checkout#edit' , :as => :checkout
 
+  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
 
@@ -143,6 +150,12 @@ Spree::Core::Engine.routes.draw do
       resources :taxons
     end
 
+    resources :taxons, :only => [] do
+      collection do
+        get :search
+      end
+    end
+
     resources :reports, :only => [:index, :show] do
       collection do
         get :sales_total

data/db/default/spree/countries.yml

@@ -1581,3 +1581,9 @@ countries_171:
   iso_name: SAINT KITTS AND NEVIS
   id: "171"
   numcode: "659"
+countries_998:
+  name: Serbia
+  iso3: SRB
+  iso: RS
+  id: "998"
+  numcode: "999"

data/db/migrate/20120905145253_add_tax_rate_label.rb

@@ -0,0 +1,5 @@
+class AddTaxRateLabel < ActiveRecord::Migration
+  def change
+    add_column :spree_tax_rates, :name, :string
+  end
+end

data/db/migrate/20120905151823_add_toggle_tax_rate_display.rb

@@ -0,0 +1,5 @@
+class AddToggleTaxRateDisplay < ActiveRecord::Migration
+  def change
+    add_column :spree_tax_rates, :show_rate_in_label, :boolean, :default => true
+  end
+end

data/db/migrate/20121009142519_add_lock_version_to_variant.rb

@@ -0,0 +1,5 @@
+class AddLockVersionToVariant < ActiveRecord::Migration
+  def change
+    add_column :spree_variants, :lock_version, :integer, :default => 0
+  end
+end

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/custom_user/custom_user_generator.rb

@@ -27,7 +27,10 @@ module Spree
 
       file_action = File.exist?('config/initializers/spree.rb') ? :append_file : :create_file
       send(file_action, 'config/initializers/spree.rb') do
-        %Q{require 'spree/authentication_helpers'\n}
+        %Q{
+          Rails.application.config.to_prepare do
+            require_dependency 'spree/authentication_helpers'
+          end\n}
       end
     end
 

data/lib/spree/core.rb

@@ -31,7 +31,7 @@ require 'rails/generators'
 require 'state_machine'
 require 'paperclip'
 require 'kaminari'
-require 'nested_set'
+require 'awesome_nested_set'
 require 'acts_as_list'
 require 'active_merchant'
 require 'ransack'
@@ -40,6 +40,7 @@ require 'deface'
 require 'cancan'
 require 'select2-rails'
 require 'spree/money'
+require 'rabl'
 
 module Spree
 
@@ -105,7 +106,7 @@ ActiveRecord::Base.class_eval do
 end
 
 if defined?(ActionView)
-  require 'nested_set/helper'
+  require 'awesome_nested_set/helper'
   ActionView::Base.class_eval do
     include CollectiveIdea::Acts::NestedSet::Helper
   end