solidus_backend 4.6.2 → 4.7.0

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

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

@@ -6,18 +6,18 @@ module Spree::Admin::StoreCreditEventsHelper
     Spree::Payment.to_s => {
       new_tab: true,
       href_type: :payment,
-      translation_key: 'admin.store_credits.payment_originator'
+      translation_key: "admin.store_credits.payment_originator"
     },
     Spree::Refund.to_s => {
       new_tab: true,
       href_type: :payments,
-      translation_key: 'admin.store_credits.refund_originator'
+      translation_key: "admin.store_credits.refund_originator"
     }
   }
 
   def store_credit_event_admin_action_name(store_credit_event)
     if Spree::StoreCreditEvent::NON_EXPOSED_ACTIONS.include?(store_credit_event.action) ||
-       store_credit_event.action == Spree::StoreCredit::VOID_ACTION
+        store_credit_event.action == Spree::StoreCredit::VOID_ACTION
       t("spree.store_credit.display_action.admin.#{store_credit_event.action}")
     else
       store_credit_event.display_action
@@ -35,35 +35,35 @@ module Spree::Admin::StoreCreditEventsHelper
 
     options = {}
     link_options = originator_links[store_credit_event.originator.class.to_s]
-    options[:target] = '_blank' if link_options[:new_tab]
+    options[:target] = "_blank" if link_options[:new_tab]
 
     # Although not all href_types are used in originator_links
     # they are necessary because they may be used within extensions
     case link_options[:href_type]
     when :user
       link_to(
-        t(link_options[:translation_key], email: originator.email, scope: 'spree'),
+        t(link_options[:translation_key], email: originator.email, scope: "spree"),
         spree.edit_admin_user_path(originator),
         options
       )
     when :line_item
       order = originator.line_item.order
       link_to(
-        t(link_options[:translation_key], order_number: order.number, scope: 'spree'),
+        t(link_options[:translation_key], order_number: order.number, scope: "spree"),
         spree.edit_admin_order_path(order),
         options
       )
     when :payment
       order = originator.order
       link_to(
-        t(link_options[:translation_key], order_number: order.number, scope: 'spree'),
+        t(link_options[:translation_key], order_number: order.number, scope: "spree"),
         spree.admin_order_payment_path(order, originator),
         options
       )
     when :payments
       order = originator.payment.order
       link_to(
-        t(link_options[:translation_key], order_number: order.number, scope: 'spree'),
+        t(link_options[:translation_key], order_number: order.number, scope: "spree"),
         spree.admin_order_payments_path(order),
         options
       )
@@ -80,7 +80,7 @@ module Spree::Admin::StoreCreditEventsHelper
     originator_links[Spree.user_class.to_s] = {
       new_tab: true,
       href_type: :user,
-      translation_key: 'admin.store_credits.user_originator'
+      translation_key: "admin.store_credits.user_originator"
     }
   end
 end

data/app/views/spree/admin/search/users.json.jbuilder

@@ -21,7 +21,7 @@ json.array!(@users) do |user|
   ]
   json.ship_address do
     if user.ship_address
-      json.(user.ship_address, *address_fields)
+      json.call(user.ship_address, *address_fields)
       if user.ship_address.state
         json.state do
           json.name user.ship_address.state.name
@@ -37,7 +37,7 @@ json.array!(@users) do |user|
 
   json.bill_address do
     if user.bill_address
-      json.(user.bill_address, *address_fields)
+      json.call(user.bill_address, *address_fields)
       if user.bill_address.state
         json.state do
           json.name user.bill_address.state.name

data/config/initializers/assets.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Rails.application.config.assets.precompile << 'solidus_backend_manifest.js'
+Rails.application.config.assets.precompile << "solidus_backend_manifest.js"

data/config/initializers/form_builder.rb

@@ -19,4 +19,4 @@ class ActionView::Helpers::FormBuilder
   end
 end
 
-ActionView::Base.field_error_proc = proc{ |html_tag, _instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }
+ActionView::Base.field_error_proc = proc { |html_tag, _instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }

data/config/routes.rb

@@ -2,11 +2,11 @@
 
 Spree::Core::Engine.routes.draw do
   namespace :admin do
-    get '/search/users', to: "search#users", as: :search_users
-    get '/search/products', to: "search#products", as: :search_products
+    get "/search/users", to: "search#users", as: :search_users
+    get "/search/products", to: "search#products", as: :search_products
 
-    put '/locale/set', to: 'locale#set', defaults: { format: :json }, as: :set_locale
-    put '/theme/set', to: 'theme#set', defaults: { format: :json }, as: :set_theme
+    put "/locale/set", to: "locale#set", defaults: {format: :json}, as: :set_locale
+    put "/theme/set", to: "theme#set", defaults: {format: :json}, as: :set_theme
 
     resources :dashboards, only: [] do
       collection do
