spree_backend 2.4.10 → 3.0.0.rc1

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

@@ -6,13 +6,13 @@ module Spree
 
         def show
           edit
-          render :action => :edit
+          render action: :edit
         end
 
         def edit
           country_id = Address.default.country.id
-          @order.build_bill_address(:country_id => country_id) if @order.bill_address.nil?
-          @order.build_ship_address(:country_id => country_id) if @order.ship_address.nil?
+          @order.build_bill_address(country_id: country_id) if @order.bill_address.nil?
+          @order.build_ship_address(country_id: country_id) if @order.ship_address.nil?
 
           @order.bill_address.country_id = country_id if @order.bill_address.country.nil?
           @order.ship_address.country_id = country_id if @order.ship_address.country.nil?
@@ -24,11 +24,11 @@ module Spree
               @order.associate_user!(Spree.user_class.find(params[:user_id]), @order.email.blank?)
             end
             @order.next
-            @order.refresh_shipment_rates
+            @order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_FRONT_AND_BACK_END)
             flash[:success] = Spree.t('customer_details_updated')
             redirect_to edit_admin_order_url(@order)
           else
-            render :action => :edit
+            render action: :edit
           end
 
         end
@@ -38,13 +38,13 @@ module Spree
             params.require(:order).permit(
               :email,
               :use_billing,
-              :bill_address_attributes => permitted_address_attributes,
-              :ship_address_attributes => permitted_address_attributes
+              bill_address_attributes: permitted_address_attributes,
+              ship_address_attributes: permitted_address_attributes
             )
           end
 
           def load_order
-            @order = Order.includes(:adjustments).find_by_number!(params[:order_id])
+            @order = Order.includes(:adjustments).friendly.find(params[:order_id])
           end
 
           def model_class

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

@@ -11,7 +11,6 @@ module Spree
         params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
         @show_only_completed = params[:q][:completed_at_not_null] == '1'
         params[:q][:s] ||= @show_only_completed ? 'completed_at desc' : 'created_at desc'
-        params[:q][:completed_at_not_null] = '' unless @show_only_completed
 
         # As date params are deleted if @show_only_completed, store
         # the original date so we can restore them into the params
@@ -57,7 +56,7 @@ module Spree
         can_not_transition_without_customer_info
 
         unless @order.completed?
-          @order.refresh_shipment_rates
+          @order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_FRONT_AND_BACK_END)
         end
       end
 
@@ -65,7 +64,7 @@ module Spree
         unless @order.completed?
           @order.refresh_shipment_rates
         end
-        if @order.shipped_shipments.count > 0
+        if @order.shipments.shipped.count > 0
           redirect_to edit_admin_order_url(@order)
         end
       end
@@ -103,7 +102,7 @@ module Spree
       end
 
       def resend
-        OrderMailer.confirm_email(@order.id, true).deliver
+        OrderMailer.confirm_email(@order.id, true).deliver_later
         flash[:success] = Spree.t(:order_email_resent)
 
         redirect_to :back
@@ -132,7 +131,7 @@ module Spree
         end
 
         def load_order
-          @order = Order.includes(:adjustments).find_by_number!(params[:id])
+          @order = Order.includes(:adjustments).friendly.find(params[:id])
           authorize! action, @order
         end
 

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

@@ -71,7 +71,7 @@ module Spree
         if params[:payment] and params[:payment_source] and source_params = params.delete(:payment_source)[params[:payment][:payment_method_id]]
           params[:payment][:source_attributes] = source_params
         end
-        
+
         params.require(:payment).permit(permitted_payment_attributes)
       end
 
@@ -86,13 +86,13 @@ module Spree
       end
 
       def load_order
-        @order = Order.find_by_number!(params[:order_id])
+        @order = Order.friendly.find(params[:order_id])
         authorize! action, @order
         @order
       end
 
       def load_payment
-        @payment = Payment.find(params[:id])
+        @payment = Payment.friendly.find(params[:id])
       end
 
       def model_class

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

@@ -100,20 +100,17 @@ module Spree
 
         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.
