solidus_backend 4.6.2 → 4.7.0

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

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

@@ -3,7 +3,7 @@
 module Spree
   module Admin
     class StoreCreditsController < ResourceController
-      belongs_to 'spree/user', model_class: Spree.user_class
+      belongs_to "spree/user", model_class: Spree.user_class
       before_action :load_categories, only: [:new]
       before_action :load_reasons, only: [:edit_amount, :edit_validity]
       before_action :ensure_store_credit_reason, only: [:update_amount, :invalidate]
@@ -27,7 +27,7 @@ module Spree
           redirect_to admin_user_store_credits_path(@user)
         else
           load_categories
-          flash[:error] = "#{t('spree.admin.store_credits.unable_to_create')} #{@store_credit.errors.full_messages}"
+          flash[:error] = "#{t("spree.admin.store_credits.unable_to_create")} #{@store_credit.errors.full_messages}"
           render :new
         end
       end
@@ -38,11 +38,11 @@ module Spree
 
         if @store_credit.save
           respond_to do |format|
-            format.json { render json: { message: flash_message_for(@store_credit, :successfully_updated) }, status: :ok }
+            format.json { render json: {message: flash_message_for(@store_credit, :successfully_updated)}, status: :ok }
           end
         else
           respond_to do |format|
-            format.json { render json: { message: "#{t('spree.admin.store_credits.unable_to_update')} #{@store_credit.errors.full_messages}" }, status: :bad_request }
+            format.json { render json: {message: "#{t("spree.admin.store_credits.unable_to_update")} #{@store_credit.errors.full_messages}"}, status: :bad_request }
           end
         end
       end
@@ -70,8 +70,8 @@ module Spree
       private
 
       def permitted_resource_params
-        params.require(:store_credit).permit([:amount, :currency, :category_id, :memo]).
-          merge(created_by: spree_current_user)
+        params.require(:store_credit).permit([:amount, :currency, :category_id, :memo])
+          .merge(created_by: spree_current_user)
       end
 
       def collection
@@ -89,7 +89,7 @@ module Spree
       def ensure_store_credit_reason
         @store_credit_reason = Spree::StoreCreditReason.find_by(id: params[:store_credit_reason_id])
         unless @store_credit_reason
-          @store_credit.errors.add(:base, t('spree.admin.store_credits.errors.store_credit_reason_required'))
+          @store_credit.errors.add(:base, t("spree.admin.store_credits.errors.store_credit_reason_required"))
           render_edit_page
         end
       end
@@ -97,14 +97,14 @@ module Spree
       def render_edit_page
         if action == :update_amount
           template = :edit_amount
-          translation_key = 'update'
+          translation_key = "update"
         else
           template = :edit_validity
-          translation_key = 'invalidate'
+          translation_key = "invalidate"
         end
 
         load_reasons
-        flash[:error] = "#{t("spree.admin.store_credits.unable_to_#{translation_key}")}: #{@store_credit.errors.full_messages.join(', ')}"
+        flash[:error] = "#{t("spree.admin.store_credits.unable_to_#{translation_key}")}: #{@store_credit.errors.full_messages.join(", ")}"
         render(template) && return
       end
 

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

@@ -4,37 +4,37 @@ module Spree
   module Admin
     class StyleGuideController < Spree::Admin::BaseController
       respond_to :html
-      layout 'spree/layouts/admin_style_guide'
+      layout "spree/layouts/admin_style_guide"
 
       def index
         @topics = {
           typography: [
-            'fonts',
-            'colors',
-            'lists',
-            'icons'
+            "fonts",
+            "colors",
+            "lists",
+            "icons"
           ],
           forms: [
-            'building_forms',
-            'buttons',
-            'helper_text',
-            'inputs',
-            'labels',
-            'validation'
+            "building_forms",
+            "buttons",
+            "helper_text",
+            "inputs",
+            "labels",
+            "validation"
           ],
           components: [
-            'pills',
-            'modals',
-            'tabs'
+            "pills",
+            "modals",
+            "tabs"
           ],
           messaging: [
-            'loading',
-            'flashes',
-            'tooltips'
+            "loading",
+            "flashes",
+            "tooltips"
           ],
           tables: [
-            'building_tables',
-            'pagination'
+            "building_tables",
+            "pagination"
           ]
         }
       end

