From 8d338a06f3b6842154142e57e59a5f83a235f2bb Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 13 Jan 2021 15:48:02 +0000
Subject: [PATCH] Delete dead code #has_available_payment

This is removed in Spree 2.2, as it serves no purpose.

See: https://github.com/spree/spree/commit/0617bdce30afd682227bcf04e5340fd26ec9c7af
---
 app/models/spree/order.rb                     | 6 ------
 spec/models/spree/order/checkout_spec.rb      | 1 -
 spec/models/spree/order/state_machine_spec.rb | 1 -
 spec/models/spree/order_spec.rb               | 2 --
 4 files changed, 10 deletions(-)

diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 4649b5a0e6..f88186f409 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -87,7 +87,6 @@ module Spree
     after_create :create_tax_charge!
 
     validate :has_available_shipment
-    validate :has_available_payment
     validates :email, presence: true,
                       format: /\A([\w\.%\+\-']+)@([\w\-]+\.)+([\w]{2,})\z/i,
                       if: :require_email
@@ -816,11 +815,6 @@ module Spree
       errors.add(:base, Spree.t(:items_cannot_be_shipped)) && (return false)
     end
 
-    def has_available_payment
-      return unless delivery?
-      # errors.add(:base, :no_payment_methods_available) if available_payment_methods.empty?
-    end
-
     def after_cancel
       shipments.each(&:cancel!)
 
diff --git a/spec/models/spree/order/checkout_spec.rb b/spec/models/spree/order/checkout_spec.rb
index 4487671f58..4926a1900b 100644
--- a/spec/models/spree/order/checkout_spec.rb
+++ b/spec/models/spree/order/checkout_spec.rb
@@ -68,7 +68,6 @@ describe Spree::Order::Checkout do
     context "from address" do
       before do
         order.state = 'address'
-        allow(order).to receive(:has_available_payment)
         order.shipments << create(:shipment)
         order.email = "user@example.com"
         order.save!
diff --git a/spec/models/spree/order/state_machine_spec.rb b/spec/models/spree/order/state_machine_spec.rb
index ce59e1b212..b442de3233 100644
--- a/spec/models/spree/order/state_machine_spec.rb
+++ b/spec/models/spree/order/state_machine_spec.rb
@@ -51,7 +51,6 @@ describe Spree::Order do
 
     context "when current state is address" do
       before do
-        allow(order).to receive(:has_available_payment)
         allow(order).to receive(:ensure_available_shipping_rates)
         order.state = "address"
       end
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index 2361ff3a21..bcedbf6df0 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -399,8 +399,6 @@ describe Spree::Order do
     end
 
     before do
-      # Don't care about available payment methods in this test
-      allow(persisted_order).to receive_messages(has_available_payment: false)
       persisted_order.line_items << line_item
       persisted_order.adjustments.create(amount: -line_item.amount, label: "Promotion")
       persisted_order.state = 'delivery'