Merge pull request #14 from paynl/feature/PLUG-750

feature/PLUG-750
paynl · Dec 6, 2021 · dc86d7d · dc86d7d
2 parents ffa07ce + 3d2d1a2
commit dc86d7d
Show file tree

Hide file tree

Showing 10 changed files with 195 additions and 0 deletions.
diff --git a/Model/Config.php b/Model/Config.php
@@ -30,6 +30,7 @@ class Config
         "paynl_payment_amazonpay" => "22",
         "paynl_payment_amex" => "9",
         "paynl_payment_applepay" => "114",
+        "paynl_payment_biercheque" => "204",
         "paynl_payment_billink" => "16",
         "paynl_payment_capayable" => "18",
         "paynl_payment_capayable_gespreid" => "19",

diff --git a/Model/Config/Source/Available/Biercheque.php b/Model/Config/Source/Available/Biercheque.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Paynl\Payment\Model\Config\Source\Available;
+
+class Biercheque extends Available
+{
+    protected $_class = \Paynl\Payment\Model\Paymentmethod\Biercheque::class;
+}
diff --git a/Model/ConfigProvider.php b/Model/ConfigProvider.php
@@ -18,6 +18,7 @@ class ConfigProvider implements ConfigProviderInterface
         'paynl_payment_amazonpay',
         'paynl_payment_amex',
         'paynl_payment_applepay',
+        'paynl_payment_biercheque',
         'paynl_payment_billink',
         'paynl_payment_decadeaukaart',
         'paynl_payment_capayable',

diff --git a/Model/Paymentmethod/Biercheque.php b/Model/Paymentmethod/Biercheque.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Paynl\Payment\Model\Paymentmethod;
+
+class Biercheque extends PaymentMethod
+{
+    protected $_code = 'paynl_payment_biercheque';
+
+    protected function getDefaultPaymentOptionId()
+    {
+        return 2622;
+    }
+}
diff --git a/etc/adminhtml/paymentmethods.xml b/etc/adminhtml/paymentmethods.xml
@@ -9,6 +9,7 @@
     <include path="Paynl_Payment::paymentmethods/amazonpay.xml" />
     <include path="Paynl_Payment::paymentmethods/amex.xml" />
     <include path="Paynl_Payment::paymentmethods/applepay.xml" />
+    <include path="Paynl_Payment::paymentmethods/biercheque.xml" />
     <include path="Paynl_Payment::paymentmethods/billink.xml" />
     <include path="Paynl_Payment::paymentmethods/capayable.xml" />
     <include path="Paynl_Payment::paymentmethods/capayable_gespreid.xml" />

diff --git a/etc/adminhtml/paymentmethods/biercheque.xml b/etc/adminhtml/paymentmethods/biercheque.xml
@@ -0,0 +1,152 @@
+<?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_biercheque" sortOrder="155" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Biercheque</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\Biercheque</source_model>
+            <config_path>payment/paynl_payment_biercheque/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_biercheque/title</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>New Order Status</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Order\Status\PendingPayment</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_biercheque/order_status</config_path>
+        </field>
+        <field id="order_status_authorized" translate="label" type="select" sortOrder="32" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Authorized Order Status</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Order\Status\Processing</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_biercheque/order_status_authorized</config_path>
+        </field>
+        <field id="order_status_processing" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Paid Order Status</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Order\Status\Processing</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_biercheque/order_status_processing</config_path>
+        </field>
+        <field id="holded" translate="label" type="select" sortOrder="35" showInDefault="1"
+               showInWebsite="1"
+               showInStore="1">
+            <label>Set order on-hold</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/paynl_payment_biercheque/holded</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <comment><![CDATA[Set the orderstatus to on-hold when payment begins (to hold stock).]]></comment>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="40" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/paynl_payment_biercheque/allowspecific</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="50" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <can_be_empty>1</can_be_empty>
+            <config_path>payment/paynl_payment_biercheque/specificcountry</config_path>
+            <depends>
+                <field id="allowspecific">1</field>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="instructions" translate="label" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Instructions</label>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_biercheque/instructions</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Minimum Order Total</label>
+            <config_path>payment/paynl_payment_biercheque/min_order_total</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Maximum Order Total</label>
+            <config_path>payment/paynl_payment_biercheque/max_order_total</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Sort Order</label>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/paynl_payment_biercheque/sort_order</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="send_new_order_email" translate="label" type="select" sortOrder="100" showInDefault="1"
+               showInWebsite="1"
+               showInStore="1">
+            <label>Send new order email</label>
+            <source_model>Paynl\Payment\Model\Config\Source\SendNewOrderEmail</source_model>
+            <config_path>payment/paynl_payment_biercheque/send_new_order_email</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="disallowedshipping" translate="label" type="multiselect" sortOrder="110" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Disallowed Shipping Methods</label>
+            <source_model>Magento\Shipping\Model\Config\Source\Allmethods</source_model>
+            <can_be_empty>1</can_be_empty>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_biercheque/disallowedshipping</config_path>
+            <comment><![CDATA[Hold CTRL button to select/deselect multiple]]></comment>
+        </field>
+        <field id="showforcompany" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Show for companies</label>
+            <source_model>Paynl\Payment\Model\Config\Source\ShowCompanyOptions</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_biercheque/showforcompany</config_path>
+            <comment><![CDATA[Allow payment method to be used for companies, private, or both.]]></comment>
+        </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_biercheque/payment_option_id</config_path>
+            </field>
+        </group>
+    </group>
+</include>
+
diff --git a/etc/config.xml b/etc/config.xml
@@ -104,6 +104,18 @@ In order to pay for your order click the link below
                 <group>paynl_payment</group>
                 <send_new_order_email>after_payment</send_new_order_email>
             </paynl_payment_applepay>
+            <paynl_payment_biercheque>
+                <active>0</active>
+                <title>Biercheque</title>
+                <payment_option_id>2622</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\Biercheque</model>
+                <group>paynl_payment</group>
+                <send_new_order_email>after_payment</send_new_order_email>
+            </paynl_payment_biercheque>
             <paynl_payment_billink>
                 <active>0</active>
                 <title>Achteraf betalen via Billink</title>

diff --git a/etc/payment.xml b/etc/payment.xml
@@ -27,6 +27,9 @@
         <method name="paynl_payment_applepay">
             <allow_multiple_address>0</allow_multiple_address>
         </method>
+        <method name="paynl_payment_biercheque">
+            <allow_multiple_address>0</allow_multiple_address>
+        </method>
         <method name="paynl_payment_billink">
             <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
@@ -39,6 +39,9 @@
                                                                         <item name="paynl_payment_applepay" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
+                                                                        <item name="paynl_payment_biercheque" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
                                                                         <item name="paynl_payment_billink" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>

diff --git a/view/frontend/web/js/view/payment/method-renderer.js b/view/frontend/web/js/view/payment/method-renderer.js
@@ -17,6 +17,7 @@ define(
             {type: 'paynl_payment_alipay', component: defaultComponent},
             {type: 'paynl_payment_amazonpay', component: defaultComponent},
             {type: 'paynl_payment_amex', component: defaultComponent},
+            {type: 'paynl_payment_biercheque', component: defaultComponent},
             {type: 'paynl_payment_billink', component: defaultComponent},
             {type: 'paynl_payment_capayable', component: defaultComponent},
             {type: 'paynl_payment_capayable_gespreid', component: defaultComponent},