Merge pull request #588 from FatchipRobert/MAG2-342-SafeInvoice-clearing-information

MAG2-342 - Payla clearing information

Author: janteuber

Block/Info/BNPL.php

@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * PAYONE Magento 2 Connector is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PAYONE Magento 2 Connector is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with PAYONE Magento 2 Connector. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * PHP version 5
+ *
+ * @category  Payone
+ * @package   Payone_Magento2_Plugin
+ * @author    FATCHIP GmbH <support@fatchip.de>
+ * @copyright 2003 - 2017 Payone GmbH
+ * @license   <http://www.gnu.org/licenses/> GNU Lesser General Public License
+ * @link      http://www.payone.de
+ */
+
+namespace Payone\Core\Block\Info;
+
+class BNPL extends Base
+{
+    /**
+     * Prepare credit card related payment info
+     *
+     * @param \Magento\Framework\DataObject|array $transport
+     * @return \Magento\Framework\DataObject
+     */
+    protected function _prepareSpecificInformation($transport = null)
+    {
+        if (null !== $this->_paymentSpecificInformation) {
+            return $this->_paymentSpecificInformation;
+        }
+        $transport = parent::_prepareSpecificInformation($transport);
+        $data = [];
+
+        $sTransId = $this->getInfo()->getLastTransId();
+        if ($sTransId == '') {
+            $data[(string)__('Payment has not been processed yet.')] = '';
+        } else {
+            $oOrder = $this->getInfo()->getOrder();
+            if ($oOrder && $oOrder->getPayoneClearingBankiban()) {
+                $data[(string)__('Please transfer the order amount to this bank account')] = '';
+                $data[(string)__('Accountholder')] = $oOrder->getPayoneClearingBankaccountholder();
+                $data[(string)__('IBAN')] = $oOrder->getPayoneClearingBankiban();
+                $data[(string)__('BIC')] = $oOrder->getPayoneClearingBankbic();
+                if (!empty($oOrder->getPayoneClearingBankname())) {
+                    $data[(string)__('Bank')] = $oOrder->getPayoneClearingBankname();
+                }
+                if (!empty($oOrder->getPayoneClearingBankcountry())) {
+                    $data[(string)__('Bank country')] = $oOrder->getPayoneClearingBankcountry();
+                }
+                if (!empty($oOrder->getPayoneClearingBankcity())) {
+                    $data[(string)__('Bank city')] = $oOrder->getPayoneClearingBankcity();
+                }
+                if (!empty($oOrder->getPayoneClearingDuedate())) {
+                    $data[(string)__('Due date')] = date((string)__('Y-m-d'), strtotime($oOrder->getPayoneClearingDuedate()));
+                }
+            }
+            $sPaymentReference = $oOrder->getPayoneTxid();
+            if (!empty($oOrder->getPayoneClearingReference())) {
+                $sPaymentReference = $oOrder->getPayoneClearingReference();
+            }
+            $data[(string)__('Payment reference')] = $sPaymentReference;
+        }
+        return $transport->setData(array_merge($data, $transport->getData()));
+    }
+}

Helper/Api.php

@@ -104,7 +104,8 @@ class Api extends Base
         'clearing_bankaccountholder' => 'payone_clearing_bankaccountholder',
         'clearing_bankcity' => 'payone_clearing_bankcity',
         'clearing_bankiban' => 'payone_clearing_bankiban',
-        'clearing_bankbic' => 'payone_clearing_bankbic'
+        'clearing_bankbic' => 'payone_clearing_bankbic',
+        'clearing_duedate' => 'payone_clearing_duedate',
     ];
 
     /**

Helper/Payment.php

@@ -137,6 +137,9 @@ public function getAvailableCreditcardTypes()
 
             $aCreditcardTypes = explode(',', $sCreditcardTypes);
             foreach ($aCreditcardTypes as $sTypeId) {
+                if (!isset($aAllTypes[$sTypeId])) {
+                    continue;
+                }
                 $aReturn[] = [
                     'id' => $aAllTypes[$sTypeId]['cardtype'],
                     'title' => $aAllTypes[$sTypeId]['name'],

Model/Methods/BNPL/BNPLBase.php

@@ -103,7 +103,7 @@ class BNPLBase extends PayoneMethod
      *
      * @var string
      */
