MAG2-333 - Removed outdated payment methods

Block/Onepage/Review.php

@@ -309,19 +309,6 @@ public function isPayPalExpress()
         return false;
     }
 
-    /**
-     * Check if paypal express is used
-     *
-     * @return bool
-     */
-    public function isPaydirekt()
-    {
-        if ($this->_quote->getPayment()->getMethod() == PayoneConfig::METHOD_PAYDIREKT) {
-            return true;
-        }
-        return false;
-    }
-
     /**
      * Generate URL to the fingerprint.js Javascript file
      *

Controller/Onepage/Review.php

@@ -70,7 +70,6 @@ class Review extends \Magento\Framework\App\Action\Action
     protected $availableReviewMethods = [
         PayoneConfig::METHOD_PAYPAL,
         PayoneConfig::METHOD_PAYPALV2,
-        PayoneConfig::METHOD_PAYDIREKT,
         PayoneConfig::METHOD_AMAZONPAYV2,
     ];
 

Helper/Database.php

@@ -374,19 +374,4 @@ public function getSubstituteOrderIncrementId($sIncrementId)
             ->where("payone_cancel_substitute_increment_id = :incrementId");
         return $this->getDb()->fetchOne($oSelect, ['incrementId' => $sIncrementId]);
     }
-
-    /**
-     * Writes the registered flag to the customer entity
-     * I'm sure there is a way to do this correctly with the entity object, but Mage2 did everything to prevent this
-     *
-     * @param  int $iCustomerId
-     * @return int
-     */
-    public function markUserAsRegisteredWithPaydirekt($iCustomerId)
-    {
-        $table = $this->databaseResource->getTableName('customer_entity');
-        $data = ['payone_paydirekt_registered' => 1];
-        $where = ['entity_id = ?' => $iCustomerId];
-        return $this->getDb()->update($table, $data, $where);
-    }
 }

Helper/Payment.php

@@ -49,14 +49,11 @@ class Payment extends \Payone\Core\Helper\Base
         PayoneConfig::METHOD_ADVANCE_PAYMENT,
         PayoneConfig::METHOD_INVOICE,
         PayoneConfig::METHOD_OBT_SOFORTUEBERWEISUNG,
-        #PayoneConfig::METHOD_OBT_GIROPAY,#Giropay has been disabled, Paydirekt is now Giropay
         PayoneConfig::METHOD_OBT_EPS,
         PayoneConfig::METHOD_OBT_POSTFINANCE_EFINANCE,
         PayoneConfig::METHOD_OBT_POSTFINANCE_CARD,
         PayoneConfig::METHOD_OBT_IDEAL,
         PayoneConfig::METHOD_OBT_PRZELEWY,
-        PayoneConfig::METHOD_BARZAHLEN,
-        PayoneConfig::METHOD_PAYDIREKT,
         PayoneConfig::METHOD_SAFE_INVOICE,
         PayoneConfig::METHOD_PAYOLUTION_INVOICE,
         PayoneConfig::METHOD_PAYOLUTION_DEBIT,
@@ -70,7 +67,6 @@ class Payment extends \Payone\Core\Helper\Base
         PayoneConfig::METHOD_KLARNA_INSTALLMENT,
         PayoneConfig::METHOD_WECHATPAY,
         PayoneConfig::METHOD_RATEPAY_INVOICE,
-        PayoneConfig::METHOD_TRUSTLY,
         PayoneConfig::METHOD_APPLEPAY,
         PayoneConfig::METHOD_BANCONTACT,
         PayoneConfig::METHOD_BNPL_INVOICE,
@@ -90,16 +86,13 @@ class Payment extends \Payone\Core\Helper\Base
         PayoneConfig::METHOD_ADVANCE_PAYMENT => 'vor',
         PayoneConfig::METHOD_INVOICE => 'rec',
         PayoneConfig::METHOD_OBT_SOFORTUEBERWEISUNG => 'sb',
-        PayoneConfig::METHOD_OBT_GIROPAY => 'sb',
         PayoneConfig::METHOD_OBT_EPS => 'sb',
         PayoneConfig::METHOD_OBT_POSTFINANCE_EFINANCE => 'sb',
         PayoneConfig::METHOD_OBT_POSTFINANCE_CARD => 'sb',
         PayoneConfig::METHOD_OBT_IDEAL => 'sb',
         PayoneConfig::METHOD_OBT_PRZELEWY => 'sb',
         PayoneConfig::METHOD_PAYPAL => 'wlt',
         PayoneConfig::METHOD_PAYPALV2 => 'wlt',
