spree_backend 2.4.0.rc2 → 2.4.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c746330159942dd82dd11de07001106f4b973ef3
-  data.tar.gz: cc5031d65ca142846fec254ed5b547ebbbbdb026
+  metadata.gz: 20e9b9d30543a971ed7797b83d1345b3902e3c5c
+  data.tar.gz: 50fba7739d5c4ef525b63d3a84a6704814f76217
 SHA512:
-  metadata.gz: a7a6bb73924c37b6a212b9127e267837b2cb901c2ddc1a39b1ea31ff791d46d18a529c297a715f85e4948be330470a6ae2d0fb2df33e9dd828f8455c90ab976b
-  data.tar.gz: d46e55cc64e75c0f36a54b84dfa9bf3d77b13865c56ec15c49e06601c04e137d60a6e9fb6db04dd4a620c8bd1103df7fdf0696b9e0bfb5db268090abfe7f5e4a
+  metadata.gz: bccd2cc77112fe4f112d1f2983bbd55c53e77daa4d549b56b53892dce6975b1f33a9c379c264a34f67b7b887abf645b114f38c5c76071667ee5b26a414776157
+  data.tar.gz: 2c68dc2d57f6d1573bcbbc978ba58b830bd9c6a984606b6d83d25073205fb2bbd01fed73aedf2dd85cbe99efde8f55699170b5810ae0d19b18447ba77026ede4

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

@@ -1,4 +1,4 @@
-var update_state = function (region) {
+var update_state = function (region, done) {
   'use strict';
 
   var country = $('span#' + region + 'country .select2').select2('val');
@@ -27,5 +27,7 @@ var update_state = function (region) {
       state_input.prop('disabled', false).show();
       state_select.select2('destroy').hide();
     }
+
+    if(done) done();
   });
 };

data/app/assets/javascripts/spree/backend/checkouts/edit.js

@@ -34,6 +34,22 @@ $(document).ready(function() {
         $('#guest_checkout_false').prop("checked", true);
         $('#guest_checkout_false').prop("disabled", false);
 
+        var billAddress = customer.bill_address;
+        if(billAddress) {
+          $('#order_bill_address_attributes_firstname').val(billAddress.firstname);
+          $('#order_bill_address_attributes_lastname').val(billAddress.lastname);
+          $('#order_bill_address_attributes_address1').val(billAddress.address1);
+          $('#order_bill_address_attributes_address2').val(billAddress.address2);
+          $('#order_bill_address_attributes_city').val(billAddress.city);
+          $('#order_bill_address_attributes_zipcode').val(billAddress.zipcode);
+          $('#order_bill_address_attributes_phone').val(billAddress.phone);
+
+          $('#order_bill_address_attributes_country_id').select2("val", billAddress.country_id).promise().done(function () {
+            update_state('b', function () {
+              $('#order_bill_address_attributes_state_id').select2("val", billAddress.state_id);
+            });
+          });
+        }
         return customer.email;
       }
     })

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

@@ -84,6 +84,11 @@ nav.menu {
       position: relative;
       text-align: center;
 
+      @media(max-width: 1009px) {
+        top: -3px;
+        margin-bottom: -5px;
+      }
+
       i {
         display: inline;
       }

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

@@ -12,4 +12,10 @@
   }
   
   margin: 10px;
-}
+}
+
+#taxon_products {
+  > li {
+    height: 170px;
+  }
+}

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

@@ -27,6 +27,12 @@ module Spree
         @order.reload.update!
       end
 
+      # Override method used to create a new instance to correctly
+      # associate adjustment with order
+      def build_resource
+        parent.adjustments.build(order: parent)
+      end
+
     end
   end
 end

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -23,8 +23,7 @@ module Spree
             if params[:guest_checkout] == "false"
               @order.associate_user!(Spree.user_class.find(params[:user_id]), @order.email.blank?)
             end
-            while @order.next; end
-
+            @order.next
             @order.refresh_shipment_rates
             flash[:success] = Spree.t('customer_details_updated')
             redirect_to edit_admin_order_url(@order)

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

@@ -20,11 +20,11 @@ module Spree
 
         params[:q].delete(:inventory_units_shipment_id_null) if params[:q][:inventory_units_shipment_id_null] == "0"
 