-        if params[:q][:deleted_at_null] == '0'
+        if params[:q].delete(:deleted_at_null) == '0'
           @collection = @collection.with_deleted
         end
         # @search needs to be defined as this is passed to search_form_for
-        # Temporarily remove params[:q][:deleted_at_null] from params[:q] to ransack products.
-        # 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' })
+        @search = @collection.ransack(params[:q])
         @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])
+
         @collection
       end
 

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

@@ -77,7 +77,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     end
 
     respond_to do |format|
-      format.js  { render text: 'Ok' }
+      format.js { render text: 'Ok' }
     end
   end
 

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

@@ -9,6 +9,7 @@ module Spree
       end
 
       protected
+
       def admin_root_redirect_path
         spree.admin_orders_path
       end

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

@@ -21,6 +21,18 @@ module Spree
           }).result.limit(10)
         end
       end
+
+      def products
+        if params[:ids]
+          @products = Product.where(:id => params[:ids].split(","))
+        else
+          @products = Product.ransack(params[:q]).result
+        end
+
+        @products = @products.distinct.page(params[:page]).per(params[:per_page])
+        expires_in 15.minutes, :public => true
+        headers['Surrogate-Control'] = "max-age=#{15.minutes}"
+      end
     end
   end
 end

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

@@ -0,0 +1,18 @@
+module Spree
+  module Admin
+    class StateChangesController < Spree::Admin::BaseController
+      before_action :load_order, only: [:index]
+
+      def index
+        @state_changes = @order.state_changes.includes(:user)
+      end
+
+      private
+
+      def load_order
+        @order = Order.find_by_number!(params[:order_id])
+        authorize! action, @order
+      end
+    end
+  end
+end

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

@@ -1,25 +1,16 @@
 module Spree
   module Admin
     class StockLocationsController < ResourceController
-
       before_action :set_country, only: :new
 
       private
 
       def set_country
-        begin
-          if Spree::Config[:default_country_id].present?
-            @stock_location.country = Spree::Country.find(Spree::Config[:default_country_id])
-          else
-            @stock_location.country = Spree::Country.find_by!(iso: 'US')
-          end
-
-        rescue ActiveRecord::RecordNotFound
-          flash[:error] = Spree.t(:stock_locations_need_a_default_country)
-          redirect_to admin_stock_locations_path and return
-        end
+        @stock_location.country = Spree::Country.default
+      rescue ActiveRecord::RecordNotFound
+        flash[:error] = Spree.t(:stock_locations_need_a_default_country)
+        redirect_to admin_stock_locations_path
       end
-
     end
   end
 end

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

@@ -6,14 +6,14 @@ module Spree
       def index
         @q = StockTransfer.ransack(params[:q])
 
-        @stock_transfers = @q.result
-                             .includes(:stock_movements => { :stock_item => :stock_location })
-                             .order('created_at DESC')
-                             .page(params[:page])
+        @stock_transfers = @q.result.
+                             includes(stock_movements: { stock_item: :stock_location }).
+                             order('created_at DESC').
+                             page(params[:page])
       end
 
       def show
-        @stock_transfer = StockTransfer.find_by_param(params[:id])
+        @stock_transfer = StockTransfer.friendly.find(params[:id])
       end
 
       def new
@@ -26,7 +26,7 @@ module Spree
           variants[variant_id] += params[:quantity][i].to_i
         end
 
-        stock_transfer = StockTransfer.create(:reference => params[:reference])
+        stock_transfer = StockTransfer.create(reference: params[:reference])
         stock_transfer.transfer(source_location,
                                 destination_location,
                                 variants)

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

@@ -1,19 +1,6 @@
 module Spree
   module Admin
     class TaxCategoriesController < ResourceController
-      def destroy
-        if @object.destroy
-          flash[:success] = flash_message_for(@object, :successfully_removed)
-          respond_with(@object) do |format|
-            format.html { redirect_to collection_url }
-            format.js   { render :partial => "spree/admin/shared/destroy" }
-          end
-        else
-          respond_with(@object) do |format|
-            format.html { redirect_to collection_url }
-          end
-        end
-      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class TaxonomiesController < ResourceController
-      respond_to :json, :only => [:get_children]
+      respond_to :json, only: [:get_children]
 
       def get_children
         @taxons = Taxon.find(params[:parent_id]).children

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

