solidus_backend 4.6.2 → 4.7.1

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

@@ -16,10 +16,10 @@ module Spree
 
       def index
         params[:q] ||= {}
-        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
+        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
@@ -31,18 +31,18 @@ module Spree
 
         if params[:q][:created_at_gt].present?
           params[:q][:created_at_gt] = begin
-                                         Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day
-                                       rescue StandardError
-                                         ""
-                                       end
+            Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day
+          rescue
+            ""
+          end
         end
 
         if params[:q][:created_at_lt].present?
           params[:q][:created_at_lt] = begin
-                                         Time.zone.parse(params[:q][:created_at_lt]).end_of_day
-                                       rescue StandardError
-                                         ""
-                                       end
+            Time.zone.parse(params[:q][:created_at_lt]).end_of_day
+          rescue
+            ""
+          end
         end
 
         if @show_only_completed
@@ -51,9 +51,9 @@ module Spree
         end
 
         @search = Spree::Order.accessible_by(current_ability, :index).ransack(params[:q])
-        @orders = @search.result.includes([:user]).
-          page(params[:page]).
-          per(params[:per_page] || Spree::Config[:orders_per_page])
+        @orders = @search.result.includes([:user])
+          .page(params[:page])
+          .per(params[:per_page] || Spree::Config[:orders_per_page])
 
         # Restore dates
         params[:q][:created_at_gt] = created_at_gt
@@ -82,15 +82,15 @@ module Spree
 
       def advance
         if @order.completed?
-          flash[:notice] = t('spree.order_already_completed')
+          flash[:notice] = t("spree.order_already_completed")
           redirect_to edit_admin_order_url(@order)
         else
           @order.contents.advance
 
           if @order.can_complete?
-            flash[:success] = t('spree.order_ready_for_confirm')
+            flash[:success] = t("spree.order_ready_for_confirm")
           else
-            flash[:error] = @order.errors.full_messages.join(', ')
+            flash[:error] = @order.errors.full_messages.join(", ")
           end
           redirect_to confirm_admin_order_url(@order)
         end
@@ -101,14 +101,14 @@ module Spree
         if @order.completed?
           redirect_to edit_admin_order_url(@order)
         elsif !@order.can_complete?
-          render template: 'spree/admin/orders/confirm_advance'
+          render template: "spree/admin/orders/confirm_advance"
         end
       end
 
       # PUT
       def complete
         @order.complete!
-        flash[:success] = t('spree.order_completed')
+        flash[:success] = t("spree.order_completed")
         redirect_to edit_admin_order_url(@order)
       rescue StateMachines::InvalidTransition => error
         flash[:error] = error.message
@@ -117,25 +117,25 @@ module Spree
 
       def cancel
         @order.canceled_by(spree_current_user)
-        flash[:success] = t('spree.order_canceled')
+        flash[:success] = t("spree.order_canceled")
         redirect_to(spree.edit_admin_order_path(@order))
       end
 
       def resume
         @order.resume!
-        flash[:success] = t('spree.order_resumed')
+        flash[:success] = t("spree.order_resumed")
         redirect_to(spree.edit_admin_order_path(@order))
       end
 
       def approve
         @order.contents.approve(user: spree_current_user)
-        flash[:success] = t('spree.order_approved')
+        flash[:success] = t("spree.order_approved")
         redirect_to(spree.edit_admin_order_path(@order))
       end
 
       def resend
         Spree::Config.order_mailer_class.confirm_email(@order, true).deliver_later
-        flash[:success] = t('spree.order_email_resent')
+        flash[:success] = t("spree.order_email_resent")
 
         redirect_to(spree.edit_admin_order_path(@order))
       end
@@ -143,7 +143,7 @@ module Spree
       def unfinalize_adjustments
         adjustments = @order.all_adjustments.finalized
         adjustments.each(&:unfinalize!)
