solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -1,16 +1,16 @@
 module Spree
   module Admin
     class PaymentsController < Spree::Admin::BaseController
-      before_filter :load_order, :only => [:create, :new, :index, :fire]
-      before_filter :load_payment, :except => [:create, :new, :index, :fire]
-      before_filter :load_payment_for_fire, :only => :fire
+      before_filter :load_order, only: [:create, :new, :index, :fire]
+      before_filter :load_payment, except: [:create, :new, :index, :fire]
+      before_filter :load_payment_for_fire, only: :fire
       before_filter :load_data
       before_filter :require_bill_address, only: [:index]
 
       respond_to :html
 
       def index
-        @payments = @order.payments.includes(:refunds => :reason)
+        @payments = @order.payments.includes(refunds: :reason)
         @refunds = @payments.flat_map(&:refunds)
         redirect_to new_admin_order_payment_url(@order) if @payments.empty?
       end
@@ -21,7 +21,7 @@ module Spree
 
       def create
         @payment = PaymentCreate.new(@order, object_params).build
-        if @payment.payment_method.source_required? && params[:card].present? and params[:card] != 'new'
+        if @payment.payment_method.source_required? && params[:card].present? && params[:card] != 'new'
           @payment.source = @payment.payment_method.payment_source_class.find_by_id(params[:card])
         end
 
@@ -43,13 +43,13 @@ module Spree
             render :new
           end
         rescue Spree::Core::GatewayError => e
-          flash[:error] = "#{e.message}"
+          flash[:error] = e.message.to_s
           redirect_to new_admin_order_payment_path(@order)
         end
       end
 
       def fire
-        return unless event = params[:e] and @payment.payment_source
+        return unless (event = params[:e]) && @payment.payment_source
 
         # Because we have a transition method also called void, we do this to avoid conflicts.
         event = "void_transaction" if event == "void"
@@ -59,7 +59,7 @@ module Spree
           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
@@ -67,17 +67,17 @@ module Spree
       private
 
       def object_params
-        if params[:payment] and params[:payment_source] and source_params = params.delete(:payment_source)[params[:payment][:payment_method_id]]
+        if params[:payment] && params[:payment_source] && (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
 
       def load_data
         @amount = params[:amount] || load_order.total
         @payment_methods = PaymentMethod.available(:back_end)
-        if @payment and @payment.payment_method
+        if @payment && @payment.payment_method
           @payment_method = @payment.payment_method
         else
           @payment_method = @payment_methods.first

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

@@ -1,27 +1,27 @@
 module Spree
   module Admin
     class ProductPropertiesController < ResourceController
-      belongs_to 'spree/product', :find_by => :slug
+      belongs_to 'spree/product', find_by: :slug
       before_action :find_properties
       before_action :setup_property, only: :index, if: -> { can?(:create, model_class) }
       before_action :setup_variant_property_rules, only: :index
 
       private
 
-        def find_properties
-          @properties = Spree::Property.pluck(:name)
-        end
+      def find_properties
+        @properties = Spree::Property.pluck(:name)
+      end
 
-        def setup_property
-          @product.product_properties.build
-        end
+      def setup_property
+        @product.product_properties.build
+      end
 
-        def setup_variant_property_rules
-          @option_types = @product.variant_option_values_by_option_type
-          @option_value_ids = (params[:ovi] || []).reject(&:blank?).map(&:to_i)
-          @variant_property_rule = @product.find_variant_property_rule(@option_value_ids) || @product.variant_property_rules.build
-          @variant_property_rule.values.build if can?(:create, Spree::VariantPropertyRuleValue)
-        end
+      def setup_variant_property_rules
+        @option_types = @product.variant_option_values_by_option_type
+        @option_value_ids = (params[:ovi] || []).reject(&:blank?).map(&:to_i)
+        @variant_property_rule = @product.find_variant_property_rule(@option_value_ids) || @product.variant_property_rules.build
+        @variant_property_rule.values.build if can?(:create, Spree::VariantPropertyRuleValue)
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Spree
     class ProductsController < ResourceController
       helper 'spree/products'
 
-      before_filter :load_data, :except => [:index]
+      before_filter :load_data, except: [:index]
       create.before :create_before
       update.before :update_before
       helper_method :clone_object_url
@@ -25,7 +25,7 @@ module Spree
           params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
         end
         if updating_variant_property_rules?
-          params[:product][:variant_property_rules_attributes].each do |index, param_attrs|
+          params[:product][:variant_property_rules_attributes].each do |_index, param_attrs|
             param_attrs[:option_value_ids] = param_attrs[:option_value_ids].split(',')
           end
         end
@@ -54,7 +54,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
 
@@ -80,7 +80,7 @@ module Spree
         if updating_variant_property_rules?
           url_params = {}
           url_params[:ovi] = []
-          params[:product][:variant_property_rules_attributes].each do |index, param_attrs|
+          params[:product][:variant_property_rules_attributes].each do |_index, param_attrs|
             url_params[:ovi] += param_attrs[:option_value_ids]
           end
           spree.admin_product_product_properties_url(@product, url_params)

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

@@ -4,25 +4,25 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
 
   def create
     @calculators = Spree::Promotion::Actions::CreateAdjustment.calculators
-    @promotion_action = params[:action_type].constantize.new(params[:promotion_action])
+    @promotion_action = @promotion_action_type.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.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
+      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.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
+      format.js   { render layout: false }
     end
   end
 
@@ -33,12 +33,16 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
   end
 
   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])
