spree_backend 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2247d6b1fd0f2c42d81b9e6fd359bc2ae51106af
-  data.tar.gz: f96494f83025962aac4de8de6064a8a7a12fa6bb
+  metadata.gz: cfb4a7508972ef8102f95e7633192342d35e8b1f
+  data.tar.gz: 245a1617da026360112445f70c38a82921c8dda8
 SHA512:
-  metadata.gz: d66f25f0a706af218074a17849edc034b005fcf759c768e94eceadb96663db6013ff48358ced784be59c265eeac8fe419b09fb1f496666d0d800a3c43856e28f
-  data.tar.gz: 141a997656ca4272428900e729cd8e7fb0a42daff8d73c566bbfb3acbc6f9a8bd08567d19dd247046405cb0e634ced2ac5987b6bf6e8aea24c3b977b154ffd38
+  metadata.gz: 32e603d0700dddb9fa38a855422c96b1e554ba51be7fe8fd5749a7120f9ce91434472603a62b66ae25dae5b8a047c6fb8cf6aadcba3c3cf809ed2475e9ea43bb
+  data.tar.gz: 7dced87891897a95ca77c7347546e0c7ed4f0af43618907edcc5262e369480372c1bdd0fd0861e8c6f74007cf3d4ebc34f9af8c7c34ee39734c64ed3809a6130

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/javascripts/spree/backend/payments/new.js

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

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

@@ -1,9 +1,9 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery-migrate-1.0.0
-//= require jquery.ui.datepicker
-//= require jquery.ui.sortable
-//= require jquery.ui.autocomplete
+//= require jquery-ui/datepicker
+//= require jquery-ui/sortable
+//= require jquery-ui/autocomplete
 //= require modernizr
 //= require jquery.cookie
 //= require jquery.delayedobserver

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/assets/stylesheets/spree/backend.css

@@ -8,8 +8,8 @@
  *= require responsive-tables
  *= require normalize
  *= require skeleton
- *= require jquery.ui.datepicker
- *= require jquery.ui.autocomplete
+ *= require jquery-ui/datepicker
+ *= require jquery-ui/autocomplete
  *= require jquery.powertip
  *= require select2
 

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_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
 
@@ -98,16 +98,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/helpers/spree/admin/base_helper.rb

@@ -159,6 +159,12 @@ module Spree
         dom_id(record, 'spree')
       end
 
+      def rails_environments
+        @@rails_environments ||= Dir.glob("#{Rails.root}/config/environments/*.rb")
+                                    .map { |f| File.basename(f, ".rb") }
+                                    .sort
+      end
+
       private
         def attribute_name_for(field_name)
           field_name.gsub(' ', '_').downcase

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

@@ -1,9 +1,11 @@
 <tr class="option_value fields" id="spree_<%= dom_id(f.object) %>"  data-hook="option_value" class="<%= cycle('odd', 'even')%>">
-  <td class="no-border">
-    <span class="handle"></span>
-    <%= f.hidden_field :id %>
-  </td>
-  <td class="name"><%= f.text_field :name %></td>
+  <% if f.object.persisted? %>
+    <td class="no-border">
+      <span class="handle"></span>
+      <%= f.hidden_field :id %>
+    </td>
+  <% end %>
+  <td colspan="<%= f.object.persisted? ? '' : '2' %>" class="name"><%= f.text_field :name %></td>
   <td class="presentation"><%= f.text_field :presentation %></td>
   <td class="actions"><%= link_to_remove_fields Spree.t(:remove), f, :no_text => true %></td>
 </tr>

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

@@ -32,15 +32,8 @@
         </tr>
       </thead>
       <tbody id="option_values">
-        <% if @option_type.option_values.empty? %>
-          <tr id="none" data-hook="option_none" class="<%= cycle('odd', 'even')%>">
-            <td colspan="2"><%= Spree.t(:none) %></td>
-            <td class="actions"></td>
-          </tr>
-        <% else %>
-          <%= f.fields_for :option_values do |option_value_form| %>
-            <%= render :partial => 'option_value_fields', :locals => { :f => option_value_form } %>
-          <% end %>
+        <%= f.fields_for :option_values, @option_values do |option_value_form| %>
+          <%= render :partial => 'option_value_fields', :locals => { :f => option_value_form } %>
         <% end %>
       </tbody>
     </table>

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

