Skip to content

Commit

Permalink
Merge pull request #56 from shopware5/pt-13157/remove-giropay
Browse files Browse the repository at this point in the history 
PT-13157 - Deactivate Giropay payment method
  • Loading branch information
@mitelg
mitelg authored Jul 3, 2024
2 parents 8500aaa + cb83e60 commit 0ad2eb5
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 60 deletions.
1 change: 1 addition & 0 deletions Components/PaymentMethodProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ public static function getDeactivatedPaymentMethods()
return [
self::SOFORT_METHOD_NAME,
self::TRUSTLY_METHOD_NAME,
self::GIROPAY_METHOD_NAME,
];
}

Expand Down
11 changes: 11 additions & 0 deletions Setup/Versions/UpdateTo618.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function __construct(Connection $connection)
*/
public function update()
{
$this->deactivateGiropayPayment();
$this->createInstanceTable();

try {
Expand All @@ -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
*/
Expand Down
1 change: 0 additions & 1 deletion Tests/E2E/helper/getPayPalPaymentMethodSelector.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default (function () {
SwagPaymentPayPalUnifiedBancontact: 'SwagPaymentPayPalUnifiedBancontact',
SwagPaymentPayPalUnifiedBlik: 'SwagPaymentPayPalUnifiedBlik',
SwagPaymentPayPalUnifiedEps: 'SwagPaymentPayPalUnifiedEps',
SwagPaymentPayPalUnifiedGiropay: 'SwagPaymentPayPalUnifiedGiropay',
SwagPaymentPayPalUnifiedIdeal: 'SwagPaymentPayPalUnifiedIdeal',
SwagPaymentPayPalUnifiedMultibanco: 'SwagPaymentPayPalUnifiedMultibanco',
SwagPaymentPayPalUnifiedMyBank: 'SwagPaymentPayPalUnifiedMyBank',
Expand Down
45 changes: 0 additions & 45 deletions Tests/E2E/test/pay_with_giropay.spec.mjs
View file

This file was deleted.

26 changes: 13 additions & 13 deletions Tests/Functional/Components/TransactionReport/_fixtures/orders.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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, '', '');
11 changes: 10 additions & 1 deletion plugin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,22 @@
<label lang="de">PayPal</label>
<label lang="en">PayPal</label>

<version>6.1.7</version>
<version>6.1.8</version>
<copyright>(c) by shopware AG</copyright>
<license>MIT</license>
<link>http://store.shopware.com</link>
<author>shopware AG</author>
<compatibility minVersion="5.2.27" maxVersion="5.99.99"/>

<changelog version="6.1.8">
<changes lang="de">
PT-13157 - Die Zahlungsart "Giropay" wird deaktiviert kann nicht mehr verwendet werden;
</changes>
<changes lang="en">
PT-13157 - The “Giropay” payment method is deactivated and can no longer be used;
</changes>
</changelog>

<changelog version="6.1.7">
<changes lang="de">
PT-13154 - Die Zahlungsart "Sofort" wird deaktiviert kann nicht mehr verwendet werden;
Expand Down

0 comments on commit 0ad2eb5

Please sign in to comment.