solidus_backend 4.6.2 → 4.7.1

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

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

@@ -5,11 +5,11 @@ module Spree
     module BaseHelper
       def field_container(model, method, options = {}, &block)
         css_classes = options[:class].to_a
-        css_classes << 'field'
+        css_classes << "field"
         if error_message_on(model, method).present?
-          css_classes << 'withError'
+          css_classes << "withError"
         end
-        content_tag(:div, capture(&block), class: css_classes.join(' '), id: "#{model}_#{method}_field")
+        content_tag(:div, capture(&block), class: css_classes.join(" "), id: "#{model}_#{method}_field")
       end
 
       def error_message_on(object, method, _options = {})
@@ -18,15 +18,15 @@ module Spree
 
         if obj && obj.errors[method].present?
           errors = safe_join(obj.errors[method], "<br>".html_safe)
-          content_tag(:span, errors, class: 'formError')
+          content_tag(:span, errors, class: "formError")
         else
-          ''
+          ""
         end
       end
 
       def admin_hint(title, text)
-        content_tag(:span, class: 'hint-tooltip', title:, data: { content: text }) do
-          content_tag(:i, '', class: 'fa fa-info-circle')
+        content_tag(:span, class: "hint-tooltip", title:, data: {content: text}) do
+          content_tag(:i, "", class: "fa fa-info-circle")
         end
       end
 
@@ -34,16 +34,16 @@ module Spree
         return if date.blank?
 
         format = if with_time
-          t('spree.date_picker.format_with_time', default: '%Y/%m/%d %H:%M')
+          t("spree.date_picker.format_with_time", default: "%Y/%m/%d %H:%M")
         else
-          t('spree.date_picker.format', default: '%Y/%m/%d')
+          t("spree.date_picker.format", default: "%Y/%m/%d")
         end
 
         l(date, format:)
       end
 
       def spree_dom_id(record)
-        dom_id(record, 'spree')
+        dom_id(record, "spree")
       end
 
       def admin_layout(layout = nil)

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

@@ -19,9 +19,9 @@ module Spree
           admin_breadcrumb(content_for(:page_title))
         end
 
-        content_tag :ol, class: 'breadcrumb' do
+        content_tag :ol, class: "breadcrumb" do
           segments = admin_breadcrumbs.map do |level|
-            content_tag(:li, level, class: "breadcrumb-item #{level == admin_breadcrumbs.last ? 'active' : ''}")
+            content_tag(:li, level, class: "breadcrumb-item #{"active" if level == admin_breadcrumbs.last}")
           end
           safe_join(segments)
         end
@@ -33,9 +33,9 @@ module Spree
         elsif content_for?(:page_title)
           content_for(:page_title)
         elsif admin_breadcrumbs.any?
-          admin_breadcrumbs.map { |breadcrumb| strip_tags(breadcrumb) }.reverse.join(' - ')
+          admin_breadcrumbs.map { |breadcrumb| strip_tags(breadcrumb) }.reverse.join(" - ")
         else
-          t(controller.controller_name, default: controller.controller_name.titleize, scope: 'spree')
+          t(controller.controller_name, default: controller.controller_name.titleize, scope: "spree")
         end
       end
 
@@ -75,76 +75,76 @@ module Spree
             request.fullpath.starts_with?(options[:url])
           end
 
-        css_classes << 'selected' if options[:selected]
+        css_classes << "selected" if options[:selected]
 
         if options[:icon]
           link = link_to_with_icon(options[:icon], label, options[:url])
-          css_classes << 'tab-with-icon'
+          css_classes << "tab-with-icon"
         else
           link = link_to(label, options[:url])
         end
         block_content = capture(&block) if block_given?
-        content_tag('li', link + block_content.to_s, class: css_classes.join(' ') )
+        content_tag("li", link + block_content.to_s, class: css_classes.join(" "))
       end
 
       def link_to_clone(resource, options = {})
-        options[:data] = { action: 'clone' }
+        options[:data] = {action: "clone"}
         options[:method] = :post
-        link_to_with_icon('copy', t('spree.clone'), clone_object_url(resource), options)
+        link_to_with_icon("copy", t("spree.clone"), clone_object_url(resource), options)
       end
 
       def link_to_new(resource)
-        options[:data] = { action: 'new' }
-        link_to_with_icon('plus', t('spree.new'), edit_object_url(resource))
+        options[:data] = {action: "new"}
+        link_to_with_icon("plus", t("spree.new"), edit_object_url(resource))
       end
 
       def link_to_edit(resource, options = {})
         url = options[:url] || edit_object_url(resource)
-        options[:data] = { action: 'edit' }
-        link_to_with_icon('edit', t('spree.actions.edit'), url, options)
+        options[:data] = {action: "edit"}
+        link_to_with_icon("edit", t("spree.actions.edit"), url, options)
       end
 
       def link_to_edit_url(url, options = {})
-        options[:data] = { action: 'edit' }
-        link_to_with_icon('edit', t('spree.actions.edit'), url, options)
+        options[:data] = {action: "edit"}
+        link_to_with_icon("edit", t("spree.actions.edit"), url, options)
       end
 
       def link_to_delete(resource, options = {})
         url = options[:url] || object_url(resource)