@@ -37,9 +37,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/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

@@ -132,7 +132,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/payment_methods/_form.html.erb

@@ -14,10 +14,10 @@
             <div id="gateway-settings-warning" class="info warning"><%= Spree.t(:provider_settings_warning) %></div>
           <% end %>
         <% end %>
-      </div>      
+      </div>
       <div data-hook="environment" class="field">
         <%= label_tag nil, Spree.t(:environment) %>
-        <%= collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env', :class => 'select2 fullwidth'}) %>        
+        <%= collection_select(:payment_method, :environment, rails_environments, :to_s, :titleize, {}, {:id => 'gtwy-env', :class => 'select2 fullwidth'}) %>
       </div>
       <div data-hook="display" class="field">
         <%= label_tag nil, Spree.t(:display) %>
@@ -33,7 +33,7 @@
           <li>
             <%= radio_button :payment_method, :active, true %>
             <%= label_tag nil, Spree.t(:say_yes) %>
-          </li>        
+          </li>
           <li>
             <%= radio_button :payment_method, :active, false %>
             <%= label_tag nil, Spree.t(:say_no) %>
@@ -41,7 +41,7 @@
         </ul>
       </div>
     </div>
-    
+
     <div class="omega eight columns">
       <div data-hook="name" class="field">
         <%= label_tag nil, Spree.t(:name) %>
@@ -50,9 +50,9 @@
       <div data-hook="description" class="field">
         <%= label_tag nil, Spree.t(:description) %>
         <%= text_area :payment_method, :description, {:cols => 60, :rows => 6, :class => 'fullwidth'} %>
-      </div>  
+      </div>
     </div>
-    
+
   </div>
 </div>
 

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) %>
@@ -62,7 +63,7 @@
 
     <% if @product.has_variants? %>
       <div data-hook="admin_product_form_multiple_variants">
-        <%= f.label :skus, Spree.t(:sku).pluralize %>
+        <%= f.label :skus, Spree.t(:skus) %>
         <span class="info">
           <%= Spree.t(:info_product_has_multiple_skus, count: @product.variants.count) %>
           <ul class="text_list">
@@ -76,7 +77,7 @@
         </span>
         <div class="info-actions">
           <% if can?(:admin, Spree::Variant) %>
-            <%= link_to_with_icon 'th-large', 'Manage Variants',  admin_product_variants_url(@product) %>
+            <%= link_to_with_icon 'th-large', Spree.t(:manage_variants),  admin_product_variants_url(@product) %>
           <% end %>
         </div>
       </div>

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

@@ -11,7 +11,7 @@
     <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>
@@ -19,7 +19,7 @@
   <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" } %>
+      <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
     <% end %>
   </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/stock_locations/_form.html.erb

@@ -1,91 +1,77 @@
 <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 :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_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/trackers/_form.html.erb

@@ -8,7 +8,7 @@
   <div class="four columns">
     <div data-hook="environment" class="field">
       <%= label_tag nil, Spree.t(:environment) %>
-      <%= collection_select(:tracker, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'tracker-env', :class => 'select2 fullwidth'}) %>
+      <%= collection_select(:tracker, :environment, rails_environments, :to_s, :titleize, {}, {:id => 'tracker-env', :class => 'select2 fullwidth'}) %>
     </div>
   </div>
   <div class="omega four columns">
@@ -26,9 +26,9 @@
       </ul>
     </div>
   </div>
-  
+
   <div class="clear"></div>
 
   <div data-hook="additional_tracker_fields"></div>
-  
+
 </div>

data/config/routes.rb

@@ -1,6 +1,4 @@
 Spree::Core::Engine.add_routes do
-  get '/admin', :to => 'admin/orders#index', :as => :admin
-
   namespace :admin do
     get '/search/users', :to => "search#users", :as => :search_users
 
@@ -151,4 +149,6 @@ Spree::Core::Engine.add_routes do
       end
     end
   end
+
+  get '/admin', :to => 'admin/orders#index', :as => :admin
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-11-20 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.3.4
+        version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,6 @@ files:
 - app/views/spree/admin/inventory_units/adjust.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

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>