Merge pull request #12 from heidelpay/feature/PLENTY-81/add-iv-sec-to…

…-config feature/PLENTY-81/add-iv-sec-to-config
heidelpay · Mar 5, 2019 · 68e9590 · 68e9590
2 parents eacc622 + 3f3af3e
commit 68e9590
Show file tree

Hide file tree

Showing 23 changed files with 284 additions and 249 deletions.
diff --git a/config.json b/config.json
@@ -321,6 +321,59 @@
           }
         }
       }
+    },
+    "Config.invoicesecuredb2cTab": {
+      "label": "Config.invoicesecuredb2cTab",
+      "formFields": {
+        "invoicesecuredb2c.isActive": {
+          "type": "checkBox",
+          "required": false,
+          "label": "Config.invoicesecuredb2cIsActiveLabel",
+          "options": {
+            "defaultValue": false
+          }
+        },
+        "invoicesecuredb2c.displayName": {
+          "type": "inputText",
+          "required": false,
+          "label": "Config.invoicesecuredb2cDisplayNameLabel",
+          "options": {
+            "defaultValue": "Gesicherter Rechnungskauf B2C"
+          }
+        },
+        "invoicesecuredb2c.channelId": {
+          "type": "inputText",
+          "required": false,
+          "label": "Config.invoicesecuredb2cChannelIdLabel",
+          "options": {
+            "defaultValue": "31HA07BC81895ACFE22C154CBC521922"
+          }
+        },
+        "invoicesecuredb2c.minAmount": {
+          "type": "inputText",
+          "required": false,
+          "label": "Config.invoicesecuredb2cMinAmountLabel",
+          "options": {
+            "defaultValue": "0,00"
+          }
+        },
+        "invoicesecuredb2c.maxAmount": {
+          "type": "inputText",
+          "required": false,
+          "label": "Config.invoicesecuredb2cMaxAmountLabel",
+          "options": {
+            "defaultValue": "0,00"
+          }
+        },
+        "invoicesecuredb2c.iconUrl": {
+          "type": "inputText",
+          "required": false,
+          "label": "Config.invoicesecuredb2cIconUrl",
+          "options": {
+            "defaultValue": ""
+          }
+        }
+      }
     }
   }
 }
diff --git a/plugin.json b/plugin.json
@@ -13,7 +13,7 @@
   },
   "categories": ["3519"],
   "keywords": ["heidelpay", "plentymarkets", "plugin", "payment", "payment method", "credit card", "debit card", "sofort", "direct debit"],
-  "version": "1.1.2",
+  "version": "1.2.0",
   "license": "Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.",
   "price": 0.00,
   "author": "heidelpay GmbH",
@@ -27,6 +27,7 @@
     "heidelpay/php-payment-api": "^1.6.0"
   },
   "runOnBuild": [
-    "Heidelpay\\Migrations\\CreateHeidelpayTables"
+    "Heidelpay\\Migrations\\CreateHeidelpayTables",
+    "Heidelpay\\Migrations\\AddInvoiceSecuredB2C"
   ]
 }
diff --git a/resources/lang/de/Config.properties b/resources/lang/de/Config.properties
@@ -38,20 +38,6 @@ sofortChannelIdLabel=Channel-ID
 sofortMinAmountLabel=Mindestbetrag (in Euro)
 sofortMaxAmountLabel=Höchstbetrag (in Euro)
 sofortIconUrl=URL zum Icon der Zahlart
-paypalTab=PayPal
-paypalIsActiveLabel=Aktiv
-paypalDisplayNameLabel=Anzeigename
-paypalChannelIdLabel=Channel-ID
-paypalMinAmountLabel=Mindestbetrag (in Euro)
-paypalMaxAmountLabel=Höchstbetrag (in Euro)
-paypalIconUrl=URL zum Icon der Zahlart
-prepaymentTab=Vorkasse
-prepaymentIsActiveLabel=Aktiv
-prepaymentDisplayNameLabel=Anzeigename
-prepaymentChannelIdLabel=Channel-ID
-prepaymentMinAmountLabel=Mindestbetrag (in Euro)
-prepaymentMaxAmountLabel=Höchstbetrag (in Euro)
-prepaymentIconUrl=URL zum Icon der Zahlart
 directdebitTab=Lastschrift
 directdebitIsActiveLabel=Aktiv
 directdebitDisplayNameLabel=Anzeigename
