spree_backend 3.1.14 → 3.2.0.rc1

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

@@ -7,22 +7,22 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
     @promotion_action = params[:action_type].constantize.new(params[:promotion_action])
     @promotion_action.promotion = @promotion
     if @promotion_action.save
-      flash[:success] = Spree.t(:successfully_created, :resource => Spree.t(:promotion_action))
+      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.js   { render :layout => false }
+      format.js   { render layout: false }
     end
   end
 
   def destroy
     @promotion_action = @promotion.promotion_actions.find(params[:id])
     if @promotion_action.destroy
-      flash[:success] = Spree.t(:successfully_removed, :resource => Spree.t(:promotion_action))
+      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.js   { render :layout => false }
+      format.js   { render layout: false }
     end
   end
 
@@ -38,7 +38,7 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
       flash[:error] = Spree.t(:invalid_promotion_action)
       respond_to do |format|
         format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
-        format.js   { render :layout => false }
+        format.js   { render layout: false }
       end
     end
   end

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

@@ -1,5 +1,5 @@
 class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
-  helper 'spree/promotion_rules'
+  helper 'spree/admin/promotion_rules'
 
   before_action :load_promotion, only: [:create, :destroy]
   before_action :validate_promotion_rule_type, only: :create
@@ -12,22 +12,22 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
     @promotion_rule = promotion_rule_type.constantize.new(params[:promotion_rule])
     @promotion_rule.promotion = @promotion
     if @promotion_rule.save
-      flash[:success] = Spree.t(:successfully_created, :resource => Spree.t(:promotion_rule))
+      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.js   { render :layout => false }
+      format.js   { render layout: false }
     end
   end
 
   def destroy
     @promotion_rule = @promotion.promotion_rules.find(params[:id])
     if @promotion_rule.destroy
-      flash[:success] = Spree.t(:successfully_removed, :resource => Spree.t(:promotion_rule))
+      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.js   { render :layout => false }
+      format.js   { render layout: false }
     end
   end
 
@@ -43,7 +43,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
       flash[:error] = Spree.t(:invalid_promotion_rule)
       respond_to do |format|
         format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
-        format.js   { render :layout => false }
+        format.js   { render layout: false }
       end
     end
   end

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

@@ -3,7 +3,7 @@ module Spree
     class PromotionsController < ResourceController
       before_action :load_data
 
-      helper 'spree/promotion_rules'
+      helper 'spree/admin/promotion_rules'
 
       protected
         def location_after_save
@@ -25,7 +25,7 @@ module Spree
           @collection = @search.result(distinct: true).
             includes(promotion_includes).
             page(params[:page]).
-            per(params[:per_page] || Spree::Config[:promotions_per_page])
+            per(params[:per_page] || Spree::Config[:admin_promotions_per_page])
         end
 
         def promotion_includes

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

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

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

@@ -3,7 +3,7 @@ module Spree
     class PrototypesController < ResourceController
       def show
         if request.xhr?
-          render :layout => false
+          render layout: false
         else
           redirect_to admin_prototypes_path
         end
@@ -12,7 +12,7 @@ module Spree
       def available
         @prototypes = Prototype.order('name asc')
         respond_with(@prototypes) do |format|
-          format.html { render :layout => !request.xhr? }
+          format.html { render layout: !request.xhr? }
           format.js
         end
       end

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

@@ -6,7 +6,7 @@ module Spree
 
       helper_method :refund_reasons
 
-      rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error, only: :create
+      rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
 
       private
 

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

@@ -1,6 +1,32 @@
 module Spree
   module Admin
     class ReimbursementTypesController < ResourceController
+      def update
+        invoke_callbacks(:update, :before)
+        if @object.update_attributes(permitted_resource_params_for_update)
+          invoke_callbacks(:update, :after)
+          respond_with(@object) do |format|
+            format.html do
+              flash[:success] = flash_message_for(@object, :successfully_updated)
+              redirect_to location_after_save
+            end
+            format.js { render layout: false }
+          end
+        else
+          invoke_callbacks(:update, :fails)
+          respond_with(@object) do |format|
+            format.html { render action: :edit }
+            format.js { render layout: false }
+          end
+        end
+      end
+
+      private
+
+      def permitted_resource_params_for_update
+        params_hash = @object.type.underscore.remove('spree/').tr('/', '_')
+        params.require(params_hash.to_s).permit(:name, :active, :mutable)
+      end
     end
   end
 end

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

