Merge pull request #251 from wirecard/RC-1.4.0-minor

Rc 1.4.0 minor

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.4.0
+
+*   Add PSD2 hint in Credit Card configuration  
+*   Remove the support live chat  
+
+
+| Overview              | Oxid version                  | PHP 5.6   | PHP 7.0   | PHP 7.1 |  
+|-----------------------|-------------------------------|:---------:|:---------:|:-------:|  
+| **Tested version(s)** | Oxid 6.1.2                    | :x:       | :x:       | ✅ |  
+| **Compatibility**     | Oxid 6.1.0 - 6.1.2            | :x:       | :x:       | ✅ |  
+
 ## v1.3.0
 
 *   Implement Credit Card 3D Secure 2 parameters  

Controller/Admin/Tab.php

@@ -86,18 +86,6 @@ public function render()
         return $sTemplate;
     }
 
-    /**
-     * Determines whether the live chat should be displayed in the tab.
-     *
-     * @return boolean
-     *
-     * @since 1.1.0
-     */
-    public function shouldDisplayLiveChat()
-    {
-        return $this->_oOrder->isCustomPaymentMethod();
-    }
-
     /**
      * Check if $_sListObjectId is set
      *

Model/PaymentMethod/CreditCardPaymentMethod.php

@@ -177,6 +177,19 @@ public function getConfigFields()
             ],
             $iUrlFieldOffset
         );
+        $iPsdTwoFieldOffset = 5;
+        Helper::insertToArrayAtPosition(
+            $aFirstFields,
+            [
+                'psdTwo' => [
+                    'type' => 'link',
+                    'field' => 'oxpayments__psd2',
+                    'title' => Helper::translate('wd_config_PSD2_information'),
+                    'text' => Helper::translate('wd_config_PSD2_information_desc_oxid'),
+                ],
+            ],
+            $iPsdTwoFieldOffset
+        );
 
         $aAdditionalFields = [
             'threeDMaid' => [

Tests/Integration/Model/TransactionTest.php

@@ -135,7 +135,7 @@ public function testGetTransactionPaymentMethodName($sExpected, $sTransactionId)
     public function getTransactionPaymentMethodNameProvider()
     {
         return [
-            'transaction with order id' => ['Wirecard Vorauskasse', 't4'],
+            'transaction with order id' => ['Vorauskasse', 't4'],
             'transaction without order id' => ['', 't7'],
         ];
     }

metadata.php

@@ -44,7 +44,7 @@
     ],
     'lang'              => 'en',
     'thumbnail'         => 'logo.png',
-    'version'           => '1.3.0',
+    'version'           => '1.4.0',
     'author'            => 'Wirecard',
     'url'               => 'https://www.wirecard.com',
     'email'             => 'shop-systems-support@wirecard.com',
@@ -228,7 +228,6 @@
         'form_interaction.tpl' => 'wirecard/paymentgateway/views/form_interaction.tpl',
         'module_support.tpl' => 'wirecard/paymentgateway/views/admin/tpl/module_support.tpl',
         'module_support_email.tpl' => 'wirecard/paymentgateway/views/admin/tpl/email/module_support_email.tpl',
-        'live_chat.tpl' => 'wirecard/paymentgateway/views/admin/inc/live_chat.tpl',
         'sepa_mandate_modal.tpl' => 'wirecard/paymentgateway/views/blocks/sepa_mandate_modal.tpl',
         'sepa_mandate.tpl' => 'wirecard/paymentgateway/views/blocks/sepa_mandate.tpl',
         'table.tpl' => 'wirecard/paymentgateway/views/admin/inc/table.tpl',