@@ -45,7 +45,7 @@ Spree::Core::Engine.routes.draw do
       resources :variants_including_master, only: [:update]
       resources :prices, only: [:destroy, :index, :edit, :update, :new, :create]
     end
-    get '/products/:product_slug/stock', to: "stock_items#index", as: :product_stock
+    get "/products/:product_slug/stock", to: "stock_items#index", as: :product_stock
 
     resources :option_types do
       collection do
@@ -54,11 +54,11 @@ Spree::Core::Engine.routes.draw do
       end
     end
 
-    delete '/option_values/:id', to: "option_values#destroy", as: :option_value
+    delete "/option_values/:id", to: "option_values#destroy", as: :option_value
 
     resources :properties
 
-    delete '/product_properties/:id', to: "product_properties#destroy", as: :product_property
+    delete "/product_properties/:id", to: "product_properties#destroy", as: :product_property
 
     resources :orders do
       member do
@@ -118,7 +118,7 @@ Spree::Core::Engine.routes.draw do
         post :update_positions
       end
       resources :taxons do
-        resource :attachment, controller: 'taxons/attachment', only: [:destroy]
+        resource :attachment, controller: "taxons/attachment", only: [:destroy]
       end
     end
 
@@ -174,5 +174,5 @@ Spree::Core::Engine.routes.draw do
     resources :style_guide, only: [:index]
   end
 
-  get '/admin', to: 'admin/root#index', as: :admin
+  get "/admin", to: "admin/root#index", as: :admin
 end

data/lib/solidus_backend.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'spree_backend'
+require "spree_backend"

data/lib/spree/backend/callbacks.rb

@@ -43,8 +43,8 @@ module Spree
         return if callbacks[action].nil?
         case callback_type.to_sym
         when :before then callbacks[action].before_methods.each { |method| send method }
-        when :after  then callbacks[action].after_methods.each  { |method| send method }
-        when :fails  then callbacks[action].fails_methods.each  { |method| send method }
+        when :after then callbacks[action].after_methods.each { |method| send method }
+        when :fails then callbacks[action].fails_methods.each { |method| send method }
         end
       end
     end

data/lib/spree/backend/config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spree/backend_configuration'
+require "spree/backend_configuration"
 
 module Spree
   module Backend

data/lib/spree/backend/engine.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'spree/backend/config'
+require "spree/backend/config"
 
 module Spree
   module Backend
     class Engine < ::Rails::Engine
       # Leave initializer empty for backwards-compatability. Other apps
       # might still rely on this event.
-      initializer "spree.backend.environment", before: :load_config_initializers do; end
+      initializer("spree.backend.environment", before: :load_config_initializers) {}
 
       config.after_initialize do
-        Spree::Backend::Config.check_load_defaults_called('Spree::Backend::Config')
+        Spree::Backend::Config.check_load_defaults_called("Spree::Backend::Config")
       end
     end
   end

data/lib/spree/backend.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'spree_core'
-require 'spree_api'
+require "spree_core"
+require "spree_api"
 
-require 'jquery-rails'
-require 'sassc-rails'
-require 'handlebars_assets'
-require 'font-awesome-rails'
-require 'jbuilder'
-require 'kaminari'
-require 'responders'
+require "jquery-rails"
+require "sassc-rails"
+require "handlebars_assets"
+require "font-awesome-rails"
+require "jbuilder"
+require "kaminari"
+require "responders"
 
-require 'spree/backend/action_callbacks'
-require 'spree/backend/callbacks'
-require 'spree/backend/engine'
+require "spree/backend/action_callbacks"
+require "spree/backend/callbacks"
+require "spree/backend/engine"

data/lib/spree/backend_configuration/deprecated_tab_constants.rb

@@ -4,6 +4,7 @@ Spree.deprecator.warn(
   "Spree::BackendConfiguration::*_TABS is deprecated. Please use Spree::BackendConfiguration::MenuItem(match_path:) instead."
 )
 
+# rubocop:disable Lint/OrAssignmentToConstant
 Spree::BackendConfiguration::ORDER_TABS ||= [
   :orders, :payments, :creditcard_payments,
   :shipments, :credit_cards, :return_authorizations,
@@ -32,3 +33,4 @@ Spree::BackendConfiguration::CONFIGURATION_TABS ||= [
   :return_reasons, :adjustment_reasons,
   :store_credit_reasons
 ]
+# rubocop:enable Lint/OrAssignmentToConstant