data/app/controllers/spree/admin/taxons/attachment_controller.rb

@@ -8,9 +8,9 @@ module Spree
           taxonomy = Spree::Taxonomy.find(params[:taxonomy_id])
           taxon = taxonomy.taxons.find(params[:taxon_id])
           if taxon.destroy_attachment(params[:attachment_definition])
-            flash[:success] = t('spree.successfully_removed', resource: params[:attachment_definition].titleize)
+            flash[:success] = t("spree.successfully_removed", resource: params[:attachment_definition].titleize)
           else
-            flash[:error] = t('spree.taxon_attachment_removal_error')
+            flash[:error] = t("spree.taxon_attachment_removal_error")
           end
           redirect_to edit_admin_taxonomy_taxon_path(taxonomy, taxon.id)
         end

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

@@ -10,10 +10,10 @@ module Spree
       end
 
       def search
-        if params[:ids]
-          @taxons = Spree::Taxon.where(id: params[:ids].split(','))
+        @taxons = if params[:ids]
+          Spree::Taxon.where(id: params[:ids].split(","))
         else
-          @taxons = Spree::Taxon.limit(20).ransack(name_cont: params[:q]).result
+          Spree::Taxon.limit(20).ransack(name_cont: params[:q]).result
         end
       end
 
@@ -25,7 +25,7 @@ module Spree
             format.json { render json: @taxon.to_json }
           end
         else
-          flash[:error] = t('spree.errors.messages.could_not_create_taxon')
+          flash[:error] = t("spree.errors.messages.could_not_create_taxon")
           respond_with(@taxon) do |format|
             format.html { redirect_to @taxonomy ? edit_admin_taxonomy_url(@taxonomy) : admin_taxonomies_url }
           end
@@ -76,7 +76,7 @@ module Spree
       def destroy
         @taxon = Spree::Taxon.find(params[:id])
         @taxon.destroy
-        respond_with(@taxon) { |format| format.json { render json: '' } }
+        respond_with(@taxon) { |format| format.json { render json: "" } }
       end
 
       private

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

@@ -9,14 +9,14 @@ module Spree
         requested_theme = params[:switch_to_theme].presence
 
         # Avoid interpolating user content into the session key
-        system_theme = params[:system_theme].presence == "dark" ? "dark" : "light"
+        system_theme = (params[:system_theme].presence == "dark") ? "dark" : "light"
         session_key = :"admin_#{system_theme}_theme"
 
         if theme_is_available?(requested_theme)
           session[session_key] = requested_theme
-          redirect_back_or_to spree.admin_url, notice: t('spree.theme_changed')
+          redirect_back_or_to spree.admin_url, notice: t("spree.theme_changed")
         else
-          redirect_back_or_to spree.admin_url, error: t('spree.error')
+          redirect_back_or_to spree.admin_url, error: t("spree.error")
         end
       end
 

data/app/controllers/spree/admin/users/api_key_controller.rb

@@ -6,14 +6,14 @@ module Spree
       class ApiKeyController < Spree::Admin::BaseController
         def create
           if user.generate_spree_api_key!
-            flash[:success] = t('spree.admin.api.key_generated')
+            flash[:success] = t("spree.admin.api.key_generated")
           end
           redirect_to edit_admin_user_path(user)
         end
 
         def destroy
           if user.clear_spree_api_key!
-            flash[:success] = t('spree.admin.api.key_cleared')
+            flash[:success] = t("spree.admin.api.key_cleared")
           end
           redirect_to edit_admin_user_path(user)
         end

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

@@ -26,7 +26,7 @@ module Spree
           set_roles
           set_stock_locations
 
-          flash[:success] = t('spree.created_successfully')
+          flash[:success] = t("spree.created_successfully")
           redirect_to edit_admin_user_url(@user)
         else
           load_roles
@@ -42,7 +42,7 @@ module Spree
           set_roles
           set_stock_locations
 
