From 69ec17ef923a106a2f79e6a68b8f4e38c59fe676 Mon Sep 17 00:00:00 2001
From: Andy Brett <andy@andybrett.com>
Date: Thu, 26 Aug 2021 17:07:33 -0700
Subject: [PATCH] do not require phone number on orders

---
 app/models/spree/address.rb       |  5 -----
 spec/models/spree/address_spec.rb | 19 ++-----------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/app/models/spree/address.rb b/app/models/spree/address.rb
index 80630359a0..7563ea66d5 100644
--- a/app/models/spree/address.rb
+++ b/app/models/spree/address.rb
@@ -12,7 +12,6 @@ module Spree
 
     validates :firstname, :lastname, :address1, :city, :country, presence: true
     validates :zipcode, presence: true, if: :require_zipcode?
-    validates :phone, presence: true, if: :require_phone?
 
     validate :state_validate
 
@@ -101,10 +100,6 @@ module Spree
 
     private
 
-    def require_phone?
-      true
-    end
-
     def require_zipcode?
       true
     end
diff --git a/spec/models/spree/address_spec.rb b/spec/models/spree/address_spec.rb
index f334392657..cf3987ebba 100644
--- a/spec/models/spree/address_spec.rb
+++ b/spec/models/spree/address_spec.rb
@@ -110,10 +110,10 @@ describe Spree::Address do
       expect(address).to be_valid
     end
 
-    it "requires phone" do
+    it "does not require phone" do
       address.phone = ""
       address.valid?
-      expect(address.errors["phone"]).to eq ["can't be blank"]
+      expect(address.errors[:phone]).to be_empty
     end
 
     it "requires zipcode" do
@@ -122,16 +122,6 @@ describe Spree::Address do
       expect(address.errors[:zipcode].first).to eq "can't be blank"
     end
 
-    context "phone not required" do
-      before { allow(address).to receive(:require_phone?) { false } }
-
-      it "shows no errors when phone is blank" do
-        address.phone = ""
-        address.valid?
-        expect(address.errors[:phone]).to be_empty
-      end
-    end
-
     context "zipcode not required" do
       before { allow(address).to receive(:require_zipcode?) { false } }
 
@@ -197,9 +187,4 @@ describe Spree::Address do
       specify { expect(address.state_text).to eq 'virginia' }
     end
   end
-
-  context "defines require_phone? helper method" do
-    let(:address) { build(:address) }
-    specify { expect(address.instance_eval{ require_phone? }).to be_truthy }
-  end
 end