-        name = options[:name] || t('spree.actions.delete')
-        confirm = options[:confirm] || t('spree.are_you_sure')
+        name = options[:name] || t("spree.actions.delete")
+        confirm = options[:confirm] || t("spree.are_you_sure")
         options[:class] = "#{options[:class]} delete-resource".strip
-        options[:data] = { confirm:, action: 'remove' }
-        link_to_with_icon 'trash', name, url, options
+        options[:data] = {confirm:, action: "remove"}
+        link_to_with_icon "trash", name, url, options
       end
 
       def link_to_with_icon(icon_name, text, url, options = {})
         options[:class] = "#{options[:class]} icon_link with-tip".strip
 
-        if icon_name.starts_with?('ri-')
-          svg_map = image_path('spree/backend/themes/solidus_admin/remixicon.symbol.svg')
+        if icon_name.starts_with?("ri-")
+          svg_map = image_path("spree/backend/themes/solidus_admin/remixicon.symbol.svg")
           icon_tag = tag.svg(
-            tag.use('xlink:href': "#{svg_map}##{icon_name}"),
-            'aria-hidden': true,
-            style: "fill: currentColor;",
+            tag.use("xlink:href": "#{svg_map}##{icon_name}"),
+            "aria-hidden": true,
+            style: "fill: currentColor;"
           )
         else
           options[:class] << " fa fa-#{icon_name}"
-          icon_tag = ''.html_safe
+          icon_tag = "".html_safe
         end
 
-        options[:class] += ' no-text' if options[:no_text]
+        options[:class] += " no-text" if options[:no_text]
         options[:title] = text if options[:no_text]
-        text = options[:no_text] ? '' : content_tag(:span, text, class: 'text')
+        text = options[:no_text] ? "" : content_tag(:span, text, class: "text")
         options.delete(:no_text)
         link_to(icon_tag + text, url, options)
       end
 
       def solidus_icon(icon_name)
-        icon_name ? content_tag(:i, '', class: icon_name) : ''
+        icon_name ? content_tag(:i, "", class: icon_name) : ""
       end
 
-      def configurations_menu_item(link_text, url, description = '')
+      def configurations_menu_item(link_text, url, description = "")
         %(<tr>
           <td>#{link_to(link_text, url)}</td>
           <td>#{description}</td>
@@ -154,9 +154,9 @@ module Spree
 
       def configurations_sidebar_menu_item(link_text, url, options = {})
         is_active = url.ends_with?(controller.controller_name) ||
-                    url.ends_with?("#{controller.controller_name}/edit") ||
-                    url.ends_with?("#{controller.controller_name.singularize}/edit")
-        options[:class] = is_active ? 'active' : nil
+          url.ends_with?("#{controller.controller_name}/edit") ||
+          url.ends_with?("#{controller.controller_name.singularize}/edit")
+        options[:class] = is_active ? "active" : nil
         content_tag(:li, options) do
           link_to(link_text, url)
         end
@@ -164,12 +164,12 @@ module Spree
 
       def settings_tab_item(link_text, url, options = {})
         is_active = url.ends_with?(controller.controller_name) ||
-                    url.ends_with?("#{controller.controller_name}/edit") ||
-                    url.ends_with?("#{controller.controller_name.singularize}/edit")
-        options[:class] = 'fa'
-        options[:class] += ' active' if is_active
+          url.ends_with?("#{controller.controller_name}/edit") ||
+          url.ends_with?("#{controller.controller_name.singularize}/edit")
+        options[:class] = "fa"
+        options[:class] += " active" if is_active
         options[:data] ||= {}
-        options[:data][:hook] = "admin_settings_#{link_text.downcase.tr(' ', '_')}"
+        options[:data][:hook] = "admin_settings_#{link_text.downcase.tr(" ", "_")}"
         content_tag(:li, options) do
           link_to(link_text, url)
         end

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

@@ -16,7 +16,7 @@ module Spree
             translated_event,
             [event.to_sym, :admin, @order],
             method: :put,
-            data: { confirm: t(:order_sure_want_to, event: translated_event, scope: :spree) }
+            data: {confirm: t(:order_sure_want_to, event: translated_event, scope: :spree)}
           )
         end
         safe_join(links, " ".html_safe)
@@ -72,7 +72,7 @@ module Spree
           "P" => "Not Processed",
           "S" => "Issuer indicates that CVV2 data should be present on the card, but the merchant has indicated data is not present on the card",
           "U" => "Issuer has not certified for CVV2 or Issuer has not provided Visa with the CVV2 encryption keys",
-          ""  => "Transaction failed because wrong CVV2 number was entered or no CVV2 number was entered"
+          "" => "Transaction failed because wrong CVV2 number was entered or no CVV2 number was entered"
         }
       end
     end

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

@@ -4,7 +4,7 @@ module Spree
   module Admin
     module ReimbursementTypeHelper
       def reimbursement_type_name(reimbursement_type)
-        reimbursement_type.present? ? reimbursement_type.name.humanize : ''
+        reimbursement_type.present? ? reimbursement_type.name.humanize : ""
       end
     end
   end

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

@@ -4,7 +4,7 @@ module Spree
   module Admin
     module StockLocationsHelper
       def admin_stock_location_display_name(stock_location)
-        [stock_location.admin_name, stock_location.name].reject(&:blank?).join(' / ')
+        [stock_location.admin_name, stock_location.name].reject(&:blank?).join(" / ")
       end
     end
   end