solidus_backend 1.2.3 → 1.3.0.beta1

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
@@ -30,7 +30,7 @@ module Spree
         unassociated_inventory_units = all_inventory_units - associated_inventory_units
 
         new_return_items = unassociated_inventory_units.map do |new_unit|
-          Spree::ReturnItem.new(inventory_unit: new_unit).tap(&:set_default_pre_tax_amount)
+          Spree::ReturnItem.new(inventory_unit: new_unit).tap(&:set_default_amount)
         end
         @form_return_items = (@return_authorization.return_items + new_return_items).sort_by(&:inventory_unit_id)
       end

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

@@ -1,7 +1,6 @@
 module Spree
   module Admin
     class ReturnItemsController < ResourceController
-
       private
 
       def location_after_save

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

@@ -1,9 +1,8 @@
 module Spree
   module Admin
     class SearchController < Spree::Admin::BaseController
-      # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
-      before_action :check_json_authenticity, only: :index
       respond_to :json
+      layout false
 
       # TODO: Clean this up by moving searching out to user_class_extensions
       # And then JSON building with something like Active Model Serializers
@@ -36,4 +35,3 @@ module Spree
     end
   end
 end
-

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

@@ -12,7 +12,7 @@ module Spree
 
         respond_with(@object) do |format|
           format.html { redirect_to collection_url }
-          format.js  { render_js_for_destroy }
+          format.js { render_js_for_destroy }
         end
       end
 
@@ -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,23 +7,23 @@ 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
 
       private
 
-        def location_after_save
-          admin_country_states_url(@country)
-        end
+      def location_after_save
+        admin_country_states_url(@country)
+      end
 
-        def collection
-          super.order(:name)
-        end
+      def collection
+        super.order(:name)
+      end
 
-        def load_data
-          @countries = Country.order(:name)
-        end
+      def load_data
+        @countries = Country.order(:name)
+      end
     end
   end
 end

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

@@ -12,58 +12,58 @@ module Spree
 
       private
 
-        def location_after_destroy
-          :back
-        end
+      def location_after_destroy
+        :back
+      end
 
-        def location_after_save
-          :back
-        end
+      def location_after_save
+        :back
+      end
 
-        def build_resource
-          variant = Variant.accessible_by(current_ability, :read).find(params[:variant_id])
-          stock_location = StockLocation.accessible_by(current_ability, :read).find(params[:stock_location_id])
-          stock_location.stock_movements.build(stock_movement_params).tap do |stock_movement|
-            stock_movement.originator = try_spree_current_user
-            stock_movement.stock_item = stock_location.set_up_stock_item(variant)
-          end
+      def build_resource
+        variant = Variant.accessible_by(current_ability, :read).find(params[:variant_id])
+        stock_location = StockLocation.accessible_by(current_ability, :read).find(params[:stock_location_id])
+        stock_location.stock_movements.build(stock_movement_params).tap do |stock_movement|
+          stock_movement.originator = try_spree_current_user
+          stock_movement.stock_item = stock_location.set_up_stock_item(variant)
         end
+      end
 
-        def permitted_resource_params
-          {}
-        end
+      def permitted_resource_params
+        {}
+      end
 
-        def stock_movement_params
-          params.require(:stock_movement).permit(permitted_stock_movement_attributes)
-        end
+      def stock_movement_params
+        params.require(:stock_movement).permit(permitted_stock_movement_attributes)
+      end
 
-        def determine_backorderable
-          @stock_item.backorderable = params[:stock_item].present? && params[:stock_item][:backorderable].present?
-        end
+      def determine_backorderable
+        @stock_item.backorderable = params[:stock_item].present? && params[:stock_item][:backorderable].present?
+      end
 
-        def load_product
-          @product = Product.accessible_by(current_ability, :read).friendly.find(params[:product_slug]) if params[:product_slug]
-        end
+      def load_product
+        @product = Product.accessible_by(current_ability, :read).friendly.find(params[:product_slug]) if params[:product_slug]
+      end
 
-        def load_stock_management_data
-          @stock_locations = Spree::StockLocation.accessible_by(current_ability, :read)
-          @stock_item_stock_locations = params[:stock_location_id].present? ? @stock_locations.where(id: params[:stock_location_id]) : @stock_locations
-          @variant_display_attributes = self.class.variant_display_attributes
-          @variants = Spree::Config.variant_search_class.new(params[:variant_search_term], scope: variant_scope).results
-          @variants = @variants.includes(:images, stock_items: :stock_location, product: :variant_images)
-          @variants = @variants.includes(option_values: :option_type)
-          @variants = @variants.order(id: :desc).page(params[:page]).per(params[:per_page] || Spree::Config[:orders_per_page])
-        end
+      def load_stock_management_data
+        @stock_locations = Spree::StockLocation.accessible_by(current_ability, :read)
+        @stock_item_stock_locations = params[:stock_location_id].present? ? @stock_locations.where(id: params[:stock_location_id]) : @stock_locations
+        @variant_display_attributes = self.class.variant_display_attributes
+        @variants = Spree::Config.variant_search_class.new(params[:variant_search_term], scope: variant_scope).results
+        @variants = @variants.includes(:images, stock_items: :stock_location, product: :variant_images)
+        @variants = @variants.includes(option_values: :option_type)
+        @variants = @variants.order(id: :desc).page(params[:page]).per(params[:per_page] || Spree::Config[:orders_per_page])
+      end
 
