spree_backend 3.3.6 → 3.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9829eb56ce4919fdb1d2f539a23b8529fb39024f
-  data.tar.gz: 369ae6c2b068d423366da4b4fbbd82d87fab9f09
+  metadata.gz: 36eab3a9676906861059532cd8d26dbdb623d3f7
+  data.tar.gz: ef850027dc86fad30a13802b2c5061e3a021b632
 SHA512:
-  metadata.gz: ca050ebad20a10af8e3e8646333921369b0ff98286d0f8b72f526085f900e721e2501ac8428217cd36b44816e9b07a8038454f5cdb7db8b2e35231c1de976038
-  data.tar.gz: 6fc83cfc66be038e106a864a2a3bd038593de76346d037d2568030d167d4e52d9a3576ee1c5c5cbb0d128408bd44cb61a33b7a59382aeb6266b2015a81325bc7
+  metadata.gz: f438859a49d14c1dfa65d67c74763510d67e6ed03179b8944f0253fc8246040dfb7a96c27dc4edfe512bb225b12249fc2cae1063135a2b6c7717f2ce7e6f45d0
+  data.tar.gz: e73b0c399415e40b089eae1373f5a4c8b9a7d830c9c00c2c044f0642c027d320109a89ec0458d8eff1c0fcbf35693f46846078a6e99f83f7d389ab13c8b0b2f4

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

@@ -31,14 +31,7 @@ $(document).ready(function() {
         cache: true,
         data: function(term, page) {
           return {
-            q: {
-              'm': 'or',
-              'email_start': term,
-              'ship_address_firstname_start': term,
-              'ship_address_lastname_start': term,
-              'bill_address_firstname_start': term,
-              'bill_address_lastname_start': term
-            },
+            q: term,
             token: Spree.api_key
           }
         },

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

@@ -5,3 +5,6 @@ Handlebars.registerHelper("t", function(key) {
     console.error("No translation found for " + key + ". Does it exist within spree/admin/shared/_translations.html.erb?")
   }
 });
+Handlebars.registerHelper("edit_product_url", function(product_id) {
+  return Spree.routes.edit_product(product_id)
+});

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

@@ -34,7 +34,7 @@ $(document).ready(function() {
 
     formFields.find('input.add-item').on('change', updateSuggestedAmount);
     formFields.find('.refund-amount-input').on('keyup', updateSuggestedAmount);
-    formFields.find('.refund-quantity-input').on('keyup', updateSuggestedAmount);
+    formFields.find('.refund-quantity-input').on('keyup mouseup', updateSuggestedAmount);
 
     formFields.find('input, select').not('.add-item').on('change', checkAddItemBox);
   }

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

@@ -43,23 +43,9 @@ $(document).ready(function () {
       var del = $(this);
       var shipment_number = del.data('shipment-number');
       var variant_id = del.data('variant-id');
-      var shipment = _.findWhere(shipments, {number: shipment_number + ''});
-      var url = Spree.routes.shipments_api + "/" + shipment_number + '/remove';
 
       toggleItemEdit();
-
-      $.ajax({
-        type: "PUT",
-        url: Spree.url(url),
-        data: {
-          variant_id: variant_id,
-          token: Spree.api_key
-        }
-      }).done(function( msg ) {
-        window.location.reload();
-      }).fail(function(msg) {
-        alert(msg.responseJSON.message)
-      });
+      adjustShipmentItems(shipment_number, variant_id, 0);
     }
     return false;
   });
@@ -159,16 +145,13 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
 
     var url = Spree.routes.shipments_api + "/" + shipment_number;
 
-    var previous_quantity = inventory_units.reduce(function(accumulator, current_unit, _index, _array) {
-      return accumulator + current_unit.quantity;
-    }, 0);
-
-    if(previous_quantity<quantity){
+    var new_quantity = 0;
+    if(inventory_units.length<quantity){
       url += "/add"
-      new_quantity = (quantity - previous_quantity);
-    }else if(previous_quantity>quantity){
+      new_quantity = (quantity - inventory_units.length);
+    }else if(inventory_units.length>quantity){
       url += "/remove"
-      new_quantity = (previous_quantity - quantity);
+      new_quantity = (inventory_units.length - quantity);
     }
     url += '.json';
 
@@ -281,7 +264,7 @@ completeItemSplit = function(event) {
       }).error(function(msg) {
           alert(msg.responseJSON['message']);
       }).done(function(msg) {
-          window.location.reload();
+        window.Spree.advanceOrder();
       });
     } else {
         // TRANSFER TO AN EXISTING SHIPMENT
@@ -299,7 +282,7 @@ completeItemSplit = function(event) {
         }).error(function(msg) {
             alert(msg.responseJSON['message']);
         }).done(function(msg) {
-            window.location.reload();
+            window.Spree.advanceOrder();
         });
     }
   }

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