+    requested_type = params[:action_type]
+    promotion_action_types = Rails.application.config.spree.promotions.actions
+    @promotion_action_type = promotion_action_types.detect do |klass|
+      klass.name == requested_type
+    end
+    if !@promotion_action_type
       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.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
+        format.js   { render layout: false }
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Spree
           end
         end
       end
-
     end
   end
 end

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

@@ -5,29 +5,25 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
   before_action :validate_promotion_rule_type, only: :create
 
   def create
-    # Remove type key from this hash so that we don't attempt
-    # to set it when creating a new record, as this is raises
-    # an error in ActiveRecord 3.2.
-    promotion_rule_type = params[:promotion_rule].delete(:type)
-    @promotion_rule = promotion_rule_type.constantize.new(params[:promotion_rule])
+    @promotion_rule = @promotion_rule_type.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.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
+      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.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
+      format.js   { render layout: false }
     end
   end
 
@@ -38,12 +34,16 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
   end
 
   def validate_promotion_rule_type
-    valid_promotion_rule_types = Rails.application.config.spree.promotions.rules.map(&:to_s)
-    if !valid_promotion_rule_types.include?(params[:promotion_rule][:type])
+    requested_type = params[:promotion_rule].delete(:type)
+    promotion_rule_types = Rails.application.config.spree.promotions.rules
+    @promotion_rule_type = promotion_rule_types.detect do |klass|
+      klass.name == requested_type
+    end
+    if !@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.js   { render :layout => false }
+        format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
+        format.js   { render layout: false }
       end
     end
   end

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

@@ -11,7 +11,7 @@ module Spree
       def create
         @promotion_builder = Spree::PromotionBuilder.new(
           permitted_promo_builder_params.merge(user: try_spree_current_user),
-          permitted_resource_params,
+          permitted_resource_params
         )
         @promotion = @promotion_builder.promotion
 
@@ -26,48 +26,48 @@ module Spree
 
       private
 
-        def load_bulk_code_information
-          @promotion_builder = Spree::PromotionBuilder.new(
-            base_code: @promotion.codes.first.try!(:value),
-            number_of_codes: @promotion.codes.count,
-          )
-        end
+      def load_bulk_code_information
+        @promotion_builder = Spree::PromotionBuilder.new(
+          base_code: @promotion.codes.first.try!(:value),
+          number_of_codes: @promotion.codes.count
+        )
+      end
 