-        def variant_scope
-          scope = Spree::Variant.accessible_by(current_ability, :read)
-          scope = scope.where(product: @product) if @product
-          scope
-        end
+      def variant_scope
+        scope = Spree::Variant.accessible_by(current_ability, :read)
+        scope = scope.where(product: @product) if @product
+        scope
+      end
 
-        def collection
-          []
-        end
+      def collection
+        []
+      end
     end
   end
 end

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

@@ -1,25 +1,17 @@
 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
+        @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 and return
-        end
+      rescue ActiveRecord::RecordNotFound
+        flash[:error] = Spree.t(:stock_locations_need_a_default_country)
+        redirect_to(admin_stock_locations_path) && return
       end
-
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Spree
       def collection
         super.
           recent.
-          includes(:stock_item => { :variant => :product }).
+          includes(stock_item: { variant: :product }).
           page(params[:page])
       end
     end

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

@@ -72,7 +72,7 @@ module Spree
       def permitted_resource_params
         resource_params = super
         if action == :create
-          resource_params.merge!(created_by: try_spree_current_user)
+          resource_params[:created_by] = try_spree_current_user
         end
         resource_params
       end
@@ -82,7 +82,7 @@ module Spree
       end
 
       def render_after_create_error
-        load_source_stock_locations
+        load_stock_locations
         super
       end
 
@@ -119,7 +119,7 @@ module Spree
       def ensure_receivable_stock_transfer
         unless @stock_transfer.receivable?
           flash[:error] = Spree.t(:stock_transfer_must_be_receivable)
-          redirect_to admin_stock_transfers_path and return
+          redirect_to(admin_stock_transfers_path) && return
         end
       end
 
@@ -129,8 +129,11 @@ module Spree
       end
 
       def source_location
-        @source_location ||= params.has_key?(:transfer_receive_stock) ? nil :
+        @source_location ||= if params.key?(:transfer_receive_stock)
+                               nil
+                             else
                                StockLocation.find(params[:transfer_source_location_id])
+                             end
       end
 
       def destination_location

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

@@ -16,7 +16,7 @@ module Spree
         @store_credit = @user.store_credits.build(
           permitted_resource_params.merge({
             created_by: try_spree_current_user,
-            action_originator: try_spree_current_user,
+            action_originator: try_spree_current_user
           })
         )
 
@@ -25,7 +25,7 @@ module Spree
           redirect_to admin_user_store_credits_path(@user)
         else
           load_categories
-          flash[:error] = "#{Spree.t("admin.store_credits.unable_to_create")} #{@store_credit.errors.full_messages}"
+          flash[:error] = "#{Spree.t('admin.store_credits.unable_to_create')} #{@store_credit.errors.full_messages}"
           render :new
         end
       end
@@ -40,7 +40,7 @@ module Spree
           end
         else
           respond_to do |format|
-            format.json { render json: { message: "#{Spree.t("admin.store_credits.unable_to_update")} #{@store_credit.errors.full_messages}" }, status: :bad_request }
+            format.json { render json: { message: "#{Spree.t('admin.store_credits.unable_to_update')} #{@store_credit.errors.full_messages}" }, status: :bad_request }
           end
         end
       end
@@ -103,7 +103,7 @@ module Spree
 
         load_update_reasons
         flash[:error] = "#{Spree.t("admin.store_credits.unable_to_#{translation_key}")}: #{@store_credit.errors.full_messages.join(', ')}"
-        render template and return
+        render(template) && return
       end
     end
   end

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

@@ -17,6 +17,9 @@ module Spree
             'building_forms',
             'validation'
           ],