@@ -79,9 +79,4 @@ $(document).ready ->
         product.fadeOut 400, (e) ->
           product.remove()
 
-  $('#taxon_products').on "click", ".js-edit-product", (e) ->
-    product = $(this).parents(".product")
-    product_id = product.data("product-id")
-    window.location = Spree.routes.edit_product(product_id)
-
-  $(".variant_autocomplete").variantAutocomplete();
+  $(".variant_autocomplete").variantAutocomplete()

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

@@ -5,12 +5,16 @@
   }
 
   .dropdown-menu {
-    padding: 20px;
-    min-width: 240px;
-    text-align: center;
+    width: 100%;
+    padding: 0 0;
+
+    hr {
+      margin: 0 0;
+    }
 
     a {
       color: $dropdown-link-color !important;
+      padding: 15px;
     }
   }
-}
+}

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

@@ -1,7 +1,6 @@
 module Spree
   module Admin
     class AdjustmentsController < ResourceController
-
       belongs_to 'spree/order', find_by: :number
 
       create.after :update_totals
@@ -32,7 +31,6 @@ module Spree
       def build_resource
         parent.adjustments.build(order: parent)
       end
-
     end
   end
 end

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

@@ -14,11 +14,11 @@ module Spree
       end
 
       def authorize_admin
-        if respond_to?(:model_class, true) && model_class
-          record = model_class
-        else
-          record = controller_name.to_sym
-        end
+        record = if respond_to?(:model_class, true) && model_class
+                   model_class
+                 else
+                   controller_name.to_sym
+                 end
         authorize! :admin, record
         authorize! action, record
       end

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

@@ -1,12 +1,11 @@
 module Spree
   module Admin
     class CountriesController < ResourceController
-
       private
+
         def collection
           super.order(:name)
         end
-
     end
   end
 end

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

@@ -36,10 +36,10 @@ module Spree
 
       def collection
         parent # trigger loading the order
-        @collection ||= Spree::ReturnItem
-          .accessible_by(current_ability, :read)
-          .where(inventory_unit_id: @order.inventory_units.pluck(:id))
-          .map(&:customer_return).uniq.compact
+        @collection ||= Spree::ReturnItem.
+                        accessible_by(current_ability, :read).
+                        where(inventory_unit_id: @order.inventory_units.pluck(:id)).
+                        map(&:customer_return).uniq.compact
         @customer_returns = @collection
       end
 
@@ -62,7 +62,6 @@ module Spree
           return_item
         end.compact
       end
-
     end
   end
 end

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

@@ -28,6 +28,7 @@ module Spree
       end
 
       private
+
       def store_params
         params.require(:store).permit(permitted_store_attributes)
       end

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

@@ -7,7 +7,6 @@ module Spree
         @log_entries = @payment.log_entries
       end
 
-
       private
 
       def find_order_and_payment

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

@@ -18,19 +18,19 @@ module Spree
 
       protected
 
