Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BP-3880-Remove-Sofort-Magento-2 #1092

Merged
merged 3 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/icons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Copy payment method icons
run: |
cd "${{ github.workspace }}/Media/Payment methods/SVG/"
rm -f ideal-qr.svg knaken.svg paylink.svg paybybank.svg pos-nfc.svg
rm -f ideal-qr.svg knaken.svg paylink.svg paybybank.svg pos-nfc.svg giropay.svg sofort.svg
cd ${{ github.workspace }}/Media
cp -R "Payment methods/SVG/." ${{ github.workspace }}/view/base/web/images/svg/
- name: Copy creditcards icons
Expand All @@ -35,7 +35,7 @@ jobs:
rm -f vvvlekkerweg.svg vvvshopchill.svg
cd ${{ github.workspace }}/Media
cp -R "Giftcards/SVG/." ${{ github.workspace }}/view/base/web/images/giftcards/

- name: Copy payment issuers icons
run: |
cd Media
Expand Down
1 change: 0 additions & 1 deletion Block/Info.php
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion Block/Widget/Button/Toolbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 1 addition & 3 deletions Controller/Redirect/Process.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.' .
Expand Down
1 change: 0 additions & 1 deletion Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')],
Expand Down
1 change: 0 additions & 1 deletion Model/Config/Source/PaymentMethods/AfterExpiry.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')],
Expand Down
1 change: 0 additions & 1 deletion Model/Config/Source/PaymentMethods/PayLink.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')],
Expand Down
5 changes: 0 additions & 5 deletions Model/Config/Source/PaymentMethods/PayPerEmail.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
81 changes: 0 additions & 81 deletions Model/ConfigProvider/Method/Sofortbanking.php

This file was deleted.

98 changes: 0 additions & 98 deletions Model/Method/Sofortbanking.php

This file was deleted.

2 changes: 0 additions & 2 deletions Model/Push.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions Test/Fixtures/buckaroo-magento2-fixture.sql

Large diffs are not rendered by default.

Original file line number Diff 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
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ public function toOptionArrayProvider()
[
['value' => 'paypal', 'label' => 'PayPal']
],
[
['value' => 'sofortueberweisung', 'label' => 'Sofort Banking']
],
[
['value' => 'transfer', 'label' => 'Bank Transfer']
],
Expand Down
Loading
Loading