Merge pull request #160 from buckaroo-it/BP-3503-remove-payment-metho…

…d-tinka-presta-shop Bp 3503 remove payment method tinka presta shop
buckaroo-it · Apr 12, 2024 · db4d531 · db4d531
2 parents a6d6a42 + c15c22f
commit db4d531
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 345 deletions.
diff --git a/api/paymentmethods/paymentrequestfactory.php b/api/paymentmethods/paymentrequestfactory.php
@@ -44,7 +44,6 @@ class PaymentRequestFactory
     public const REQUEST_TYPE_PAYCONIQ = 'payconiq';
     public const REQUEST_TYPE_PAYPEREMAIL = 'payperemail';
     public const REQUEST_TYPE_PRZELEWY24 = 'przelewy24';
-    public const REQUEST_TYPE_TINKA = 'tinka';
     public const REQUEST_TYPE_TRUSTLY = 'trustly';
     public const REQUEST_TYPE_WECHATPAY = 'wechatpay';
     public const REQUEST_TYPE_ALIPAY = 'alipay';
@@ -77,7 +76,6 @@ class PaymentRequestFactory
         PaymentRequestFactory::REQUEST_TYPE_PAYCONIQ => 'Payconiq',
         PaymentRequestFactory::REQUEST_TYPE_PAYPEREMAIL => 'PayPerEmail',
         PaymentRequestFactory::REQUEST_TYPE_PRZELEWY24 => 'Przelewy24',
-        PaymentRequestFactory::REQUEST_TYPE_TINKA => 'Tinka',
         PaymentRequestFactory::REQUEST_TYPE_TRUSTLY => 'Trustly',
         PaymentRequestFactory::REQUEST_TYPE_WECHATPAY => 'Wechatpay',
         PaymentRequestFactory::REQUEST_TYPE_ALIPAY => 'Alipay',

diff --git a/api/paymentmethods/tinka/tinka.php b/api/paymentmethods/tinka/tinka.php
diff --git a/dev/lang/php_de.json b/dev/lang/php_de.json
@@ -193,7 +193,6 @@
   "payment_methods.przelewy24": "Przelewy24",
   "payment_methods.sepadirectdebit": "SEPA-Lastschrift",
   "payment_methods.sofortueberweisung": "Sofort",
-  "payment_methods.tinka": "Tinka",
   "payment_methods.transfer": "Überweisen",
   "payment_methods.trustly": "Vertrauenswürdig",
   "payment_methods.wechatpay": "WeChatPay",

diff --git a/dev/lang/php_en.json b/dev/lang/php_en.json
@@ -193,7 +193,6 @@
   "payment_methods.przelewy24": "Przelewy24",
   "payment_methods.sepadirectdebit": "SEPA Direct Debit",
   "payment_methods.sofortueberweisung": "Sofort",
-  "payment_methods.tinka": "Tinka",
   "payment_methods.transfer": "Transfer",
   "payment_methods.trustly": "Trustly",
   "payment_methods.wechatpay": "WeChatPay",

diff --git a/dev/lang/php_fr.json b/dev/lang/php_fr.json
@@ -193,7 +193,6 @@
   "payment_methods.przelewy24": "Przelewy24",
   "payment_methods.sepadirectdebit": "Prélèvement SEPA",
   "payment_methods.sofortueberweisung": "Sofort",
-  "payment_methods.tinka": "Tinka",
   "payment_methods.transfer": "Transfert",
   "payment_methods.trustly": "En toute confiance",
   "payment_methods.wechatpay": "WeChatPay",

diff --git a/dev/lang/php_nl.json b/dev/lang/php_nl.json
@@ -189,7 +189,6 @@
   "payment_methods.przelewy24": "Przelewy24",
   "payment_methods.sepadirectdebit": "SEPA Direct Debit",
   "payment_methods.sofortueberweisung": "Sofort",
-  "payment_methods.tinka": "Tinka",
   "payment_methods.transfer": "Transfer",
   "payment_methods.trustly": "Trustly",
   "payment_methods.wechatpay": "WeChatPay",

diff --git a/dev/src/components/payments/TinkaPaymentConfig.vue b/dev/src/components/payments/TinkaPaymentConfig.vue
diff --git a/dev/src/pages/PaymentMethods.vue b/dev/src/pages/PaymentMethods.vue
@@ -34,7 +34,6 @@
           <PayByBankPaymentConfig v-if="selectedPayment.name === 'paybybank'" />
           <PayPerEmailPaymentConfig v-if="selectedPayment.name === 'payperemail'" :payments="payments" />
           <TransferPaymentConfig v-if="selectedPayment.name === 'transfer'" />
-          <TinkaPaymentConfig v-if="selectedPayment.name === 'tinka'" />
           <KlarnaPaymentConfig v-if="selectedPayment.name === 'klarna'" />
         </DefaultPaymentConfig>
       </div>