-        def location_after_save
-          if @option_type.created_at == @option_type.updated_at
-            edit_admin_option_type_url(@option_type)
-          else
-            admin_option_types_url
-          end
+      def location_after_save
+        if @option_type.created_at == @option_type.updated_at
+          edit_admin_option_type_url(@option_type)
+        else
+          admin_option_types_url
         end
-
+      end
 
       private
-        def setup_new_option_value
-          @option_type.option_values.build if @option_type.option_values.empty?
-        end
+
+      def setup_new_option_value
+        @option_type.option_values.build if @option_type.option_values.empty?
+      end
     end
   end
 end

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

@@ -19,14 +19,22 @@ module Spree
         created_at_gt = params[:q][:created_at_gt]
         created_at_lt = params[:q][:created_at_lt]
 
-        params[:q].delete(:inventory_units_shipment_id_null) if params[:q][:inventory_units_shipment_id_null] == "0"
+        params[:q].delete(:inventory_units_shipment_id_null) if params[:q][:inventory_units_shipment_id_null] == '0'
 
         if params[:q][:created_at_gt].present?
-          params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue ""
+          params[:q][:created_at_gt] = begin
+                                         Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day
+                                       rescue
+                                         ''
+                                       end
         end
 
         if params[:q][:created_at_lt].present?
-          params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
+          params[:q][:created_at_lt] = begin
+                                         Time.zone.parse(params[:q][:created_at_lt]).end_of_day
+                                       rescue
+                                         ''
+                                       end
         end
 
         if @show_only_completed
@@ -40,8 +48,8 @@ module Spree
         # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
         # see https://github.com/spree/spree/pull/3919
         @orders = @search.result(distinct: true).
-          page(params[:page]).
-          per(params[:per_page] || Spree::Config[:admin_orders_per_page])
+                  page(params[:page]).
+                  per(params[:per_page] || Spree::Config[:admin_orders_per_page])
 
         # Restore dates
         params[:q][:created_at_gt] = created_at_gt
@@ -62,7 +70,7 @@ module Spree
       def cart
         @order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_BACK_END) unless @order.completed?
 
-        if @order.shipments.shipped.count > 0
+        if @order.shipments.shipped.exists?
           redirect_to edit_admin_order_url(@order)
         end
       end
@@ -123,24 +131,25 @@ module Spree
       end
 
       private
-        def order_params
-          params[:created_by_id] = try_spree_current_user.try(:id)
-          params.permit(:created_by_id, :user_id)
-        end
 
-        def load_order
-          @order = Spree::Order.includes(:adjustments).find_by!(number: params[:id])
-          authorize! action, @order
-        end
+      def order_params
+        params[:created_by_id] = try_spree_current_user.try(:id)
+        params.permit(:created_by_id, :user_id, :store_id)
+      end
 
-        # Used for extensions which need to provide their own custom event links on the order details view.
-        def initialize_order_events
-          @order_events = %w{approve cancel resume}
-        end
+      def load_order
+        @order = Spree::Order.includes(:adjustments).find_by!(number: params[:id])
+        authorize! action, @order
+      end
 
-        def model_class
-          Spree::Order
-        end
+      # Used for extensions which need to provide their own custom event links on the order details view.
+      def initialize_order_events
+        @order_events = %w{approve cancel resume}
+      end
+
+      def model_class
+        Spree::Order
+      end
     end
   end
 end

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

@@ -27,16 +27,14 @@ module Spree
         if @payment_method['type'].to_s != payment_method_type
           @payment_method.update_columns(
             type: payment_method_type,
-            updated_at: Time.current,
+            updated_at: Time.current
           )
           @payment_method = PaymentMethod.find(params[:id])
         end
 
         attributes = payment_method_params.merge(preferences_params)
-        attributes.each do |k,v|
-          if k.include?("password") && attributes[k].blank?
-            attributes.delete(k)
-          end
+        attributes.each do |k, _v|
+          attributes.delete(k) if k.include?('password') && attributes[k].blank?
         end
 
         if @payment_method.update_attributes(attributes)
