Merge pull request #185 from buckaroo-it/BP-3783-Remove-Giropay-Prest…

…aShop remove Giropay
buckaroo-it · Sep 19, 2024 · d7f5cf6 · d7f5cf6
2 parents 802a461 + 352be83
commit d7f5cf6
Show file tree

Hide file tree

Showing 14 changed files with 70 additions and 395 deletions.
diff --git a/api/paymentmethods/giropay/index.php b/api/paymentmethods/giropay/index.php
diff --git a/api/paymentmethods/paymentrequestfactory.php b/api/paymentmethods/paymentrequestfactory.php
@@ -24,7 +24,6 @@ class PaymentRequestFactory
     public const REQUEST_TYPE_PAYPAL = 'paypal';
     public const REQUEST_TYPE_IDEAL = 'ideal';
     public const REQUEST_TYPE_PAYBYBANK = 'paybybank';
-    public const REQUEST_TYPE_GIROPAY = 'giropay';
     public const REQUEST_TYPE_KBCPAYMENTBUTTON = 'kbcpaymentbutton';
     public const REQUEST_TYPE_SEPADIRECTDEBIT = 'sepadirectdebit';
     public const REQUEST_TYPE_BANCONTACTMRCASH = 'bancontactmrcash';
@@ -58,7 +57,6 @@ class PaymentRequestFactory
         PaymentRequestFactory::REQUEST_TYPE_IDEAL => 'IDeal',
         PaymentRequestFactory::REQUEST_TYPE_PAYBYBANK => 'PayByBank',
         PaymentRequestFactory::REQUEST_TYPE_SEPADIRECTDEBIT => 'SepaDirectDebit',
-        PaymentRequestFactory::REQUEST_TYPE_GIROPAY => 'Giropay',
         PaymentRequestFactory::REQUEST_TYPE_KBCPAYMENTBUTTON => 'Kbcpaymentbutton',
         PaymentRequestFactory::REQUEST_TYPE_BANCONTACTMRCASH => 'Bancontactmrcash',
         PaymentRequestFactory::REQUEST_TYPE_BLIK => 'Blik',

diff --git a/dev/lang/php_de.json b/dev/lang/php_de.json
@@ -189,7 +189,6 @@
   "payment_methods.creditcard": "Karten",
   "payment_methods.eps": "EPS",
   "payment_methods.giftcard": "Geschenkkarte",
-  "payment_methods.giropay": "Giropay",
   "payment_methods.ideal": "Ideal",
   "payment_methods.idin": "iDIN",
   "payment_methods.in3": "In3",

diff --git a/dev/lang/php_en.json b/dev/lang/php_en.json
@@ -190,7 +190,6 @@
   "payment_methods.creditcard": "Cards",
   "payment_methods.eps": "EPS",
   "payment_methods.giftcard": "Giftcard",
-  "payment_methods.giropay": "Giropay",
   "payment_methods.ideal": "iDEAL",
   "payment_methods.idin": "iDIN",
   "payment_methods.in3": "In3",

diff --git a/dev/lang/php_fr.json b/dev/lang/php_fr.json
@@ -189,7 +189,6 @@
   "payment_methods.creditcard": "Cartes",
   "payment_methods.eps": "PSE",
   "payment_methods.giftcard": "Carte cadeau",
-  "payment_methods.giropay": "Giropay",
   "payment_methods.ideal": "idéal",
   "payment_methods.idin": "IDIN",
   "payment_methods.in3": "Dans3",

diff --git a/dev/lang/php_nl.json b/dev/lang/php_nl.json
@@ -185,7 +185,6 @@
   "payment_methods.creditcard": "Cards",
   "payment_methods.eps": "EPS",
   "payment_methods.giftcard": "Giftcard",
-  "payment_methods.giropay": "Giropay",
   "payment_methods.ideal": "iDEAL",
   "payment_methods.idin": "iDIN",
   "payment_methods.in3": "In3",

diff --git a/library/checkout/checkout.php b/library/checkout/checkout.php
@@ -34,7 +34,6 @@ abstract class Checkout
     public const CHECKOUT_TYPE_IDEAL = 'ideal';
     public const CHECKOUT_TYPE_PAYBYBANK = 'paybybank';
     public const CHECKOUT_TYPE_SEPADIRECTDEBIT = 'sepadirectdebit';
-    public const CHECKOUT_TYPE_GIROPAY = 'giropay';
     public const CHECKOUT_TYPE_KBCPAYMENTBUTTON = 'kbcpaymentbutton';
     public const CHECKOUT_TYPE_BANCONTACTMRCASH = 'bancontactmrcash';
     public const CHECKOUT_TYPE_GIFTCARD = 'giftcard';
@@ -66,7 +65,6 @@ abstract class Checkout
         self::CHECKOUT_TYPE_IDEAL => 'IDeal',
         self::CHECKOUT_TYPE_PAYBYBANK => 'PayByBank',
         self::CHECKOUT_TYPE_SEPADIRECTDEBIT => 'SepaDirectdebit',
-        self::CHECKOUT_TYPE_GIROPAY => 'Giropay',
         self::CHECKOUT_TYPE_KBCPAYMENTBUTTON => 'Kbcpaymentbutton',
         self::CHECKOUT_TYPE_BANCONTACTMRCASH => 'Bancontactmrcash',
         self::CHECKOUT_TYPE_GIFTCARD => 'GiftCard',

