From 1fa3cf407c8d98f8daeea873cc50013b82d415be Mon Sep 17 00:00:00 2001
From: Ivascu Madalin <madalin.ivascu@arnia.ro>
Date: Fri, 30 Jun 2023 06:50:53 +0000
Subject: [PATCH] BP-2188] Payment method availability gets checked on shipping
 address

---
 .../CanUseForCountry/CountryProvider.php      | 50 -------------------
 etc/di.xml                                    |  1 -
 2 files changed, 51 deletions(-)
 delete mode 100644 Model/Checks/CanUseForCountry/CountryProvider.php

diff --git a/Model/Checks/CanUseForCountry/CountryProvider.php b/Model/Checks/CanUseForCountry/CountryProvider.php
deleted file mode 100644
index 5513f2a9d..000000000
--- a/Model/Checks/CanUseForCountry/CountryProvider.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * NOTICE OF LICENSE
- *
- * This source file is subject to the MIT License
- * It is available through the world-wide-web at this URL:
- * https://tldrlegal.com/license/mit-license
- * If you are unable to obtain it through the world-wide-web, please send an email
- * to support@buckaroo.nl so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade this module to newer
- * versions in the future. If you wish to customize this module for your
- * needs please contact support@buckaroo.nl for more information.
- *
- * @copyright Copyright (c) Buckaroo B.V.
- * @license   https://tldrlegal.com/license/mit-license
- */
-
-namespace Buckaroo\Magento2\Model\Checks\CanUseForCountry;
-
-use Magento\Quote\Model\Quote;
-use Magento\Directory\Helper\Data as DirectoryHelper;
-use Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider as MagentoCountryProvider;
-
-/**
- * Select country which will be used for payment.
- *
- * This class may be extended if logic fo country selection should be modified.
- *
- * @api
- * @since 100.0.2
- */
-class CountryProvider extends MagentoCountryProvider
-{
-    /**
-     * Get payment country
-     *
-     * @param Quote $quote
-     * @return int
-     */
-    public function getCountry(Quote $quote)
-    {
-        $address = $quote->getShippingAddress() ? : $quote->getBillingAddress();
-        return (!empty($address) && !empty($address->getCountry()))
-            ? $address->getCountry()
-            : $this->directoryHelper->getDefaultCountry();
-    }
-}
diff --git a/etc/di.xml b/etc/di.xml
index 741923ac8..de2bf44e1 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -31,7 +31,6 @@
     <preference for="Magento\Quote\Model\Cart\CartTotalRepository" type="Buckaroo\Magento2\Model\Cart\CartTotalRepository" />
     <preference for="Magento\Sales\Model\ResourceModel\Order\Handler\State" type="Buckaroo\Magento2\Model\ResourceModel\Order\Handler\State" />
     <preference for="Onestepcheckout\Iosc\Plugin\GuestSaveManager" type="Buckaroo\Magento2\Plugin\GuestSaveManager" />
-    <preference for="Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider" type="Buckaroo\Magento2\Model\Checks\CanUseForCountry\CountryProvider" />
     <preference for="Mageplaza\Osc\Model\CheckoutManagement" type="Buckaroo\Magento2\Plugin\CheckoutManagement" />
     <preference for="Magento\Ui\Model\Export\ConvertToCsv" type="Buckaroo\Magento2\Model\Export\ConvertToCsv" />
     <preference for="Magento\Sales\Model\Order\CreditmemoFactory" type="Buckaroo\Magento2\Model\Order\CreditmemoFactory" />