@@ -56,12 +54,12 @@ module Spree
       end
 
       def load_data
-        @providers = Gateway.providers.sort{|p1, p2| p1.name <=> p2.name }
+        @providers = Gateway.providers.sort_by(&:name)
       end
 
       def validate_payment_method_provider
         valid_payment_methods = Rails.application.config.spree.payment_methods.map(&:to_s)
-        if !valid_payment_methods.include?(params[:payment_method][:type])
+        unless valid_payment_methods.include?(params[:payment_method][:type])
           flash[:error] = Spree.t(:invalid_payment_provider)
           redirect_to new_admin_payment_method_path
         end

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

@@ -56,7 +56,7 @@ module Spree
           end
         rescue Spree::Core::GatewayError => e
           invoke_callbacks(:create, :fails)
-          flash[:error] = "#{e.message}"
+          flash[:error] = e.message.to_s
           redirect_to new_admin_order_payment_path(@order)
         end
       end
@@ -65,14 +65,14 @@ module Spree
         return unless event = params[:e] and @payment.payment_source
 
         # Because we have a transition method also called void, we do this to avoid conflicts.
-        event = "void_transaction" if event == "void"
+        event = 'void_transaction' if event == 'void'
         if @payment.send("#{event}!")
           flash[:success] = Spree.t(:payment_updated)
         else
           flash[:error] = Spree.t(:cannot_perform_operation)
         end
       rescue Spree::Core::GatewayError => ge
-        flash[:error] = "#{ge.message}"
+        flash[:error] = ge.message.to_s
       ensure
         redirect_to admin_order_payments_path(@order)
       end

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

@@ -6,13 +6,14 @@ module Spree
       before_action :setup_property, only: :index
 
       private
-        def find_properties
-          @properties = Spree::Property.pluck(:name)
-        end
 
-        def setup_property
-          @product.product_properties.build
-        end
+      def find_properties
+        @properties = Spree::Property.pluck(:name)
+      end
+
+      def setup_property
+        @product.product_properties.build
+      end
     end
   end
 end

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

@@ -58,7 +58,7 @@ module Spree
 
         respond_with(@product) do |format|
           format.html { redirect_to collection_url }
-          format.js  { render_js_for_destroy }
+          format.js { render_js_for_destroy }
         end
       end
 
@@ -72,7 +72,6 @@ module Spree
           flash[:error] = Spree.t('notice_messages.product_not_cloned')
           redirect_to admin_products_url
         end
-
       rescue ActiveRecord::RecordInvalid
         # Handle error on uniqueness validation on product fields
         flash[:error] = Spree.t('notice_messages.product_not_cloned')
@@ -109,10 +108,10 @@ module Spree
       def collection
         return @collection if @collection.present?
         params[:q] ||= {}
-        params[:q][:deleted_at_null] ||= "1"
-        params[:q][:not_discontinued] ||= "1"
+        params[:q][:deleted_at_null] ||= '1'
+        params[:q][:not_discontinued] ||= '1'
 
-        params[:q][:s] ||= "name asc"
+        params[:q][:s] ||= 'name asc'
         @collection = super
         # Don't delete params[:q][:deleted_at_null] here because it is used in view to check the
         # checkbox for 'q[deleted_at_null]'. This also messed with pagination when deleted_at_null is checked.
@@ -124,10 +123,10 @@ module Spree
         # This is to include all products and not just deleted products.
         @search = @collection.ransack(params[:q].reject { |k, _v| k.to_s == 'deleted_at_null' })
         @collection = @search.result.
-              distinct_by_product_ids(params[:q][:s]).
-              includes(product_includes).
-              page(params[:page]).
-              per(params[:per_page] || Spree::Config[:admin_products_per_page])
+                      distinct_by_product_ids(params[:q][:s]).
+                      includes(product_includes).
+                      page(params[:page]).
+                      per(params[:per_page] || Spree::Config[:admin_products_per_page])
         @collection
       end
 

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