@@ -5,7 +5,7 @@ module Spree
 
       before_action :load_simulated_refunds, only: :edit
 
-      rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error, only: :perform
+      rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
 
       def perform
         @reimbursement.perform!

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

@@ -45,7 +45,7 @@ module Spree
 
         @totals = {}
         @orders.each do |order|
-          @totals[order.currency] = { :item_total => ::Money.new(0, order.currency), :adjustment_total => ::Money.new(0, order.currency), :sales_total => ::Money.new(0, order.currency) } unless @totals[order.currency]
+          @totals[order.currency] = { item_total: ::Money.new(0, order.currency), adjustment_total: ::Money.new(0, order.currency), sales_total: ::Money.new(0, order.currency) } unless @totals[order.currency]
           @totals[order.currency][:item_total] += order.display_item_total.money
           @totals[order.currency][:adjustment_total] += order.display_adjustment_total.money
           @totals[order.currency][:sales_total] += order.display_total.money

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

@@ -3,25 +3,25 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
   before_action :load_resource, except: :update_positions
-  rescue_from ActiveRecord::RecordNotFound, :with => :resource_not_found
+  rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
 
   respond_to :html
 
   def new
     invoke_callbacks(:new_action, :before)
     respond_with(@object) do |format|
-      format.html { render :layout => !request.xhr? }
+      format.html { render layout: !request.xhr? }
       if request.xhr?
-        format.js   { render :layout => false }
+        format.js   { render layout: false }
       end
     end
   end
 
   def edit
     respond_with(@object) do |format|
-      format.html { render :layout => !request.xhr? }
+      format.html { render layout: !request.xhr? }
       if request.xhr?
-        format.js   { render :layout => false }
+        format.js   { render layout: false }
       end
     end
   end
@@ -54,7 +54,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       flash[:success] = flash_message_for(@object, :successfully_created)
       respond_with(@object) do |format|
         format.html { redirect_to location_after_save }
-        format.js   { render :layout => false }
+        format.js   { render layout: false }
       end
     else
       invoke_callbacks(:create, :fails)
@@ -66,14 +66,14 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def update_positions
-    ActiveRecord::Base.transaction do
+    ApplicationRecord.transaction do
       params[:positions].each do |id, index|
         model_class.find(id).set_list_position(index)
       end
     end
 
     respond_to do |format|
-      format.js { render text: 'Ok' }
+      format.js { render plain: 'Ok' }
     end
   end
 

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class ReturnAuthorizationsController < ResourceController
-      belongs_to 'spree/order', :find_by => :number
+      belongs_to 'spree/order', find_by: :number
 
       before_action :load_form_data, only: [:new, :edit]
       create.fails  :load_form_data
@@ -10,7 +10,7 @@ module Spree
       def fire
         @return_authorization.send("#{params[:e]}!")
         flash[:success] = Spree.t(:return_authorization_updated)
-        redirect_to :back
+        redirect_back fallback_location: spree.admin_return_authorization_url(@return_authorization)
       end
 
       private
@@ -40,7 +40,7 @@ module Spree
       end
 
       def load_return_authorization_reasons
-        @reasons = Spree::ReturnAuthorizationReason.active
+        @reasons = Spree::ReturnAuthorizationReason.active.to_a
         # Only allow an inactive reason if it's already associated to the RMA
         if @return_authorization.reason && !@return_authorization.reason.active?
           @reasons << @return_authorization.reason

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

@@ -20,7 +20,7 @@ module Spree
         @collection = resource.all
         # @search needs to be defined as this is passed to search_form_for
         @search = @collection.ransack(params[:q])
