Merge pull request #41 from daanstokhof/master

Add Tikkie, Creditclick, Przelewy24.
paynl · Jul 9, 2019 · f0d0f27 · f0d0f27
2 parents 3ede6e5 + fcceee9
commit f0d0f27
Show file tree

Hide file tree

Showing 16 changed files with 261 additions and 3 deletions.
diff --git a/Model/Config/Source/Available/Creditclick.php b/Model/Config/Source/Available/Creditclick.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
+
+namespace Paynl\Payment\Model\Config\Source\Available;
+
+
+class Creditclick extends Available
+{
+    protected $_class = \Paynl\Payment\Model\Paymentmethod\Creditclick::class;
+}
diff --git a/Model/Config/Source/Available/Przelewy24.php b/Model/Config/Source/Available/Przelewy24.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
+
+namespace Paynl\Payment\Model\Config\Source\Available;
+
+
+class Przelewy24 extends Available
+{
+    protected $_class = \Paynl\Payment\Model\Paymentmethod\Przelewy24::class;
+}
diff --git a/Model/Config/Source/Available/Tikkie.php b/Model/Config/Source/Available/Tikkie.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
+
+namespace Paynl\Payment\Model\Config\Source\Available;
+
+
+class Tikkie extends Available
+{
+    protected $_class = \Paynl\Payment\Model\Paymentmethod\Tikkie::class;
+}
diff --git a/Model/ConfigProvider.php b/Model/ConfigProvider.php
@@ -26,6 +26,7 @@ class ConfigProvider implements ConfigProviderInterface
         'paynl_payment_cartebleue',
         'paynl_payment_cashly',
         'paynl_payment_clickandbuy',
+        'paynl_payment_creditclick',
         'paynl_payment_dankort',
         'paynl_payment_eps',
         'paynl_payment_fashioncheque',
@@ -45,9 +46,11 @@ class ConfigProvider implements ConfigProviderInterface
         'paynl_payment_paysafecard',
         'paynl_payment_podiumcadeaukaart',
         'paynl_payment_postepay',
+        'paynl_payment_przelewy24',
         'paynl_payment_sofortbanking',
         'paynl_payment_spraypay',
         'paynl_payment_telefonischbetalen',
+        'paynl_payment_tikkie',
         'paynl_payment_visamastercard',
         'paynl_payment_vvvgiftcard',
         'paynl_payment_webshopgiftcard',
@@ -74,8 +77,11 @@ class ConfigProvider implements ConfigProviderInterface
     protected $paynlConfig;
 
     /**
+     * ConfigProvider constructor.
      * @param PaymentHelper $paymentHelper
      * @param Escaper $escaper
+     * @param Config $paynlConfig
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function __construct(
         PaymentHelper $paymentHelper,

diff --git a/Model/Paymentmethod/Creditclick.php b/Model/Paymentmethod/Creditclick.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
+
+namespace Paynl\Payment\Model\Paymentmethod;
+
+/**
+ * Description of Creditclick
+ *
+ * @author Andy Pieters <[email protected]>
+ */
+class Creditclick extends PaymentMethod
+{
+    protected $_code = 'paynl_payment_creditclick';
+
+    protected function getDefaultPaymentOptionId()
+    {
+        return 2107;
+    }
+}
diff --git a/Model/Paymentmethod/Przelewy24.php b/Model/Paymentmethod/Przelewy24.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
+
+namespace Paynl\Payment\Model\Paymentmethod;
+
+/**
+ * Description of Przelewy24
+ *
+ * @author Andy Pieters <[email protected]>
+ */
+class Przelewy24 extends PaymentMethod
+{
+    protected $_code = 'paynl_payment_przelewy24';
+
+    protected function getDefaultPaymentOptionId()
+    {
+        return 2151;
+    }
+}
diff --git a/Model/Paymentmethod/Tikkie.php b/Model/Paymentmethod/Tikkie.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © 2015 Pay.nl All rights reserved.
+ */
+
+namespace Paynl\Payment\Model\Paymentmethod;
+
+/**
+ * Class Tikkie
+ * @package Paynl\Payment\Model\Paymentmethod
+ * @author Daan Stokhof <[email protected]>
+ */
+class Tikkie extends PaymentMethod
+{
+    protected $_code = 'paynl_payment_tikkie';
+
+    protected function getDefaultPaymentOptionId()
+    {
+        return 2104;
+    }
+}
diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ Giropay |American Express | FashionCheque |Focum AchterafBetalen.nl | AmazonPay
 MyBank | Carte Bancaire | Podium Cadeaukaart | Capayable Achteraf Betalen | Cashly | 
 SOFORT | PostePay | Gezondheidsbon | Capayable Gespreid betalen | Pay Fixed Price (phone) |
 Maestro | Dankort | Fashion Giftcard | Klarna | Instore Payments (POS) |
