Skip to content

Commit 0ad2eb5

Browse files
mitelgmitelg
authored
Merge pull request #56 from shopware5/pt-13157/remove-giropay
PT-13157 - Deactivate Giropay payment method
2 parents 8500aaa + cb83e60 commit 0ad2eb5

File tree

6 files changed

+35
-60
lines changed

6 files changed

+35
-60
lines changed

‎Components/PaymentMethodProvider.php

+1
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ public static function getDeactivatedPaymentMethods()
195195
return [
196196
self::SOFORT_METHOD_NAME,
197197
self::TRUSTLY_METHOD_NAME,
198+
self::GIROPAY_METHOD_NAME,
198199
];
199200
}
200201

‎Setup/Versions/UpdateTo618.php

+11
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public function __construct(Connection $connection)
2929
*/
3030
public function update()
3131
{
32+
$this->deactivateGiropayPayment();
3233
$this->createInstanceTable();
3334

3435
try {
@@ -38,6 +39,16 @@ public function update()
3839
}
3940
}
4041

42+
/**
43+
* @return void
44+
*/
45+
private function deactivateGiropayPayment()
46+
{
47+
$this->connection->executeQuery(
48+
'UPDATE s_core_paymentmeans SET active = 0 WHERE name = "SwagPaymentPayPalUnifiedGiropay"'
49+
);
50+
}
51+
4152
/**
4253
* @return void
4354
*/

‎Tests/E2E/helper/getPayPalPaymentMethodSelector.mjs

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export default (function () {
1212
SwagPaymentPayPalUnifiedBancontact: 'SwagPaymentPayPalUnifiedBancontact',
1313
SwagPaymentPayPalUnifiedBlik: 'SwagPaymentPayPalUnifiedBlik',
1414
SwagPaymentPayPalUnifiedEps: 'SwagPaymentPayPalUnifiedEps',
15-
SwagPaymentPayPalUnifiedGiropay: 'SwagPaymentPayPalUnifiedGiropay',
1615
SwagPaymentPayPalUnifiedIdeal: 'SwagPaymentPayPalUnifiedIdeal',
1716
SwagPaymentPayPalUnifiedMultibanco: 'SwagPaymentPayPalUnifiedMultibanco',
1817
SwagPaymentPayPalUnifiedMyBank: 'SwagPaymentPayPalUnifiedMyBank',

‎Tests/E2E/test/pay_with_giropay.spec.mjs

-45
This file was deleted.

‎Tests/Functional/Components/TransactionReport/_fixtures/orders.sql

+13-13
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,16 @@ INSERT INTO `s_order` (`ordernumber`, `userID`, `invoice_amount`, `invoice_amoun
9191
('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, '', ''),
9292
('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, '', ''),
9393
('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, '', ''),
94-
('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, '', ''),
95-
('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, '', ''),
96-
('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, '', ''),
97-
('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, '', ''),
98-
('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, '', ''),
99-
('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, '', ''),
100-
('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, '', ''),
101-
('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, '', ''),
102-
('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, '', ''),
103-
('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, '', ''),
104-
('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, '', ''),
105-
('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, '', ''),
106-
('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, '', '');
94+
('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, '', ''),
95+
('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, '', ''),
96+
('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, '', ''),
97+
('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, '', ''),
98+
('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, '', ''),
99+
('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, '', ''),
100+
('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, '', ''),
101+
('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, '', ''),
102+
('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, '', ''),
103+
('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, '', ''),
104+
('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, '', ''),
105+
('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, '', ''),
106+
('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, '', '');

‎plugin.xml

+10-1
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,22 @@
55
<label lang="de">PayPal</label>
66
<label lang="en">PayPal</label>
77

8-
<version>6.1.7</version>
8+
<version>6.1.8</version>
99
<copyright>(c) by shopware AG</copyright>
1010
<license>MIT</license>
1111
<link>http://store.shopware.com</link>
1212
<author>shopware AG</author>
1313
<compatibility minVersion="5.2.27" maxVersion="5.99.99"/>
1414

15+
<changelog version="6.1.8">
16+
<changes lang="de">
17+
PT-13157 - Die Zahlungsart "Giropay" wird deaktiviert kann nicht mehr verwendet werden;
18+
</changes>
19+
<changes lang="en">
20+
PT-13157 - The “Giropay” payment method is deactivated and can no longer be used;
21+
</changes>
22+
</changelog>
23+
1524
<changelog version="6.1.7">
1625
<changes lang="de">
1726
PT-13154 - Die Zahlungsart "Sofort" wird deaktiviert kann nicht mehr verwendet werden;

0 commit comments

Comments
 (0)