@@ -2,6 +2,8 @@ module Spree
   module Admin
     class TaxonsController < Spree::Admin::BaseController
 
+      before_action :load_taxonomy, only: [:create, :edit, :update]
+      before_action :load_taxon, only: [:edit, :update]
       respond_to :html, :json, :js
 
       def index
@@ -17,7 +19,6 @@ module Spree
       end
 
       def create
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
         @taxon = @taxonomy.taxons.build(params[:taxon])
         if @taxon.save
           respond_with(@taxon) do |format|
@@ -32,40 +33,21 @@ module Spree
       end
 
       def edit
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
-        @taxon = @taxonomy.taxons.find(params[:id])
         @permalink_part = @taxon.permalink.split("/").last
       end
 
       def update
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
-        @taxon = @taxonomy.taxons.find(params[:id])
         parent_id = params[:taxon][:parent_id]
-        new_position = params[:taxon][:position]
-
-        if parent_id
-          @taxon.parent = Taxon.find(parent_id.to_i)
-        end
-
-        if new_position
-          @taxon.child_index = new_position.to_i
-        end
+        set_position
+        set_parent(parent_id)
 
         @taxon.save!
 
         # regenerate permalink
-        if parent_id
-          @taxon.reload
-          @taxon.set_permalink
-          @taxon.save!
-          @update_children = true
-        end
+        regenerate_permalink if parent_id
+
+        set_permalink_params
 
-        if params.key? "permalink_part"
-          parent_permalink = @taxon.permalink.split("/")[0...-1].join("/")
-          parent_permalink += "/" unless parent_permalink.blank?
-          params[:taxon][:permalink] = parent_permalink + params[:permalink_part]
-        end
         #check if we need to rename child taxons if parent name or permalink changes
         @update_children = true if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
 
@@ -74,13 +56,7 @@ module Spree
         end
 
         #rename child taxons
-        if @update_children
-          @taxon.descendants.each do |taxon|
-            taxon.reload
-            taxon.set_permalink
-            taxon.save!
-          end
-        end
+        rename_child_taxons if @update_children
 
         respond_with(@taxon) do |format|
           format.html {redirect_to edit_admin_taxonomy_url(@taxonomy) }
@@ -95,13 +71,54 @@ module Spree
       end
 
       private
-        def taxon_params
-          params.require(:taxon).permit(permitted_params)
+
+      def taxon_params
+        params.require(:taxon).permit(permitted_taxon_attributes)
+      end
+
+      def load_taxon
+        @taxon = @taxonomy.taxons.find(params[:id])
+      end
+
+      def load_taxonomy
+        @taxonomy = Taxonomy.find(params[:taxonomy_id])
+      end
+
+      def set_position
+        new_position = params[:taxon][:position]
+        if new_position
+          @taxon.child_index = new_position.to_i
+        end
+      end
+
+      def set_parent(parent_id)
+        if parent_id
+          @taxon.parent = Taxon.find(parent_id.to_i)
         end
+      end
 
-        def permitted_params
-          Spree::PermittedAttributes.taxon_attributes
+      def set_permalink_params
+        if params.key? "permalink_part"
+          parent_permalink = @taxon.permalink.split("/")[0...-1].join("/")
+          parent_permalink += "/" unless parent_permalink.blank?
+          params[:taxon][:permalink] = parent_permalink + params[:permalink_part]
         end
+      end
+
+      def rename_child_taxons
+        @taxon.descendants.each do |taxon|
+          taxon.reload
+          taxon.set_permalink
+          taxon.save!
+        end
+      end
+
+      def regenerate_permalink
+        @taxon.reload
+        @taxon.set_permalink
+        @taxon.save!
+        @update_children = true
+      end
     end
   end
 end

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