-        PayoneConfig::METHOD_PAYDIREKT => 'wlt',
-        PayoneConfig::METHOD_BARZAHLEN => 'csh',
         PayoneConfig::METHOD_SAFE_INVOICE => 'rec',
         PayoneConfig::METHOD_PAYOLUTION_INVOICE => 'fnc',
         PayoneConfig::METHOD_PAYOLUTION_DEBIT => 'fnc',
@@ -113,7 +106,6 @@ class Payment extends \Payone\Core\Helper\Base
         PayoneConfig::METHOD_KLARNA_INSTALLMENT => 'wlt',
         PayoneConfig::METHOD_WECHATPAY => 'wlt',
         PayoneConfig::METHOD_RATEPAY_INVOICE => 'fnc',
-        PayoneConfig::METHOD_TRUSTLY => 'sb',
         PayoneConfig::METHOD_APPLEPAY => 'wlt',
         PayoneConfig::METHOD_BANCONTACT => 'sb',
     ];

Model/Api/Request/Authorization.php

@@ -133,7 +133,7 @@ protected function setUserParameters(PayoneMethod $oPayment, Order $oOrder)
         $oShipping = $oOrder->getShippingAddress(); // get shipping address from order
         if ($oShipping) {// shipping address existing?
             $this->addAddress($oShipping, true); // add regular shipping address
-        } elseif ($oPayment->getCode() == PayoneConfig::METHOD_PAYDIREKT || ($oPayment->getCode() == PayoneConfig::METHOD_PAYPAL && $this->shopHelper->getConfigParam('bill_as_del_address', PayoneConfig::METHOD_PAYPAL, 'payone_payment', $this->storeCode))) {
+        } elseif ($oPayment->getCode() == PayoneConfig::METHOD_PAYPAL && $this->shopHelper->getConfigParam('bill_as_del_address', PayoneConfig::METHOD_PAYPAL, 'payone_payment', $this->storeCode)) {
             $this->addAddress($oOrder->getBillingAddress(), true); // add billing address as shipping address
         }
     }

Model/ConfigProvider.php

@@ -251,13 +251,11 @@ protected function getPayoneConfig()
             'availableApplePayTypes' => $this->paymentHelper->getAvailableApplePayTypes(),
             'fieldConfig' => $this->hostedIframeHelper->getHostedFieldConfig(),
             'sepaCountries' => $this->countryHelper->getEnabledCountries(PayoneConfig::METHOD_DEBIT),
-            'trustlyCountries' => $this->countryHelper->getEnabledCountries(PayoneConfig::METHOD_TRUSTLY),
             'hostedRequest' => $this->requestHelper->getHostedIframeRequest(),
             'mandateManagementActive' => $this->paymentHelper->isMandateManagementActive(),
             'checkCvc' => (bool)$this->paymentHelper->isCheckCvcActive(),
             'ccMinValidity' => $this->requestHelper->getConfigParam('min_validity_period', PayoneConfig::METHOD_CREDITCARD, 'payone_payment'),
             'requestBic' => (bool)$this->requestHelper->getConfigParam('request_bic', PayoneConfig::METHOD_DEBIT, 'payone_payment'),
-            'trustlyRequestBic' => (bool)$this->requestHelper->getConfigParam('request_bic', PayoneConfig::METHOD_TRUSTLY, 'payone_payment'),
             'validateBankCode' => (bool)$this->requestHelper->getConfigParam('check_bankaccount', PayoneConfig::METHOD_DEBIT, 'payone_payment'),
             'disableSafeInvoice' => (bool)$this->requestHelper->getConfigParam('disable_after_refusal', PayoneConfig::METHOD_SAFE_INVOICE, 'payone_payment'),
             'bankaccountcheckRequest' => $this->requestHelper->getBankaccountCheckRequest(),

Model/Methods/BaseMethod.php

@@ -86,7 +86,7 @@ abstract class BaseMethod extends AbstractMethod
 
     /**
      * Determines if payment type can use partial captures
-     * Is true for all PAYONE Payment Methods except Barzahlen
+     * Is true for all PAYONE Payment Methods
      *
      * @var bool
      */

Model/Methods/OnlineBankTransfer/OnlineBankTransferBase.php

@@ -36,7 +36,6 @@ class OnlineBankTransferBase extends \Payone\Core\Model\Methods\PayoneMethod
 {
     /* Payment method sub types */
     const METHOD_OBT_SUBTYPE_SOFORTUEBERWEISUNG = 'PNT';
-    const METHOD_OBT_SUBTYPE_GIROPAY = 'GPY';
     const METHOD_OBT_SUBTYPE_EPS = 'EPS';
     const METHOD_OBT_SUBTYPE_POSTFINANCE_EFINANCE = 'PFF';
     const METHOD_OBT_SUBTYPE_POSTFINANCE_CARD = 'PFC';