From d74d0a60f0a9365d8ea850599bd1c9d39662c686 Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Fri, 1 Dec 2023 11:43:10 +0100
Subject: [PATCH 1/6] Prevent form submission on toast close button click

---
 admin/app/components/solidus_admin/ui/toast/component.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/app/components/solidus_admin/ui/toast/component.html.erb b/admin/app/components/solidus_admin/ui/toast/component.html.erb
index 65a176f9e92..7e1e97c066a 100644
--- a/admin/app/components/solidus_admin/ui/toast/component.html.erb
+++ b/admin/app/components/solidus_admin/ui/toast/component.html.erb
@@ -18,6 +18,7 @@
   <p class="body-tiny-bold leading-none"><%= @text %></p>
 
   <button
+    type="button"
     class="ml-2 align-text-bottom"
     title="<%= t('.close_text') %>"
     data-action="<%= stimulus_id %>#close"

From 5175a83987822d6308772a806dfa51063a822bc9 Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Fri, 1 Dec 2023 11:29:52 +0100
Subject: [PATCH 2/6] Normalize translations across components

---
 .../solidus_admin/option_types/index/component.html.erb         | 2 +-
 .../components/solidus_admin/option_types/index/component.yml   | 2 +-
 .../solidus_admin/promotion_categories/index/component.html.erb | 2 +-
 .../solidus_admin/promotion_categories/index/component.yml      | 2 +-
 .../solidus_admin/properties/index/component.html.erb           | 2 +-
 .../app/components/solidus_admin/properties/index/component.yml | 2 +-
 .../solidus_admin/taxonomies/index/component.html.erb           | 2 +-
 .../app/components/solidus_admin/taxonomies/index/component.yml | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/app/components/solidus_admin/option_types/index/component.html.erb b/admin/app/components/solidus_admin/option_types/index/component.html.erb
index b7f24c6b50c..97eb469d2ac 100644
--- a/admin/app/components/solidus_admin/option_types/index/component.html.erb
+++ b/admin/app/components/solidus_admin/option_types/index/component.html.erb
@@ -4,7 +4,7 @@
     <%= page_header_actions do %>
       <%= render component("ui/button").new(
         tag: :a,
-        text: t('.create_option_type'),
+        text: t('.add'),
         href: spree.new_admin_option_type_path,
         icon: "add-line",
       ) %>
diff --git a/admin/app/components/solidus_admin/option_types/index/component.yml b/admin/app/components/solidus_admin/option_types/index/component.yml
index 4d61e58803a..fe07d079a52 100644
--- a/admin/app/components/solidus_admin/option_types/index/component.yml
+++ b/admin/app/components/solidus_admin/option_types/index/component.yml
@@ -1,4 +1,4 @@
 en:
   batch_actions:
     delete: 'Delete'
-  create_option_type: Create Option Type
+  add: 'Add new'
diff --git a/admin/app/components/solidus_admin/promotion_categories/index/component.html.erb b/admin/app/components/solidus_admin/promotion_categories/index/component.html.erb
index 5607ca1fd94..fa5e9dffe96 100644
--- a/admin/app/components/solidus_admin/promotion_categories/index/component.html.erb
+++ b/admin/app/components/solidus_admin/promotion_categories/index/component.html.erb
@@ -4,7 +4,7 @@
     <%= page_header_actions do %>
       <%= render component("ui/button").new(
         tag: :a,
-        text: t('.create_promotion_category'),
+        text: t('.add'),
         href: spree.new_admin_promotion_category_path,
         icon: "add-line",
       ) %>
diff --git a/admin/app/components/solidus_admin/promotion_categories/index/component.yml b/admin/app/components/solidus_admin/promotion_categories/index/component.yml
index f6d86e2006f..fe07d079a52 100644
--- a/admin/app/components/solidus_admin/promotion_categories/index/component.yml
+++ b/admin/app/components/solidus_admin/promotion_categories/index/component.yml
@@ -1,4 +1,4 @@
 en:
   batch_actions:
     delete: 'Delete'