-        per_page = params[:per_page] || Spree::Config[:admin_products_per_page]
+        per_page = params[:per_page] || Spree::Config[:admin_customer_returns_per_page]
         @collection = @search.result.order(created_at: :desc).page(params[:page]).per(per_page)
       end
     end

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

@@ -20,14 +20,14 @@ module Spree
 
       def set_shipping_category
         return true if params["shipping_method"][:shipping_categories] == ""
-        @shipping_method.shipping_categories = Spree::ShippingCategory.where(:id => params["shipping_method"][:shipping_categories])
+        @shipping_method.shipping_categories = Spree::ShippingCategory.where(id: params["shipping_method"][:shipping_categories])
         @shipping_method.save
         params[:shipping_method].delete(:shipping_categories)
       end
 
       def set_zones
         return true if params["shipping_method"][:zones] == ""
-        @shipping_method.zones = Spree::Zone.where(:id => params["shipping_method"][:zones])
+        @shipping_method.zones = Spree::Zone.where(id: params["shipping_method"][:zones])
         @shipping_method.save
         params[:shipping_method].delete(:zones)
       end

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

@@ -7,7 +7,7 @@ module Spree
       def index
         respond_with(@collection) do |format|
           format.html
-          format.js { render :partial => 'state_list' }
+          format.js { render partial: 'state_list' }
         end
       end
 

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

@@ -22,14 +22,14 @@ module Spree
           flash[:error] = Spree.t(:could_not_create_stock_movement)
         end
 
-        redirect_to :back
+        redirect_back fallback_location: spree.stock_admin_product_url(variant.product)
       end
 
       def destroy
         stock_item.destroy
 
         respond_with(@stock_item) do |format|
-          format.html { redirect_to :back }
+          format.html { redirect_back fallback_location: spree.stock_admin_product_url(stock_item.product) }
           format.js
         end
       end

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

@@ -6,7 +6,7 @@ module Spree
 
       def index
         @stock_movements = stock_location.stock_movements.recent.
-          includes(:stock_item => { :variant => :product }).
+          includes(stock_item: { variant: :product }).
           page(params[:page])
       end
 
@@ -21,10 +21,6 @@ module Spree
         redirect_to admin_stock_location_stock_movements_path(stock_location)
       end
 
-      def edit
-        @stock_movement = StockMovement.find(params[:id])
-      end
-
       private
 
       def stock_location

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

@@ -54,7 +54,7 @@ module Spree
             format.js { render_js_for_destroy }
           end
         else
-          render text: Spree.t('store_credit.errors.unable_to_delete'), status: :unprocessable_entity
+          render plain: Spree.t('store_credit.errors.unable_to_delete'), status: :unprocessable_entity
         end
       end
 

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

@@ -4,18 +4,9 @@ module Spree
 
       before_action :load_taxonomy, only: [:create, :edit, :update]
       before_action :load_taxon, only: [:edit, :update]
-      respond_to :html, :json, :js
+      respond_to :html, :js
 
       def index
-
-      end
-
-      def search
-        if params[:ids]
-          @taxons = Spree::Taxon.where(id: params[:ids].split(','))
-        else
-          @taxons = Spree::Taxon.limit(20).ransack(name_cont: params[:q]).result
-        end
       end
 
       def create

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

@@ -1,20 +1,10 @@
 module Spree
   module Admin
     class UsersController < ResourceController
-      rescue_from Spree::Core::DestroyWithOrdersError, :with => :user_destroy_with_orders_error
+      rescue_from Spree::Core::DestroyWithOrdersError, with: :user_destroy_with_orders_error
 
       after_action :sign_in_if_change_own_password, only: :update
 
-      # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
-      before_action :check_json_authenticity, only: :index
-
-      def index
-        respond_with(@collection) do |format|
-          format.html
-          format.json { render :json => json_data }
-        end
-      end
-
       def show
         redirect_to edit_admin_user_path(@user)
       end
@@ -55,7 +45,7 @@ module Spree
       def orders
         params[:q] ||= {}
         @search = Spree::Order.reverse_chronological.ransack(params[:q].merge(user_id_eq: @user.id))
