spree_backend 4.4.0 → 4.5.0

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

@@ -132,7 +132,7 @@ module Spree
         adjustments.update_all(state: 'open')
         flash[:success] = Spree.t(:all_adjustments_opened)
 
-        respond_with(@order) { |format| format.html { redirect_back fallback_location: spree.admin_order_adjustments_url(@order) } }
+        redirect_back fallback_location: spree.admin_order_adjustments_url(@order)
       end
 
       def close_adjustments
@@ -140,7 +140,7 @@ module Spree
         adjustments.update_all(state: 'closed')
         flash[:success] = Spree.t(:all_adjustments_closed)
 
-        respond_with(@order) { |format| format.html { redirect_back fallback_location: spree.admin_order_adjustments_url(@order) } }
+        redirect_back fallback_location: spree.admin_order_adjustments_url(@order)
       end
 
       def set_channel

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

@@ -15,7 +15,7 @@ module Spree
         if @payment_method.save
           invoke_callbacks(:create, :after)
           flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:payment_method))
-          redirect_to spree.edit_admin_payment_method_path(@payment_method)
+          redirect_to location_after_create
         else
           invoke_callbacks(:create, :fails)
           respond_with(@payment_method, status: :unprocessable_entity)
@@ -89,6 +89,10 @@ module Spree
 
         params.require(key).permit!
       end
+
+      def location_after_create
+        spree.edit_admin_payment_method_path(@payment_method)
+      end
     end
   end
 end

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

@@ -3,12 +3,15 @@ module Spree
     class ProductsController < ResourceController
       include Spree::Admin::ProductConcern
 
-      helper 'spree/products'
+      helper 'spree/admin/products'
 
       before_action :load_data, except: :index
+      before_action :set_product_defaults, only: :new
 
       create.before :create_before
       update.before :update_before
+      update.before :skip_updating_status
+      update.after :update_status
       helper_method :clone_object_url
 
       def show
@@ -101,7 +104,11 @@ module Spree
       end
 
       def location_after_save
-        spree.edit_admin_product_url(@product)
+        if params[:product][:product_properties_attributes].present?
+          spree.admin_product_product_properties_path(@product)
+        else
+          spree.edit_admin_product_url(@product)
+        end
       end
 
       def load_data
@@ -111,12 +118,27 @@ module Spree
         @shipping_categories = ShippingCategory.order(:name)
       end
 
+      def set_product_defaults
+        @product.shipping_category ||= @shipping_categories&.first
+      end
+
+      def skip_updating_status
+        @new_status = params[:product].delete(:status)
+      end
+
+      def update_status
+        return if @new_status == @product.status
+        return if cannot?(:activate, Spree::Product) && @new_status&.to_sym == :active
+
+        event_to_fire = @product.status_transitions.find { |transition| transition.from == @product.status && transition.to == @new_status }&.event
+        @product.send(event_to_fire) if event_to_fire
+      end
+
       def collection
         return @collection if @collection.present?
 
         params[:q] ||= {}
         params[:q][:deleted_at_null] ||= '1'
-        params[:q][:not_discontinued] ||= '1'
 
         params[:q][:s] ||= 'name asc'
 
@@ -135,6 +157,7 @@ module Spree
                       includes(product_includes).
                       page(params[:page]).
                       per(params[:per_page] || Spree::Backend::Config[:admin_products_per_page])
+
         @collection
       end
 
@@ -165,6 +188,14 @@ module Spree
         clone_admin_product_url resource
       end
 
+      def permitted_resource_params
+        if cannot?(:activate, @product) && @new_status&.to_sym == :active
+          super.except(:status, :make_active_at).permit!
+        else
+          super
+        end
+      end
+
       private
 
       def variant_stock_includes

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

@@ -27,6 +27,8 @@ module Spree
       end
 
       def load_data
+        @actions = Rails.application.config.spree.promotions.actions
+
         @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
         @promotion_categories = Spree::PromotionCategory.order(:name)
       end

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

@@ -30,9 +30,10 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       set_current_store
       invoke_callbacks(:update, :after)
       respond_with(@object) do |format|
+        format.turbo_stream if update_turbo_stream_enabled?
         format.html do
           flash[:success] = flash_message_for(@object, :successfully_updated)