-        if !params[:q][:created_at_gt].blank?
+        if params[:q][:created_at_gt].present?
           params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue ""
         end
 
-        if !params[:q][:created_at_lt].blank?
+        if params[:q][:created_at_lt].present?
           params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
         end
 
@@ -109,16 +109,16 @@ module Spree
       end
 
       def open_adjustments
-        adjustments = @order.adjustments.where(:state => 'closed')
-        adjustments.update_all(:state => 'open')
+        adjustments = @order.all_adjustments.where(state: 'closed')
+        adjustments.update_all(state: 'open')
         flash[:success] = Spree.t(:all_adjustments_opened)
 
         respond_with(@order) { |format| format.html { redirect_to :back } }
       end
 
       def close_adjustments
-        adjustments = @order.adjustments.where(:state => 'open')
-        adjustments.update_all(:state => 'closed')
+        adjustments = @order.all_adjustments.where(state: 'open')
+        adjustments.update_all(state: 'closed')
         flash[:success] = Spree.t(:all_adjustments_closed)
 
         respond_with(@order) { |format| format.html { redirect_to :back } }

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

@@ -130,9 +130,6 @@ module Spree
           clone_admin_product_url resource
         end
 
-        def permit_attributes
-          params.require(:product).permit!
-        end
     end
   end
 end

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

@@ -0,0 +1,17 @@
+module Spree
+  module Admin
+    class RootController < Spree::Admin::BaseController
+
+      skip_before_filter :authorize_admin
+
+      def index
+        redirect_to admin_root_redirect_path
+      end
+
+      protected
+      def admin_root_redirect_path
+        spree.admin_orders_path
+      end
+    end
+  end
+end

data/app/models/spree/backend_configuration.rb

@@ -1,5 +1,21 @@
 module Spree
   class BackendConfiguration < Preferences::Configuration
-    preference :locale, :string, :default => Rails.application.config.i18n.default_locale
+    preference :locale, :string, default: Rails.application.config.i18n.default_locale
+
+    ORDER_TABS         ||= [:orders, :payments, :creditcard_payments,
+                            :shipments, :credit_cards, :return_authorizations,
+                            :customer_returns, :adjustments, :customer_details]
+    PRODUCT_TABS       ||= [:products, :option_types, :properties, :prototypes,
+                            :variants, :product_properties, :taxonomies,
+                            :taxons]
+    REPORT_TABS        ||= [:reports]
+    CONFIGURATION_TABS ||= [:configurations, :general_settings, :tax_categories,
+                            :tax_rates, :zones, :countries, :states,
+                            :payment_methods, :shipping_methods,
+                            :shipping_categories, :stock_transfers,
+                            :stock_locations, :trackers, :refund_reasons,
+                            :reimbursement_types, :return_authorization_reasons]
+    PROMOTION_TABS     ||= [:promotions, :promotion_categories]
+    USER_TABS          ||= [:users]
   end
 end

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

@@ -22,7 +22,10 @@
         </tr>
       </thead>
       <tbody>
-        <%= render "spree/admin/log_entries/#{@payment.payment_method.name.gsub(' ', '').underscore}", entry: entry %>
+        <tr>
+          <td>Message</td>
+          <td><%= entry.parsed_details.message %></td>
+        </tr>
       </tbody>
   <% end %>
-</table>
+</table>

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

@@ -36,9 +36,8 @@
     var shipments = [];
 
     <% @order.shipments.each do |shipment| %>
-      shipments.push(<%== shipment.to_json(:root => false, :include => [:inventory_units, :stock_location]) %>);
+            shipments.push(<%== shipment.as_json(:root => false, :only => [:id, :tracking, :number, :state, :stock_location_id], :include => [:inventory_units, :stock_location]).to_json %>);
     <% end %>
-
     <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>
   <% end -%>
 </div>

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

@@ -32,7 +32,7 @@
       var shipments = [];
 
       <% @order.shipments.each do |shipment| %>
-          shipments.push(<%== shipment.to_json(:root => false, :include => [:inventory_units, :stock_location]) %>);
+            shipments.push(<%== shipment.as_json(:root => false, :only => [:id, :tracking, :number, :state, :stock_location_id], :include => [:inventory_units, :stock_location]).to_json %>);
       <% end %>
 
       <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -51,7 +51,7 @@
       <%= f.fields_for :ship_address do |sa_form| %>
         <div class="field" style="position: absolute;margin-top: -15px;right: 0;">
           <span data-hook="use_billing">