+          components: [
+            'tabs'
+          ],
           messaging: [
             'loading',
             'flashes',

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

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

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

@@ -1,18 +1,16 @@
 module Spree
   module Admin
     class TaxonsController < Spree::Admin::BaseController
-
       respond_to :html, :json, :js
 
       def index
-
       end
 
       def search
         if params[:ids]
-          @taxons = Spree::Taxon.where(:id => params[:ids].split(','))
+          @taxons = Spree::Taxon.where(id: params[:ids].split(','))
         else
-          @taxons = Spree::Taxon.limit(20).ransack(:name_cont => params[:q]).result
+          @taxons = Spree::Taxon.limit(20).ransack(name_cont: params[:q]).result
         end
       end
 
@@ -21,7 +19,7 @@ module Spree
         @taxon = @taxonomy.taxons.build(params[:taxon])
         if @taxon.save
           respond_with(@taxon) do |format|
-            format.json {render :json => @taxon.to_json }
+            format.json { render json: @taxon.to_json }
           end
         else
           flash[:error] = Spree.t('errors.messages.could_not_create_taxon')
@@ -51,53 +49,32 @@ module Spree
           @taxon.child_index = new_position.to_i
         end
 
-        @taxon.save!
-
-        # regenerate permalink
-        if parent_id
-          @taxon.reload
-          @taxon.set_permalink
-          @taxon.save!
-          @update_children = true
+        if params[:permalink_part]
+          @taxon.permalink_part = params[:permalink_part].to_s
         end
 
-        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
+        @taxon.assign_attributes(taxon_params)
 
-        if @taxon.update_attributes(taxon_params)
+        if @taxon.save
           flash[:success] = flash_message_for(@taxon, :successfully_updated)
         end
 
-        #rename child taxons
-        if @update_children
-          @taxon.descendants.each do |taxon|
-            taxon.reload
-            taxon.set_permalink
-            taxon.save!
-          end
-        end
-
         respond_with(@taxon) do |format|
-          format.html {redirect_to edit_admin_taxonomy_url(@taxonomy) }
-          format.json {render :json => @taxon.to_json }
+          format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
         end
       end
 
       def destroy
         @taxon = Taxon.find(params[:id])
         @taxon.destroy
-        respond_with(@taxon) { |format| format.json { render :json => '' } }
+        respond_with(@taxon) { |format| format.json { render json: '' } }
       end
 
       private
-        def taxon_params
-          params.require(:taxon).permit(permitted_taxon_attributes)
-        end
+
+      def taxon_params
+        params.require(:taxon).permit(permitted_taxon_attributes)
+      end
     end
   end
 end

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

@@ -5,14 +5,11 @@ module Spree
 
       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
       before_filter :load_roles, :load_stock_locations, only: [:edit, :new]
 
       def index
         respond_with(@collection) do |format|
           format.html
-          format.json { render :json => json_data }
         end
       end
 
@@ -91,89 +88,74 @@ module Spree
 
       private
 
-        def collection
-          return @collection if @collection.present?
-          if request.xhr? && params[:q].present?
-            @collection = Spree.user_class.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 = Spree.user_class.ransack(params[:q])
-            @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
-          end
+      def collection
+        return @collection if @collection.present?
+        if request.xhr? && params[:q].present?
+          @collection = Spree.user_class.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 = Spree.user_class.ransack(params[:q])
+          @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
         end
+      end
 
-        def user_params
-          attributes = permitted_user_attributes
-
-          if action_name == "create" || can?(:update_email, @user)
-            attributes |= [:email]
-          end
+      def user_params
+        attributes = permitted_user_attributes
 
-          if can? :manage, Spree::Role
-            attributes += [{ spree_role_ids: [] }]
-          end
-
-          params.require(:user).permit(attributes)
+        if action_name == "create" || can?(:update_email, @user)
+          attributes |= [:email]
         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)
+        if can? :manage, Spree::Role
+          attributes += [{ spree_role_ids: [] }]
         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, :country_iso]
-            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
+        params.require(:user).permit(attributes)
+      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
-        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 load_roles
-          @roles = Spree::Role.all
-          @user_roles = @user.spree_roles
+      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_stock_locations
-          @stock_locations = Spree::StockLocation.all
-        end
+      def load_roles
+        @roles = Spree::Role.all
+        @user_roles = @user.spree_roles
+      end
 
-        def set_roles
-          # FIXME: user_params permits the roles that can be set, if spree_role_ids is set.
-          # when submitting a user with no roles, the param is not present. Because users can be updated
-          # with some users being able to set roles, and some users not being able to set roles, we have to check
-          # if the roles should be cleared, or unchanged again here. The roles form should probably hit a seperate
-          # action or controller to remedy this.
-          if user_params[:spree_role_ids]
-            @user.spree_roles = Spree::Role.where(id: user_params[:spree_role_ids])
-          elsif can?(:manage, Spree::Role)
-            @user.spree_roles = []
-          end
-        end
+      def load_stock_locations
+        @stock_locations = Spree::StockLocation.all
+      end
 
-        def set_stock_locations
-          @user.stock_locations = Spree::StockLocation.where(id: (params[:user][:stock_location_ids] || []))
+      def set_roles
+        # FIXME: user_params permits the roles that can be set, if spree_role_ids is set.
+        # when submitting a user with no roles, the param is not present. Because users can be updated
+        # with some users being able to set roles, and some users not being able to set roles, we have to check
+        # if the roles should be cleared, or unchanged again here. The roles form should probably hit a seperate
+        # action or controller to remedy this.
+        if user_params[:spree_role_ids]
+          @user.spree_roles = Spree::Role.where(id: user_params[:spree_role_ids])
+        elsif can?(:manage, Spree::Role)
+          @user.spree_roles = []
         end
+      end
+
+      def set_stock_locations
+        @user.stock_locations = Spree::StockLocation.where(id: (params[:user][:stock_location_ids] || []))
+      end
     end
   end
 end