-        flash[:success] = t('spree.all_adjustments_unfinalized')
+        flash[:success] = t("spree.all_adjustments_unfinalized")
 
         respond_with(@order) { |format| format.html { redirect_to(spree.admin_order_adjustments_path(@order)) } }
       end
@@ -151,7 +151,7 @@ module Spree
       def finalize_adjustments
         adjustments = @order.all_adjustments.not_finalized
         adjustments.each(&:finalize!)
-        flash[:success] = t('spree.all_adjustments_finalized')
+        flash[:success] = t("spree.all_adjustments_finalized")
 
         respond_with(@order) { |format| format.html { redirect_to(spree.admin_order_adjustments_path(@order)) } }
       end
@@ -175,7 +175,7 @@ module Spree
 
       # Used for extensions which need to provide their own custom event links on the order details view.
       def initialize_order_events
-        @order_events = %w{approve cancel resume}
+        @order_events = %w[approve cancel resume]
       end
 
       def model_class
@@ -183,13 +183,13 @@ module Spree
       end
 
       def insufficient_stock_error
-        flash[:error] = t('spree.insufficient_stock_for_order')
+        flash[:error] = t("spree.insufficient_stock_for_order")
         redirect_to cart_admin_order_url(@order)
       end
 
       def require_ship_address
         if @order.ship_address.nil?
-          flash[:notice] = t('spree.fill_in_customer_info')
+          flash[:notice] = t("spree.fill_in_customer_info")
           redirect_to edit_admin_order_customer_url(@order)
         end
       end

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

@@ -15,7 +15,7 @@ module Spree
         invoke_callbacks(:create, :before)
         if @payment_method.save
           invoke_callbacks(:create, :after)
-          flash[:success] = t('spree.successfully_created', resource: t('spree.payment_method'))
+          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)
@@ -36,7 +36,7 @@ module Spree
 
         if @payment_method.update(attributes)
           invoke_callbacks(:update, :after)
-          flash[:success] = t('spree.successfully_updated', resource: t('spree.payment_method'))
+          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)
@@ -61,7 +61,7 @@ module Spree
         end
 
         if !@payment_method_type
-          flash[:error] = t('spree.invalid_payment_method_type')
+          flash[:error] = t("spree.invalid_payment_method_type")
           redirect_to new_admin_payment_method_path
         end
       end

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

@@ -27,7 +27,7 @@ module Spree
 
       def create
         @payment = PaymentCreate.new(@order, object_params).build
-        if @payment.payment_method.source_required? && params[:card].present? && 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
 
@@ -45,7 +45,7 @@ module Spree
             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')
+            flash[:error] = t("spree.payment_could_not_be_created")
             render :new
           end
         rescue Spree::Core::GatewayError => error
@@ -60,9 +60,9 @@ module Spree
         # 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')
+          flash[:success] = t("spree.payment_updated")
         else
-          flash[:error] = t('spree.cannot_perform_operation')
+          flash[:error] = t("spree.cannot_perform_operation")
         end
       rescue Spree::Core::GatewayError => ge
         flash[:error] = ge.message.to_s
@@ -77,16 +77,18 @@ module Spree
           params[:payment][:source_attributes] = source_params
         end
 
-        params.require(:payment).permit(permitted_payment_attributes)
+        # Admins are allowed to set the amount of a payment, so we need to
+        # permit it here. This is not permitted for non-admin users.
+        params.require(:payment).permit(permitted_payment_attributes + [:amount])
       end
 
       def load_data
         @amount = params[:amount] || load_order.total
         @payment_methods = Spree::PaymentMethod.active.available_to_admin.ordered_by_position
-        if @payment && @payment.payment_method
-          @payment_method = @payment.payment_method
+        @payment_method = if @payment&.payment_method
+          @payment.payment_method
         else
-          @payment_method = @payment_methods.first
+          @payment_methods.first
         end
       end
 
@@ -113,13 +115,13 @@ module Spree
 
       def require_bill_address
         if Spree::Config[:order_bill_address_used] && @order.bill_address.nil?