-            <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
+            <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
             <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
           </span>
         </div>

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

@@ -17,7 +17,7 @@
 </div>
 
 <% if @order.payments.exists? && @order.considered_risky? %>
-  <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
+  <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.last %>
 <% end %>
 
 <%= render partial: 'add_product' if @order.shipment_state != 'shipped' && can?(:update, @order) %>

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

@@ -45,10 +45,16 @@
           <%= label_tag :q_number_cont, Spree.t(:order_number, :number => '') %>
           <%= f.text_field :number_cont %>
         </div>
+
         <div class="field">
           <%= label_tag :q_email_cont, Spree.t(:email) %>
           <%= f.text_field :email_cont %>
         </div>
+
+        <div class="field">
+          <%= label_tag :q_line_items_variant_id_in, Spree.t(:sku) %>
+          <%= f.select :line_items_variant_id_in, Spree::Variant.pluck(:sku, :id), {:include_blank => true}, :class => 'select2' %>
+        </div>
       </div>
 
       <div class="four columns">
@@ -132,7 +138,13 @@
           <% if Spree::Order.checkout_step_names.include?(:delivery) %>
             <td class="align-center"><span class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") if order.shipment_state %></span></td>
           <% end %>
-        <td><%= mail_to order.email %></td>
+        <td>
+          <% if order.user %>
+            <%= link_to order.email, edit_admin_user_path(order.user) %>
+          <% else %>
+            <%= mail_to order.email %>
+          <% end %>
+        </td>
         <td class="align-center"><%= order.display_total.to_html %></td>
         <td class='actions align-center' data-hook="admin_orders_index_row_actions">
           <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}", :no_text => true %>

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

@@ -4,7 +4,7 @@
     <div data-hook="admin_product_form_name">
       <%= f.field_container :name do %>
         <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
-        <%= f.text_field :name, :class => 'fullwidth title' %>
+        <%= f.text_field :name, :class => 'fullwidth title', :required => true %>
         <%= f.error_message_on :name %>
       <% end %>
     </div>
@@ -12,7 +12,7 @@
     <div data-hook="admin_product_form_slug">
       <%= f.field_container :slug do %>
         <%= f.label :slug, raw(Spree.t(:slug) + content_tag(:span, ' *',  :class => "required")) %>
-        <%= f.text_field :slug, :class => 'fullwidth title' %>
+        <%= f.text_field :slug, :class => 'fullwidth title', :required => true %>
         <%= f.error_message_on :slug %>
       <% end %>
     </div>
@@ -30,7 +30,7 @@
     <div data-hook="admin_product_form_price">
     <%= f.field_container :price do %>
       <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', :class => "required")) %>
-      <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
+      <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :required => true %>
       <%= f.error_message_on :price %>
     <% end %>
     </div>
@@ -42,6 +42,7 @@
         <%= f.error_message_on :cost_price %>
       <% end %>
     </div>
+
     <div data-hook="admin_product_form_cost_currency" class="omega two columns">
       <%= f.field_container :cost_currency do %>
         <%= f.label :cost_currency, Spree.t(:cost_currency) %>

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

@@ -10,7 +10,7 @@
 
     <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-      <%= f.text_field :name, :class => 'fullwidth title' %>
+      <%= f.text_field :name, :class => 'fullwidth title', :required => true %>
       <%= f.error_message_on :name %>
     <% end %>
 
@@ -35,7 +35,7 @@
       <div data-hook="new_product_price" class="four columns">
         <%= f.field_container :price do %>
           <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span><br />
-          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'fullwidth' %>
+          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'fullwidth', :required => true %>
           <%= f.error_message_on :price %>
         <% end %>
       </div>
@@ -54,7 +54,7 @@
       <div data-hook="new_product_shipping_category" class="alpha four columns">
         <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span><br />
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth', :required => true }) %>
           <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>

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

@@ -2,11 +2,7 @@
   <%= Spree.t(:editing_promotion_category) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_promotion_categories_list), spree.admin_promotion_categories_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