-        def location_after_save
-          spree.edit_admin_promotion_url(@promotion)
-        end
+      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 load_data
+        @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
+        @promotion_categories = Spree::PromotionCategory.order(:name)
+      end
 
-        def collection
-          return @collection if defined?(@collection)
-          params[:q] ||= HashWithIndifferentAccess.new
-          params[:q][:s] ||= 'id desc'
+      def collection
+        return @collection if defined?(@collection)
+        params[:q] ||= HashWithIndifferentAccess.new
+        params[:q][:s] ||= 'id desc'
 
-          @collection = super
-          @search = @collection.ransack(params[:q])
-          @collection = @search.result(distinct: true).
-            includes(promotion_includes).
-            page(params[:page]).
-            per(params[:per_page] || Spree::Config[:promotions_per_page])
+        @collection = super
+        @search = @collection.ransack(params[:q])
+        @collection = @search.result(distinct: true).
+          includes(promotion_includes).
+          page(params[:page]).
+          per(params[:per_page] || Spree::Config[:promotions_per_page])
 
-          @collection
-        end
+        @collection
+      end
 
-        def promotion_includes
-          [:promotion_actions]
-        end
+      def promotion_includes
+        [:promotion_actions]
+      end
 
-        def permitted_promo_builder_params
-          if params[:promotion_builder]
-            params[:promotion_builder].permit(:base_code, :number_of_codes)
-          else
-            {}
-          end
+      def permitted_promo_builder_params
+        if params[:promotion_builder]
+          params[:promotion_builder].permit(:base_code, :number_of_codes)
+        else
+          {}
         end
+      end
     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
@@ -21,7 +21,6 @@ module Spree
         @prototype ||= Prototype.find(params[:id])
         @prototype_properties = @prototype.properties
       end
-
     end
   end
 end

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

@@ -12,7 +12,7 @@ module Spree
           if report_description_key.nil?
             report_description_key = "#{report_key}_description"
           end
-          @@available_reports[report_key] = {name: Spree.t(report_key), description: Spree.t(report_description_key)}
+          @@available_reports[report_key] = { name: Spree.t(report_key), description: Spree.t(report_description_key) }
         end
       end
 
@@ -31,11 +31,19 @@ module Spree
         if params[:q][:completed_at_gt].blank?
           params[:q][:completed_at_gt] = Time.current.beginning_of_month
         else
-          params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.current.beginning_of_month
+          params[:q][:completed_at_gt] = begin
+                                           Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day
+                                         rescue
+                                           Time.current.beginning_of_month
+                                         end
         end
 
         if params[:q] && !params[:q][:completed_at_lt].blank?
-          params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue ""
+          params[:q][:completed_at_lt] = begin
+                                           Time.zone.parse(params[:q][:completed_at_lt]).end_of_day
+                                         rescue
+                                           ""
+                                         end
         end
 
         params[:q][:s] ||= "completed_at desc"
@@ -59,8 +67,6 @@ module Spree
         end
       end
 
-      private
-
       @@available_reports = {}
     end
   end

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
@@ -35,7 +35,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
           flash[:success] = flash_message_for(@object, :successfully_updated)
           redirect_to location_after_save
         end
-        format.js { render :layout => false }
+        format.js { render layout: false }
       end
     else
       invoke_callbacks(:update, :fails)
@@ -57,7 +57,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)
@@ -79,7 +79,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
 
@@ -90,7 +90,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       flash[:success] = flash_message_for(@object, :successfully_removed)
       respond_with(@object) do |format|
         format.html { redirect_to location_after_destroy }
-        format.js   { render :partial => "spree/admin/shared/destroy" }
+        format.js   { render partial: "spree/admin/shared/destroy" }
       end
     else
       invoke_callbacks(:destroy, :fails)
@@ -102,169 +102,166 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   private
 
-    class << self
-      attr_accessor :parent_data
+  class << self
+    attr_accessor :parent_data
 
-      def belongs_to(model_name, options = {})
-        @parent_data ||= {}
-        @parent_data[:model_name] = model_name
-        @parent_data[:model_class] = (options[:model_class] || model_name.to_s.classify.constantize)
-        @parent_data[:find_by] = options[:find_by] || :id
-      end
+    def belongs_to(model_name, options = {})
+      @parent_data ||= {}
+      @parent_data[:model_name] = model_name
+      @parent_data[:model_class] = (options[:model_class] || model_name.to_s.classify.constantize)
+      @parent_data[:find_by] = options[:find_by] || :id
     end
+  end
 
-    def resource_not_found
-      flash[:error] = flash_message_for(model_class.new, :not_found)
-      redirect_to collection_url
-    end
+  def resource_not_found
+    flash[:error] = flash_message_for(model_class.new, :not_found)
+    redirect_to collection_url
+  end
 
-    def model_class
-      "Spree::#{controller_name.classify}".constantize
-    end
+  def model_class
+    "Spree::#{controller_name.classify}".constantize
+  end
 
-    def model_name
-      parent_data[:model_name].gsub('spree/', '')
-    end
+  def model_name
+    parent_data[:model_name].gsub('spree/', '')
+  end
 
-    def object_name
-      controller_name.singularize
-    end
+  def object_name
+    controller_name.singularize
+  end
 
-    def load_resource
-      if member_action?
-        @object ||= load_resource_instance
+  def load_resource
+    if member_action?
+      @object ||= load_resource_instance
 
-        # call authorize! a third time (called twice already in Admin::BaseController)
-        # this time we pass the actual instance so fine-grained abilities can control
-        # access to individual records, not just entire models.
-        authorize! action, @object
+      # call authorize! a third time (called twice already in Admin::BaseController)
+      # this time we pass the actual instance so fine-grained abilities can control
+      # access to individual records, not just entire models.
+      authorize! action, @object
 
-        instance_variable_set("@#{object_name}", @object)
-      else
-        @collection ||= collection
+      instance_variable_set("@#{object_name}", @object)
+    else
+      @collection ||= collection
 
-        # note: we don't call authorize here as the collection method should use
-        # CanCan's accessible_by method to restrict the actual records returned
+      # note: we don't call authorize here as the collection method should use
+      # CanCan's accessible_by method to restrict the actual records returned
 
-        instance_variable_set("@#{controller_name}", @collection)
-      end
+      instance_variable_set("@#{controller_name}", @collection)
     end
+  end
 
-    def load_resource_instance
-      if new_actions.include?(action)
-        build_resource
-      elsif params[:id]
-        find_resource
-      end
+  def load_resource_instance
+    if new_actions.include?(action)
+      build_resource
+    elsif params[:id]
+      find_resource
     end
+  end
 
-    def parent_data
-      self.class.parent_data
-    end
+  def parent_data
+    self.class.parent_data
+  end
 
-    def parent
-      if parent_data.present?
-        @parent ||= parent_data[:model_class].send("find_by_#{parent_data[:find_by]}", params["#{model_name}_id"])
-        instance_variable_set("@#{model_name}", @parent)
-      else
-        nil
-      end
+  def parent
+    if parent_data.present?
+      @parent ||= parent_data[:model_class].send("find_by_#{parent_data[:find_by]}", params["#{model_name}_id"])
+      instance_variable_set("@#{model_name}", @parent)
     end
+  end
 
-    def find_resource
-      if parent_data.present?
-        parent.send(controller_name).find(params[:id])
-      else
-        model_class.find(params[:id])
-      end
+  def find_resource
+    if parent_data.present?
+      parent.send(controller_name).find(params[:id])
+    else
+      model_class.find(params[:id])
     end
+  end
 
-    def build_resource
-      if parent_data.present?
-        parent.send(controller_name).build
-      else
-        model_class.new
-      end
+  def build_resource
+    if parent_data.present?
+      parent.send(controller_name).build
+    else
+      model_class.new
     end
+  end
 
-    def collection
-      return parent.send(controller_name) if parent_data.present?
-      if model_class.respond_to?(:accessible_by) && !current_ability.has_block?(params[:action], model_class)
-        model_class.accessible_by(current_ability, action)
-      else
-        model_class.where(nil)
-      end
+  def collection
+    return parent.send(controller_name) if parent_data.present?
+    if model_class.respond_to?(:accessible_by) && !current_ability.has_block?(params[:action], model_class)
+      model_class.accessible_by(current_ability, action)
+    else
+      model_class.where(nil)
     end
+  end
 
-    def location_after_destroy
-      collection_url
-    end
+  def location_after_destroy
+    collection_url
+  end
 
-    def location_after_save
-      collection_url
-    end
+  def location_after_save
+    collection_url
+  end
 
-    # URL helpers
+  # URL helpers
 
-    def new_object_url(options = {})
-      if parent_data.present?
-        spree.new_polymorphic_url([:admin, parent, model_class], options)
-      else
-        spree.new_polymorphic_url([:admin, model_class], options)
-      end
+  def new_object_url(options = {})
+    if parent_data.present?
+      spree.new_polymorphic_url([:admin, parent, model_class], options)
+    else
+      spree.new_polymorphic_url([:admin, model_class], options)
     end
+  end
 
-    def edit_object_url(object, options = {})
-
-      if parent_data.present?
-        spree.polymorphic_url([:edit, :admin, parent, object], options)
-      else
-        spree.polymorphic_url([:edit, :admin, object], options)
-      end
+  def edit_object_url(object, options = {})
+    if parent_data.present?
+      spree.polymorphic_url([:edit, :admin, parent, object], options)
+    else
+      spree.polymorphic_url([:edit, :admin, object], options)
     end
+  end
 
-    def object_url(object = nil, options = {})
-      target = object ? object : @object
+  def object_url(object = nil, options = {})
+    target = object ? object : @object
 
-      if parent_data.present?
-        spree.polymorphic_url([:admin, parent, target], options)
-      else
-        spree.polymorphic_url([:admin, target], options)
-      end
+    if parent_data.present?
+      spree.polymorphic_url([:admin, parent, target], options)
+    else
+      spree.polymorphic_url([:admin, target], options)
     end
+  end
 
-    def collection_url(options = {})
-      if parent_data.present?
-        spree.polymorphic_url([:admin, parent, model_class], options)
-      else
-        spree.polymorphic_url([:admin, model_class], options)
-      end
+  def collection_url(options = {})
+    if parent_data.present?
+      spree.polymorphic_url([:admin, parent, model_class], options)
+    else
+      spree.polymorphic_url([:admin, model_class], options)
     end
+  end
 
-    # Allow all attributes to be updatable.
-    #
-    # Other controllers can, should, override it to set custom logic
-    def permitted_resource_params
-      params[object_name].present? ? params.require(object_name).permit! : ActionController::Parameters.new
-    end
+  # Allow all attributes to be updatable.
+  #
+  # Other controllers can, should, override it to set custom logic
+  def permitted_resource_params
+    params[object_name].present? ? params.require(object_name).permit! : ActionController::Parameters.new
+  end
 
-    def collection_actions
-      [:index]
-    end
+  def collection_actions
+    [:index]
+  end
 
-    def member_action?
-      !collection_actions.include? action
-    end
+  def member_action?
+    !collection_actions.include? action
+  end
 
-    def new_actions
-      [:new, :create]
-    end
+  def new_actions
+    [:new, :create]
+  end
 
-    def render_after_create_error
-      render action: 'new'
-    end
+  def render_after_create_error
+    render action: 'new'
+  end
 
-    def render_after_update_error
-      render action: 'edit'
-    end
+  def render_after_update_error
+    render action: 'edit'
+  end
 end