-Bank Transfer | Cartasi | GivaCard | SprayPay | | 
-| | | YourGift | | | 
+Bank Transfer | Cartasi | GivaCard | SprayPay | Przelewy24 | 
+| Tikkie | | YourGift | Creditclick | | 
 | | | Paysafecard |
 
 

diff --git a/etc/adminhtml/paymentmethods.xml b/etc/adminhtml/paymentmethods.xml
@@ -16,6 +16,7 @@
     <include path="Paynl_Payment::paymentmethods/cartebleue.xml" />
     <include path="Paynl_Payment::paymentmethods/cashly.xml" />
     <include path="Paynl_Payment::paymentmethods/clickandbuy.xml" />
+    <include path="Paynl_Payment::paymentmethods/creditclick.xml" />
     <include path="Paynl_Payment::paymentmethods/dankort.xml" />
     <include path="Paynl_Payment::paymentmethods/eps.xml" />
     <include path="Paynl_Payment::paymentmethods/fashioncheque.xml" />
@@ -35,14 +36,16 @@
     <include path="Paynl_Payment::paymentmethods/paysafecard.xml" />
     <include path="Paynl_Payment::paymentmethods/podiumcadeaukaart.xml" />
     <include path="Paynl_Payment::paymentmethods/postepay.xml" />
+    <include path="Paynl_Payment::paymentmethods/przelewy24.xml" />
     <include path="Paynl_Payment::paymentmethods/sofortbanking.xml" />
     <include path="Paynl_Payment::paymentmethods/spraypay.xml" />
     <include path="Paynl_Payment::paymentmethods/telefonischbetalen.xml" />
+    <include path="Paynl_Payment::paymentmethods/tikkie.xml" />
     <include path="Paynl_Payment::paymentmethods/visamastercard.xml" />
     <include path="Paynl_Payment::paymentmethods/vvvgiftcard.xml" />
     <include path="Paynl_Payment::paymentmethods/webshopgiftcard.xml" />
     <include path="Paynl_Payment::paymentmethods/wechatpay.xml" />
     <include path="Paynl_Payment::paymentmethods/wijncadeau.xml" />
     <include path="Paynl_Payment::paymentmethods/yehhpay.xml" />
     <include path="Paynl_Payment::paymentmethods/yourgift.xml" />
-</include>
+</include>
diff --git a/etc/adminhtml/paymentmethods/creditclick.xml b/etc/adminhtml/paymentmethods/creditclick.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="paynl_payment_creditclick" sortOrder="425" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Creditclick</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Enabled</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Available\Creditclick</source_model>
+            <config_path>payment/paynl_payment_creditclick/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Title</label>
+            <config_path>payment/paynl_payment_creditclick/title</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Advanced</label>
+            <field id="payment_option_id" translate="label comment" type="text" sortOrder="10" showInDefault="1"
+                   showInWebsite="1"
+                   showInStore="1">
+                <label>Payment option id</label>
+                <comment>The id of the payment method, only change this if you are told to do so</comment>
+                <config_path>payment/paynl_payment_creditclick/payment_option_id</config_path>
+            </field>
+        </group>
+    </group>
+</include>
diff --git a/etc/adminhtml/paymentmethods/przelewy24.xml b/etc/adminhtml/paymentmethods/przelewy24.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="paynl_payment_przelewy24" sortOrder="1825" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Przelewy24</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Enabled</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Available\Przelewy24</source_model>
+            <config_path>payment/paynl_payment_przelewy24/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Title</label>
+            <config_path>payment/paynl_payment_przelewy24/title</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Advanced</label>
+            <field id="payment_option_id" translate="label comment" type="text" sortOrder="10" showInDefault="1"
+                   showInWebsite="1"
+                   showInStore="1">
+                <label>Payment option id</label>
+                <comment>The id of the payment method, only change this if you are told to do so</comment>
+                <config_path>payment/paynl_payment_przelewy24/payment_option_id</config_path>
+            </field>
+        </group>
+    </group>
+</include>
diff --git a/etc/adminhtml/paymentmethods/tikkie.xml b/etc/adminhtml/paymentmethods/tikkie.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="paynl_payment_tikkie" sortOrder="2050" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Tikkie</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Enabled</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Available\Tikkie</source_model>
+            <config_path>payment/paynl_payment_tikkie/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Title</label>
+            <config_path>payment/paynl_payment_tikkie/title</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Advanced</label>
+            <field id="payment_option_id" translate="label comment" type="text" sortOrder="10" showInDefault="1"
+                   showInWebsite="1"
+                   showInStore="1">
+                <label>Payment option id</label>
+                <comment>The id of the payment method, only change this if you are told to do so</comment>
+                <config_path>payment/paynl_payment_tikkie/payment_option_id</config_path>
+            </field>
+        </group>
+    </group>
+</include>
diff --git a/etc/config.xml b/etc/config.xml
@@ -145,6 +145,18 @@
                 <group>paynl_payment</group>
                 <send_new_order_email>after_payment</send_new_order_email>
             </paynl_payment_clickandbuy>