+<%= render 'spree/admin/shared/promotion_sub_menu' %>
 
 <%= form_for @promotion_category, :url => object_url, :method => :put do |f| %>
   <fieldset class="no-border-top">
@@ -14,4 +10,3 @@
     <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>
-

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

@@ -4,31 +4,39 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_promotion_category), spree.new_admin_promotion_category_path, :icon => 'plus' %>
-  </li>
-  <li>
-    <%= button_link_to Spree.t(:back_to_promotions_list), spree.admin_promotions_path, :icon => 'arrow-left' %>
+    <%= button_link_to Spree.t(:new_promotion_category), spree.new_admin_promotion_category_path, icon: 'plus', remote: true, id: 'new_promotion_category_link' %>
   </li>
 <% end %>
 
-<table>
-  <colgroup>
-    <col style="width: 85%">
-    <col style="width: 15%">
-  </colgroup>
-  <thead>
-    <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
-    <th class='actions'></th>
-  </thead>
-  <tbody>
-    <% @promotion_categories.each do |promotion_category| %>
-      <tr>
-        <td><%= promotion_category.name %></td>
-        <td class="actions">
-          <%= link_to_edit promotion_category, :no_text => true %>
-          <%= link_to_delete promotion_category, :no_text => true %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<%= render 'spree/admin/shared/promotion_sub_menu' %>
+
+<div id="new_promotion_category"></div>
+
+<% if @promotion_categories.any? %>
+  <table>
+    <colgroup>
+      <col style="width: 85%">
+      <col style="width: 15%">
+    </colgroup>
+    <thead>
+      <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
+      <th class='actions'></th>
+    </thead>
+    <tbody>
+      <% @promotion_categories.each do |promotion_category| %>
+        <tr>
+          <td><%= promotion_category.name %></td>
+          <td class="actions">
+            <%= link_to_edit promotion_category, :no_text => true %>
+            <%= link_to_delete promotion_category, :no_text => true %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alpha sixteen columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/promotion_category')) %>
+    <%= link_to Spree.t(:add_one) + '!', spree.new_admin_promotion_category_path, remote: true, id: 'new_promotion_category_link' %>
+  </div>
+<% end %>

data/app/views/spree/admin/promotion_categories/new.html.erb

@@ -2,11 +2,7 @@
   <%= Spree.t(:new_promotion_category) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_promotion_categories_list), spree.admin_promotion_categories_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
+<%= render 'spree/admin/shared/promotion_sub_menu' %>
 
 <%= form_for :promotion_category, :url => collection_url do |f| %>
   <fieldset class="no-border-top">

data/app/views/spree/admin/promotion_categories/new.js.erb

@@ -0,0 +1,5 @@
+$("#new_promotion_category").html('<%= escape_javascript(render template: "spree/admin/promotion_categories/new", formats: [:html], handlers: [:erb]) %>');
+<% unless Rails.env.test? %>
+  $('.select2').select2();
+<% end %>
+$("#new_promotion_category_link").parent().hide();

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

@@ -2,11 +2,7 @@
   <%= Spree.t(:editing_promotion) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_promotions_list), admin_promotions_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
+<%= render 'spree/admin/shared/promotion_sub_menu' %>
 
 <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
   <fieldset class="no-border-top">

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

@@ -3,14 +3,13 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:manage_promotion_categories), spree.admin_promotion_categories_path, :icon => 'bars' %>
-  </li>
   <li>
     <%= button_link_to Spree.t(:new_promotion), spree.new_admin_promotion_path, :icon => 'plus' %>
   </li>
 <% end %>
 
+<%= render 'spree/admin/shared/promotion_sub_menu' %>
+
 <% content_for :table_filter_title do %>
   <%= Spree.t(:search) %>
 <% end %>
@@ -100,7 +99,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="alpha omega sixteen columns no-objects-found">
     <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/promotion')) %>,
     <%= link_to Spree.t(:add_one), spree.new_admin_promotion_path %>!
   </div>

data/app/views/spree/admin/promotions/new.html.erb

@@ -2,11 +2,7 @@
   <%= Spree.t(:new_promotion) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_promotions_list), spree.admin_promotions_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
+<%= render 'spree/admin/shared/promotion_sub_menu' %>
 
 <%= form_for :promotion, :url => collection_url do |f| %>
   <fieldset class="no-border-top">

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

