spree_backend 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2a0a8249ffdc4df0fd4419a9b2ec3b6871eaaf9
-  data.tar.gz: d46f4f76c6804eb26c2c89443fccf1ba5acdf3a1
+  metadata.gz: 2247d6b1fd0f2c42d81b9e6fd359bc2ae51106af
+  data.tar.gz: f96494f83025962aac4de8de6064a8a7a12fa6bb
 SHA512:
-  metadata.gz: c8e9301a71888f597eb431fc65118566b8c41f6794e60b2b47048516bb4f89b0d3de26014a1c8e87a96ea44ee5c7d6a1536db14517f023ef5d3e90fa0b631c28
-  data.tar.gz: 052547c594d36134b8001ecdacea0bb7c4ef65b5bcf90afd8abfe8039a3a99a2344107b65cc19756602d476cd518fd0ad10c876c0263b0c77b1609aaa0037a8b
+  metadata.gz: d66f25f0a706af218074a17849edc034b005fcf759c768e94eceadb96663db6013ff48358ced784be59c265eeac8fe419b09fb1f496666d0d800a3c43856e28f
+  data.tar.gz: 141a997656ca4272428900e729cd8e7fb0a42daff8d73c566bbfb3acbc6f9a8bd08567d19dd247046405cb0e634ced2ac5987b6bf6e8aea24c3b977b154ffd38

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