@@ -61,4 +47,11 @@ directdebitTransactionTypePossibleValue0=Direkte Buchung
 directdebitTransactionTypePossibleValue1=Reservierung mit Erfassung bei Rechnungserstellung
 directdebitMinAmountLabel=Mindestbetrag (in Euro)
 directdebitMaxAmountLabel=Höchstbetrag (in Euro)
-directdebitIconUrl=URL zum Icon der Zahlart
+directdebitIconUrl=URL zum Icon der Zahlart
+invoicesecuredb2cTab=Gesicherter Rechnungskauf B2C
+invoicesecuredb2cIsActiveLabel=Aktiv
+invoicesecuredb2cDisplayNameLabel=Anzeigename
+invoicesecuredb2cChannelIdLabel=Channel-ID
+invoicesecuredb2cMinAmountLabel=Mindestbetrag (in Euro)
+invoicesecuredb2cMaxAmountLabel=Höchstbetrag (in Euro)
+invoicesecuredb2cIconUrl=URL zum Icon der Zahlart
diff --git a/resources/lang/de/template.properties b/resources/lang/de/template.properties
@@ -2,4 +2,12 @@ payNow = "Jetzt bezahlen"
 transactions = "Transaktionen"
 cancel = "Abbrechen"
 accountHolder = "Konto Inhaber"
-accountIban = "IBAN"
+accountIban = "IBAN"
+birthday = "Geburtsdatum"
+salutation = "Anrede"
+mr = "Herr"
+mrs = "Frau"
+day = "Tag"
+month = "Monat"
+year = "Jahr"
+choose = "wählen"
diff --git a/resources/lang/en/Config.properties b/resources/lang/en/Config.properties
@@ -38,20 +38,6 @@ sofortChannelIdLabel=Channel-ID
 sofortMinAmountLabel=min. Total (in Euro)
 sofortMaxAmountLabel=max. Total (in Euro)
 sofortIconUrl=URL to payment icon
-paypalTab=PayPal
-paypalIsActiveLabel=Active
-paypalDisplayNameLabel=Display name
-paypalChannelIdLabel=Channel-ID
-paypalMinAmountLabel=min. Total (in Euro)
-paypalMaxAmountLabel=max. Total (in Euro)
-paypalIconUrl=URL to payment icon
-prepaymentTab=Prepayment
-prepaymentIsActiveLabel=Active
-prepaymentDisplayNameLabel=Display name
-prepaymentChannelIdLabel=Channel-ID
-prepaymentMinAmountLabel=min. Total (in Euro)
-prepaymentMaxAmountLabel=max. Total (in Euro)
-prepaymentIconUrl=URL to payment icon
 directdebitTab=Direct Debit
 directdebitIsActiveLabel=Active
 directdebitDisplayNameLabel=Display name
@@ -61,4 +47,11 @@ directdebitMaxAmountLabel=max. Total (in Euro)
 directdebitTransactionTypeLabel=Transaction mode
 directdebitTransactionTypePossibleValue0=Direct debit
 directdebitTransactionTypePossibleValue1=Authorisation with capture
-directdebitIconUrl=URL to payment icon
+directdebitIconUrl=URL to payment icon
+invoicesecuredb2cTab=Invoice Secured B2C
+invoicesecuredb2cIsActiveLabel=Active
+invoicesecuredb2cDisplayNameLabel=Display name
+invoicesecuredb2cChannelIdLabel=Channel-ID
+invoicesecuredb2cMinAmountLabel=min. Total (in Euro)
+invoicesecuredb2cMaxAmountLabel=max. Total (in Euro)
+invoicesecuredb2cIconUrl=URL to payment icon
diff --git a/resources/lang/en/template.properties b/resources/lang/en/template.properties
@@ -2,4 +2,12 @@ payNow = "Pay Now"
 transactions = "Transactions"
 cancel = "Cancel"
 accountHolder = "Account Owner"