+            <paynl_payment_creditclick>
+                <active>0</active>
+                <title>Creditclick</title>
+                <payment_option_id>2107</payment_option_id>
+                <order_status>pending_payment</order_status>
+                <order_status_authorized>processing</order_status_authorized>
+                <order_status_processing>processing</order_status_processing>
+                <payment_action>order</payment_action>
+                <model>Paynl\Payment\Model\Paymentmethod\Creditclick</model>
+                <group>paynl_payment</group>
+                <send_new_order_email>after_payment</send_new_order_email>
+            </paynl_payment_creditclick>
             <paynl_payment_dankort>
                 <active>0</active>
                 <title>Dankort</title>
@@ -375,6 +387,18 @@
                 <group>paynl_payment</group>
                 <send_new_order_email>after_payment</send_new_order_email>
             </paynl_payment_postepay>
+            <paynl_payment_przelewy24>
+                <active>0</active>
+                <title>Przelewy24</title>
+                <payment_option_id>2151</payment_option_id>
+                <order_status>pending_payment</order_status>
+                <order_status_authorized>processing</order_status_authorized>
+                <order_status_processing>processing</order_status_processing>
+                <payment_action>order</payment_action>
+                <model>Paynl\Payment\Model\Paymentmethod\Przelewy24</model>
+                <group>paynl_payment</group>
+                <send_new_order_email>after_payment</send_new_order_email>
+            </paynl_payment_przelewy24>
             <paynl_payment_sofortbanking>
                 <active>0</active>
                 <title>Sofortbanking</title>
@@ -412,6 +436,18 @@
                 <group>paynl_payment</group>
                 <send_new_order_email>after_payment</send_new_order_email>
             </paynl_payment_telefonischbetalen>
+            <paynl_payment_tikkie>
+                <active>0</active>
+                <title>Tikkie</title>
+                <payment_option_id>2104</payment_option_id>
+                <order_status>pending_payment</order_status>
+                <order_status_authorized>processing</order_status_authorized>
+                <order_status_processing>processing</order_status_processing>
+                <payment_action>order</payment_action>
+                <model>Paynl\Payment\Model\Paymentmethod\Tikkie</model>
+                <group>paynl_payment</group>
+                <send_new_order_email>after_payment</send_new_order_email>
+            </paynl_payment_tikkie>
             <paynl_payment_visamastercard>
                 <active>0</active>
                 <title>Visa / Mastercard</title>

diff --git a/etc/payment.xml b/etc/payment.xml
@@ -39,6 +39,9 @@
         <method name="paynl_payment_clickandbuy">
             <allow_multiple_address>0</allow_multiple_address>
         </method>
+        <method name="paynl_payment_creditclick">
+            <allow_multiple_address>0</allow_multiple_address>
+        </method>
         <method name="paynl_payment_dankort">
             <allow_multiple_address>0</allow_multiple_address>
         </method>
@@ -90,6 +93,9 @@
         <method name="paynl_payment_postepay">
             <allow_multiple_address>0</allow_multiple_address>
         </method>
+        <method name="paynl_payment_przelewy24">
+            <allow_multiple_address>0</allow_multiple_address>
+        </method>
         <method name="paynl_payment_sofortbanking">
             <allow_multiple_address>0</allow_multiple_address>
         </method>
@@ -99,6 +105,9 @@
         <method name="paynl_payment_telefonischbetalen">
             <allow_multiple_address>0</allow_multiple_address>
         </method>
+        <method name="paynl_payment_tikkie">
+            <allow_multiple_address>0</allow_multiple_address>
+        </method>
         <method name="paynl_payment_visamastercard">
             <allow_multiple_address>0</allow_multiple_address>
         </method>

diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
@@ -50,6 +50,9 @@
                                                                         <item name="paynl_payment_clickandbuy" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
+                                                                        <item name="paynl_payment_creditclick" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
                                                                         <item name="paynl_payment_dankort" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
@@ -107,6 +110,9 @@
                                                                         <item name="paynl_payment_postepay" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
+                                                                        <item name="paynl_payment_przelewy24" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
                                                                         <item name="paynl_payment_sofortbanking" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
@@ -116,6 +122,9 @@
                                                                         <item name="paynl_payment_telefonischbetalen" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
+                                                                        <item name="paynl_payment_tikkie" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
                                                                         <item name="paynl_payment_visamastercard" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>