-          redirect_to location_after_save
+          redirect_to location_after_save unless request.xhr?
         end
         format.js { render layout: false }
       end
@@ -52,8 +53,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       invoke_callbacks(:create, :after)
       flash[:success] = flash_message_for(@object, :successfully_created)
       respond_with(@object) do |format|
+        format.turbo_stream if create_turbo_stream_enabled?
         format.html { redirect_to location_after_save }
-        format.turbo_stream if turbo_enabled?
         format.js   { render layout: false }
       end
     else
@@ -280,7 +281,11 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     [:new, :create]
   end
 
-  def turbo_enabled?
+  def create_turbo_stream_enabled?
+    false
+  end
+
+  def update_turbo_stream_enabled?
     false
   end
 end

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

@@ -2,12 +2,12 @@ module Spree
   module Admin
     class ReturnIndexController < BaseController
       def return_authorizations
-        collection(Spree::ReturnAuthorization.for_store(current_store))
+        collection(Spree::ReturnAuthorization.for_store(current_store).accessible_by(current_ability, :index))
         respond_with(@collection)
       end
 
       def customer_returns
-        collection(current_store.customer_returns)
+        collection(current_store.customer_returns.accessible_by(current_ability, :index))
         respond_with(@collection)
       end
 
@@ -23,6 +23,11 @@ module Spree
         per_page = params[:per_page] || Spree::Backend::Config[:admin_customer_returns_per_page]
         @collection = @search.result.order(created_at: :desc).page(params[:page]).per(per_page)
       end
+
+      # this is needed for proper permissions checking
+      def model_class
+        action == :customer_returns ? Spree::CustomerReturn : Spree::ReturnAuthorization
+      end
     end
   end
 end

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

@@ -43,21 +43,24 @@ module Spree
       private
 
       def load_stock_locations
-        @stock_locations = Spree::StockLocation.active.order_default
+        @stock_locations = stock_locations_scope.active.order_default
       end
 
       def source_location
-        @source_location ||= params.key?(:transfer_receive_stock) ? nil :
-                               StockLocation.find(params[:transfer_source_location_id])
+        @source_location ||= params.key?(:transfer_receive_stock) ? nil : stock_locations_scope.find(params[:transfer_source_location_id])
       end
 
       def destination_location
-        @destination_location ||= StockLocation.find(params[:transfer_destination_location_id])
+        @destination_location ||= stock_locations_scope.find(params[:transfer_destination_location_id])
       end
 
       def any_missing_variants?(variant_ids)
         source_location&.stock_items&.where(variant_id: variant_ids, count_on_hand: 0)&.any?
       end
+
+      def stock_locations_scope
+        Spree::StockLocation.accessible_by(current_ability, :update)
+      end
     end
   end
 end

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

@@ -10,37 +10,12 @@ module Spree
       before_action :load_all_countries, only: [:new, :edit, :update, :create]
       before_action :load_all_zones, only: [:new, :edit, :update, :create]
 
-      def index
-        if params[:ids]
-          load_stores_by_ids
-        elsif params[:q]
-          load_stores_by_query
-        end
-
-        respond_with(@stores) do |format|
-          format.json { render layout: false }
-        end
-      end
-
-      def load_stores_by_ids
-        @stores = stores_scope.where(id: params[:ids].split(','))
-      end
-
-      def load_stores_by_query
-        @stores = if defined?(SpreeGlobalize)
-                    stores_scope.joins(:translations).where("LOWER(#{Store::Translation.table_name}.name) LIKE LOWER(:query)",
-                                                            query: "%#{params[:q]}%")
-                  else
-                    stores_scope.where('LOWER(name) LIKE LOWER(:query)', query: "%#{params[:q]}%")
-                  end
-      end
-
       def create
         @store = stores_scope.new(permitted_store_params)
 
         if @store.save
           flash[:success] = flash_message_for(@store, :successfully_created)
-          redirect_to @store.formatted_url + spree.admin_stores_path
+          redirect_to spree.admin_url(domain: @store.url), allow_other_host: true
         else
           flash[:error] = "#{Spree.t('store_errors.unable_to_create')}: #{@store.errors.full_messages.join(', ')}"
           render :new, status: :unprocessable_entity