@@ -60,7 +59,6 @@ import IdealPaymentConfig from "../components/payments/IdealPaymentConfig.vue";
 import PaymentMethodBlock from "../components/PaymentMethodBlock.vue";
 import Loading from "../components/Loading.vue";
 import PayPalPaymentConfig from "../components/payments/PayPalPaymentConfig.vue";
-import TinkaPaymentConfig  from "../components/payments/TinkaPaymentConfig.vue";
 import KlarnaPaymentConfig from "../components/payments/KlarnaPaymentConfig.vue";
 
 export default {
@@ -80,7 +78,6 @@ export default {
     TransferPaymentConfig,
     PayPerEmailPaymentConfig,
     PaymentMethodBlock,
-    TinkaPaymentConfig,
     KlarnaPaymentConfig
   },
   setup() {

diff --git a/library/checkout/checkout.php b/library/checkout/checkout.php
@@ -53,7 +53,6 @@ abstract class Checkout
     public const CHECKOUT_TYPE_PAYCONIQ = 'payconiq';
     public const CHECKOUT_TYPE_PAYPEREMAIL = 'payperemail';
     public const CHECKOUT_TYPE_PRZELEWY24 = 'przelewy24';
-    public const CHECKOUT_TYPE_TINKA = 'tinka';
     public const CHECKOUT_TYPE_TRUSTLY = 'trustly';
     public const CHECKOUT_TYPE_WECHATPAY = 'wechatpay';
     public const CHECKOUT_TYPE_ALIPAY = 'alipay';
@@ -86,7 +85,6 @@ abstract class Checkout
         Checkout::CHECKOUT_TYPE_PAYCONIQ => 'Payconiq',
         Checkout::CHECKOUT_TYPE_PAYPEREMAIL => 'PayPerEmail',
         Checkout::CHECKOUT_TYPE_PRZELEWY24 => 'Przelewy24',
-        Checkout::CHECKOUT_TYPE_TINKA => 'Tinka',
         Checkout::CHECKOUT_TYPE_TRUSTLY => 'Trustly',
         Checkout::CHECKOUT_TYPE_WECHATPAY => 'Wechatpay',
         Checkout::CHECKOUT_TYPE_ALIPAY => 'Alipay',

diff --git a/library/checkout/tinkacheckout.php b/library/checkout/tinkacheckout.php
diff --git a/src/Repository/RawPaymentMethodRepository.php b/src/Repository/RawPaymentMethodRepository.php
@@ -64,7 +64,6 @@ private function insertConfiguration(string $paymentName, int $paymentMethodId):
 
         switch ($paymentName) {
             case 'klarna':
-            case 'tinka':
                 $configValue['financial_warning'] = true;
                 break;
 
@@ -142,7 +141,6 @@ private function getPaymentMethodsData()
             ['name' => 'przelewy24', 'label' => 'Przelewy24', 'icon' => 'Przelewy24.svg', 'template' => '', 'is_payment_method' => '1'],
             ['name' => 'payperemail', 'label' => 'PayPerEmail', 'icon' => 'PayPerEmail.svg', 'template' => 'payment_payperemail.tpl', 'is_payment_method' => '1'],
             ['name' => 'payconiq', 'label' => 'Payconiq', 'icon' => 'Payconiq.svg', 'template' => '', 'is_payment_method' => '1'],
-            ['name' => 'tinka', 'label' => 'Tinka', 'icon' => 'Tinka.svg', 'template' => 'payment_tinka.tpl', 'is_payment_method' => '1'],
             ['name' => 'trustly', 'label' => 'Trustly', 'icon' => 'Trustly.svg', 'template' => '', 'is_payment_method' => '1'],
             ['name' => 'transfer', 'label' => 'Bank Transfer', 'icon' => 'SEPA-credittransfer.svg', 'template' => '', 'is_payment_method' => '1'],
             ['name' => 'wechatpay', 'label' => 'WeChatPay', 'icon' => 'WeChat Pay.svg', 'template' => '', 'is_payment_method' => '1'],

diff --git a/src/Service/BuckarooPaymentService.php b/src/Service/BuckarooPaymentService.php
@@ -506,7 +506,6 @@ public function paymentMethodsWithFinancialWarning()
             'afterpay',
             'billink',
             'in3',
-            'tinka',
         ];
         $methods = [];
         foreach ($buyNowPayLaterMethods as $method) {

diff --git a/api/paymentmethods/tinka/index.php → upgrade/upgrade-4.3.0.php b/api/paymentmethods/tinka/index.php → upgrade/upgrade-4.3.0.php
@@ -14,12 +14,19 @@
  *  @copyright Copyright (c) Buckaroo B.V.
  *  @license   http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
+use Buckaroo\PrestaShop\Src\Repository\RawOrderingRepository;
 
-header('Location: ../');
-exit;
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+/**
+ * @return mixed
+ * @throws Exception
+ */
+function upgrade_module_4_2_0($object)
+{
+    Db::getInstance()->execute('DELETE FROM ' . _DB_PREFIX_ . 'bk_payment_methods WHERE name = "tinka"');
+    return true;
+}