-        @orders = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+        @orders = @search.result.page(params[:page])
       end
 
       def items
@@ -64,7 +54,7 @@ module Spree
           line_items: {
             variant: [:product, { option_values: :option_type }]
           }).ransack(params[:q].merge(user_id_eq: @user.id))
-        @orders = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+        @orders = @search.result.page(params[:page])
       end
 
       def generate_api_key
@@ -90,19 +80,8 @@ module Spree
         def collection
           return @collection if @collection.present?
           @collection = super
-          if request.xhr? && params[:q].present?
-            @collection = @collection.includes(:bill_address, :ship_address)
-                              .where("spree_users.email #{LIKE} :search
-                                     OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                     OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                     OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)
-                                     OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)",
-                                    { :search => "#{params[:q].strip}%" })
-                              .limit(params[:limit] || 100)
-          else
-            @search = @collection.ransack(params[:q])
-            @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
-          end
+          @search = @collection.ransack(params[:q])
+          @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_users_per_page])
         end
 
       private
@@ -120,21 +99,6 @@ module Spree
         render status: :forbidden, text: Spree.t(:error_user_destroy_with_orders)
       end
 
-      # Allow different formats of json data to suit different ajax calls
-      def json_data
-        json_format = params[:json_format] || 'default'
-        case json_format
-        when 'basic'
-          collection.map { |u| { 'id' => u.id, 'name' => u.email } }.to_json
-        else
-          address_fields = [:firstname, :lastname, :address1, :address2, :city, :zipcode, :phone, :state_name, :state_id, :country_id]
-          includes = { only: address_fields, include: { state: { only: :name }, country: { only: :name } } }
-
-          collection.to_json(only: [:id, :email], include:
-                             { bill_address: includes, ship_address: includes })
-        end
-      end
-
       def sign_in_if_change_own_password
         if try_spree_current_user == @user && @user.password.present?
           sign_in(@user, event: :authentication, bypass: true)

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class VariantsController < ResourceController
-      belongs_to 'spree/product', :find_by => :slug
+      belongs_to 'spree/product', find_by: :slug
       new_action.before :new_before
       before_action :load_data, only: [:new, :create, :edit, :update]
 
@@ -28,6 +28,7 @@ module Spree
         @object.attributes = master.attributes.except(
           'id', 'created_at', 'deleted_at', 'sku', 'is_master'
         )
+
         # Shallow Clone of the default price to populate the price field.
         @object.default_price = master.default_price.clone if master.default_price.present?
       end
@@ -38,6 +39,7 @@ module Spree
 
       def collection
         @deleted = (params.key?(:deleted) && params[:deleted] == "on") ? "checked" : ""
+
         @collection ||=
           if @deleted.blank?
             super.includes(:default_price, option_values: :option_type)

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

@@ -145,13 +145,8 @@ module Spree
       end
 
       def order_time(time)
-        [I18n.l(time.to_date), time.strftime("%l:%M %p")].join('')
+        [I18n.l(time.to_date), time.strftime("%l:%M %p").strip].join(' ')
       end
-
-      private
-        def attribute_name_for(field_name)
-          field_name.gsub(' ', '_').downcase
-        end
     end
   end
 end

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

@@ -69,17 +69,6 @@ module Spree
         end
       end
 
-      # sidebar are used on order edit, product edit, user overview etc.
-      # this link is shown so a user can collapse the sidebar
-      def collapse_sidebar_link
-        content_tag :div, class: "collapse-sidebar" do
-          link_to "javascript:;", class: "js-collapse-sidebar" do
-            content_tag(:span, nil, class: "icon icon-chevron-right") +
-            content_tag(:span, "Collapse sidebar", class: "text")
-          end
-        end
-      end
-
       # the per_page_dropdown is used on index pages like orders, products, promotions etc.
       # this method generates the select_tag
       def per_page_dropdown
@@ -90,19 +79,21 @@ module Spree
             per_page_options << (amount + 1) * Spree::Config.admin_products_per_page
           end
         else