@@ -52,11 +27,11 @@ module Spree
 
         if @store.save
           flash[:success] = flash_message_for(@store, :successfully_updated)
-          redirect_to spree.admin_stores_path
         else
           flash[:error] = "#{Spree.t('store_errors.unable_to_update')}: #{@store.errors.full_messages.join(', ')}"
-          redirect_to spree.edit_admin_store_path(@store)
         end
+
+        redirect_to spree.edit_admin_store_path(@store)
       end
 
       def destroy
@@ -64,33 +39,12 @@ module Spree
 
         if @store.destroy
           flash[:success] = flash_message_for(@store, :successfully_removed)
-          respond_with(@store) do |format|
-            format.html { redirect_to spree.admin_stores_path }
-            format.js { render_js_for_destroy }
-          end
+          redirect_to spree.admin_url(domain: Spree::Store.default.url), allow_other_host: true
         else
           render plain: "#{Spree.t('store_errors.unable_to_delete')}: #{@store.errors.full_messages.join(', ')}", status: :unprocessable_entity
         end
       end
 
-      def set_default
-        store = stores_scope.find(params[:id])
-        stores = stores_scope.where.not(id: params[:id])
-
-        ApplicationRecord.transaction do
-          store.update(default: true)
-          stores.update_all(default: false)
-        end
-
-        if store.errors.empty?
-          flash[:success] = Spree.t(:store_set_as_default, store: store.name)
-        else
-          flash[:error] = "#{Spree.t(:store_not_set_as_default, store: store.name)} #{store.errors.full_messages.join(', ')}"
-        end
-
-        redirect_to spree.admin_stores_path
-      end
-
       protected
 
       def permitted_store_params
@@ -104,7 +58,7 @@ module Spree
       end
 
       def load_all_countries
-        @countries = Spree::Country.all
+        @countries = Spree::Country.pluck(:name, :id)
       end
 
       def load_all_zones
@@ -132,7 +86,7 @@ module Spree
       end
 
       def set_default_country_id
-        @store.default_country_id = Spree::Config[:default_country_id]
+        @store.default_country_id ||= Spree::Store.default.default_country_id || Spree::Country.find_by(iso: "US")&.id
       end
     end
   end

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

@@ -4,7 +4,7 @@ module Spree
       private
 
       def location_after_save
-        if @taxonomy.created_at == @taxonomy.updated_at
+        if @taxonomy.previously_new_record?
           edit_admin_taxonomy_url(@taxonomy)
         else
           admin_taxonomies_url

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

@@ -8,7 +8,7 @@ module Spree
         params[:q] ||= {}
         params[:q][:s] ||= 'created_at desc'
 
-        search = Webhooks::Subscriber.ransack(params[:q])
+        search = Webhooks::Subscriber.accessible_by(current_ability).ransack(params[:q])
         @webhooks_subscribers = search.result.
                                 includes(:events).
                                 page(params[:page]).

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

@@ -63,7 +63,6 @@ module Spree
 
       def spree_humanize_type(obj)
         last_word = obj.split('::', 10).last
-
         if last_word.starts_with?('Cms')
           last_word.slice(3, 100).gsub(/(?<=[a-z])(?=[A-Z])/, ' ')
         else
@@ -236,29 +235,13 @@ module Spree
         content_tag(:span, ' *', class: 'required font-weight-bold text-danger')
       end
 
-      def product_preview_link(product)
-       ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-         Admin::BaseHelper#product_preview_link is deprecated and will be removed in Spree 5.0. - Use Admin::BaseHelper#external_page_preview_link
-       DEPRECATION
-
-        external_page_preview_link(product)
-      end
-
-      def taxon_preview_link(taxon)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          Admin::BaseHelper#taxon_preview_link is deprecated and will be removed in Spree 5.0. - Use Admin::BaseHelper#external_page_preview_link
-        DEPRECATION
-
-        external_page_preview_link(taxon)
-      end
-
       def external_page_preview_link(resource, options = {})
         resource_name = options[:name] || resource.class.name.demodulize
 
         button_link_to(
-          Spree.t('admin.utilities.preview', name: resource_name ),
+          Spree.t('admin.utilities.preview', name: resource_name),
           spree_storefront_resource_url(resource),
-          class: 'btn-outline-secondary', icon: 'view.svg', id: "adminPreview#{resource_name}", target: :blank, data: { turbo: false }
+          class: 'btn-light', icon: 'view.svg', id: "adminPreview#{resource_name}", target: :blank, data: { turbo: false }
         )
       end
 

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