-          flash[:notice] = t('spree.fill_in_customer_info')
+          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')
+        flash[:error] = t("spree.insufficient_stock_for_order")
         redirect_to new_admin_order_payment_url(@order)
       end
     end

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

@@ -3,7 +3,7 @@
 module Spree
   module Admin
     class PricesController < ResourceController
-      belongs_to 'spree/product', find_by: :slug
+      belongs_to "spree/product", find_by: :slug
 
       def index
         params[:q] ||= {}

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

@@ -3,7 +3,7 @@
 module Spree
   module Admin
     class ProductPropertiesController < ResourceController
-      belongs_to 'spree/product', find_by: :slug, includes: { product_properties: :property }
+      belongs_to "spree/product", find_by: :slug, includes: {product_properties: :property}
       before_action :find_properties
       before_action :setup_property, only: :index, if: -> { can?(:create, model_class) }
       before_action :setup_variant_property_rules, only: :index

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

@@ -3,7 +3,7 @@
 module Spree
   module Admin
     class ProductsController < ResourceController
-      helper 'spree/products'
+      helper "spree/products"
 
       before_action :load_data, except: [:index]
       update.before :update_before
@@ -25,7 +25,7 @@ module Spree
         @product = Spree::Product.friendly.find(params[:id])
         @product.discard
 
-        flash[:success] = t('spree.notice_messages.product_deleted')
+        flash[:success] = t("spree.notice_messages.product_deleted")
 
         respond_with(@product) do |format|
           format.html { redirect_to collection_url }
@@ -37,9 +37,9 @@ module Spree
         @new = @product.duplicate
 
         if @new.save
-          flash[:success] = t('spree.notice_messages.product_cloned')
+          flash[:success] = t("spree.notice_messages.product_cloned")
         else
-          flash[:error] = t('spree.notice_messages.product_not_cloned')
+          flash[:error] = t("spree.notice_messages.product_not_cloned")
         end
 
         redirect_to edit_admin_product_url(@new)
@@ -53,10 +53,10 @@ module Spree
 
       def split_params
         if params[:product][:taxon_ids].present?
-          params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')
+          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(',')
+          params[:product][:option_type_ids] = params[:product][:option_type_ids].split(",")
         end
       end
 
@@ -89,11 +89,11 @@ module Spree
         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])
+        @collection = @search.result
+          .order(id: :asc)
+          .includes(product_includes)
+          .page(params[:page])
+          .per(Spree::Config[:admin_products_per_page])
       end
 
       def update_before
@@ -104,7 +104,7 @@ module Spree
       end
 
       def product_includes
-        [:variant_images, { variants: [:images], master: [:images, :prices] }]
+        [:variant_images, {variants: [:images], master: [:images, :prices]}]
       end
 
       def clone_object_url(resource)
@@ -127,14 +127,14 @@ module Spree
         # Stops people submitting blank slugs, causing errors when they try to
         # update the product again
         @product.slug = @product.slug_was if @product.slug.blank?
-        render action: 'edit'
+        render action: "edit"
       end
 
       def normalize_variant_property_rules
         return unless updating_variant_property_rules?
 
         params[:product][:variant_property_rules_attributes].each_value do |param_attrs|
-          param_attrs[:option_value_ids] = param_attrs[:option_value_ids].split(',')
+          param_attrs[:option_value_ids] = param_attrs[:option_value_ids].split(",")
         end
       end
     end

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

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

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

@@ -3,7 +3,7 @@
 module Spree
   module Admin
     class RefundsController < ResourceController
-      belongs_to 'spree/payment'
+      belongs_to "spree/payment"
       before_action :load_order
 
       helper_method :refund_reasons
@@ -21,7 +21,7 @@ module Spree
         else
           flash.now[:error] = @refund.errors.full_messages.join(", ")
           respond_with(@refund) do |format|
-            format.html { render action: 'new' }
+            format.html { render action: "new" }
           end
         end
       end

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

