From cb83e60d2a75178f98fc16a9dc7af3f2e4e12457 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Wed, 3 Jul 2024 09:03:34 +0200 Subject: [PATCH] PT-13157 - Deactivate Giropay payment method --- Components/PaymentMethodProvider.php | 1 + Setup/Versions/UpdateTo618.php | 11 +++++ .../helper/getPayPalPaymentMethodSelector.mjs | 1 - Tests/E2E/test/pay_with_giropay.spec.mjs | 45 ------------------- .../TransactionReport/_fixtures/orders.sql | 26 +++++------ plugin.xml | 11 ++++- 6 files changed, 35 insertions(+), 60 deletions(-) delete mode 100644 Tests/E2E/test/pay_with_giropay.spec.mjs diff --git a/Components/PaymentMethodProvider.php b/Components/PaymentMethodProvider.php index 142d09b1..fac51e3c 100644 --- a/Components/PaymentMethodProvider.php +++ b/Components/PaymentMethodProvider.php @@ -195,6 +195,7 @@ public static function getDeactivatedPaymentMethods() return [ self::SOFORT_METHOD_NAME, self::TRUSTLY_METHOD_NAME, + self::GIROPAY_METHOD_NAME, ]; } diff --git a/Setup/Versions/UpdateTo618.php b/Setup/Versions/UpdateTo618.php index b182f51e..50bce3ed 100644 --- a/Setup/Versions/UpdateTo618.php +++ b/Setup/Versions/UpdateTo618.php @@ -29,6 +29,7 @@ public function __construct(Connection $connection) */ public function update() { + $this->deactivateGiropayPayment(); $this->createInstanceTable(); try { @@ -38,6 +39,16 @@ public function update() } } + /** + * @return void + */ + private function deactivateGiropayPayment() + { + $this->connection->executeQuery( + 'UPDATE s_core_paymentmeans SET active = 0 WHERE name = "SwagPaymentPayPalUnifiedGiropay"' + ); + } + /** * @return void */ diff --git a/Tests/E2E/helper/getPayPalPaymentMethodSelector.mjs b/Tests/E2E/helper/getPayPalPaymentMethodSelector.mjs index 3466d4a6..71f1c635 100644 --- a/Tests/E2E/helper/getPayPalPaymentMethodSelector.mjs +++ b/Tests/E2E/helper/getPayPalPaymentMethodSelector.mjs @@ -12,7 +12,6 @@ export default (function () { SwagPaymentPayPalUnifiedBancontact: 'SwagPaymentPayPalUnifiedBancontact', SwagPaymentPayPalUnifiedBlik: 'SwagPaymentPayPalUnifiedBlik', SwagPaymentPayPalUnifiedEps: 'SwagPaymentPayPalUnifiedEps', - SwagPaymentPayPalUnifiedGiropay: 'SwagPaymentPayPalUnifiedGiropay', SwagPaymentPayPalUnifiedIdeal: 'SwagPaymentPayPalUnifiedIdeal', SwagPaymentPayPalUnifiedMultibanco: 'SwagPaymentPayPalUnifiedMultibanco', SwagPaymentPayPalUnifiedMyBank: 'SwagPaymentPayPalUnifiedMyBank', diff --git a/Tests/E2E/test/pay_with_giropay.spec.mjs b/Tests/E2E/test/pay_with_giropay.spec.mjs deleted file mode 100644 index dc9768f5..00000000 --- a/Tests/E2E/test/pay_with_giropay.spec.mjs +++ /dev/null @@ -1,45 +0,0 @@ -import { test, expect } from '@playwright/test'; -import MysqlFactory from '../helper/mysqlFactory.mjs'; -import defaultPaypalSettingsSql from '../helper/paypalSqlHelper.mjs'; -import loginHelper from '../helper/loginHelper.mjs'; -import clearCacheHelper from '../helper/clearCacheHelper.mjs'; -import getPaypalPaymentMethodSelector from '../helper/getPayPalPaymentMethodSelector.mjs'; - -const connection = MysqlFactory.getInstance(); - -test.describe('Pay with Giropay', () => { - test.beforeEach(async() => { - await connection.query(defaultPaypalSettingsSql); - await clearCacheHelper.clearCache(); - }); - - test('Buy as german customer with euro', async({ page }) => { - await loginHelper.login(page); - - // Buy Product - await page.goto('genusswelten/edelbraende/9/special-finish-lagerkorn-x.o.-32', { waitUntil: 'load' }); - await page.click('.buybox--button'); - - // Go to checkout - await page.click('.button--checkout'); - await expect(page).toHaveURL(/.*checkout\/confirm/); - - // Change payment - await page.click('.btn--change-payment'); - const selector = await getPaypalPaymentMethodSelector.getSelector( - getPaypalPaymentMethodSelector.paymentMethodNames.SwagPaymentPayPalUnifiedGiropay - ); - await page.locator(selector).check(); - await page.waitForLoadState('load'); - await page.click('text=Weiter >> nth=1'); - - await page.click('input[name="sAGB"]'); - - await page.waitForLoadState('load'); - - await page.click('button:has-text("Zahlungspflichtig bestellen")'); - await page.click('text=Test Successful Payment'); - - await expect(page.locator('.teaser--title')).toHaveText(/Vielen Dank für Ihre Bestellung bei Shopware Demo/); - }); -}); diff --git a/Tests/Functional/Components/TransactionReport/_fixtures/orders.sql b/Tests/Functional/Components/TransactionReport/_fixtures/orders.sql index 5646659e..10e5e983 100644 --- a/Tests/Functional/Components/TransactionReport/_fixtures/orders.sql +++ b/Tests/Functional/Components/TransactionReport/_fixtures/orders.sql @@ -91,16 +91,16 @@ INSERT INTO `s_order` (`ordernumber`, `userID`, `invoice_amount`, `invoice_amoun ('SWTest85', 1, 989.82, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 17, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'EUR', 1, 1, '', ''), ('SWTest86', 1, 809.5, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 18, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'CHF', 1, 1, '', ''), ('SWTest87', 1, 143.44, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 18, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'EUR', 1, 1, '', ''), - ('SWTest88', 1, 486.77, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'CHF', 1, 1, '', ''), - ('SWTest89', 1, 810.71, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'USD', 1, 1, '', ''), - ('SWTest90', 1, 880.31, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'USD', 1, 1, '', ''), - ('SWTest91', 1, 236.62, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), - ('SWTest92', 1, 860.96, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), - ('SWTest93', 1, 468.87, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), - ('SWTest94', 1, 581.9, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), - ('SWTest95', 1, 843.29, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'USD', 1, 1, '', ''), - ('SWTest96', 1, 265.87, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), - ('SWTest97', 1, 996.34, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'CHF', 1, 1, '', ''), - ('SWTest98', 1, 797.81, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), - ('SWTest99', 1, 747.16, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'USD', 1, 1, '', ''), - ('SWTest100', 1, 271.69, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 19, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'EUR', 1, 1, '', ''); + ('SWTest88', 1, 486.77, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 7, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'CHF', 1, 1, '', ''), + ('SWTest89', 1, 810.71, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 7, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'USD', 1, 1, '', ''), + ('SWTest90', 1, 880.31, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 7, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'USD', 1, 1, '', ''), + ('SWTest91', 1, 236.62, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 7, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), + ('SWTest92', 1, 860.96, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 7, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), + ('SWTest93', 1, 468.87, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 7, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), + ('SWTest94', 1, 581.9, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 8, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), + ('SWTest95', 1, 843.29, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 8, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'USD', 1, 1, '', ''), + ('SWTest96', 1, 265.87, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 8, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), + ('SWTest97', 1, 996.34, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 8, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'CHF', 1, 1, '', ''), + ('SWTest98', 1, 797.81, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 8, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'DKK', 1, 1, '', ''), + ('SWTest99', 1, 747.16, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 8, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'USD', 1, 1, '', ''), + ('SWTest100', 1, 271.69, 170.09, 0, 0, '2012-08-31 08:51:46', 0, 12, 8, '', '', '', '', 0, 0, '', '', '', NULL, '', '1', 9, 'EUR', 1, 1, '', ''); diff --git a/plugin.xml b/plugin.xml index 88c193d1..aa954576 100644 --- a/plugin.xml +++ b/plugin.xml @@ -5,13 +5,22 @@ - 6.1.7 + 6.1.8 (c) by shopware AG MIT http://store.shopware.com shopware AG + + + PT-13157 - Die Zahlungsart "Giropay" wird deaktiviert kann nicht mehr verwendet werden; + + + PT-13157 - The “Giropay” payment method is deactivated and can no longer be used; + + + PT-13154 - Die Zahlungsart "Sofort" wird deaktiviert kann nicht mehr verwendet werden;