@@ -1,14 +1,10 @@
 module Spree
   module Admin
     module CmsHelper
-      def cms_page_preview_url(page)
-        page_localization = if page.locale == current_store.default_locale
-                              nil
-                            else
-                              page.locale
-                            end
+      def cms_page_locale(page)
+        return if page.locale == current_store.default_locale
 
-        spree_storefront_resource_url(page, locale: page_localization)
+        page.locale
       end
     end
   end

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

@@ -16,7 +16,8 @@ module Spree
       #   # Link to /admin/orders, also highlight tab for ProductsController and ShipmentsController
       #   tab :orders, :products, :shipments
 
-      ICON_SIZE = 16
+      ICON_SIZE = 14
+      MENU_ICON_SIZE = 18
 
       def tab(*args)
         options = { label: args.first.to_s }
@@ -37,26 +38,30 @@ module Spree
 
         css_classes = ['sidebar-menu-item d-block w-100 position-relative']
 
-        selected = if options[:match_path].is_a? Regexp
-                     request.fullpath =~ options[:match_path]
-                   elsif options[:match_path]
-                     request.fullpath.starts_with?("#{spree.admin_path}#{options[:match_path]}")
-                   else
-                     args.include?(controller.controller_name.to_sym)
-                   end
+        if (selected = options[:selected]).nil?
+          selected = if options[:match_path].is_a? Regexp
+                       request.fullpath =~ options[:match_path]
+                     elsif options[:match_path]
+                       request.fullpath.starts_with?("#{spree.admin_path}#{options[:match_path]}")
+                     else
+                       args.include?(controller.controller_name.to_sym)
+                     end
+        end
 
         link = if options[:icon]
                  link_to_with_icon(
                    options[:icon],
                    titleized_label,
                    destination_url,
-                   class: 'w-100 p-3 d-flex align-items-center'
+                   class: 'w-100 px-3 py-2 d-flex align-items-center text-muted',
+                   width: MENU_ICON_SIZE,
+                   height: MENU_ICON_SIZE
                  )
                else
                  link_to(
                    titleized_label,
                    destination_url,
-                   class: "sidebar-submenu-item w-100 py-2 py-md-1 pl-3 d-block #{'text-success' if selected}"
+                   class: "sidebar-submenu-item w-100 py-2 py-md-1 pl-5 d-block #{selected ? 'font-weight-bold' : 'text-muted'}"
                  )
                end
 
@@ -68,22 +73,22 @@ module Spree
 
       # Single main menu item
       def main_menu_item(text, url: nil, icon: nil)
-        link_to url, 'data-toggle': 'collapse', class: 'd-flex w-100 p-3 position-relative align-items-center' do
+        link_to url, 'data-toggle': 'collapse', class: 'd-flex w-100 px-3 py-2 position-relative align-items-center' do
           if icon.ends_with?('.svg')
-            svg_icon(name: icon, classes: 'mr-2', width: ICON_SIZE, height: ICON_SIZE) +
-              content_tag(:span, " #{text}", class: 'text') +
-              svg_icon(name: 'chevron-left.svg', classes: 'drop-menu-indicator position-absolute', width: (ICON_SIZE - 4), height: (ICON_SIZE - 4))
+            svg_icon(name: icon, classes: 'mr-2 text-muted', width: MENU_ICON_SIZE, height: MENU_ICON_SIZE) +
+              content_tag(:span, raw(" #{text}"), class: 'text-muted') +
+              svg_icon(name: 'chevron-right.svg', classes: 'drop-menu-indicator text-muted position-absolute', width: (MENU_ICON_SIZE - 8), height: (MENU_ICON_SIZE - 8))
           else