@@ -3,9 +3,9 @@
 module Spree
   module Admin
     class ReimbursementsController < ResourceController
-      helper 'spree/admin/reimbursement_type'
-      helper 'spree/admin/customer_returns'
-      belongs_to 'spree/order', find_by: :number
+      helper "spree/admin/reimbursement_type"
+      helper "spree/admin/customer_returns"
+      belongs_to "spree/order", find_by: :number
 
       before_action :load_stock_locations, only: :edit
       before_action :load_simulated_refunds, only: :edit
@@ -50,11 +50,7 @@ module Spree
       # Perhaps we should add a reimbursement new page of some sort.
       def render_after_create_error
         flash.keep
-        if request.referer
-          redirect_to request.referer
-        else
-          redirect_to admin_url
-        end
+        redirect_to request.referer || admin_url
       end
 
       def load_stock_locations

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

@@ -17,7 +17,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     respond_with(@object) do |format|
       format.html { render layout: !request.xhr? }
       if request.xhr?
-        format.js   { render layout: false }
+        format.js { render layout: false }
       end
     end
   end
@@ -26,7 +26,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     respond_with(@object) do |format|
       format.html { render layout: !request.xhr? }
       if request.xhr?
-        format.js   { render layout: false }
+        format.js { render layout: false }
       end
     end
   end
@@ -62,7 +62,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)
@@ -112,7 +112,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)
@@ -152,7 +152,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def parent_model_name
-    self.class.parent_data[:model_name].gsub('spree/', '')
+    self.class.parent_data[:model_name].gsub("spree/", "")
   end
 
   def object_name
@@ -189,8 +189,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   def parent
     @parent ||= self.class.parent_data[:model_class]
-                  .includes(self.class.parent_data[:includes])
-                  .find_by!(self.class.parent_data[:find_by] => params["#{parent_model_name}_id"])
+      .includes(self.class.parent_data[:includes])
+      .find_by!(self.class.parent_data[:find_by] => params["#{parent_model_name}_id"])
     instance_variable_set("@#{parent_model_name}", @parent)
   rescue ActiveRecord::RecordNotFound => e
     resource_not_found(flash_class: e.model.constantize, redirect_url: routes_proxy.polymorphic_url([:admin, parent_model_name.pluralize.to_sym]))
@@ -253,7 +253,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def object_url(object = nil, options = {})
-    target = object ? object : @object
+    target = object || @object
 
     if parent?
       routes_proxy.polymorphic_url([:admin, parent, target], options)
@@ -294,11 +294,11 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def render_after_create_error
-    render action: 'new'
+    render action: "new"
   end
 
   def render_after_update_error
-    render action: 'edit'
+    render action: "edit"
   end
 
   def resource_invalid(exception)

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

@@ -3,25 +3,25 @@
 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
-      update.fails  :load_form_data
+      create.fails :load_form_data
+      update.fails :load_form_data
 
       def fire
         action_from_params = "#{params[:e]}!"
 
-        if @return_authorization.state_events.include?(params[:e].to_sym) &&
-           @return_authorization.send(action_from_params)
+        flash_message = if @return_authorization.state_events.include?(params[:e].to_sym) &&
+            @return_authorization.send(action_from_params)
 
-          flash_message = { success: t('spree.return_authorization_updated') }
+          {success: t("spree.return_authorization_updated")}
         else
-          flash_message = { error: t('spree.return_authorization_fire_error') }
+          {error: t("spree.return_authorization_fire_error")}
         end
 
         redirect_back(fallback_location: admin_order_return_authorizations_path(@order),
-                      flash: flash_message)
+          flash: flash_message)
       end
 
       private
@@ -40,10 +40,13 @@ module Spree
         associated_inventory_units = @return_authorization.return_items.map(&:inventory_unit)
         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_amount)
+        unassociated_inventory_units.each do |new_unit|
+          @return_authorization.return_items
+            .build(inventory_unit: new_unit)
+            .tap(&:set_default_amount)
         end