-          per_page_default = 15
-          per_page_options = %w{5 15 30 45 60}
+          per_page_default = Spree::Config.admin_orders_per_page
+          per_page_options = %w{15 30 45 60}
         end
 
+        selected_option = params[:per_page].try(:to_i) || per_page_default
+
         select_tag(:per_page,
-          options_for_select(per_page_options, params['per_page'] || per_page_default),
-          { class: "form-control pull-right js-per-page-select" })
+                   options_for_select(per_page_options, selected_option),
+                   class: "form-control pull-right js-per-page-select per-page-selected-#{selected_option}")
       end
 
       # helper method to create proper url to apply per page filtering
       # fixes https://github.com/spree/spree/issues/6888
       def per_page_dropdown_params(args = nil)
-        args ||= params.clone
+        args = params.permit!.to_h.clone
         args.delete(:page)
         args.delete(:per_page)
         args
@@ -132,12 +123,6 @@ module Spree
         button_link_to '', clone_object_url(resource), options
       end
 
-      def link_to_new(resource)
-        options[:data] = { action: 'new' }
-        options[:class] = "btn btn-success btn-sm"
-        link_to_with_icon('plus', Spree.t(:new), edit_object_url(resource))
-      end
-
       def link_to_edit(resource, options={})
         url = options[:url] || edit_object_url(resource)
         options[:data] = { action: 'edit' }
@@ -176,12 +161,13 @@ module Spree
         icon_name ? content_tag(:i, '', class: icon_name) : ''
       end
 
+      #Override: Add disable_with option to prevent multiple request on consecutive clicks
       def button(text, icon_name = nil, button_type = 'submit', options={})
         if icon_name
           icon = content_tag(:span, '', class: "icon icon-#{icon_name}")
           text.insert(0, icon + ' ')
         end
-        button_tag(text.html_safe, options.merge(type: button_type, class: "btn btn-primary #{options[:class]}"))
+        button_tag(text.html_safe, options.merge(type: button_type, class: "btn btn-primary #{options[:class]}", data: { disable_with: "#{ Spree.t(:saving) }..." }))
       end
 
       def button_link_to(text, url, html_options = {})
@@ -210,14 +196,6 @@ module Spree
         end
       end
 
-      def configurations_menu_item(link_text, url, description = '')
-        %(<tr>
-          <td>#{link_to(link_text, url)}</td>
-          <td>#{description}</td>
-        </tr>
-        ).html_safe
-      end
-
       def configurations_sidebar_menu_item(link_text, url, options = {})
         is_selected = url.ends_with?(controller.controller_name) ||
                       url.ends_with?("#{controller.controller_name}/edit") ||

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

@@ -0,0 +1,12 @@
+module Spree
+  module Admin
+    module PromotionRulesHelper
+      def options_for_promotion_rule_types(promotion)
+        existing = promotion.rules.map { |rule| rule.class.name }
+        rule_names = Rails.application.config.spree.promotions.rules.map(&:name).reject{ |r| existing.include? r }
+        options = rule_names.map { |name| [ Spree.t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] }
+        options_for_select(options)
+      end
+    end
+  end
+end

data/app/views/kaminari/_first_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <li class="first">
-  <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote %>
+  <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote %>
 </li>

data/app/views/kaminari/_last_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <li class="last">
-  <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote %>
+  <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote %>
 </li>

data/app/views/kaminari/_next_page.html.erb

@@ -10,6 +10,6 @@
   <% if current_page.last? %>
     <a href="javascript:;">&raquo;</a>
   <% else %>
-    <%= link_to_unless current_page.last?, "&raquo;".html_safe, url, :rel => 'next', :remote => remote %>
+    <%= link_to_unless current_page.last?, "&raquo;".html_safe, url, rel: 'next', remote: remote %>
   <% end %>
 </li>

data/app/views/kaminari/_page.html.erb

@@ -8,5 +8,5 @@
     remote:        data-remote
 -%>
 <li class="<%= 'active' if page.current? %>">
-  <%= link_to page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+  <%= link_to page, url, {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
 </li>