-            content_tag(:span, nil, class: "icon icon-#{icon} mr-2") +
-              content_tag(:span, " #{text}", class: 'text') +
-              svg_icon(name: 'chevron-left.svg', classes: 'drop-menu-indicator position-absolute', width: (ICON_SIZE - 4), height: (ICON_SIZE - 4))
+            content_tag(:span, nil, class: "icon text-muted icon-#{icon} mr-2") +
+              content_tag(:span, raw(" #{text}"), class: 'text-muted') +
+              svg_icon(name: 'chevron-right.svg', classes: 'drop-menu-indicator text-muted position-absolute', width: (MENU_ICON_SIZE - 8), height: (MENU_ICON_SIZE - 8))
           end
         end
       end
 
       # Main menu tree menu
       def main_menu_tree(text, icon: nil, sub_menu: nil, url: '#')
-        content_tag :li, class: 'sidebar-menu-item d-block w-100' do
+        content_tag :li, class: 'sidebar-menu-item d-block w-100 text-muted' do
           main_menu_item(text, url: url, icon: icon) +
             render(partial: "spree/admin/shared/sub_menu/#{sub_menu}")
         end
@@ -107,7 +112,7 @@ module Spree
 
         select_tag(:per_page,
                    options_for_select(per_page_options, selected_option),
-                   class: "w-auto form-control js-per-page-select per-page-selected-#{selected_option} custom-select")
+                   class: "w-auto form-control js-per-page-select per-page-selected-#{selected_option} custom-select custom-select-sm")
       end
 
       # helper method to create proper url to apply per page ing
@@ -135,7 +140,7 @@ module Spree
 
       def link_to_clone(resource, options = {})
         options[:data] = { action: 'clone', 'original-title': Spree.t(:clone) }
-        options[:class] = 'btn btn-warning btn-sm with-tip'
+        options[:class] = 'btn btn-light btn-sm with-tip icon-link'
         options[:method] = :post
         options[:icon] = 'clone.svg'
         button_link_to '', clone_object_url(resource), options
@@ -143,7 +148,7 @@ module Spree
 
       def link_to_clone_promotion(promotion, options = {})
         options[:data] = { action: 'clone', 'original-title': Spree.t(:clone) }
-        options[:class] = 'btn btn-warning btn-sm with-tip'
+        options[:class] = 'btn btn-light btn-sm with-tip'
         options[:method] = :post
         options[:icon] = 'clone.svg'
         button_link_to '', clone_admin_promotion_path(promotion), options
@@ -152,13 +157,13 @@ module Spree
       def link_to_edit(resource, options = {})
         url = options[:url] || edit_object_url(resource)
         options[:data] = { action: 'edit' }
-        options[:class] = 'btn btn-primary btn-sm'
+        options[:class] = 'btn btn-light btn-sm'
         link_to_with_icon('edit.svg', Spree.t(:edit), url, options)
       end
 
       def link_to_edit_url(url, options = {})
         options[:data] = { action: 'edit' }
-        options[:class] = 'btn btn-primary btn-sm'
+        options[:class] = 'btn btn-light btn-sm'
         link_to_with_icon('edit.svg', Spree.t(:edit), url, options)
       end
 
@@ -173,11 +178,13 @@ module Spree
       def link_to_with_icon(icon_name, text, url, options = {})
         options[:class] = (options[:class].to_s + " icon-link with-tip action-#{icon_name}").strip
         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)
         options.delete(:no_text)
+        options[:width] ||= ICON_SIZE
+        options[:height] ||= ICON_SIZE
         if icon_name
           icon = if icon_name.ends_with?('.svg')
-                   svg_icon(name: icon_name, classes: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}", width: ICON_SIZE, height: ICON_SIZE)
+                   svg_icon(name: icon_name, classes: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}", width: options[:width], height: options[:height])
                  else
                    content_tag(:span, '', class: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}")
                  end
@@ -188,7 +195,7 @@ module Spree
 
       def spree_icon(icon_name)
         if icon_name.ends_with?('.svg')
-          icon_name ? svg_icon(name: icon_name, classes: icon_name, width: ICON_SIZE, height: ICON_SIZE) : ''
+          icon_name ? svg_icon(name: icon_name, classes: icon_name, width: MENU_ICON_SIZE, height: MENU_ICON_SIZE) : ''
         else
           icon_name ? content_tag(:span, '', class: icon_name) : ''
         end
@@ -220,6 +227,9 @@ module Spree
         if html_options[:method] &&
             !html_options[:method].to_s.casecmp('get').zero? &&
             !html_options[:remote]