-        @form_return_items = (@return_authorization.return_items + new_return_items).sort_by(&:inventory_unit_id)
+
+        @form_return_items = @return_authorization.return_items.sort_by(&:inventory_unit_id)
       end
 
       def load_reimbursement_types

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

@@ -11,7 +11,7 @@ module Spree
 
       def render_after_update_error
         redirect_back(fallback_location: location_after_save,
-                    flash: { error: @object.errors.full_messages.join(', ') })
+          flash: {error: @object.errors.full_messages.join(", ")})
       end
     end
   end

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

@@ -9,12 +9,12 @@ module Spree
       # TODO: Clean this up by moving searching out to user_class_extensions
       # And then JSON building with something like Active Model Serializers
       def users
-        if params[:ids]
+        @users = if params[:ids]
           # split here may be String#split or Array#split, so we must flatten the results
-          @users = Spree.user_class.where(id: params[:ids].split(',').flatten)
+          Spree.user_class.where(id: params[:ids].split(",").flatten)
         else
-          @users = Spree.user_class.ransack({
-            m: 'or',
+          Spree.user_class.ransack({
+            m: "or",
             email_start: params[:q],
             name_start: params[:q]
           }).result.limit(10)
@@ -22,16 +22,16 @@ module Spree
       end
 
       def products
-        if params[:ids]
+        @products = if params[:ids]
           # split here may be String#split or Array#split, so we must flatten the results
-          @products = Spree::Product.where(id: params[:ids].split(",").flatten)
+          Spree::Product.where(id: params[:ids].split(",").flatten)
         else
-          @products = Spree::Product.ransack(params[:q]).result
+          Spree::Product.ransack(params[:q]).result
         end
 
         @products = list_products
         expires_in 15.minutes, public: true
-        headers['Surrogate-Control'] = "max-age=#{15.minutes}"
+        headers["Surrogate-Control"] = "max-age=#{15.minutes}"
       end
 
       private

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

@@ -5,8 +5,8 @@ module Spree
     class StockItemsController < ResourceController
       class_attribute :variant_display_attributes
       self.variant_display_attributes = [
-        { translation_key: :sku, attr_name: :sku },
-        { translation_key: :name, attr_name: :name }
+        {translation_key: :sku, attr_name: :sku},
+        {translation_key: :name, attr_name: :name}
       ]
 
       update.before :determine_backorderable
@@ -46,11 +46,11 @@ module Spree
           :@stock_locations,
           :stock_item_stock_locations,
           Spree.deprecator,
-          "Please, do not use @stock_item_stock_locations anymore in the views, use @stock_locations",
+          "Please, do not use @stock_item_stock_locations anymore in the views, use @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.
-            order(id: :desc).page(params[:page]).per(params[:per_page] || Spree::Config[:orders_per_page])
+        @variants = Spree::Config.variant_search_class.new(params[:variant_search_term], scope: variant_scope).results
+          .order(id: :desc).page(params[:page]).per(params[:per_page] || Spree::Config[:orders_per_page])
       end
 
       def variant_scope

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

@@ -10,7 +10,7 @@ module Spree
       def set_country
         @stock_location.country = Spree::Country.default
       rescue ActiveRecord::RecordNotFound
-        flash[:error] = t('spree.stock_locations_need_a_default_country')
+        flash[:error] = t("spree.stock_locations_need_a_default_country")
         redirect_to(admin_stock_locations_path) && return
       end
 

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

@@ -3,7 +3,7 @@
 module Spree
   module Admin
     class StockMovementsController < ResourceController
-      belongs_to 'spree/stock_location'
+      belongs_to "spree/stock_location"
       before_action :parent
 
       def index
@@ -20,10 +20,10 @@ module Spree
       end
 
       def collection
-        super.
-          recent.
-          includes(stock_item: { variant: :product }).
-          page(params[:page])
+        super
+          .recent
+          .includes(stock_item: {variant: :product})
+          .page(params[:page])
       end
     end
   end