-accountIban = "IBAN"
+accountIban = "IBAN"
+birthday = "Birthday"
+salutation = "Salutation"
+mr = "Mr"
+mrs = "Mrs"
+day = "Day"
+month = "Month"
+year = "Year"
+choose = "choose"
diff --git a/resources/lib/paypalTransactionRequest.php b/resources/lib/paypalTransactionRequest.php
diff --git a/resources/views/directDebitForm.twig b/resources/views/directDebitForm.twig
@@ -1,7 +1,7 @@
 {% extends "Heidelpay::base" %}
 
 {% block content %}
-    <form id="paymentFrameForm" action="{{ paymentFrameUrl }}" method="post">
+    <form id="paymentFrameForm" action="{{ submit_action }}" method="post">
         <div class="row">
             <div class="col-md-3"></div>
             <div class="col-md-6">

diff --git a/resources/views/externalCardForm.twig b/resources/views/externalCardForm.twig
@@ -4,7 +4,7 @@
     <div class="row">
         <div class="col-md-3"></div>
         <div class="col-md-6">
-            <iframe src="{{ paymentFrameUrl }}" id="heidelpayIFrame"></iframe>
+            <iframe src="{{ submit_action }}" id="heidelpayIFrame"></iframe>
         </div>
         <div class="col-md-3"></div>
     </div>

diff --git a/resources/views/invoiceSecuredB2CForm.twig b/resources/views/invoiceSecuredB2CForm.twig
@@ -0,0 +1,74 @@
+{% extends "Heidelpay::base" %}
+
+{% block content %}
+    <form action="{{ submit_action }}" id="heidelpay-payment-form" method="post">
+        <div class="row">
+            <div class="col-md-4"></div>
+            <div class="col-md-2">
+                <label for="salutation" class="required">{{ trans('Heidelpay::template.salutation') }} <em>*</em></label>
+            </div>
+            <div class="col-md-2">
+                <select id="salutation" required>
+                    <option value="" disabled selected>{{ trans('Heidelpay::template.choose') }}</option>
+                    <option value="mr">{{ trans('Heidelpay::template.mr') }}</option>
+                    <option value="mrs">{{ trans('Heidelpay::template.mrs') }}</option>
+                </select>
+            </div>
+            <div class="col-md-4"></div>
+        </div>
+        <div class="row">
+            <div class="col-md-4"></div>
+            <div class="col-md-2">
+                <label for="dateofbirth" class="required">{{ trans('Heidelpay::template.birthday') }} <em>*</em></label>
+            </div>
+            <div class="col-md-1">
+                <div class="input-box" style="width:100%">
+                    <select id="dob_day" required>
+                        <option disabled selected value="">{{ trans('Heidelpay::template.day') }}</option>
+                        <option value="01">01</option><option value="02">02</option><option value="03">03</option>
+                        <option value="04">04</option><option value="05">05</option><option value="06">06</option>
+                        <option value="07">07</option><option value="08">08</option><option value="09">09</option>
+                        <option value="10">10</option><option value="11">11</option><option value="12">12</option>
+                        <option value="13">13</option><option value="14">14</option><option value="15">15</option>
+                        <option value="16">16</option><option value="17">17</option><option value="18">18</option>
+                        <option value="19">19</option><option value="20">20</option><option value="21">21</option>
+                        <option value="22">22</option><option value="23">23</option><option value="24">24</option>
+                        <option value="25">25</option><option value="26">26</option><option value="27">27</option>
+                        <option value="28">28</option><option value="29">29</option><option value="30">30</option>
+                        <option value="31">31</option>
+                    </select>
+                </div>
+            </div>
+            <div class="col-md-1">
+                <div class="input-box" style="width:100%">
+                    <select title="dob_month" required>
+                        <option disabled selected value="">{{ trans('Heidelpay::template.month') }}</option>
+                        <option value="01">01</option><option value="02">02</option><option value="03">03</option>
+                        <option value="04">04</option><option value="05">05</option><option value="06">06</option>
+                        <option value="07">07</option><option value="08">08</option><option value="09">09</option>
+                        <option value="10">10</option><option value="11">11</option><option value="12">12</option>
+                    </select>
+                </div>
+            </div>
+            <div class="col-md-1">
+                <div class="input-box" style="width:100%">
+                    <select id="dob_year" required>
+                        <option disabled selected value="">{{ trans('Heidelpay::template.year') }}</option>
+                        {% set minYear = "now -80 years"|date("Y") %}
+                        {% set maxYear = "now -18 years"|date("Y") %}
+                        <ul>
+                            {% for year in maxYear..minYear %}
+                                <option value="{{ year }}">{{ year }}</option>
+                            {% endfor %}
+                        </ul>
+                    </select>
+                </div>
+            </div>
+            <div class="col-md-3"></div>
+        </div>
+        {% include "Heidelpay::partials/cancelSubmitButtons" %}
+    </form>
+{% endblock %}
+
+{% block scripts %}
+{% endblock %}
diff --git a/src/Configs/MethodConfig.php b/src/Configs/MethodConfig.php
@@ -7,6 +7,7 @@
 use Heidelpay\Methods\CreditCard;
 use Heidelpay\Methods\DebitCard;
 use Heidelpay\Methods\DirectDebit;