@@ -2,24 +2,35 @@
   <div class="alpha four columns">
     <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-      <%= f.text_field :name, :class => 'fullwidth' %>
+      <%= f.text_field :name, class: 'fullwidth' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
 
-  <div class="six columns">
+  <div class="four columns">
     <div id='properties' data-hook>
       <%= f.field_container :property_ids do %>
         <%= f.label :property_ids, Spree.t(:properties) %><br>
-        <%= f.select :property_ids, Spree::Property.all.map { |p| [p.presentation, p.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+        <%= f.select :property_ids, Spree::Property.all.map { |p| ["#{p.presentation} (#{p.name})", p.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
       <% end %>
     </div>
   </div>
 
-  <div class="six columns omega">
-    <%= f.field_container :option_type_ids do %>
-      <%= f.label :option_type_ids, Spree.t(:option_types) %><br>
-      <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| [ot.presentation, ot.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
-    <% end %>
+  <div class="four columns">
+    <div id="option_types" data-hook>
+      <%= f.field_container :option_type_ids do %>
+        <%= f.label :option_type_ids, Spree.t(:option_types) %><br>
+        <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="four columns omega">
+    <div id='taxons' data-hook>
+      <%= f.field_container :taxon_ids do %>
+        <%= f.label :taxon_ids, Spree.t(:taxons) %><br>
+        <%= f.select :taxon_ids, Spree::Taxon.all.map { |t| [t.name, t.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
+      <% end %>
+    </div>
   </div>
 </div>

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

@@ -10,8 +10,8 @@
       <%= configurations_sidebar_menu_item Spree.t(:tax_rates), admin_tax_rates_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] %>
-        <%= configurations_sidebar_menu_item Spree.t(:states), admin_country_states_path(Spree::Config[:default_country_id]) %>
+      <% if country = Spree::Country.find_by_id(Spree::Config[:default_country_id]) || Spree::Country.first %>
+        <%= configurations_sidebar_menu_item Spree.t(:states), admin_country_states_path(country) %>
       <% end %>
       <%= configurations_sidebar_menu_item Spree.t(:payment_methods), admin_payment_methods_path %>
       <%= configurations_sidebar_menu_item Spree.t(:taxonomies), admin_taxonomies_path %>

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

@@ -24,7 +24,6 @@
       <%= content_tag :li, :class => ('active' if current == 'Stock Management') do %>
         <%= link_to_with_icon 'tasks', Spree.t(:stock_management), stock_admin_product_url(@product) %>
       <% end if can?(:stock, Spree::Product) %>
-      </li>
     </ul>
   </nav>
 

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

@@ -0,0 +1,6 @@
+<% content_for :sub_menu do %>
+  <ul id="sub_nav" data-hook="admin_promotion_sub_tabs" class="inline-menu">
+    <%= tab :promotions %>
+    <%= tab :promotion_categories %>
+  </ul>
+<% end %>

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

@@ -1,16 +1,21 @@
 <% if can? :admin, Spree::Order %>
-  <%= tab :orders, :payments, :creditcard_payments, :shipments, :credit_cards, :return_authorizations, :customer_returns, :icon => 'shopping-cart' %>
+  <%= tab *Spree::BackendConfiguration::ORDER_TABS, icon: 'shopping-cart' %>
 <% end %>
+
 <% if can? :admin, Spree::Product %>
-  <%= tab :products, :option_types, :properties, :prototypes, :variants, :product_properties, :taxonomies, :taxons, :icon => 'th-large' %>
+  <%= tab *Spree::BackendConfiguration::PRODUCT_TABS, icon: 'th-large' %>
 <% end %>
+
 <% if can? :admin, Spree::Admin::ReportsController %>
-  <%= tab :reports, :icon => 'file'  %>
+  <%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'file'  %>
 <% end %>
-<%= 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 %>
+
+<%= tab *Spree::BackendConfiguration::CONFIGURATION_TABS, 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') %>
+  <%= tab *Spree::BackendConfiguration::PROMOTION_TABS, url: spree.admin_promotions_path, icon: 'bullhorn' %>
 <% end %>
+
 <% if Spree.user_class && can?(:admin, Spree.user_class) %>
-  <%= tab(:users, :url => spree.admin_users_path, :icon => 'user') %>
+  <%= tab *Spree::BackendConfiguration::USER_TABS, url: spree.admin_users_path, icon: 'user' %>
 <% end %>

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

@@ -1,95 +1,81 @@
 <div data-hook="admin_stock_locations_form_fields" class="row">
-  <div class="row">
-    <div class="alpha twelve columns">
+  <div class="alpha nine columns" data-hook="stock_location_names">
+    <div data-hook="stock_location_name">
       <%= f.field_container :name do %>
         <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-        <%= f.text_field :name, :class => 'fullwidth' %>
-      <% end %><br>
-      <%= f.field_container :admin_name do %>
-        <%= f.label :admin_name, Spree.t(:internal_name) %>
-        <%= f.text_field :admin_name, :class => 'fullwidth', :label => false %>
+        <%= f.text_field :name, class: 'fullwidth', required: true %>
       <% end %>
     </div>
-    <div class="omega four columns">
-      <%= f.field_container :active do %>
-        <label for="active"><%= Spree.t(:status) %></label>
-        <ul>
-          <li>
-            <%= f.label :active, Spree.t(:active) %>
-            <%= f.check_box :active %>
-          </li>
-          <li>
-            <%= f.label :default, Spree.t(:default) %>
-            <%= f.check_box :default %>
-          </li>
-          <li>
-            <%= f.label :backorderable_default, Spree.t(:backorderable_default) %>
-            <%= f.check_box :backorderable_default %>
-          </li>
-          <li>
-            <%= f.label :propagate_all_variants, Spree.t(:propagate_all_variants) %>
-            <%= f.check_box :propagate_all_variants %>
-          </li>
-        </ul>
+    <div data-hook="stock_location_admin_name">
+      <%= f.field_container :admin_name do %>
+        <%= f.label :admin_name, Spree.t(:internal_name) %>
+        <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
       <% end %>
     </div>
   </div>
 
-  <div class="row">
-    <div class="alpha four columns">
-      <div class="field ">
-        <%= f.label :address1, Spree.t(:street_address) %>
-        <%= f.text_field :address1, :class => 'fullwidth' %>
-      </div>
-    </div>
+  <div class="omega three columns" data-hook="stock_location_status">
+    <%= f.field_container :active do %>
+      <label for="active"><%= Spree.t(:status) %></label>
+      <ul>
+        <li class="fullwidth" data-hook="stock_location_active">
+          <%= f.check_box :active %>
+          <%= f.label :active, Spree.t(:active) %>
+        </li>
+        <li class="fullwidth" data-hook="stock_location_default">
+          <%= f.check_box :default %>
+          <%= f.label :default, Spree.t(:default) %>
+        </li>
+        <li class="fullwidth" data-hook="stock_location_backorderable_default">
+          <%= f.check_box :backorderable_default %>
+          <%= f.label :backorderable_default, Spree.t(:backorderable_default) %>
+        </li>
+        <li class="fullwidth" data-hook="stock_location_propagate_all_variants">
+          <%= f.check_box :propagate_all_variants %>
+          <%= f.label :propagate_all_variants, Spree.t(:propagate_all_variants) %>
+        </li>
+      </ul>
+    <% end %>
+  </div>
 
-    <div class="four columns">
-      <div class="field ">
-        <%= f.label :address2, Spree.t(:street_address_2) %>
-        <%= f.text_field :address2, :class => 'fullwidth' %>
-      </div>
-    </div>
-    <div class="four columns">
-      <div class="field ">
-        <%= f.label :city, Spree.t(:city) %>
-        <%= f.text_field :city, :class => 'fullwidth' %>
-      </div>
-    </div>
+  <div class="alpha six columns field" data-hook="stock_location_address1">
+    <%= f.label :address1, Spree.t(:street_address) %>
+    <%= f.text_field :address1, class: 'fullwidth' %>
+  </div>
 
-    <div class="omega four columns">
-      <div class="field ">
-        <%= f.label :zipcode, Spree.t(:zip) %>
-        <%= f.text_field :zipcode, :class => 'fullwidth' %>
-      </div>
-    </div>
+  <div class="omega six columns field" data-hook="stock_location_city">
+    <%= f.label :city, Spree.t(:city) %>
+    <%= f.text_field :city, class: 'fullwidth' %>
   </div>
 
-  <div class="row">
-    <div class="alpha eight columns">
-      <div class="field ">
-        <%= f.label :country_id, Spree.t(:country) %>
-        <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'select2 fullwidth'} %></span>
-      </div>
-    </div>
+  <div class="alpha six columns field" data-hook="stock_location_address2">
+    <%= f.label :address2, Spree.t(:street_address_2) %>
+    <%= f.text_field :address2, class: 'fullwidth' %>
+  </div>
 
-    <div class="four columns">
-      <div class="field ">
-        <% if f.object.country %>
-          <%= f.label :state_id, Spree.t(:state) %>
-          <span id="state" class="region">
-            <%= f.text_field :state_name, :style => "display: #{f.object.country.states.empty? ? 'block' : 'none' };", :disabled => !f.object.country.states.empty?, :class => 'fullwidth state_name' %>
-            <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
-          </span>
-        <% end %>
-      </div>
-    </div>
+  <div class="three columns field" data-hook="stock_location_zipcode">
+    <%= f.label :zipcode, Spree.t(:zip) %>
+    <%= f.text_field :zipcode, class: 'fullwidth' %>
+  </div>
 
-    <div class="omega four columns">
-      <div class="field ">
-        <%= f.label :phone, Spree.t(:phone) %>
-        <%= f.phone_field :phone, :class => 'fullwidth' %>
-      </div>
-    </div>
+  <div class="omega three columns field" data-hook="stock_location_phone">
+    <%= f.label :phone, Spree.t(:phone) %>
+    <%= f.phone_field :phone, class: 'fullwidth' %>
+  </div>
+
+  <div class="alpha six columns field" data-hook="stock_location_country">
+    <%= f.label :country_id, Spree.t(:country) %>
+    <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 fullwidth' } %></span>
+  </div>
+
+  <div class="omega six columns field" data-hook="stock_location_state">
+    <% if f.object.country %>
+      <%= f.label :state_id, Spree.t(:state) %>
+      <span id="state" class="region">
+        <%= f.text_field :state_name, style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };", disabled: !f.object.country.states.empty?, class: 'fullwidth state_name' %>
+        <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2 fullwidth', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
+      </span>
+    <% end %>
   </div>
 </div>
 

data/app/views/spree/admin/taxonomies/new.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_taxonomy) %>
@@ -10,6 +10,8 @@
   </li>
 <% end %>
 
+<%= render 'spree/admin/shared/product_sub_menu' %>
+
 <%= form_for [:admin, @taxonomy] do |f| %>
 
   <%= render :partial => 'form', :locals => { :f => f } %>

data/config/routes.rb

@@ -1,13 +1,13 @@
 Spree::Core::Engine.add_routes do
   namespace :admin do
-    get '/search/users', :to => "search#users", :as => :search_users
+    get '/search/users', to: "search#users", as: :search_users
 
     resources :promotions do
       resources :promotion_rules
       resources :promotion_actions
     end
 
-    resources :promotion_categories, :except => [:show]
+    resources :promotion_categories, except: [:show]
 
     resources :zones
 
@@ -37,10 +37,10 @@ Spree::Core::Engine.add_routes do
           post :update_positions
         end
       end
-      resources :variants_including_master, :only => [:update]
+      resources :variants_including_master,   only: [:update]
     end
 
-    get '/variants/search', :to => "variants#search", :as => :search_variants
+    get '/variants/search', to: "variants#search", as: :search_variants
 
     resources :option_types do
       collection do
@@ -49,7 +49,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    delete '/option_values/:id', :to => "option_values#destroy", :as => :option_value
+    delete '/option_values/:id', to: "option_values#destroy", as: :option_value
 
     resources :properties do
       collection do
@@ -57,7 +57,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    delete '/product_properties/:id', :to => "product_properties#destroy", :as => :product_property
+    delete '/product_properties/:id', to: "product_properties#destroy", as: :product_property
 
     resources :prototypes do
       member do
@@ -69,7 +69,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    resources :orders, :except => [:show] do
+    resources :orders, except: [:show] do
       member do
         get :cart
         post :resend
@@ -80,7 +80,7 @@ Spree::Core::Engine.add_routes do
         put :resume
       end
 
-      resource :customer, :controller => "orders/customer_details"
+      resource :customer, controller: "orders/customer_details"
       resources :customer_returns, only: [:index, :new, :edit, :create, :update] do
         member do
           put :refund
@@ -128,34 +128,34 @@ Spree::Core::Engine.add_routes do
       resources :taxons
     end
 
-    resources :taxons, :only => [:index, :show] do
+    resources :taxons, only: [:index, :show] do
       collection do
         get :search
       end
     end
 
-    resources :reports, :only => [:index] do
+    resources :reports, only: [:index] do
       collection do
         get :sales_total
         post :sales_total
       end
     end
 
-    resources :reimbursement_types, :only => [:index]
-    resources :refund_reasons, :except => [:show, :destroy]
-    resources :return_authorization_reasons, :except => [:show, :destroy]
+    resources :reimbursement_types, only: [:index]
+    resources :refund_reasons, except: [:show, :destroy]
+    resources :return_authorization_reasons, except: [:show, :destroy]
 
     resources :shipping_methods
     resources :shipping_categories
-    resources :stock_transfers, :only => [:index, :show, :new, :create]
+    resources :stock_transfers, only: [:index, :show, :new, :create]
     resources :stock_locations do
-      resources :stock_movements, :except => [:edit, :update, :destroy]
+      resources :stock_movements, except: [:edit, :update, :destroy]
       collection do
         post :transfer_stock
       end
     end
 
-    resources :stock_items, :only => [:create, :update, :destroy]
+    resources :stock_items, only: [:create, :update, :destroy]
     resources :tax_rates
 
     resources :trackers
@@ -171,5 +171,5 @@ Spree::Core::Engine.add_routes do
     end
   end
 
-  get '/admin', :to => 'admin/orders#index', :as => :admin
+  get '/admin', to: 'admin/root#index', as: :admin
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc2
+  version: 2.4.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc2
+        version: 2.4.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc2
+        version: 2.4.0.rc3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc2
+        version: 2.4.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc2
+        version: 2.4.0.rc3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +203,7 @@ files:
 - app/controllers/spree/admin/return_authorization_reasons_controller.rb
 - app/controllers/spree/admin/return_authorizations_controller.rb
 - app/controllers/spree/admin/return_items_controller.rb
+- app/controllers/spree/admin/root_controller.rb
 - app/controllers/spree/admin/search_controller.rb
 - app/controllers/spree/admin/shipping_categories_controller.rb
 - app/controllers/spree/admin/shipping_methods_controller.rb
@@ -261,7 +262,6 @@ files:
 - app/views/spree/admin/images/new.html.erb
 - app/views/spree/admin/line_items/create.js.erb
 - app/views/spree/admin/line_items/destroy.js.erb
-- app/views/spree/admin/log_entries/_credit_card.html.erb
 - app/views/spree/admin/log_entries/index.html.erb
 - app/views/spree/admin/option_types/_form.html.erb
 - app/views/spree/admin/option_types/_option_value_fields.html.erb
@@ -317,6 +317,7 @@ files:
 - app/views/spree/admin/promotion_categories/edit.html.erb
 - app/views/spree/admin/promotion_categories/index.html.erb
 - app/views/spree/admin/promotion_categories/new.html.erb
+- app/views/spree/admin/promotion_categories/new.js.erb
 - app/views/spree/admin/promotion_rules/create.js.erb
 - app/views/spree/admin/promotion_rules/destroy.js.erb
 - app/views/spree/admin/promotions/_actions.html.erb
@@ -394,6 +395,7 @@ files:
 - app/views/spree/admin/shared/_order_tabs.html.erb
 - app/views/spree/admin/shared/_product_sub_menu.html.erb
 - app/views/spree/admin/shared/_product_tabs.html.erb
+- app/views/spree/admin/shared/_promotion_sub_menu.html.erb
 - app/views/spree/admin/shared/_refunds.html.erb
 - app/views/spree/admin/shared/_report_criteria.html.erb
 - app/views/spree/admin/shared/_report_order_criteria.html.erb

data/app/views/spree/admin/log_entries/_credit_card.html.erb

@@ -1,4 +0,0 @@
-<tr>
-  <td>Message</td>
-  <td><%= entry.parsed_details.message %></td>
-</tr>