remove Sofort

buckaroo-it · Nov 6, 2024 · cc02538 · cc02538
1 parent 9dc26aa
commit cc02538
Show file tree

Hide file tree

Showing 35 changed files with 17 additions and 1,305 deletions.
diff --git a/Block/Info.php b/Block/Info.php
@@ -106,7 +106,6 @@ public function getPaymentLogo(string $method): string
             "mrcash" => "svg/bancontact.svg",
             "p24" => "svg/przelewy24.svg",
             "sepadirectdebit" => "svg/sepa-directdebit.svg",
-            "sofortbanking" => "svg/sofort.svg",
             "emandate" => "emandate.png",
             "pospayment" => "pos.png",
             "transfer" => "svg/sepa-credittransfer.svg",

diff --git a/Block/Widget/Button/Toolbar.php b/Block/Widget/Button/Toolbar.php
@@ -44,7 +44,6 @@ class Toolbar
         'buckaroo_magento2_paypal',
         'buckaroo_magento2_payconiq',
         'buckaroo_magento2_sepadirectdebit',
-        'buckaroo_magento2_sofortbanking',
         'buckaroo_magento2_belfius',
         'buckaroo_magento2_transfer',
         'buckaroo_magento2_eps',

diff --git a/Controller/Redirect/Process.php b/Controller/Redirect/Process.php
@@ -346,9 +346,7 @@ private function redirectProcess() {
                 }
 
                 $pendingCode = $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_PENDING_PROCESSING');
-                if (($statusCode == $pendingCode)
-                    && !$this->hasPostData('brq_payment_method', 'sofortueberweisung')
-                ) {
+                if ($statusCode == $pendingCode) {
                     $this->addErrorMessage(
                         __(
                             'Unfortunately an error occurred while processing your payment.' .

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -435,7 +435,6 @@ public function getPaymentMethodsList()
             ['value' => 'payperemail',       'label' => __('PayPerEmail')],
             ['value' => 'pospayment',       'label' => __('Point of Sale')],
             ['value' => 'sepadirectdebit',       'label' => __('SEPA direct debit')],
-            ['value' => 'sofortbanking',       'label' => __('SOFORT')],
             ['value' => 'belfius',       'label' => __('Belfius')],
             ['value' => 'transfer',       'label' => __('Bank Transfer')],
             ['value' => 'trustly',       'label' => __('Trustly')],

diff --git a/Model/Config/Source/PaymentMethods/AfterExpiry.php b/Model/Config/Source/PaymentMethods/AfterExpiry.php
@@ -44,7 +44,6 @@ public function toOptionArray()
             ['value' => 'nexi',                   'label' => __('Nexi')],
             ['value' => 'postepay',               'label' => __('PostePay')],
             ['value' => 'paypal',                 'label' => __('PayPal')],
-            ['value' => 'sofortueberweisung',     'label' => __('Sofort Banking')],
             ['value' => 'belfius',                'label' => __('Belfius')],
             ['value' => 'visa',                   'label' => __('Visa')],
             ['value' => 'visaelectron',           'label' => __('Visa Electron')],

diff --git a/Model/Config/Source/PaymentMethods/PayLink.php b/Model/Config/Source/PaymentMethods/PayLink.php
@@ -44,7 +44,6 @@ public function toOptionArray()
             ['value' => 'mastercard',             'label' => __('Mastercard')],
             ['value' => 'paypal',                 'label' => __('PayPal')],
             ['value' => 'sepadirectdebit',        'label' => __('SEPA Direct Debit')],
-            ['value' => 'sofortueberweisung',     'label' => __('Sofort Banking')],
             ['value' => 'belfius',                'label' => __('Belfius')],
             ['value' => 'visa',                   'label' => __('Visa')],
             ['value' => 'visaelectron',           'label' => __('Visa Electron')],

diff --git a/Model/Config/Source/PaymentMethods/PayPerEmail.php b/Model/Config/Source/PaymentMethods/PayPerEmail.php
@@ -100,11 +100,6 @@ public function toOptionArray()
                 'label' => __('SEPA Direct Debit'),
                 'code' => 'buckaroo_magento2_sepadirectdebit'
             ],
-            [
-                'value' => 'sofortueberweisung',
-                'label' => __('Sofort Banking'),
-                'code' => 'buckaroo_magento2_sofortbanking'
-            ],
             [
                 'value' => 'belfius',
                 'label' => __('Belfius'),

diff --git a/Model/ConfigProvider/Method/Sofortbanking.php b/Model/ConfigProvider/Method/Sofortbanking.php
diff --git a/Model/Method/Sofortbanking.php b/Model/Method/Sofortbanking.php
diff --git a/Model/Push.php b/Model/Push.php
@@ -39,7 +39,6 @@
 use Buckaroo\Magento2\Model\Method\Paypal;
 use Buckaroo\Magento2\Model\Method\PayPerEmail;
 use Buckaroo\Magento2\Model\Method\SepaDirectDebit;
-use Buckaroo\Magento2\Model\Method\Sofortbanking;
 use Buckaroo\Magento2\Model\Method\Transfer;
 use Buckaroo\Magento2\Model\Method\Voucher;
 use Buckaroo\Magento2\Model\Refund\Push as RefundPush;
@@ -1610,7 +1609,6 @@ public function processPendingPaymentPush($newStatus, $message)
         if (!$this->order->getEmailSent()
             && in_array($payment->getMethod(), [Transfer::PAYMENT_METHOD_CODE,
                 SepaDirectDebit::PAYMENT_METHOD_CODE,
-                Sofortbanking::PAYMENT_METHOD_CODE,
                 PayPerEmail::PAYMENT_METHOD_CODE,
             ])
             && ($this->configAccount->getOrderConfirmationEmail($store)

diff --git a/Test/Fixtures/buckaroo-magento2-fixture.sql b/Test/Fixtures/buckaroo-magento2-fixture.sql
diff --git a/Test/Unit/Model/Config/Source/PaymentMethods/AfterExpiryTest.php b/Test/Unit/Model/Config/Source/PaymentMethods/AfterExpiryTest.php
@@ -53,9 +53,6 @@ public function toOptionArrayProvider()
             [
                 ['value' => 'paypal',             'label' => 'PayPal']
             ],
-            [
-                ['value' => 'sofortueberweisung', 'label' => 'Sofort Banking']
-            ],
             [
                 ['value' => 'transfer',           'label' => 'Bank Transfer']
             ],

diff --git a/Test/Unit/Model/Config/Source/PaymentMethods/PayPerEmailTest.php b/Test/Unit/Model/Config/Source/PaymentMethods/PayPerEmailTest.php
@@ -56,9 +56,6 @@ public function toOptionArrayProvider()
             [
                 ['value' => 'paypal',             'label' => 'PayPal']
             ],
-            [
-                ['value' => 'sofortueberweisung', 'label' => 'Sofort Banking']
-            ],
             [
                 ['value' => 'transfer',           'label' => 'Bank Transfer']
             ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,9 +53,6 @@ public function toOptionArrayProvider() @@
                 [
                     ['value' => 'paypal',             'label' => 'PayPal']
                 ],
-                [
-                    ['value' => 'sofortueberweisung', 'label' => 'Sofort Banking']
-                ],
                 [
                     ['value' => 'transfer',           'label' => 'Bank Transfer']
                 ],
@@ Expand Down @@