@@ -10,7 +10,7 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
       flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:promotion_action))
     end
     respond_to do |format|
-      format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
+      format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
       format.js   { render layout: false }
     end
   end
@@ -21,7 +21,7 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
       flash[:success] = Spree.t(:successfully_removed, resource: Spree.t(:promotion_action))
     end
     respond_to do |format|
-      format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
+      format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
       format.js   { render layout: false }
     end
   end
@@ -34,10 +34,10 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
 
   def validate_promotion_action_type
     valid_promotion_action_types = Rails.application.config.spree.promotions.actions.map(&:to_s)
-    if !valid_promotion_action_types.include?(params[:action_type])
+    unless valid_promotion_action_types.include?(params[:action_type])
       flash[:error] = Spree.t(:invalid_promotion_action)
       respond_to do |format|
-        format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
+        format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
         format.js   { render layout: false }
       end
     end

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

@@ -11,7 +11,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
       flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:promotion_rule))
     end
     respond_to do |format|
-      format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
+      format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
       format.js   { render layout: false }
     end
   end
@@ -22,7 +22,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
       flash[:success] = Spree.t(:successfully_removed, resource: Spree.t(:promotion_rule))
     end
     respond_to do |format|
-      format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
+      format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
       format.js   { render layout: false }
     end
   end
@@ -39,10 +39,10 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
     @promotion_rule_type = promotion_rule_types.detect do |klass|
       klass.name == requested_type
     end
-    if !@promotion_rule_type
+    unless @promotion_rule_type
       flash[:error] = Spree.t(:invalid_promotion_rule)
       respond_to do |format|
-        format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
+        format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
         format.js   { render layout: false }
       end
     end

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

@@ -6,31 +6,32 @@ module Spree
       helper 'spree/admin/promotion_rules'
 
       protected
-        def location_after_save
-          spree.edit_admin_promotion_url(@promotion)
-        end
 
-        def load_data
-          @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
-          @promotion_categories = Spree::PromotionCategory.order(:name)
-        end
+      def location_after_save
+        spree.edit_admin_promotion_url(@promotion)
+      end
 
-        def collection
-          return @collection if defined?(@collection)
-          params[:q] ||= HashWithIndifferentAccess.new
-          params[:q][:s] ||= 'id desc'
+      def load_data
+        @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
+        @promotion_categories = Spree::PromotionCategory.order(:name)
+      end
 
-          @collection = super
-          @search = @collection.ransack(params[:q])
-          @collection = @search.result(distinct: true).
-            includes(promotion_includes).
-            page(params[:page]).
-            per(params[:per_page] || Spree::Config[:admin_promotions_per_page])
-        end
+      def collection
+        return @collection if defined?(@collection)
+        params[:q] ||= HashWithIndifferentAccess.new
+        params[:q][:s] ||= 'id desc'
 
-        def promotion_includes
-          [:promotion_actions]
-        end
+        @collection = super
+        @search = @collection.ransack(params[:q])
+        @collection = @search.result(distinct: true).
+                      includes(promotion_includes).
+                      page(params[:page]).
+                      per(params[:per_page] || Spree::Config[:admin_promotions_per_page])
+      end
+
+      def promotion_includes
+        [:promotion_actions]
+      end
     end
   end
 end

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

@@ -15,8 +15,8 @@ module Spree
         @collection = super
         @search = @collection.ransack(params[:q])
         @collection = @search.result.
-              page(params[:page]).
-              per(Spree::Config[:admin_properties_per_page])
+                      page(params[:page]).
+                      per(Spree::Config[:admin_properties_per_page])
       end
     end
   end

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

@@ -21,7 +21,6 @@ module Spree
         @prototype ||= Prototype.find(params[:id])
         @prototype_properties = @prototype.properties
       end
-
     end
   end
 end