@@ -8,6 +8,7 @@ module Spree
       # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
       before_action :check_json_authenticity, only: :index
       before_action :load_roles
+      before_action :extract_roles_from_params, only: [:create, :update]
 
       def index
         respond_with(@collection) do |format|
@@ -21,16 +22,10 @@ module Spree
       end
 
       def create
-        if params[:user]
-          roles = params[:user].delete("spree_role_ids")
-        end
 
         @user = Spree.user_class.new(user_params)
         if @user.save
-
-          if roles
-            @user.spree_roles = roles.reject(&:blank?).collect{|r| Spree::Role.find(r)}
-          end
+          set_roles
 
           flash.now[:success] = Spree.t(:created_successfully)
           render :edit
@@ -40,14 +35,9 @@ module Spree
       end
 
       def update
-        if params[:user]
-          roles = params[:user].delete("spree_role_ids")
-        end
 
         if @user.update_attributes(user_params)
-          if roles
-            @user.spree_roles = roles.reject(&:blank?).collect{|r| Spree::Role.find(r)}
-          end
+          set_roles
           flash.now[:success] = Spree.t(:account_updated)
         end
 
@@ -117,43 +107,56 @@ module Spree
         end
 
       private
-        def user_params
-          params.require(:user).permit(PermittedAttributes.user_attributes |
-                                       [:spree_role_ids,
-                                        ship_address_attributes: PermittedAttributes.address_attributes,
-                                        bill_address_attributes: PermittedAttributes.address_attributes])
+
+      def set_roles
+        if @roles_ids
+          @user.spree_roles = Spree::Role.where(id: @roles_ids)
         end
+      end
 
-        # handling raise from Spree::Admin::ResourceController#destroy
-        def user_destroy_with_orders_error
-          invoke_callbacks(:destroy, :fails)
-          render :status => :forbidden, :text => Spree.t(:error_user_destroy_with_orders)
+      def extract_roles_from_params
+        if params[:user]
+          @roles_ids = params[:user].delete("spree_role_ids")
         end
+      end
 
-        # Allow different formats of json data to suit different ajax calls
-        def json_data
-          json_format = params[:json_format] or '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 } } }
+      def user_params
+        params.require(:user).permit(permitted_user_attributes |
+                                     [:spree_role_ids,
+                                      ship_address_attributes: permitted_address_attributes,
+                                      bill_address_attributes: permitted_address_attributes])
+      end
 
-            collection.to_json(:only => [:id, :email], :include =>
-                               { :bill_address => includes, :ship_address => includes })
-          end
-        end
+      # handling raise from Spree::Admin::ResourceController#destroy
+      def user_destroy_with_orders_error
+        invoke_callbacks(:destroy, :fails)
+        render status: :forbidden, text: Spree.t(:error_user_destroy_with_orders)
+      end
 
-        def sign_in_if_change_own_password
-          if try_spree_current_user == @user && @user.password.present?
-            sign_in(@user, :event => :authentication, :bypass => true)
-          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 load_roles
-          @roles = Spree::Role.all
+      def sign_in_if_change_own_password
+        if try_spree_current_user == @user && @user.password.present?
+          sign_in(@user, event: :authentication, bypass: true)
         end
+      end
+
+      def load_roles
+        @roles = Spree::Role.all
+      end
     end
   end
 end

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

@@ -33,7 +33,7 @@ module Spree
           @deleted = (params.key?(:deleted) && params[:deleted] == "on") ? "checked" : ""
 
           if @deleted.blank?
-            @collection ||= super
+            @collection ||= super.includes(:default_price, option_values: :option_type)
           else
             @collection ||= Variant.only_deleted.where(:product_id => parent.id)
           end

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

@@ -1,11 +1,6 @@
 module Spree
   module Admin
     module AdjustmentsHelper
-      def adjustment_state(adjustment)
-        state = adjustment.state.to_sym
-        icon = { closed: 'lock', open: 'unlock' }
-        content_tag(:span, '', class: "fa fa-#{ icon[state] }")
-      end
 
       def display_adjustable(adjustable)
         case adjustable