-  create_promotion_category: Create Promotion Category
+  add: 'Add new'
diff --git a/admin/app/components/solidus_admin/properties/index/component.html.erb b/admin/app/components/solidus_admin/properties/index/component.html.erb
index 33a7946329e..4304bf4d572 100644
--- a/admin/app/components/solidus_admin/properties/index/component.html.erb
+++ b/admin/app/components/solidus_admin/properties/index/component.html.erb
@@ -4,7 +4,7 @@
     <%= page_header_actions do %>
       <%= render component("ui/button").new(
         tag: :a,
-        text: t('.add_property'),
+        text: t('.add'),
         href: spree.new_admin_property_path,
         icon: "add-line",
       ) %>
diff --git a/admin/app/components/solidus_admin/properties/index/component.yml b/admin/app/components/solidus_admin/properties/index/component.yml
index d8e03923d7f..54418702ad3 100644
--- a/admin/app/components/solidus_admin/properties/index/component.yml
+++ b/admin/app/components/solidus_admin/properties/index/component.yml
@@ -1,4 +1,4 @@
 en:
-  add_property: 'Add Property'
+  add: 'Add new'
   batch_actions:
     delete: 'Delete'
diff --git a/admin/app/components/solidus_admin/taxonomies/index/component.html.erb b/admin/app/components/solidus_admin/taxonomies/index/component.html.erb
index 26c1addd8f2..bd43b5e5675 100644
--- a/admin/app/components/solidus_admin/taxonomies/index/component.html.erb
+++ b/admin/app/components/solidus_admin/taxonomies/index/component.html.erb
@@ -4,7 +4,7 @@
     <%= page_header_actions do %>
       <%= render component("ui/button").new(
         tag: :a,
-        text: t('.create_taxonomy'),
+        text: t('.add'),
         href: spree.new_admin_taxonomy_path,
         icon: "add-line",
       ) %>
diff --git a/admin/app/components/solidus_admin/taxonomies/index/component.yml b/admin/app/components/solidus_admin/taxonomies/index/component.yml
index 80341dbf5b5..fe07d079a52 100644
--- a/admin/app/components/solidus_admin/taxonomies/index/component.yml
+++ b/admin/app/components/solidus_admin/taxonomies/index/component.yml
@@ -1,4 +1,4 @@
 en:
   batch_actions:
     delete: 'Delete'
-  create_taxonomy: Create Taxonomy
+  add: 'Add new'

From 05127f04f909bc70be7979901eb26fcc9ff1b431 Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Thu, 30 Nov 2023 14:42:32 +0100
Subject: [PATCH 3/6] Fix cancel search function to handle absence of filters

---
 .../solidus_admin/ui/table/component.html.erb    |  2 +-
 .../solidus_admin/ui/table/component.js          | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/admin/app/components/solidus_admin/ui/table/component.html.erb b/admin/app/components/solidus_admin/ui/table/component.html.erb
index b2bc0c5fdac..05e288c8a2c 100644
--- a/admin/app/components/solidus_admin/ui/table/component.html.erb
+++ b/admin/app/components/solidus_admin/ui/table/component.html.erb
@@ -44,7 +44,7 @@
             <%= render component("ui/button").new(
               text: t('.cancel'),
               scheme: :ghost,
-              "data-action": "#{stimulus_id}#cancelSearch",
+              "data-action": "#{stimulus_id}#resetSearchAndFilters",
             ) %>
           </div>
         <% end %>
diff --git a/admin/app/components/solidus_admin/ui/table/component.js b/admin/app/components/solidus_admin/ui/table/component.js
index 626e72c48d0..6343183f5bd 100644
--- a/admin/app/components/solidus_admin/ui/table/component.js
+++ b/admin/app/components/solidus_admin/ui/table/component.js
@@ -46,18 +46,12 @@ export default class extends Controller {
     this.search()
   }
 