diff --git a/library/checkout/giropaycheckout.php b/library/checkout/giropaycheckout.php
diff --git a/src/Repository/RawPaymentMethodRepository.php b/src/Repository/RawPaymentMethodRepository.php
@@ -125,7 +125,6 @@ private function getPaymentMethodsData()
             ['name' => 'paybybank', 'label' => 'PayByBank', 'icon' => 'PayByBank.gif', 'template' => 'payment_paybybank.tpl', 'is_payment_method' => '1'],
             ['name' => 'paypal', 'label' => 'PayPal', 'icon' => 'PayPal.svg', 'template' => '', 'is_payment_method' => '1'],
             ['name' => 'sepadirectdebit', 'label' => 'SEPA Direct Debit', 'icon' => 'SEPA-directdebit.svg', 'template' => 'payment_sepadirectdebit.tpl', 'is_payment_method' => '1'],
-            ['name' => 'giropay', 'label' => 'GiroPay', 'icon' => 'Giropay.svg', 'template' => '', 'is_payment_method' => '1'],
             ['name' => 'kbcpaymentbutton', 'label' => 'KBC', 'icon' => 'KBC.svg', 'template' => '', 'is_payment_method' => '1'],
             ['name' => 'bancontactmrcash', 'label' => 'Bancontact', 'icon' => 'Bancontact.svg', 'template' => '', 'is_payment_method' => '1'],
             ['name' => 'blik', 'label' => 'Blik', 'icon' => 'Blik.svg', 'template' => '', 'is_payment_method' => '1'],

diff --git a/translations/nl.php b/translations/nl.php
@@ -20,7 +20,6 @@
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_ad69e733ebae8d264bccaa38d68830e8'] = 'PayPal';
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_1fc08d231c784024c9ca47ffe6275e17'] = 'Sepa Direct Debit';
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_78de7a286d3bd3aaa82600efa0da115a'] = 'iDEAL';
-$_MODULE['<{buckaroo3}prestashop>buckaroo3_a683f375eef3f3d268fc80de53582248'] = 'Giropay';
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_8c499d7eb31238006d39ae95ad373cb8'] = 'Bancontact';
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_9f614d6c81e94d2b992e27f40207d925'] = 'Sofortbanking';
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_f1848e487ad5b48dc588d553a813ca48'] = 'Cashticket';
@@ -38,7 +37,6 @@
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_admin_802487810607dad9dc2c5880e2350da6'] = 'PayPal instellingen';
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_admin_977148a6ece63fbe8305296ba61e831a'] = 'SEPA Direct Debit instellingen';
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_admin_655b916405ca2d57579d8b90bf5effd1'] = 'iDEAL instellingen';
-$_MODULE['<{buckaroo3}prestashop>buckaroo3_admin_2970625f2bbbd57f22a3dc1599582dcd'] = 'Giropay instellingen';
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_admin_f62692cf772053e0595b4e2015425ab6'] = 'BanContact';
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_admin_57bccb74967985dedb2b0cd23659bfea'] = 'Cadeaukaarten instellingen';
 $_MODULE['<{buckaroo3}prestashop>buckaroo3_admin_4ffce20c2740e43df35dedcce59816be'] = 'Creditcard- en debetkaartinstellingen';
@@ -119,8 +117,6 @@
 $_MODULE['<{buckaroo3}prestashop>payment_8df34bb962577b90d574a51ed2ca757f'] = 'JJJJ';
 $_MODULE['<{buckaroo3}prestashop>payment_9c5deb329d8968844dcd60f94ed6d4cd'] = 'Geboortedatum voor persoon van afleveradres';
 $_MODULE['<{buckaroo3}prestashop>payment_ec003bdd4337c2e6c4c424e79dc41bf3'] = 'Ik accepteer de algemene voorwaarden van AfterPay.';
-$_MODULE['<{buckaroo3}prestashop>payment_0ef9bf708675e2e3c2b48a1e2d861694'] = 'Betaal met Giropay';
-$_MODULE['<{buckaroo3}prestashop>payment_32e26982dda43a14285657baee320523'] = 'Betaal met Giropay';
 $_MODULE['<{buckaroo3}prestashop>payment_8c4798f7b0dee03ef48a3be454963e68'] = 'U moet de BIC invullen';
 $_MODULE['<{buckaroo3}prestashop>payment_7059fd381d7c0226c032bf91c1cefdf9'] = 'Betaal met Bancontact';
 $_MODULE['<{buckaroo3}prestashop>payment_925a6f19b5d3eb888bee5389807be909'] = 'Betaal met Buckaroo Cadeaukaarten';

diff --git a/api/paymentmethods/giropay/giropay.php → upgrade/upgrade-4.5.0.php b/api/paymentmethods/giropay/giropay.php → upgrade/upgrade-4.5.0.php
@@ -14,17 +14,21 @@
  *  @copyright Copyright (c) Buckaroo B.V.
  *  @license   http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+use Buckaroo\PrestaShop\Src\Repository\RawOrderingRepository;
+
 if (!defined('_PS_VERSION_')) {
     exit;
 }
 
-require_once dirname(__FILE__) . '/../paymentmethod.php';
-
-class Giropay extends PaymentMethod
+/**
+ * @return mixed
+ * @throws Exception
+ */
+function upgrade_module_4_5_0($object)
 {
-    public function __construct()
-    {
-        $this->type = 'giropay';
-        $this->version = 2;
-    }
+        Db::getInstance()->execute('DELETE FROM ' . _DB_PREFIX_ . 'bk_payment_methods WHERE name = "giropay"');
+        $orderingRepository = new RawOrderingRepository();
+        $orderingRepository->insertCountryOrdering();
+        return true;
 }