spree_backend 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16854ac8fc1bd9366a39802aa884534c018a62a4
-  data.tar.gz: 4825fb14f9dc2e1bde39be757d5fa4cf7f46c686
+  metadata.gz: fcaab04407621b636170b40405d2b04784bae951
+  data.tar.gz: 2f875cb85b7b5f00f76caac5ff0d38b5a5e38afc
 SHA512:
-  metadata.gz: bedebf0cf5ec5eabca3dca08a449a4e62331b9276af8e61e1779588a6d916bbaf120701995a972a705b195dce890eb16d9d4f6cc76e9d229fc61e287c8948c21
-  data.tar.gz: aa153dc093b1c23c68b2d023ae61e6dc296833fbcebfaa8644c1c3c460762502ea0db50eda316ccf6d4509eb26a6124e346ecb623c81f545034901bbf8d72dc9
+  metadata.gz: 63bd4a7ede4219c5234a9b2d9d647e86c83332eb9048263e43e0059320cf4d9fe7b3db6f9e40f8726d28ab8cab06a310a30cabedb783ce0088923b288580910c
+  data.tar.gz: 9bd26dde28d827366a06776aada15334030d6b99506c02e7a8a1f19b9193acb14333a96a93cebd17021c318c7117b87f703ec06726d45142e967eb920abd2b2e

data/app/assets/javascripts/spree/backend/payments/new.js