+use Heidelpay\Methods\InvoiceSecuredB2C;
 use Heidelpay\Methods\PaymentMethodContract;
 use Heidelpay\Methods\Sofort;
 
@@ -57,16 +58,11 @@ class MethodConfig extends BaseConfig implements MethodConfigContract
             self::ARRAY_KEY_KEY => DirectDebit::KEY,
             self::ARRAY_KEY_DEFAULT_NAME => DirectDebit::DEFAULT_NAME,
         ],
-//        Prepayment::class => [
-//            self::ARRAY_KEY_CONFIG_KEY => Prepayment::CONFIG_KEY,
-//            self::ARRAY_KEY_KEY => Prepayment::KEY,
-//            self::ARRAY_KEY_DEFAULT_NAME => Prepayment::DEFAULT_NAME,
-//        ],
-//        PayPal::class => [
-//            self::ARRAY_KEY_CONFIG_KEY => PayPal::CONFIG_KEY,
-//            self::ARRAY_KEY_KEY => PayPal::KEY,
-//            self::ARRAY_KEY_DEFAULT_NAME => PayPal::DEFAULT_NAME,
-//        ],
+        InvoiceSecuredB2C::class => [
+            self::ARRAY_KEY_CONFIG_KEY => InvoiceSecuredB2C::CONFIG_KEY,
+            self::ARRAY_KEY_KEY => InvoiceSecuredB2C::KEY,
+            self::ARRAY_KEY_DEFAULT_NAME => InvoiceSecuredB2C::DEFAULT_NAME,
+        ]
     ];
 
     /**

diff --git a/src/Constants/Plugin.php b/src/Constants/Plugin.php
@@ -18,5 +18,5 @@ class Plugin
 {
     const KEY = 'heidelpay';
     const NAME = 'Heidelpay';
-    const VERSION = '1.1.2';
+    const VERSION = '1.2.0';
 }
diff --git a/src/Constants/Routes.php b/src/Constants/Routes.php
@@ -22,6 +22,7 @@ class Routes
 
     const RESPONSE_URL = self::BASE_URI . 'response';
     const PUSH_NOTIFICATION_URL = self::BASE_URI . 'pushNotification';
+    const HANDLE_FORM_URL = self::BASE_URI . 'handleSyncRequest';
 
     const CHECKOUT_SUCCESS = self::BASE_URI . 'checkoutSuccess';
     const CHECKOUT_CANCEL = self::BASE_URI . 'checkoutCancel';