-  cancelSearch() {
-    this.resetFilters()
-    this.search()
-  }
-
-  resetFilters() {
-    if (!this.hasFilterToolbarTarget) return
-
-    for (const fieldset of this.filterToolbarTarget.querySelectorAll('fieldset')) {
-      fieldset.setAttribute('disabled', true)
+  resetSearchAndFilters() {
+    if (this.hasFilterToolbarTarget) {
+      this.filterToolbarTarget.querySelectorAll('fieldset').forEach(fieldset => fieldset.disabled = true)
     }
-    this.searchFieldTarget.setAttribute('disabled', true)
+
+    this.searchFieldTarget.disabled = true
     this.searchFormTarget.submit()
   }
 

From fb15fd8afe0c5ad4d4aa496a7a1fbd73f7e18261 Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Fri, 1 Dec 2023 11:22:09 +0100
Subject: [PATCH 4/6] Enable sortable in `ui/table` component only for default
 scope

Introduced a fix to conditionally enable the sortable functionality in
the `ui/table` component.

This enhancement activates sorting options only when the default scope
is applied, which is assumed to align with `Model.all`.

This approach is taken as a precautionary measure to prevent issues in
data
positioning and sorting when other, more complex scopes are applied.
---
 .../solidus_admin/ui/table/component.html.erb  |  4 ++--
 .../solidus_admin/ui/table/component.js        | 18 +++++++++++-------
 .../solidus_admin/ui/table/component.rb        |  8 ++++++++
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/admin/app/components/solidus_admin/ui/table/component.html.erb b/admin/app/components/solidus_admin/ui/table/component.html.erb
index 05e288c8a2c..22302aa7246 100644
--- a/admin/app/components/solidus_admin/ui/table/component.html.erb
+++ b/admin/app/components/solidus_admin/ui/table/component.html.erb
@@ -7,7 +7,7 @@
   data-controller="<%= stimulus_id %>"
   data-<%= stimulus_id %>-selected-row-class="bg-gray-15"
   data-<%= stimulus_id %>-mode-value="<%= initial_mode %>"
-  data-<%= stimulus_id %>-sortable-value="<%= @sortable.present? %>"
+  data-<%= stimulus_id %>-sortable-value="<%= should_enable_sortable? %>"
   data-action="
     <%= component("ui/table/ransack_filter").stimulus_id %>:search-><%= stimulus_id %>#search
     <%= component("ui/table/ransack_filter").stimulus_id %>:showSearch-><%= stimulus_id %>#showSearch
@@ -130,7 +130,7 @@
     <tbody
       class="bg-white text-3.5 line-[150%] text-black"
       data-<%= stimulus_id %>-target="tableBody"
-      <%= "data-controller=sortable" if @sortable&.url %>
+      <%= "data-controller=sortable" if should_enable_sortable? %>
       <%= "data-sortable-param-value=#{@sortable.param}" if @sortable&.param %>
       <%= "data-sortable-handle-value=#{@sortable.handle}" if @sortable&.handle %>
       <%= "data-sortable-animation-value=#{@sortable.animation}" if @sortable&.animation %>
diff --git a/admin/app/components/solidus_admin/ui/table/component.js b/admin/app/components/solidus_admin/ui/table/component.js
index 6343183f5bd..db605cca934 100644
--- a/admin/app/components/solidus_admin/ui/table/component.js
+++ b/admin/app/components/solidus_admin/ui/table/component.js
@@ -31,6 +31,17 @@ export default class extends Controller {
     this.search = debounce(this.search.bind(this), 200)
   }
 
+  // Determine if sortable should be enabled
+  modeValueChanged() {
+    const shouldSetSortable = this.sortableValue && this.modeValue !== "batch" && this.modeValue !== "search"
+
+    if (shouldSetSortable) {
+      this.tableBodyTarget.setAttribute('data-controller', 'sortable')
+    } else {
+      this.tableBodyTarget.removeAttribute('data-controller')
+    }
+  }
+
   showSearch(event) {
     this.modeValue = "search"
     this.render()
@@ -129,13 +140,6 @@ export default class extends Controller {
       checkbox.closest("tr").classList.toggle(this.selectedRowClass, checkbox.checked),
     )
 
-    // Determine if sortable should be enabled
-    if (this.sortableValue && this.modeValue !== "batch" && this.modeValue !== "search") {
-      this.tableBodyTarget.setAttribute('data-controller', 'sortable');
-    } else {
-      this.tableBodyTarget.removeAttribute('data-controller');
-    }
-
     // Update the selected rows count
     this.selectedRowsCountTarget.textContent = `${selectedRows.length}`
 
diff --git a/admin/app/components/solidus_admin/ui/table/component.rb b/admin/app/components/solidus_admin/ui/table/component.rb
index 6a8568755be..747a6524f61 100644
--- a/admin/app/components/solidus_admin/ui/table/component.rb
+++ b/admin/app/components/solidus_admin/ui/table/component.rb
@@ -39,6 +39,10 @@ def default_scope
       scopes.find(&:default)
     end
 
+    def on_default_scope?
+      current_scope == default_scope
+    end
+
     def scope_param_name
       "#{name}[scope]"
     end
@@ -163,4 +167,8 @@ def initial_mode
         "scopes"
       end
   end
+
+  def should_enable_sortable?
+    @sortable && @search&.on_default_scope?
+  end
 end

From 6b3fe71463ff47617582885d8cdd15f54618b186 Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Fri, 1 Dec 2023 11:49:55 +0100
Subject: [PATCH 5/6] Add ransackable attributes for `Spree::PaymentMethod`
 search in admin

Enhanced the search capabilities in the admin panel by updating
the `allowed_ransackable_attributes` of the `Spree::PaymentMethod`
model.

This update specifically adds the `name` and `description` fields to the
list of attributes that can be searched using Ransack.
---
 core/app/models/spree/payment_method.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/app/models/spree/payment_method.rb b/core/app/models/spree/payment_method.rb
index c74bb03701e..18547815ab3 100644
--- a/core/app/models/spree/payment_method.rb
+++ b/core/app/models/spree/payment_method.rb
@@ -42,6 +42,8 @@ class UnsupportedPaymentMethod < StandardError; end
 
     include Spree::Preferences::StaticallyConfigurable
 
+    self.allowed_ransackable_attributes = %w[name description]
+
     # Custom ModelName#human implementation to ensure we don't refer to
     # subclasses as just "PaymentMethod"
     class ModelName < ActiveModel::Name

From dc968c6641013ff16a8b01f67dbf76e915e5412f Mon Sep 17 00:00:00 2001
From: Rainer Dema <rainer.dema@gmail.com>
Date: Fri, 1 Dec 2023 11:52:38 +0100
Subject: [PATCH 6/6] Add `payment_methods/index` component with dedicated
 actions

---
 .../payment_methods/index/component.html.erb  | 35 ++++++++
 .../payment_methods/index/component.rb        | 81 +++++++++++++++++++
 .../payment_methods/index/component.yml       | 15 ++++
 .../payment_methods_controller.rb             | 50 ++++++++++++
 admin/config/locales/payment_methods.en.yml   |  6 ++
 admin/config/routes.rb                        |  9 +++
 admin/spec/features/payment_methods_spec.rb   | 48 +++++++++++
 7 files changed, 244 insertions(+)
 create mode 100644 admin/app/components/solidus_admin/payment_methods/index/component.html.erb
 create mode 100644 admin/app/components/solidus_admin/payment_methods/index/component.rb
 create mode 100644 admin/app/components/solidus_admin/payment_methods/index/component.yml
 create mode 100644 admin/app/controllers/solidus_admin/payment_methods_controller.rb
 create mode 100644 admin/config/locales/payment_methods.en.yml
 create mode 100644 admin/spec/features/payment_methods_spec.rb

diff --git a/admin/app/components/solidus_admin/payment_methods/index/component.html.erb b/admin/app/components/solidus_admin/payment_methods/index/component.html.erb
new file mode 100644
index 00000000000..33b7c29e13c
--- /dev/null
+++ b/admin/app/components/solidus_admin/payment_methods/index/component.html.erb
@@ -0,0 +1,35 @@
+<%= page do %>
+  <%= page_header do %>
+    <%= page_header_title title %>
+    <%= page_header_actions do %>
+      <%= render component("ui/button").new(
+        tag: :a,
+        text: t('.add'),
+        href: spree.new_admin_payment_method_path,
+        icon: "add-line",
+      ) %>
+    <% end %>
+  <% end %>
+
+  <%= render component('ui/table').new(
+    id: stimulus_id,
+    data: {
+      class: Spree::PaymentMethod,
+      rows: @payment_methods,
+      url: ->(payment_method) { spree.edit_admin_payment_method_path(payment_method) },
+      columns: columns,
+      batch_actions: batch_actions,
+    },
+    search: {
+      name: :q,
+      value: params[:q],
+      url: solidus_admin.payment_methods_path,
+      searchbar_key: :name_or_description_cont,
+      scopes: scopes,
+    },
+    sortable: {
+      url: ->(payment_method) { solidus_admin.move_payment_method_path(payment_method) },
+      param: 'position',
+    },
+  ) %>
+<% end %>
diff --git a/admin/app/components/solidus_admin/payment_methods/index/component.rb b/admin/app/components/solidus_admin/payment_methods/index/component.rb
new file mode 100644
index 00000000000..230a128f8b5
--- /dev/null
+++ b/admin/app/components/solidus_admin/payment_methods/index/component.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::PaymentMethods::Index::Component < SolidusAdmin::BaseComponent
+  include SolidusAdmin::Layout::PageHelpers
+
+  def initialize(payment_methods:)
+    @payment_methods = payment_methods
+  end
+
+  def title
+    Spree::PaymentMethod.model_name.human.pluralize
+  end
+
+  def batch_actions
+    [
+      {
+        display_name: t('.batch_actions.delete'),
+        action: solidus_admin.payment_methods_path,
+        method: :delete,
+        icon: 'delete-bin-7-line',
+      },
+    ]
+  end
+
+  def scopes
+    [
+      { name: :all, label: t('.scopes.all'), default: true },
+      { name: :active, label: t('.scopes.active') },
+      { name: :inactive, label: t('.scopes.inactive') },
+      { name: :storefront, label: t('.scopes.storefront') },
+      { name: :admin, label: t('.scopes.admin') },
+    ]
+  end
+
+  def columns
+    [
+      {
+        header: :name,
+        data: ->(payment_method) do
+          content_tag :div, payment_method.name
+        end
+      },
+      {
+        header: :type,
+        data: ->(payment_method) do
+          content_tag :div, payment_method.model_name.human
+        end
+      },
+      {
+        header: :available_to_users,
+        data: ->(payment_method) do
+          if payment_method.available_to_users?
+            component('ui/badge').new(name: t('.yes'), color: :green)
+          else
+            component('ui/badge').new(name: t('.no'), color: :graphite_light)
+          end
+        end
+      },
+      {
+        header: :available_to_admin,
+        data: ->(payment_method) do
+          if payment_method.available_to_admin?
+            component('ui/badge').new(name: t('.yes'), color: :green)
+          else
+            component('ui/badge').new(name: t('.no'), color: :graphite_light)
+          end
+        end
+      },
+      {
+        header: :status,
+        data: ->(payment_method) do
+          if payment_method.active?
+            render component('ui/badge').new(name: t('.status.active'), color: :green)
+          else
+            render component('ui/badge').new(name: t('.status.inactive'), color: :graphite_light)
+          end
+        end
+      },
+    ]
+  end
+end
diff --git a/admin/app/components/solidus_admin/payment_methods/index/component.yml b/admin/app/components/solidus_admin/payment_methods/index/component.yml
new file mode 100644
index 00000000000..34acf86bda7
--- /dev/null
+++ b/admin/app/components/solidus_admin/payment_methods/index/component.yml
@@ -0,0 +1,15 @@
+en:
+  add: 'Add new'
+  "yes": "Yes"
+  "no": "No"
+  status:
+    active: Active
+    inactive: Inactive
+  scopes:
+    active: Active
+    inactive: Inactive
+    admin: Admin
+    storefront: Storefront
+    all: All
+  batch_actions:
+    delete: 'Delete'
diff --git a/admin/app/controllers/solidus_admin/payment_methods_controller.rb b/admin/app/controllers/solidus_admin/payment_methods_controller.rb
new file mode 100644
index 00000000000..23056b9e2c9
--- /dev/null
+++ b/admin/app/controllers/solidus_admin/payment_methods_controller.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module SolidusAdmin
+  class PaymentMethodsController < SolidusAdmin::BaseController
+    include SolidusAdmin::ControllerHelpers::Search
+
+    before_action :load_payment_method, only: [:move]
+
+    search_scope(:all)
+    search_scope(:active, default: true, &:active)
+    search_scope(:inactive) { _1.where.not(active: true) }
+    search_scope(:storefront, &:available_to_users)
+    search_scope(:admin, &:available_to_admin)
+
+    def index
+      @payment_methods = apply_search_to(
+        Spree::PaymentMethod.ordered_by_position,
+        param: :q,
+      )
+
+      respond_to do |format|
+        format.html { render component('payment_methods/index').new(payment_methods: @payment_methods) }
+      end
+    end
+
+    def move
+      @payment_method.insert_at(params[:position].to_i)
+
+      respond_to do |format|
+        format.js { head :no_content }
+      end
+    end
+
+    def destroy
+      @payment_methods = Spree::PaymentMethod.where(id: params[:id])
+
+      Spree::PaymentMethod.transaction { @payment_methods.destroy_all }
+
+      flash[:notice] = t('.success')
+      redirect_back_or_to payment_methods_path, status: :see_other
+    end
+
+    private
+
+    def load_payment_method
+      @payment_method = Spree::PaymentMethod.find_by!(id: params[:id])
+      authorize! action_name, @payment_method
+    end
+  end
+end
diff --git a/admin/config/locales/payment_methods.en.yml b/admin/config/locales/payment_methods.en.yml
new file mode 100644
index 00000000000..c9b1308e35e
--- /dev/null
+++ b/admin/config/locales/payment_methods.en.yml
@@ -0,0 +1,6 @@
+en:
+  solidus_admin:
+    payment_methods:
+      title: "Payment Methods"
+      destroy:
+        success: "Payment Methods were successfully removed."
diff --git a/admin/config/routes.rb b/admin/config/routes.rb
index 11e68f6af5c..7513e01a28e 100644
--- a/admin/config/routes.rb
+++ b/admin/config/routes.rb
@@ -84,4 +84,13 @@
       delete :destroy
     end
   end
+
+  resources :payment_methods, only: [:index] do
+    collection do
+      delete :destroy
+    end
+    member do
+      patch :move
+    end
+  end
 end
diff --git a/admin/spec/features/payment_methods_spec.rb b/admin/spec/features/payment_methods_spec.rb
new file mode 100644
index 00000000000..55ebf3ec74b
--- /dev/null
+++ b/admin/spec/features/payment_methods_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe "Payment Methods", :js, type: :feature do
+  before { sign_in create(:admin_user, email: 'admin@example.com') }
+
+  it "lists users and allows deleting them" do
+    create(:check_payment_method, name: "Check", active: true)
+    create(:simple_credit_card_payment_method, name: "Credit Card", active: false)
+    create(:store_credit_payment_method, name: "Store Credit Users", available_to_users: true)
+    create(:store_credit_payment_method, name: "Store Credit Admins", available_to_admin: true)
+
+    visit "/admin/payment_methods"
+    expect(page).to have_content("Check")
+    expect(page).not_to have_content("Credit Card")
+    expect(page).to have_content("Store Credit Users")
+    expect(page).to have_content("Store Credit Admins")
+    click_on "Inactive"
+    expect(page).not_to have_content("Check")
+    expect(page).to have_content("Credit Card")
+    expect(page).not_to have_content("Store Credit Users")
+    expect(page).not_to have_content("Store Credit Admins")
+    click_on "Admin"
+    expect(page).to have_content("Check")
+    expect(page).to have_content("Credit Card")
+    expect(page).to have_content("Store Credit Admins")
+    expect(page).not_to have_content("Store Credit Users")
+    click_on "Storefront"
+    expect(page).to have_content("Check")
+    expect(page).to have_content("Credit Card")
+    expect(page).not_to have_content("Store Credit Admins")
+    expect(page).to have_content("Store Credit Users")
+    click_on "All"
+    expect(page).to have_content("Check")
+    expect(page).to have_content("Credit Card")
+    expect(page).to have_content("Store Credit Admins")
+    expect(page).to have_content("Store Credit Users")
+
+    expect(page).to be_axe_clean
+
+    select_row("Check")
+    click_on "Delete"
+    expect(page).to have_content("Payment Methods were successfully removed.")
+    expect(page).not_to have_content("Check")
+    expect(Spree::PaymentMethod.count).to eq(3)
+  end
+end