@@ -127,15 +127,12 @@ $(document).ready(function(){
   handle_date_picker_fields();
   $(".observe_field").on('change', function() {
     target = $(this).data("update");
-    ajax_indicator = $(this).data("ajax-indicator") || '#busy_indicator';
     $(target).hide();
-    $(ajax_indicator).show();
     $.ajax({ dataType: 'html',
              url: $(this).data("base-url")+encodeURIComponent($(this).val()),
              type: 'get',
              success: function(data){
                $(target).html(data);
-               $(ajax_indicator).hide();
                $(target).show();
              }
     });

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

@@ -47,7 +47,7 @@ $(document).ready(function () {
   });
 
   //handle delete click
-  $('a.delete-item').click(function(){
+  $('a.delete-item').click(function(event){
     if (confirm(Spree.translations.are_you_sure_delete)) {
       var del = $(this);
       var shipment_number = del.data('shipment-number');
@@ -56,6 +56,7 @@ $(document).ready(function () {
       toggleItemEdit();
       adjustShipmentItems(shipment_number, variant_id, 0);
     }
+    return false;
   });
 
   // handle ship click
@@ -78,7 +79,9 @@ $(document).ready(function () {
   $('a.cancel-method').click(toggleMethodEdit);
 
   // handle shipping method save
-  $('[data-hook=admin_shipment_form] a.save-method').on('click', function () {
+  $('[data-hook=admin_shipment_form] a.save-method').on('click', function (event) {
+    event.preventDefault();
+
     var link = $(this);
     var shipment_number = link.data('shipment-number');
     var selected_shipping_rate_id = link.parents('tbody').find("select#selected_shipping_rate_id[data-shipment-number='" + shipment_number + "']").val();
@@ -171,6 +174,8 @@ toggleMethodEdit = function(){
   var link = $(this);
   link.parents('tbody').find('tr.edit-method').toggle();
   link.parents('tbody').find('tr.show-method').toggle();
+
+  return false;
 }
 
 toggleItemEdit = function(){
@@ -292,7 +297,9 @@ cancelItemSplit = function(event) {
   prev_row.find('a.delete-item').toggle();
 }
 
-addVariantFromStockLocation = function() {
+addVariantFromStockLocation = function(event) {
+  event.preventDefault();
+
   $('#stock_details').hide();
 
   var variant_id = $('input.variant_autocomplete').val();

data/app/assets/stylesheets/spree/backend/globals/_variables.scss

@@ -124,6 +124,8 @@ $color-ste-inactive-bg:          $color-notice !default;
 $color-ste-inactive-text:        $color-1 !default;
 $color-ste-considered_risky-bg:  $color-error !default;
 $color-ste-considered_risky-text:$color-1 !default;
+$color-ste-considered_safe-bg:   $color-success !default;
+$color-ste-considered_safe-text: $color-1 !default;
 $color-ste-success-bg:           $color-success !default;
 $color-ste-success-text:         $color-1 !default;
 $color-ste-notice-bg:            $color-notice !default;
@@ -133,19 +135,19 @@ $color-ste-error-text:           $color-1 !default;
 
 // Available states
 $states: completed, complete, sold, pending, awaiting_return, returned, credit_owed, paid, shipped, balance_due, backorder, checkout, cart, address,
-delivery, payment, confirm, canceled, failed, ready, void, active, inactive, considered_risky, success, notice, error !default;
+delivery, payment, confirm, canceled, failed, ready, void, active, inactive, considered_risky, considered_safe, success, notice, error !default;
 
 $states-bg-colors: $color-ste-completed-bg, $color-ste-complete-bg, $color-ste-sold-bg, $color-ste-pending-bg, $color-ste-awaiting_return-bg,
 $color-ste-returned-bg, $color-ste-credit_owed-bg, $color-ste-paid-bg, $color-ste-shipped-bg, $color-ste-balance_due-bg, $color-ste-backorder-bg,
 $color-ste-checkout-bg, $color-ste-cart-bg, $color-ste-address-bg, $color-ste-delivery-bg, $color-ste-payment-bg, $color-ste-confirm-bg,
 $color-ste-canceled-bg, $color-ste-failed-bg, $color-ste-ready-bg, $color-ste-void-bg, $color-ste-active-bg, $color-ste-inactive-bg, $color-ste-considered_risky-bg,
-$color-ste-success-bg, $color-ste-notice-bg, $color-ste-error-bg !default;
+$color-ste-considered_safe-bg, $color-ste-success-bg, $color-ste-notice-bg, $color-ste-error-bg !default;
 
 $states-text-colors: $color-ste-completed-text, $color-ste-complete-text, $color-ste-sold-text, $color-ste-pending-text, $color-ste-awaiting_return-text,
 $color-ste-returned-text, $color-ste-credit_owed-text, $color-ste-paid-text, $color-ste-shipped-text, $color-ste-balance_due-text, $color-ste-backorder-text,
 $color-ste-checkout-text, $color-ste-cart-text, $color-ste-address-text, $color-ste-delivery-text, $color-ste-payment-text, $color-ste-confirm-text,
 $color-ste-canceled-text, $color-ste-failed-text, $color-ste-ready-text, $color-ste-void-text, $color-ste-active-text, $color-ste-inactive-text, $color-ste-considered_risky-text,
-$color-ste-success-text, $color-ste-notice-text, $color-ste-error-text !default;
+$color-ste-considered_safe-text, $color-ste-success-text, $color-ste-notice-text, $color-ste-error-text !default;
 
 // Available actions
 $actions: edit, clone, remove, void, capture, save, cancel, mail !default;

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

@@ -10,25 +10,12 @@ module Spree
 
       skip_before_filter :load_resource, only: [:toggle_state, :edit, :update, :destroy]
 
-      def destroy
-        find_adjustment
-        super
-      end
-
-      def edit
-        find_adjustment
-        super
-      end
+      before_action :find_adjustment, only: [:destroy, :edit, :update]
 
       def index
         @adjustments = @order.all_adjustments.order("created_at ASC")
       end
 
-      def update
-        find_adjustment
-        super
-      end
-
       private
 
       def find_adjustment

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

@@ -99,7 +99,7 @@ module Spree
 
           params[:q][:s] ||= "name asc"
           @collection = super
-          @collection = @collection.with_deleted if params[:q][:deleted_at_null] == '0'
+          @collection = @collection.with_deleted if params[:q].delete(:deleted_at_null) == '0'
           # @search needs to be defined as this is passed to search_form_for
           @search = @collection.ransack(params[:q])
           @collection = @search.result.

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

@@ -188,7 +188,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       if model_class.respond_to?(:accessible_by) && !current_ability.has_block?(params[:action], model_class)
         model_class.accessible_by(current_ability, action)
       else
-        model_class.scoped
+        model_class.where(nil)
       end
     end
 

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

@@ -20,5 +20,3 @@
 <%= javascript_tag do -%>
   var order_number = '<%= @order.number %>';
 <% end -%>
-
-<%= button_link_to Spree.t(:continue), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url, :icon => 'arrow-right' %>

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

@@ -1,3 +1,5 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
 <% content_for :page_title do %>
   <%= Spree.t(:new_country) %>
 <% end %>

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

@@ -10,31 +10,31 @@
     <fieldset class="general no-border-top">
 
       <%= fields_for :store do |f| %>
-        <div class="field">
+        <div class="field" data-hook="admin_general_setting_input_name">
           <%= f.label :name %>
           <br />
           <%= f.text_field :name, class: 'fullwidth' %>
         </div>
 
-        <div class="field">
+        <div class="field" data-hook="admin_general_setting_input_seo_title">
           <%= f.label :seo_title %>
           <br />
           <%= f.text_field :seo_title, class: 'fullwidth'  %>
         </div>
 
-        <div class="field">
+        <div class="field" data-hook="admin_general_setting_input_meta_keywords">
           <%= f.label :meta_keywords %>
           <br />
           <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
         </div>
 
-        <div class="field">
+        <div class="field" data-hook="admin_general_setting_input_meta_description">
           <%= f.label :meta_description %>
           <br />
           <%= f.text_field :meta_description, class: 'fullwidth'  %>
         </div>
 
-        <div class="field">
+        <div class="field" data-hook="admin_general_setting_input_url">
           <%= f.label :url %>
           <br />
           <%= f.text_field :url, class: 'fullwidth'  %>

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

@@ -3,23 +3,24 @@
     <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
   <% end %>
 
-  <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+  <% if Spree::Order.checkout_step_names.include?(:delivery) && !%w(cart address).include?(@order.state) %>
     <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order } %>
   <% else %>
     <%= render :partial => "spree/admin/orders/line_items", :locals => { :order => order } %>
   <% end %>
+
   <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.line_item_adjustments, 
+        :adjustments => @order.line_item_adjustments,
         :order => order,
         :title => Spree.t(:line_item_adjustments)
    } %>
   <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.shipment_adjustments, 
+        :adjustments => @order.shipment_adjustments,
         :order => order,
         :title => Spree.t(:shipment_adjustments)
    } %>
   <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.adjustments, 
+        :adjustments => @order.adjustments,
         :order => order,
         :title => Spree.t(:order_adjustments)
    } %>

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

@@ -34,6 +34,10 @@
           <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2' %>
         </div>
 
+        <div class="field">
+          <%= label_tag nil, Spree.t(:promotion) %>
+          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), {:include_blank => true}, :class => 'select2' %>
+        </div>
       </div>
 
       <div class="four columns">
@@ -64,10 +68,10 @@
             <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '0' %>
             <%= Spree.t(:show_only_complete_orders) %>
           </label>
-        </div>
-        <div class="field">
-          <%= label_tag nil, Spree.t(:promotion) %>
-          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), {:include_blank => true}, :class => 'select2' %>
+          <label>
+            <%= f.check_box :considered_risky_eq, {:checked => (params[:q][:considered_risky_eq] == '1')}, '1', '' %>
+            <%= Spree.t(:show_only_considered_risky) %>
+          </label>
         </div>
       </div>
 
@@ -101,18 +105,19 @@
     <thead>
       <tr data-hook="admin_orders_index_headers">
         <% if @show_only_completed %>
-          <th><%= sort_link @search, :completed_at, I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order') %></th>
+          <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order') %></th>
         <% else %>
-          <th><%= sort_link @search, :created_at,   I18n.t(:created_at, :scope => 'activerecord.attributes.spree/order') %></th>
+          <th><%= sort_link @search, :created_at,     I18n.t(:created_at, :scope => 'activerecord.attributes.spree/order') %></th>
         <% end %>
-        <th><%= sort_link @search, :number,         I18n.t(:number, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :state,          I18n.t(:state, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :payment_state,  I18n.t(:payment_state, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :number,           I18n.t(:number, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :considered_risky, I18n.t(:considered_risky, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :state,            I18n.t(:state, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :payment_state,    I18n.t(:payment_state, :scope => 'activerecord.attributes.spree/order') %></th>
          <% if Spree::Order.checkout_step_names.include?(:delivery) %>
           <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, :scope => 'activerecord.attributes.spree/order') %></th>
          <% end %>
-        <th><%= sort_link @search, :email,          I18n.t(:email, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :total,          I18n.t(:total, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :email,            I18n.t(:email, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :total,            I18n.t(:total, :scope => 'activerecord.attributes.spree/order') %></th>
         <th data-hook="admin_orders_index_header_actions" class="actions"></th>
       </tr>
     </thead>
@@ -121,6 +126,7 @@
       <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
         <td class="align-center"><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
         <td class="align-center"><%= link_to order.number, edit_admin_order_path(order) %></td>
+        <td class="align-center"><span class="state <%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>"></span></td>
         <td class="align-center"><span class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span></td>
         <td class="align-center"><span class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></span></td>
           <% if Spree::Order.checkout_step_names.include?(:delivery) %>

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

@@ -17,8 +17,6 @@
   </select>
 </div>
 
-<%= image_tag 'select2-spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
-
 <div id="state-list" data-hook>
   <%= render :partial => 'state_list'%>
 </div>

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

@@ -12,18 +12,18 @@
     </div>
     <div class="omega four columns">
       <%= f.field_container :active do %>
-        <label for="active"><%= Spree.t(:state) %></label>
+        <label for="active"><%= Spree.t(:status) %></label>
         <ul>
           <li>
             <%= f.label :active, Spree.t(:active) %>
             <%= f.check_box :active %>
           </li>
           <li>
-            <%= f.label :active, Spree.t(:backorderable_default) %>
+            <%= f.label :backorderable_default, Spree.t(:backorderable_default) %>
             <%= f.check_box :backorderable_default %>
           </li>
           <li>
-            <%= f.label :active, Spree.t(:propagate_all_variants) %>
+            <%= f.label :propagate_all_variants, Spree.t(:propagate_all_variants) %>
             <%= f.check_box :propagate_all_variants %>
           </li>
         </ul>

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

@@ -1,3 +1,5 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
 <% content_for :page_title do %>
   <%= Spree.t(:editing_stock_location) %> <i class="fa fa-arrow-right"></i>
   <%= @stock_location.name %>

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

@@ -1,3 +1,5 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
 <% content_for :page_title do %>
   <%= Spree.t(:new_stock_location) %>
 <% end %>

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

@@ -82,8 +82,7 @@
     </fieldset>
 
     <div class="alpha twelve columns no-objects-found">
-      <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_transfer')) %>,
-      <%= link_to Spree.t(:add_one), spree.new_admin_tax_rate_path %>!
+      <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/variant')) %>.
     </div>
 
     <div id="transfer-variants-table" class="twelve columns alpha" style="display:none">

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -49,5 +49,6 @@
             </tr>
           {{/each}}
         </tbody>
+      </table>
   </fieldset>
 </script>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-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.3.3
+        version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement