solidus_backend_devise_token_auth 2.8.0.alpha.2

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class PaymentMethodsController < ResourceController
+      skip_before_action :load_resource, only: :create
+      before_action :load_payment_method_types, except: [:index]
+      before_action :validate_payment_method_type, only: [:create, :update]
+
+      respond_to :html
+
+      def create
+        @payment_method = @payment_method_type.new(payment_method_params)
+        @object = @payment_method
+        invoke_callbacks(:create, :before)
+        if @payment_method.save
+          invoke_callbacks(:create, :after)
+          flash[:success] = t('spree.successfully_created', resource: t('spree.payment_method'))
+          redirect_to edit_admin_payment_method_path(@payment_method)
+        else
+          invoke_callbacks(:create, :fails)
+          respond_with(@payment_method)
+        end
+      end
+
+      def update
+        @payment_method = @payment_method.becomes(@payment_method_type)
+        invoke_callbacks(:update, :before)
+
+        attributes = payment_method_params
+        attributes.each do |k, _v|
+          if k.include?("password") && attributes[k].blank?
+            attributes.delete(k)
+          end
+        end
+
+        if @payment_method.update_attributes(attributes)
+          invoke_callbacks(:update, :after)
+          flash[:success] = t('spree.successfully_updated', resource: t('spree.payment_method'))
+          redirect_to edit_admin_payment_method_path(@payment_method)
+        else
+          invoke_callbacks(:update, :fails)
+          respond_with(@payment_method)
+        end
+      end
+
+      private
+
+      def collection
+        super.ordered_by_position
+      end
+
+      def load_providers
+        Spree::Deprecation.warn('load_providers is deprecated. Please use load_payment_method_types instead.', caller)
+        load_payment_method_types
+      end
+
+      def load_payment_method_types
+        @payment_method_types = Rails.application.config.spree.payment_methods.sort_by(&:name)
+        # TODO: Remove `@providers` instance var once `load_providers` gets removed.
+        @providers = @payment_method_types
+      end
+
+      def validate_payment_provider
+        Spree::Deprecation.warn('validate_payment_provider is deprecated. Please use validate_payment_method_type instead.', caller)
+        validate_payment_method_type
+      end
+
+      def validate_payment_method_type
+        requested_type = params[:payment_method][:type]
+        @payment_method_type = @payment_method_types.detect do |klass|
+          klass.name == requested_type
+        end
+
+        if !@payment_method_type
+          flash[:error] = t('spree.invalid_payment_method_type')
+          redirect_to new_admin_payment_method_path
+        end
+      end
+
+      def payment_method_params
+        params.require(:payment_method).permit!
+      end
+    end
+  end
+end

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

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class PaymentsController < Spree::Admin::BaseController
+      rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
+
+      before_action :load_order, only: [:create, :new, :index, :fire]
+      before_action :load_payment, except: [:create, :new, :index, :fire]
+      before_action :load_payment_for_fire, only: :fire
+      before_action :load_data
+      before_action :require_bill_address, only: [:index]
+
+      respond_to :html
+
+      def index
+        @payments = @order.payments.includes(refunds: :reason)
+        @refunds = @payments.flat_map(&:refunds)
+        redirect_to new_admin_order_payment_url(@order) if @payments.empty?
+      end
+
+      def new
+        @payment = @order.payments.build(amount: @order.outstanding_balance)
+      end
+
+      def create
+        @payment = PaymentCreate.new(@order, object_params).build
+        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
+
+        begin
+          if @payment.save
+            if @order.completed?
+              # If the order was already complete then go ahead and process the payment
+              # (auth and/or capture depending on payment method configuration)
+              @payment.process! if @payment.checkout?
+            else
+              # Transition order as far as it will go.
+              while @order.next; end
+            end
+
+            flash[:success] = flash_message_for(@payment, :successfully_created)
+            redirect_to admin_order_payments_path(@order)
+          else
+            flash[:error] = t('spree.payment_could_not_be_created')
+            render :new
+          end
+        rescue Spree::Core::GatewayError => e
+          flash[:error] = e.message.to_s
+          redirect_to new_admin_order_payment_path(@order)
+        end
+      end
+
+      def fire
+        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"
+        if @payment.send("#{event}!")
+          flash[:success] = t('spree.payment_updated')
+        else
+          flash[:error] = t('spree.cannot_perform_operation')
+        end
+      rescue Spree::Core::GatewayError => ge
+        flash[:error] = ge.message.to_s
+      ensure
+        redirect_to admin_order_payments_path(@order)
+      end
+
+      private
+
+      def object_params
+        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 = Spree::PaymentMethod.active.available_to_admin
+        if @payment && @payment.payment_method
+          @payment_method = @payment.payment_method
+        else
+          @payment_method = @payment_methods.first
+        end
+      end
+
+      def load_order
+        @order = Spree::Order.find_by!(number: params[:order_id])
+        authorize! action, @order
+        @order
+      end
+
+      def load_payment
+        @payment = Spree::Payment.find(params[:id])
+      end
+
+      def load_payment_for_fire
+        load_payment
+        authorize! params[:e].to_sym, @payment
+      end
+
+      def model_class
+        Spree::Payment
+      end
+
+      def require_bill_address
+        if Spree::Config[:order_bill_address_used] && @order.bill_address.nil?
+          flash[:notice] = t('spree.fill_in_customer_info')
+          redirect_to edit_admin_order_customer_url(@order)
+        end
+      end
+
+      def insufficient_stock_error
+        flash[:error] = t('spree.insufficient_stock_for_order')
+        redirect_to new_admin_order_payment_url(@order)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class PricesController < ResourceController
+      belongs_to 'spree/product', find_by: :slug
+
+      def index
+        params[:q] ||= {}
+
+        @search = @product.prices.accessible_by(current_ability, :index).ransack(params[:q])
+        @master_prices = @search.result
+          .currently_valid
+          .for_master
+          .order(:variant_id, :country_iso, :currency)
+          .page(params[:page]).per(Spree::Config.admin_variants_per_page)
+        @variant_prices = @search.result
+          .currently_valid
+          .for_variant
+          .order(:variant_id, :country_iso, :currency)
+          .page(params[:page]).per(Spree::Config.admin_variants_per_page)
+      end
+
+      def edit
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class ProductPropertiesController < ResourceController
+      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 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
+    end
+  end
+end

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

@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class ProductsController < ResourceController
+      helper 'spree/products'
+
+      before_action :load_data, except: [:index]
+      update.before :update_before
+      helper_method :clone_object_url
+      before_action :split_params, only: [:create, :update]
+
+      def show
+        redirect_to action: :edit
+      end
+
+      def index
+        session[:return_to] = request.url
+        respond_with(@collection)
+      end
+
+      def update
+        if updating_variant_property_rules?
+          params[:product][:variant_property_rules_attributes].each do |_index, param_attrs|
+            param_attrs[:option_value_ids] = param_attrs[:option_value_ids].split(',')
+          end
+        end
+        invoke_callbacks(:update, :before)
+        if @object.update_attributes(permitted_resource_params)
+          invoke_callbacks(:update, :after)
+          flash[:success] = flash_message_for(@object, :successfully_updated)
+          respond_with(@object) do |format|
+            format.html { redirect_to location_after_save }
+            format.js   { render layout: false }
+          end
+        else
+          # Stops people submitting blank slugs, causing errors when they try to
+          # update the product again
+          @product.slug = @product.slug_was if @product.slug.blank?
+          invoke_callbacks(:update, :fails)
+          respond_with(@object)
+        end
+      end
+
+      def destroy
+        @product = Spree::Product.friendly.find(params[:id])
+        @product.discard
+
+        flash[:success] = t('spree.notice_messages.product_deleted')
+
+        respond_with(@product) do |format|
+          format.html { redirect_to collection_url }
+          format.js { render_js_for_destroy }
+        end
+      end
+
+      def clone
+        @new = @product.duplicate
+
+        if @new.save
+          flash[:success] = t('spree.notice_messages.product_cloned')
+        else
+          flash[:error] = t('spree.notice_messages.product_not_cloned')
+        end
+
+        redirect_to edit_admin_product_url(@new)
+      end
+
+      private
+
+      def split_params
+        if params[:product][:taxon_ids].present?
+          params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')
+        end
+        if params[:product][:option_type_ids].present?
+          params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
+        end
+      end
+
+      def find_resource
+        Spree::Product.with_deleted.friendly.find(params[:id])
+      end
+
+      def location_after_save
+        if updating_variant_property_rules?
+          url_params = {}
+          url_params[:ovi] = []
+          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)
+        else
+          spree.edit_admin_product_url(@product)
+        end
+      end
+
+      def load_data
+        @tax_categories = Spree::TaxCategory.order(:name)
+        @shipping_categories = Spree::ShippingCategory.order(:name)
+      end
+
+      def collection
+        return @collection if @collection
+        params[:q] ||= {}
+        params[:q][:s] ||= "name asc"
+        # @search needs to be defined as this is passed to search_form_for
+        @search = super.ransack(params[:q])
+        @collection = @search.result.
+              order(id: :asc).
+              includes(product_includes).
+              page(params[:page]).
+              per(Spree::Config[:admin_products_per_page])
+      end
+
+      def update_before
+        # note: we only reset the product properties if we're receiving a post
+        #       from the form on that tab
+        return unless params[:clear_product_properties]
+        params[:product] ||= {}
+      end
+
+      def product_includes
+        [{ variants: [:images], master: [:images, :default_price] }]
+      end
+
+      def clone_object_url(resource)
+        clone_admin_product_url resource
+      end
+
+      def variant_stock_includes
+        [:images, stock_items: :stock_location, option_values: :option_type]
+      end
+
+      def variant_scope
+        @product.variants
+      end
+
+      def updating_variant_property_rules?
+        params[:product][:variant_property_rules_attributes].present?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
+  before_action :load_promotion, only: [:create, :destroy]
+  before_action :validate_promotion_action_type, only: :create
+
+  def create
+    @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
+    @promotion_action = @promotion_action_type.new(params[:promotion_action])
+    @promotion_action.promotion = @promotion
+    if @promotion_action.save
+      flash[:success] = t('spree.successfully_created', resource: t('spree.promotion_action'))
+    end
+    respond_to do |format|
+      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.discard
+      flash[:success] = t('spree.successfully_removed', resource: t('spree.promotion_action'))
+    end
+    respond_to do |format|
+      format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
+      format.js   { render layout: false }
+    end
+  end
+
+  private
+
+  def load_promotion
+    @promotion = Spree::Promotion.find(params[:promotion_id])
+  end
+
+  def validate_promotion_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] = t('spree.invalid_promotion_action')
+      respond_to do |format|
+        format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
+        format.js   { render layout: false }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class PromotionCategoriesController < ResourceController
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class PromotionCodeBatchesController < ResourceController
+      belongs_to 'spree/promotion'
+
+      create.after :build_promotion_code_batch
+
+      def download
+        require "csv"
+
+        @promotion_code_batch = Spree::PromotionCodeBatch.find(
+          params[:promotion_code_batch_id]
+        )
+
+        send_data(
+          render_to_string,
+          filename: "promotion-code-batch-list-#{@promotion_code_batch.id}.csv"
+        )
+      end
+
+      private
+
+      def build_promotion_code_batch
+        @promotion_code_batch.process
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module Spree
+  module Admin
+    class PromotionCodesController < Spree::Admin::ResourceController
+      def index
+        @promotion = Spree::Promotion.accessible_by(current_ability, :read).find(params[:promotion_id])
+        @promotion_codes = @promotion.promotion_codes
+
+        respond_to do |format|
+          format.html do
+            @promotion_codes = @promotion_codes.page(params[:page]).per(50)
+          end
+          format.csv do
+            filename = "promotion-code-list-#{@promotion.id}.csv"
+            headers["Content-Type"] = "text/csv"
+            headers["Content-disposition"] = "attachment; filename=\"#{filename}\""
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
+  helper 'spree/promotion_rules'
+
+  before_action :load_promotion, only: [:create, :destroy]
+  before_action :validate_promotion_rule_type, only: :create
+
+  def create
+    @promotion_rule = @promotion_rule_type.new(promotion_rule_params)
+    @promotion_rule.promotion = @promotion
+
+    if @promotion_rule.save
+      flash[:success] = t('spree.successfully_created', resource: t('spree.promotion_rule'))
+    end
+    respond_to do |format|
+      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] = t('spree.successfully_removed', resource: t('spree.promotion_rule'))
+    end
+    respond_to do |format|
+      format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
+      format.js   { render layout: false }
+    end
+  end
+
+  private
+
+  def load_promotion
+    @promotion = Spree::Promotion.find(params[:promotion_id])
+  end
+
+  def model_class
+    Spree::PromotionRule
+  end
+
+  def validate_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] = t('spree.invalid_promotion_rule')
+      respond_to do |format|
+        format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
+        format.js   { render layout: false }
+      end
+    end
+  end
+
+  def promotion_rule_params
+    params[:promotion_rule].permit!
+  end
+end

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

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class PromotionsController < ResourceController
+      before_action :load_data
+
+      helper 'spree/promotion_rules'
+
+      def show
+        redirect_to action: :edit
+      end
+
+      def create
+        @promotion = Spree::Promotion.new(permitted_resource_params)
+        @promotion.codes.new(value: params[:single_code]) if params[:single_code].present?
+
+        if params[:promotion_code_batch]
+          @promotion_code_batch = @promotion.promotion_code_batches.new(promotion_code_batch_params)
+        end
+
+        if @promotion.save
+          @promotion_code_batch.process if @promotion_code_batch
+          flash[:success] = t('spree.promotion_successfully_created')
+          redirect_to location_after_save
+        else
+          flash[:error] = @promotion.errors.full_messages.join(", ")
+          render action: 'new'
+        end
+      end
+
+      private
+
+      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 collection
+        return @collection if @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
+      end
+
+      def promotion_code_batch_params
+        params.require(:promotion_code_batch).permit!
+      end
+
+      def promotion_includes
+        [:promotion_actions]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class PropertiesController < ResourceController
+      def index
+        respond_with(@collection)
+      end
+
+      private
+
+      def collection
+        return @collection if @collection
+        # params[:q] can be blank upon pagination
+        params[:q] = {} if params[:q].blank?
+
+        @collection = super
+        @search = @collection.ransack(params[:q])
+        @collection = @search.result.
+              page(params[:page]).
+              per(Spree::Config[:properties_per_page])
+
+        @collection
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class RefundReasonsController < ResourceController
+    end
+  end
+end