-    protected $_infoBlockType = 'Payone\Core\Block\Info\ClearingReference';
+    protected $_infoBlockType = 'Payone\Core\Block\Info\BNPL';
 
     /**
      * @var \Payone\Core\Helper\Api
@@ -207,6 +207,28 @@ protected function getDeviceToken()
         return self::BNPL_PARTNER_ID.'_'.$sMid.'_'.$sUuid;
     }
 
+    /**
+     * @param Order $oOrder
+     * @return string|false
+     */
+    protected function getBirthday(Order $oOrder)
+    {
+        $sDob = false;
+        if (!empty($oOrder->getCustomerDob())) {
+            $sDob = $oOrder->getCustomerDob();
+        } elseif (!empty($this->getInfoInstance()->getAdditionalInformation('dateofbirth'))) {
+            $sDob = $this->getInfoInstance()->getAdditionalInformation('dateofbirth');
+        }
+
+        if (!empty($sDob)) {
+            $iDobTime = strtotime($sDob);
+            if ($iDobTime !== false) {
+                $sDob = date('Ymd', $iDobTime);
+            }
+        }
+        return $sDob;
+    }
+
     /**
      * Return parameters specific to this payment type
      *
@@ -226,7 +248,7 @@ public function getPaymentSpecificParameters(Order $oOrder)
             'financingtype' => $this->getSubType(),
             'add_paydata[device_token]' => $this->getDeviceToken(),
             'businessrelation' => $sBusinessrelation,
-            'birthday' => $oInfoInstance->getAdditionalInformation('dateofbirth')
+            'birthday' => $this->getBirthday($oOrder),
         ];
 
         $sTelephone = $oInfoInstance->getAdditionalInformation('telephone');

Model/PayoneConfig.php

@@ -32,7 +32,7 @@
 abstract class PayoneConfig
 {
     /* Module version */
-    const MODULE_VERSION = '3.13.2';
+    const MODULE_VERSION = '3.13.3';
 
     /* Authorization request types */
     const REQUEST_TYPE_PREAUTHORIZATION = 'preauthorization';

Setup/UpgradeData.php

@@ -234,6 +234,14 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                 ['type' => 'varchar', 'length' => 64, 'default' => '']
             );
         }
+        if (!$setup->getConnection()->tableColumnExists($setup->getTable('sales_order'), 'payone_clearing_duedate')) {
+            $salesInstaller = $this->salesSetupFactory->create(['resourceName' => 'sales_setup', 'setup' => $setup]);
+            $salesInstaller->addAttribute(
+                'order',
+                'payone_clearing_duedate',
+                ['type' => 'varchar', 'length' => 32, 'default' => '']
+            );
+        }
 
         $serializedRows = $this->getSerializedConfigRows($setup);
         if (!empty($serializedRows) && version_compare($this->shopHelper->getMagentoVersion(), '2.2.0', '>=')) {

composer.json

@@ -2,7 +2,7 @@
     "name": "payone-gmbh/magento-2",
     "description": "PAYONE payment gateway for all German online and offline payment methods including PayPal, all major Credit Cards.",
     "type": "magento2-module",
-    "version": "3.13.2",
+    "version": "3.13.3",
     "license": [
       "OSL-3.0",
       "AFL-3.0"

etc/module.xml

@@ -25,7 +25,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Payone_Core" setup_version="3.13.2">
+    <module name="Payone_Core" setup_version="3.13.3">
         <sequence>
             <module name="Magento_Quote" />
             <module name="Magento_Sales" />

i18n/de_DE.csv

@@ -1185,3 +1185,4 @@
 "Safe installment is not available for your current basket. Please choose another payment method.","Gesicherter Ratenkauf wird für Ihren aktuellen Warenkorb nicht unterstützt. Bitte wählen Sie eine andere Zahlart."
 "Payment with differing billing- and shipping-address is not supported for this payment type","Die Zahlung bei abweichender Rechnungs- und Lieferadressen wird für diese Zahlart nicht unterstützt"
 "Place Order","Jetzt kaufen"
+"Y-m-d","d.m.Y"