-          flash[:success] = t('spree.account_updated')
+          flash[:success] = t("spree.account_updated")
           redirect_to edit_admin_user_url(@user)
         else
           load_roles
@@ -56,7 +56,7 @@ module Spree
       def addresses
         if request.put?
           if @user.update(user_params)
-            flash.now[:success] = t('spree.account_updated')
+            flash.now[:success] = t("spree.account_updated")
           end
 
           render :addresses
@@ -74,9 +74,9 @@ module Spree
 
         @search = Spree::Order.includes(
           line_items: {
-            variant: [:product, { option_values: :option_type }]
+            variant: [:product, {option_values: :option_type}]
           }
-).ransack(params[:q].merge(user_id_eq: @user.id))
+        ).ransack(params[:q].merge(user_id_eq: @user.id))
 
         @orders = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
       end
@@ -104,7 +104,7 @@ module Spree
         end
 
         if can? :manage, Spree::StockLocation
-          attributes += [{ stock_location_ids: [] }]
+          attributes += [{stock_location_ids: []}]
         end
 
         unless can? :update_password, @user

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

@@ -3,7 +3,7 @@
 module Spree
   module Admin
     class VariantPropertyRuleValuesController < ResourceController
-      belongs_to 'spree/product', find_by: :slug
+      belongs_to "spree/product", find_by: :slug
     end
   end
 end

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

@@ -3,9 +3,9 @@
 module Spree
   module Admin
     class VariantsController < ResourceController
-      helper 'spree/admin/products'
+      helper "spree/admin/products"
 
-      belongs_to 'spree/product', find_by: :slug
+      belongs_to "spree/product", find_by: :slug
       new_action.before :new_before
       before_action :redirect_on_empty_option_values, only: [:new]
       before_action :load_data, only: [:new, :create, :edit, :update]
@@ -13,17 +13,17 @@ module Spree
       private
 
       def new_before
-        @object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',
-                                                                      'sku', 'is_master')
+        @object.attributes = @object.product.master.attributes.except("id", "created_at", "deleted_at",
+          "sku", "is_master")
         # Shallow Clone of the default price to populate the price field.
         @object.prices.build(@object.product.master.default_price.attributes.except("id", "created_at", "updated_at", "deleted_at"))
       end
 
       def collection
-        if params[:deleted] == "on"
-          base_variant_scope ||= super.with_discarded
+        base_variant_scope ||= if params[:deleted] == "on"
+          super.with_discarded
         else
-          base_variant_scope ||= super
+          super
         end
 
         search = Spree::Config.variant_search_class.new(params[:variant_search_term], scope: base_variant_scope)
@@ -36,7 +36,7 @@ module Spree
       end
 
       def variant_includes
-        [{ option_values: :option_type }, :prices]
+        [{option_values: :option_type}, :prices]
       end
 
       def redirect_on_empty_option_values

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

@@ -4,18 +4,18 @@ module Spree
   module Admin
     module AdjustmentsHelper
       def adjustment_state(adjustment)
-        icon = adjustment.finalized? ? 'lock' : 'unlock'
-        content_tag(:span, '', class: "fa fa-#{icon}")
+        icon = adjustment.finalized? ? "lock" : "unlock"
+        content_tag(:span, "", class: "fa fa-#{icon}")
       end
 
       def display_adjustable(adjustable)
         case adjustable
         when Spree::LineItem
-            display_line_item(adjustable)
+          display_line_item(adjustable)
         when Spree::Shipment
-            display_shipment(adjustable)
+          display_shipment(adjustable)
         when Spree::Order
-            display_order(adjustable)
+          display_order(adjustable)
         end
       end
 
@@ -32,14 +32,14 @@ module Spree
 
       def display_shipment(shipment)
         parts = [
-          "#{t('spree.shipment')} ##{shipment.number}",
+          "#{t("spree.shipment")} ##{shipment.number}",
           shipment.display_cost
         ]
         safe_join(parts, "<br>".html_safe)
       end
 
       def display_order(_order)
-        t('spree.order')
+        t("spree.order")
       end
     end
   end