+
+          html_options[:class] = html_options[:class] ? "btn #{html_options[:class]}" : 'btn btn-primary'
+
           form_tag(url, method: html_options.delete(:method)) do
             button(text, html_options.delete(:icon), nil, html_options)
           end
@@ -231,7 +241,7 @@ module Spree
 
           html_options.delete('data-update') unless html_options['data-update']
 
-          html_options[:class] = html_options[:class] ? "btn #{html_options[:class]}" : 'btn btn-outline-secondary'
+          html_options[:class] = html_options[:class] ? "btn #{html_options[:class]}" : 'btn btn-light'
 
           if html_options[:icon]
             icon = if html_options[:icon].ends_with?('.svg')
@@ -247,14 +257,14 @@ module Spree
       end
 
       def configurations_sidebar_menu_item(link_text, url, options = {})
-        is_selected = url.ends_with?(controller.controller_name) ||
+        options[:is_selected] ||= url.ends_with?(controller.controller_name) ||
           url.ends_with?("#{controller.controller_name}/edit") ||
           url.ends_with?("#{controller.controller_name.singularize}/edit")
 
         options[:class] = 'sidebar-menu-item d-block w-100'
-        options[:class] << ' selected' if is_selected
+        options[:class] << ' selected font-weight-bold' if options[:is_selected]
         content_tag(:li, options) do
-          link_to(link_text, url, class: "#{'text-success' if is_selected} sidebar-submenu-item w-100 py-2 py-md-1 pl-3 d-block")
+          link_to(link_text, url, class: "#{'text-muted' unless options[:is_selected]} sidebar-submenu-item w-100 py-2 py-md-1 pl-5 d-block")
         end
       end
 
@@ -263,7 +273,7 @@ module Spree
         label ||= condition ? Spree.t(:say_yes) : Spree.t(:say_no)
         css_class = condition ? 'badge-active' : 'badge-inactive'
 
-        content_tag(:strong, class: "badge #{css_class} text-uppercase") do
+        content_tag(:small, class: "badge badge-pill #{css_class}") do
           label
         end
       end
@@ -296,6 +306,12 @@ module Spree
         DEPRECATION
         'sidebar-minimized' if cookies['sidebar-minimized'] == 'true'
       end
+
+      def page_header_back_button(url)
+        link_to url, class: 'btn btn-outline-info mr-3 pr-1' do
+          svg_icon name: 'chevron-left.svg', width: 15, height: 15
+        end
+      end
     end
   end
 end

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

@@ -13,7 +13,8 @@ module Spree
             [event.to_sym, :admin, order],
             method: :put,
             icon: event.to_s + '.svg',
-            data: { confirm: Spree.t(:order_sure_want_to, event: label) }
+            data: { confirm: Spree.t(:order_sure_want_to, event: label) },
+            class: 'btn-light'
           )
         end
         safe_join(links, ''.html_safe)

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

@@ -4,7 +4,11 @@ module Spree
       def payment_method_name(payment)
         payment_method = payment.payment_method
 
-        link_to payment_method.name, spree.edit_admin_payment_method_path(payment_method)
+        if can?(:update, payment_method)
+          link_to payment_method.name, spree.edit_admin_payment_method_path(payment_method)
+        else
+          payment_method.name
+        end
       end
     end
   end

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

@@ -0,0 +1,17 @@
+module Spree
+  module Admin
+    module ProductsHelper
+      # will return a human readable string
+      def available_status(product)
+        return Spree.t('admin.product.archived') if product.status == 'archived'
+        return Spree.t('admin.product.deleted') if product.deleted?
+
+        if product.available?
+          Spree.t('admin.product.active')
+        else
+          Spree.t('admin.product.draft')
+        end
+      end
+    end
+  end
+end

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

@@ -22,8 +22,8 @@ module Spree
           icon = svg_icon name: 'circle.svg', width: '18', height: '18'
         end
 
-        link_to icon + store.unique_name, url_for(host: store.formatted_url),
-                class: "#{classes} text-dark p-3 dropdown-item", id: store.code, data: { turbo: false }
+        link_to icon + store.unique_name, spree.admin_url(host: store.formatted_url),
+                class: "#{classes} py-3 px-4 dropdown-item rounded", id: store.code, data: { turbo: false }
       end
     end
   end