@@ -12,7 +12,9 @@ $(document).ready(function() {
     $('.payment_methods_radios').click(
       function() {
         $('.payment-methods').hide();
+        $('.payment-methods input').prop('disabled', true);
         if (this.checked) {
+          $('#payment_method_' + this.value).prop('disabled', false);
           $('#payment_method_' + this.value).show();
         }
       }
@@ -21,9 +23,11 @@ $(document).ready(function() {
     $('.payment_methods_radios').each(
       function() {
         if (this.checked) {
+          $('#payment_method_' + this.value).prop('disabled', false);
           $('#payment_method_' + this.value).show();
         } else {
           $('#payment_method_' + this.value).hide();
+          $('#payment_method_' + this.value).prop('disabled', true);
         }
 
         if ($("#card_new" + this.value).is("*")) {

data/app/assets/javascripts/spree/backend/promotions.js

@@ -33,6 +33,37 @@ var initProductActions = function () {
     });
   });
 
+  //
+  // Tiered Calculator
+  //
+  if ($('#tier-fields-template').length && $('#tier-input-name').length) {
+    var tierFieldsTemplate = Handlebars.compile($('#tier-fields-template').html());
+    var tierInputNameTemplate = Handlebars.compile($('#tier-input-name').html());
+
+    var originalTiers = $('.js-original-tiers').data('original-tiers');
+    $.each(originalTiers, function(base, value) {
+      var fieldName = tierInputNameTemplate({base: base}).trim();
+      $('.js-tiers').append(tierFieldsTemplate({
+        baseField: {value: base},
+        valueField: {name: fieldName, value: value}
+      }));
+    });
+
+    $(document).on('click', '.js-add-tier', function(event) {
+      event.preventDefault();
+      $('.js-tiers').append(tierFieldsTemplate({valueField: {name: null}}));
+    });
+
+    $(document).on('click', '.js-remove-tier', function(event) {
+      $(this).parents('.tier').remove();
+    });
+
+    $(document).on('change', '.js-base-input', function(event) {
+      var valueInput = $(this).parents('.tier').find('.js-value-input');
+      valueInput.attr('name', tierInputNameTemplate({base: $(this).val()}).trim());
+    });
+  }
+
   //
   // CreateLineItems Promotion Action
   //
@@ -87,4 +118,4 @@ $(document).ready(function () {
 
   initProductActions();
 
-});
+});

data/app/assets/javascripts/spree/backend/select_payments.js.coffee

@@ -4,4 +4,4 @@ $ ->
     $('input[name="payment[payment_method_id]"]').click ()->
       $('.payment-method-settings fieldset').addClass('hidden')
       id = $(this).parents('li').data('id')
-      $("fieldset##{id}").removeClass('hidden')
+      $("fieldset[data-id='#{id}']").removeClass('hidden')

data/app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb

@@ -20,10 +20,10 @@ $(document).ready(function () {
           return {
             per_page: 50,
             page: page,
+            without_children: true,
             q: {
               name_cont: term
-            },
-            token: Spree.api_key
+            }
           };
         },
         results: function (data, page) {

data/app/assets/stylesheets/spree/backend/components/_date-picker.scss

@@ -9,6 +9,7 @@
 
 #ui-datepicker-div {
   @include border-radius($border-radius);
+
   border-color: $color-3;
   padding: 0;
   margin-top: 10px;
@@ -23,6 +24,7 @@
     margin-top: -10px;
     left: 25px;
     z-index: 1;
+    display: block;
   }
 
   .ui-datepicker-header {
@@ -47,14 +49,15 @@
       }
 
       .ui-icon {
+        @extend [class^="icon-"]:before;
+        @extend .fa;
+
         background-image: none;
         text-indent: 0;
         color: $color-1;
         width: 10px;
         margin-left: -5px;
-        @extend [class^="icon-"]:before;
-        @extend .fa;
-
+        
         &:hover {
           color: very-light($color-2, 25);
         }

data/app/assets/stylesheets/spree/backend/components/_navigation.scss

@@ -51,6 +51,10 @@ nav.menu {
         color: $color-body-text;
       }
 
+      &.fa:before {
+        padding-right: 4px;
+      }
+
       &:hover {
         i {
           color: $color-2;

data/app/assets/stylesheets/spree/backend/sections/_products.scss

@@ -16,6 +16,12 @@
   }
 }
 
+[data-hook="admin_product_form_multiple_variants"] {
+  .info-actions {
+    text-align: right;
+  }
+}
+
 .outstanding-balance {
   margin-bottom: 15px;
   text-transform: uppercase;

data/app/assets/stylesheets/spree/backend/sections/_promotions.scss

@@ -34,6 +34,25 @@
     margin-bottom: 0;
   }
 
+  .tier {
+    position: relative;
+    padding-bottom: 10px;
+
+    .remove {
+      position: absolute;
+      left: -15px;
+      top: 10px;
+
+      &:hover {
+        color: #c60f13;
+      }
+    }
+  }
+
+  .right-align {
+    text-align: right;
+  }
+
   .field {
     padding-bottom: 10px;
 
@@ -97,4 +116,4 @@
     border: none;
     padding-bottom: 0;
   }
-}
+}

data/app/assets/stylesheets/spree/backend/shared/_forms.scss

@@ -32,6 +32,45 @@ textarea {
   width: 100%;
 }
 
+.input-group {
+  position: relative;
+  display: table;
+  border-collapse: separate;
+
+  .form-control,
+  .input-group-addon {
+    display: table-cell;
+
+    &:first-child {
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+    &:last-child {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+    }
+  }
+
+  .form-control {
+    width: 100%;
+  }
+
+  .input-group-addon {
+    padding: 6px 10px;
+    border: 1px solid #cee1f4;
+    background: #eff5fc;
+    border-radius: 3px;
+
+    &:first-child {
+      border-right: none;
+    }
+
+    &:last-child {
+      border-left: none;
+    }
+  }
+}
+
 label {
   font-weight: 600;
   text-transform: uppercase;

data/app/assets/stylesheets/spree/backend/shared/_icons.scss

@@ -46,3 +46,8 @@ button, a {
 .icon-user          { @extend .fa-user; }
 .icon-signout       { @extend .fa-sign-out; }
 .icon-external-link { @extend .fa-external-link; }
+
+// Avoid ugly default browser font (usually a serif) when an element has an icon AND text
+.fa {
+  font-family: "FontAwesome", $base-font-family !important;
+}

data/app/assets/stylesheets/spree/backend/shared/_layout.scss

@@ -35,6 +35,14 @@
   margin-right: -10px;
 }
 
+.container .column,
+.container .columns {
+  // Float container right instead of left.
+  .right {
+    float: right;
+  }
+}
+
 // Header
 //---------------------------------------------------
 #header {

data/app/assets/stylesheets/spree/backend/shared/_typography.scss

@@ -77,6 +77,12 @@ ul {
   }
 }
 
+ul.text_list {
+  border-top: none;
+  margin: 0;
+  list-style: disc inside none;
+}
+
 dl {
   width: 100%;
   overflow: hidden;

data/app/controllers/spree/admin/products_controller.rb

@@ -59,7 +59,7 @@ module Spree
         if @new.save
           flash[:success] = Spree.t('notice_messages.product_cloned')
         else
-          flash[:success] = Spree.t('notice_messages.product_not_cloned')
+          flash[:error] = Spree.t('notice_messages.product_not_cloned')
         end
 
         redirect_to edit_admin_product_url(@new)
@@ -123,9 +123,9 @@ module Spree
         end
 
         def product_includes
-          [{ :variants => [:images, { :option_values => :option_type }], :master => [:images, :default_price]}]
+          [{ :variants => [:images], :master => [:images, :default_price]}]
         end
-        
+
         def clone_object_url resource
           clone_admin_product_url resource
         end

data/app/controllers/spree/admin/resource_controller.rb

@@ -37,7 +37,13 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       end
     else
       invoke_callbacks(:update, :fails)
-      respond_with(@object)
+      respond_with(@object) do |format|
+        format.html do
+          flash.now[:error] = @object.errors.full_messages.join(", ")
+          render action: 'edit'
+        end
+        format.js { render layout: false }
+      end
     end
   end
 
@@ -53,7 +59,13 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       end
     else
       invoke_callbacks(:create, :fails)
-      respond_with(@object)
+      respond_with(@object) do |format|
+        format.html do
+          flash.now[:error] = @object.errors.full_messages.join(", ")
+          render action: 'new'
+        end
+        format.js { render layout: false }
+      end
     end
   end
 

data/app/helpers/spree/admin/adjustments_helper.rb

@@ -4,7 +4,7 @@ module Spree
       def adjustment_state(adjustment)
         state = adjustment.state.to_sym
         icon = { closed: 'lock', open: 'unlock' }
-        content_tag(:span, '', class: icon[state])
+        content_tag(:span, '', class: "fa fa-#{ icon[state] }")
       end
 
       def display_adjustable(adjustable)

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

@@ -3,24 +3,24 @@
     <li><%= event_links %></li>
   <% end %>
   <% if can?(:resend, @order) %>
-    <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'email' %></li>
+    <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), method: :post, icon: 'email' %></li>
   <% end %>
   <% if can?(:admin, Spree::Order) %>
-    <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
+    <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, icon: 'arrow-left' %></li>
   <% end %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Order Details' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Order Details' } %>
 
 <div data-hook="admin_order_edit_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
 </div>
 
 <% if @order.payments.exists? && @order.considered_risky? %>
   <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
 <% end %>
 
-<%= render :partial => 'add_product' if can?(:update, @order) %>
+<%= render partial: 'add_product' if @order.shipment_state != 'shipped' && can?(:update, @order) %>
 
 <% if @order.line_items.empty? %>
   <div class="no-objects-found">
@@ -30,7 +30,7 @@
 
 <div data-hook="admin_order_edit_form">
   <div id="order-form-wrapper">
-    <%= render :partial => 'form', :locals => { :order => @order } %>
+    <%= render partial: 'form', locals: { order: @order } %>
   </div>
 </div>
 

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -1,4 +1,4 @@
-<fieldset class="no-border-bottom">
+<fieldset data-id='credit-card' class="no-border-bottom">
   <div class="field" data-hook="previous_cards">
     <% if previous_cards.any? %>
       <% previous_cards.each do |card| %>

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

@@ -60,7 +60,27 @@
       <% end %>
     </div>
 
-    <% unless @product.has_variants? %>
+    <% if @product.has_variants? %>
+      <div data-hook="admin_product_form_multiple_variants">
+        <%= f.label :skus, Spree.t(:sku).pluralize %>
+        <span class="info">
+          <%= Spree.t(:info_product_has_multiple_skus, count: @product.variants.count) %>
+          <ul class="text_list">
+            <% @product.variants.first(5).each do |variant| %>
+              <li><%= variant.sku %></li>
+            <% end %>
+          </ul>
+          <% if @product.variants.count > 5 %>
+            <%= Spree.t(:info_number_of_skus_not_shown, count: @product.variants.count - 5) %>
+          <% end %>
+        </span>
+        <div class="info-actions">
+          <% if can?(:admin, Spree::Variant) %>
+            <%= link_to_with_icon 'th-large', 'Manage Variants',  admin_product_variants_url(@product) %>
+          <% end %>
+        </div>
+      </div>
+    <% else %>
       <div data-hook="admin_product_form_sku">
         <%= f.field_container :sku do %>
           <%= f.label :sku, Spree.t(:sku) %>

data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb

@@ -13,12 +13,14 @@
 
   <% unless promotion_action.new_record? %>
     <div class="settings field omega four columns">
-      <% promotion_action.calculator.preferences.keys.map do |key| %>
-        <% field_name = "#{param_prefix}[calculator_attributes][preferred_#{key}]" %>
-        <%= label_tag field_name, Spree.t(key.to_s) %>
-        <%= preference_field_tag(field_name,
-                                 promotion_action.calculator.get_preference(key),
-                                 :type => promotion_action.calculator.preference_type(key)) %>
+      <% type_name = promotion_action.calculator.type.demodulize.underscore %>
+      <% if lookup_context.exists?("fields",
+          ["spree/admin/promotions/calculators/#{type_name}"], true) %>
+        <%= render "spree/admin/promotions/calculators/#{type_name}/fields",
+          calculator: promotion_action.calculator, prefix: param_prefix %>
+      <% else %>
+        <%= render "spree/admin/promotions/calculators/default_fields",
+          calculator: promotion_action.calculator, prefix: param_prefix %>
       <% end %>
       <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
     </div>

data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb

@@ -0,0 +1,8 @@
+<% calculator.preferences.keys.map do |key| %>
+  <% field_name = "#{prefix}[calculator_attributes][preferred_#{key}]" %>
+  <%= label_tag field_name, Spree.t(key.to_s) %>
+  <%= preference_field_tag(
+    field_name,
+    calculator.get_preference(key),
+    type: calculator.preference_type(key)) %>
+<% end %>

data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -0,0 +1,37 @@
+<%= label_tag "#{prefix}[calculator_attributes][preferred_base_amount]",
+  Spree.t(:base_amount) %>
+<%= preference_field_tag(
+  "#{prefix}[calculator_attributes][preferred_base_amount]",
+  calculator.preferred_base_amount,
+  type: calculator.preference_type(:base_amount)) %>
+
+<%= label_tag nil, Spree.t(:tiers) %>
+<%= content_tag :div, nil, class: "hidden js-original-tiers",
+  data: { :'original-tiers' => Hash[calculator.preferred_tiers.sort] } %>
+<div class="js-tiers"></div>
+<button class="fa fa-plus button js-add-tier"><%= Spree.t(:add) %></button>
+
+<script type="text/x-handlebars-template" id="tier-input-name">
+  <%= prefix %>[calculator_attributes][preferred_tiers][{{base}}]
+</script>
+
+<script type="text/x-handlebars-template" id="tier-fields-template">
+  <div class="fullwidth tier">
+    <a class="fa fa-trash remove js-remove-tier"></a>
+    <div class="two columns alpha omega">
+      <div class="input-group">
+        <span class="input-group-addon">$</span>
+        <input class="js-base-input form-control" type="text" value={{baseField.value}}>
+      </div>
+    </div>
+    <div class="two columns alpha omega right">
+      <div class="input-group">
+        <span class="input-group-addon">$</span>
+        <input class="js-value-input form-control"
+          name="{{valueField.name}}" type="text" value={{valueField.value}}>
+      </div>
+    </div>
+    <div class="clear"></div>
+  </div>
+</script>
+

data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb

@@ -0,0 +1,36 @@
+<%= label_tag "#{prefix}[calculator_attributes][preferred_base_percent]",
+  Spree.t(:base_percent) %>
+<%= preference_field_tag(
+  "#{prefix}[calculator_attributes][preferred_base_percent]",
+  calculator.preferred_base_percent,
+  type: calculator.preference_type(:base_percent)) %>
+
+<%= label_tag nil, Spree.t(:tiers) %>
+<%= content_tag :div, nil, class: "hidden js-original-tiers",
+  data: { :'original-tiers' => Hash[calculator.preferred_tiers.sort] } %>
+<div class="js-tiers"></div>
+<button class="fa fa-plus button js-add-tier"><%= Spree.t(:add) %></button>
+
+<script type="text/x-handlebars-template" id="tier-input-name">
+  <%= prefix %>[calculator_attributes][preferred_tiers][{{base}}]
+</script>
+
+<script type="text/x-handlebars-template" id="tier-fields-template">
+  <div class="fullwidth tier">
+    <a class="fa fa-trash remove js-remove-tier"></a>
+    <div class="two columns alpha omega">
+      <div class="input-group">
+        <span class="input-group-addon">$</span>
+        <input class="js-base-input form-control" type="text" value={{baseField.value}}>
+      </div>
+    </div>
+    <div class="two columns alpha omega right">
+      <div class="input-group">
+        <input class="js-value-input form-control right-align"
+          name="{{valueField.name}}" type="text" value={{valueField.value}}>
+        <span class="input-group-addon">%</span>
+      </div>
+    </div>
+    <div class="clear"></div>
+  </div>
+</script>

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

@@ -48,5 +48,3 @@
     <%= Spree.t(:cannot_create_returns) %>
   </div>
 <% end %>
-
-<%= button_link_to Spree.t(:continue), admin_orders_url, :icon => 'arrow-right' %>

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

@@ -8,7 +8,6 @@
       <%= configurations_sidebar_menu_item Spree.t(:general_settings), edit_admin_general_settings_path %>
       <%= configurations_sidebar_menu_item Spree.t(:tax_categories), admin_tax_categories_path %>
       <%= configurations_sidebar_menu_item Spree.t(:tax_rates), admin_tax_rates_path %>
-      <%= configurations_sidebar_menu_item Spree.t(:tax_settings), edit_admin_tax_settings_path %>
       <%= configurations_sidebar_menu_item Spree.t(:zones), admin_zones_path %>
       <%= configurations_sidebar_menu_item Spree.t(:countries), admin_countries_path %>
       <% if Spree::Config[:default_country_id] %>

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

@@ -1,32 +1,32 @@
 <nav class="menu">
   <ul data-hook="admin_order_tabs">
     <% if can? :update, @order %>
-      <li<%== ' class="active"' if current == 'Order Details' %>>
+      <li<%== ' class="active"' if current == 'Order Details' %> data-hook='admin_order_tabs_order_details'>
         <%= link_to_with_icon 'edit', Spree.t(:order_details), edit_admin_order_url(@order) %>
       </li>
     <% end %>
 
     <% if can?(:update, @order) && checkout_steps.include?("address") %>
-      <li<%== ' class="active"' if current == 'Customer Details' %>>
+      <li<%== ' class="active"' if current == 'Customer Details' %> data-hook='admin_order_tabs_customer_details'>
         <%= link_to_with_icon 'user', Spree.t(:customer_details), admin_order_customer_url(@order) %>
       </li>
     <% end %>
 
     <% if can? :index, Spree::Adjustment %>
-      <li<%== ' class="active"' if current == 'Adjustments' %>>
+      <li<%== ' class="active"' if current == 'Adjustments' %> data-hook='admin_order_tabs_adjustments'>
         <%= link_to_with_icon 'cogs', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
       </li>
     <% end %>
 
     <% if can?(:index, Spree::Payment) %>
-      <li<%== ' class="active"' if current == 'Payments' %>>
+      <li<%== ' class="active"' if current == 'Payments' %> data-hook='admin_order_tabs_payments'>
         <%= link_to_with_icon 'credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
       </li>
     <% end %>
 
     <% if can? :index, Spree::ReturnAuthorization %>
       <% if @order.completed? %>
-        <li<%== ' class="active"' if current == 'Return Authorizations' %>>
+        <li<%== ' class="active"' if current == 'Return Authorizations' %> data-hook='admin_order_tabs_return_authorizations'>
           <%= link_to_with_icon 'share', Spree.t(:return_authorizations), admin_order_return_authorizations_url(@order) %>
         </li>
       <% end %>

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

@@ -7,7 +7,7 @@
 <% if can? :admin, Spree::Admin::ReportsController %>
   <%= tab :reports, :icon => 'file'  %>
 <% end %>
-<%= tab :configurations, :general_settings, :tax_categories, :tax_rates, :tax_settings, :zones, :countries, :states, :payment_methods, :shipping_methods, :shipping_categories, :stock_transfers, :stock_locations, :trackers, :label => 'configuration', :icon => 'wrench', :url => spree.edit_admin_general_settings_path %>
+<%= tab :configurations, :general_settings, :tax_categories, :tax_rates, :zones, :countries, :states, :payment_methods, :shipping_methods, :shipping_categories, :stock_transfers, :stock_locations, :trackers, :label => 'configuration', :icon => 'wrench', :url => spree.edit_admin_general_settings_path %>
 <% if can? :admin, Spree::Promotion %>
   <%= tab(:promotions, :url => spree.admin_promotions_path, :icon => 'bullhorn') %>
 <% end %>

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

@@ -77,7 +77,7 @@
     <fieldset class="tax_categories no-border-bottom">
       <legend align="center"><%= Spree.t(:tax_category) %></legend>
         <%= f.field_container :categories do %>
-          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {}, :class => "select2 fullwidth" %>
+          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {include_blank: true}, class: "select2 fullwidth" %>
           <%= error_message_on :shipping_method, :tax_category_id %>
         <% end %>
     </fieldset>

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

@@ -9,7 +9,7 @@
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-<span id='sorting_explanation' style='display:none'>Click &amp; drag on the products to sort them.</span>
+<span id='sorting_explanation' style='display:none'><%= Spree.t(:click_and_drag_on_the_products_to_sort_them) %></span>
 <ul id='taxon_products'></ul>
 
 <%= render :partial => "spree/admin/products/autocomplete", :formats => :js %>

data/app/views/spree/admin/users/_user_page_actions.html.erb

@@ -2,4 +2,7 @@
   <li>
     <%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'arrow-left' %>
   </li>
+  <li>
+    <%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id), :icon => 'plus' %>
+  </li>
 <% end %>

data/config/locales/en.yml

@@ -0,0 +1,6 @@
+en:
+  spree:
+    info_product_has_multiple_skus: "This product has %{count} variants:"
+    info_number_of_skus_not_shown:
+      one: "and one other"
+      other: "and %{count} others"

data/config/routes.rb

@@ -138,7 +138,6 @@ Spree::Core::Engine.add_routes do
 
     resources :stock_items, :only => [:create, :update, :destroy]
     resources :tax_rates
-    resource  :tax_settings
 
     resources :trackers
     resources :payment_methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
@@ -217,7 +217,6 @@ files:
 - app/controllers/spree/admin/stock_transfers_controller.rb
 - app/controllers/spree/admin/tax_categories_controller.rb
 - app/controllers/spree/admin/tax_rates_controller.rb
-- app/controllers/spree/admin/tax_settings_controller.rb
 - app/controllers/spree/admin/taxonomies_controller.rb
 - app/controllers/spree/admin/taxons_controller.rb
 - app/controllers/spree/admin/trackers_controller.rb
@@ -319,6 +318,9 @@ files:
 - app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb
 - app/views/spree/admin/promotions/actions/_create_line_items.html.erb
 - app/views/spree/admin/promotions/actions/_free_shipping.html.erb
+- app/views/spree/admin/promotions/calculators/_default_fields.html.erb
+- app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb
+- app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb
 - app/views/spree/admin/promotions/edit.html.erb
 - app/views/spree/admin/promotions/index.html.erb
 - app/views/spree/admin/promotions/new.html.erb
@@ -413,7 +415,6 @@ files:
 - app/views/spree/admin/tax_rates/edit.html.erb
 - app/views/spree/admin/tax_rates/index.html.erb
 - app/views/spree/admin/tax_rates/new.html.erb
-- app/views/spree/admin/tax_settings/edit.html.erb
 - app/views/spree/admin/taxonomies/_form.html.erb
 - app/views/spree/admin/taxonomies/_js_head.html.erb
 - app/views/spree/admin/taxonomies/_list.html.erb
@@ -458,6 +459,7 @@ files:
 - app/views/spree/layouts/admin.html.erb
 - app/views/spree/test_mailer/test_email.text.erb
 - config/initializers/form_builder.rb
+- config/locales/en.yml
 - config/routes.rb
 - lib/spree/backend.rb
 - lib/spree/backend/action_callbacks.rb

data/app/controllers/spree/admin/tax_settings_controller.rb

@@ -1,17 +0,0 @@
-module Spree
-  module Admin
-    class TaxSettingsController < Spree::Admin::BaseController
-
-      def update
-        Spree::Config.set(params[:preferences])
-
-        respond_to do |format|
-          format.html {
-            redirect_to edit_admin_tax_settings_path
-          }
-        end
-      end
-
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
-<% content_for :page_title do %>
-  <%= Spree.t(:tax_settings) %>
-<% end %>
-
-<%= form_tag admin_tax_settings_path, :method => :put do %>
-  <div data-hook="shipment_vat" class="field align-center">
-    <%= hidden_field_tag 'preferences[shipment_inc_vat]', '0' %>
-    <%= check_box_tag 'preferences[shipment_inc_vat]', '1',  Spree::Config[:shipment_inc_vat] %>
-    <%= label_tag nil, Spree.t(:shipment_inc_vat) %>    
-
-  </div>
-
-  <div class="form-buttons" data-hook="buttons">
-    <%= button Spree.t('actions.update'), 'refresh' %>
-  </div>
-<% end %>