Merge pull request #40 from heidelpay/develop

Merge for Release 19.4.16
heidelpay · Apr 16, 2019 · eb5a24e · eb5a24e
2 parents c8e8b29 + 85539ce
commit eb5a24e
Show file tree

Hide file tree

Showing 35 changed files with 355 additions and 154 deletions.
diff --git a/.php_cs b/.php_cs
@@ -1,6 +1,7 @@
 <?php
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__);
+
 return PhpCsFixer\Config::create()
     ->setUsingCache(false)
     ->setRules(

diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,8 @@ before_install:
   - composer update
 
 before_script:
- - ./vendor/bin/phpcs --config-set installed_paths vendor/magento/marketplace-eqp
+# - ./vendor/bin/phpcs --config-set installed_paths vendor/magento/marketplace-eqp
 
 script:
- - ./vendor/bin/phpcs . --ignore=vendor/ -v --standard=MEQP1;
+ - ./vendor/bin/php-cs-fixer fix --dry-run --diff --verbose
+# - ./vendor/bin/phpcs . --ignore=vendor/ -v --standard=MEQP1;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Release Notes - heidelpay extension for Magento 1
 
+## v19.4.16
+
+### Added
+- Enabled payment method Santander Invoice
+- Added support information to readme.
+
+### Changed
+- Updated heidelpay logo.
+
 ## v18.8.14
 
 ### Added

diff --git a/README.md b/README.md
@@ -24,6 +24,7 @@ Currently supported payment methods are:
 * iDeal
 * BillSafe
 * Payolution Invoice
+* Santander Invoice
 
 For more information please visit -http://dev.heidelpay.com/magento/
 
@@ -38,6 +39,21 @@ You can find a copy of this license in [LICENSE.txt](LICENSE.txt).
 
 ## Installation
 
-A manual can be fund here...
+A manual can be found here...
 * http://dev.heidelpay.com/magento-cd-edition-manual/ (EN) 
-* https://dev.heidelpay.de/handbuch-magento-cd-edition-plugin/ (DE) 
+* https://dev.heidelpay.de/handbuch-magento-cd-edition-plugin/ (DE) 
+
+## Support
+For any issues or questions please get in touch with our support.
+
+#### Web page
+https://dev.heidelpay.com/
+
+#### Email
+support@heidelpay.com
+
+#### Phone
++49 (0)6221/6471-100
+
+#### Twitter
+@devHeidelpay
diff --git a/app/code/community/HeidelpayCD/Edition/Block/Form/SantanderInvoice.php b/app/code/community/HeidelpayCD/Edition/Block/Form/SantanderInvoice.php
@@ -17,23 +17,23 @@ class HeidelpayCD_Edition_Block_Form_SantanderInvoice extends Mage_Payment_Block
     /** @var string */
     public $optin;
 
-    /** @var string */
-    public $privacyPolicy;
-
     /** @var string */
     public $imgLink;
 
     /** @var string */
-    public $advLink;
-
-    /** @var string */
-    public $advText;
-
-    /** @var string */
-    public $privpolLink;
+    public $privacyPolicy;
 
-    /** @var string */
-    public $privpolText;
+    /**
+     * Replaces paragraph-tag (<p>) with span-tag (<span>).
+     *
+     * @param $text
+     *
+     * @return mixed
+     */
+    public function stripParagraphTag($text)
+    {
+        return str_replace('<p', '<span', $text);
+    }
 
     /**
      * @inheritdoc
@@ -64,23 +64,8 @@ public function setSantanderInformation()
                 $this->optin = $optinInformation->optin;
                 $this->privacyPolicy = $optinInformation->privacy_policy;
 
-                // urls for logo, advanced privacy and policy information
-                $this->imgLink = $optinInformation->santander_iv_img_link;
-                $this->advLink = $optinInformation->santander_iv_de_adv_link;
-                $this->privpolLink = $optinInformation->santander_iv_de_privpol_link;
-
-                // texts for checkboxes (accept policies, ...)
-                $this->advText = str_replace(
-                    'hier',
-                    '<a href="' . $this->advLink . '" target="_blank" rel="nofollow">hier</a>',
-                    $optinInformation->santander_iv_de_adv_text
-                );
-
-                $this->privpolText = str_replace(
-                    'Einwilligungserklärungstextes',
-                    '<a href="' . $this->privpolLink . '" target="_blank" rel="nofollow">hier</a>',
-                    $optinInformation->santander_iv_de_privpol_text
-                );
+                // url for the santander logo
+                $this->imgLink = $optinInformation->logolink;
             }
         }
     }
@@ -96,48 +81,32 @@ public function getOptin()
     /**
      * @return string
      */
-    public function getPrivacyPolicy()
+    public function getOptinText()
     {
-        return $this->privacyPolicy;
+        return $this->stripParagraphTag($this->getOptin());
     }
 
     /**
      * @return string
      */
-    public function getImgLink()
-    {
-        return $this->imgLink;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAdvLink()
-    {
-        return $this->advLink;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAdvText()
+    public function getPrivacyPolicy()
     {
-        return $this->advText;
+        return $this->privacyPolicy;
     }
 
     /**
      * @return string
      */
-    public function getPrivpolLink()
+    public function getImgLink()
     {
-        return $this->privpolLink;
+        return $this->imgLink;
     }
 
     /**
      * @return string
      */
     public function getPrivpolText()
     {
-        return $this->privpolText;
+        return $this->stripParagraphTag($this->getPrivacyPolicy());
     }
 }
diff --git a/app/code/community/HeidelpayCD/Edition/Helper/BasketApi.php b/app/code/community/HeidelpayCD/Edition/Helper/BasketApi.php
@@ -118,6 +118,7 @@ protected function getBasketTotalNet($quote)
      * Returns the net shipping cost amount depending on the order/quote type
      *
      * @param Mage_Sales_Model_Order|Mage_Sales_Model_Quote $quote
+     *
      * @return float
      */
     protected function getShippingAmount($quote)
@@ -134,6 +135,7 @@ protected function getShippingAmount($quote)
      * Returns the shipping discount amount depending on the order/quote type
      *
      * @param Mage_Sales_Model_Order|Mage_Sales_Model_Quote $quote
+     *
      * @return float
      */
     protected function getShippingDiscountAmount($quote)
@@ -150,6 +152,7 @@ protected function getShippingDiscountAmount($quote)
      * Returns the gross shipping cost amount depending on the order/quote type
      *
      * @param Mage_Sales_Model_Order|Mage_Sales_Model_Quote $quote
+     *
      * @return float
      */
     protected function getShippingInclTax($quote)
@@ -166,6 +169,7 @@ protected function getShippingInclTax($quote)
      * Returns the shipping tax amount depending on the order/quote type
      *
      * @param Mage_Sales_Model_Order|Mage_Sales_Model_Quote $quote
+     *
      * @return float
      */
     protected function getShippingTaxAmount($quote)

diff --git a/app/code/community/HeidelpayCD/Edition/Helper/InvoiceHelper.php b/app/code/community/HeidelpayCD/Edition/Helper/InvoiceHelper.php
@@ -11,7 +11,6 @@
  *
  * @package  heidelpay/${Package}
  */
-
 class HeidelpayCD_Edition_Helper_InvoiceHelper
 {
     /**
@@ -22,6 +21,7 @@ class HeidelpayCD_Edition_Helper_InvoiceHelper
      * @param bool   $file  name of the logfile
      *
      * @return mixed
+     *
      * @throws Mage_Core_Model_Store_Exception
      */
     public function log($message, $level = 'DEBUG', $file = false)
@@ -35,9 +35,11 @@ public function log($message, $level = 'DEBUG', $file = false)
     /**
      * Return true if actual equals expected currency.
      *
-     * @param Mage_Sales_Model_Order $order
+     * @param Mage_Sales_Model_Order                $order
      * @param HeidelpayCD_Edition_Model_Transaction $data
+     *
      * @return bool
+     *
      * @throws Mage_Core_Model_Store_Exception
      */
     public function validateCurrency(Mage_Sales_Model_Order $order, $data)
@@ -65,6 +67,7 @@ public function validateCurrency(Mage_Sales_Model_Order $order, $data)
      * @param $message string order history message
      *
      * @return Mage_Sales_Model_Order
+     *
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
      */

diff --git a/app/code/community/HeidelpayCD/Edition/Helper/Payment.php b/app/code/community/HeidelpayCD/Edition/Helper/Payment.php
@@ -20,7 +20,7 @@ class HeidelpayCD_Edition_Helper_Payment extends HeidelpayCD_Edition_Helper_Abst
     /**
      * send request to heidelpay apo
      *
-     * @param       $url string url for the heidelpay api
+     * @param       $url    string url for the heidelpay api
      * @param array $params post parameter
      *
      * @return array response from heidelpay api
@@ -231,7 +231,7 @@ protected function _setPaymentMethod($config = array(), $customer = array())
                 break;
             /* Payolution invoice */
             case 'ivpol':
-                $params['PAYMENT.CODE'] = 'IV.' . ($type !== 'RG' ? $type : 'PA') ;
+                $params['PAYMENT.CODE'] = 'IV.' . ($type !== 'RG' ? $type : 'PA');
                 $params['ACCOUNT.BRAND'] = 'PAYOLUTION_DIRECT';
                 break;
             /* direct debit secured */

diff --git a/app/code/community/HeidelpayCD/Edition/Model/Convert/Order.php b/app/code/community/HeidelpayCD/Edition/Model/Convert/Order.php
@@ -20,6 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Sales
+ *
  * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -29,16 +30,17 @@
  *
  * @category    Mage
  * @package     Mage_Sales
+ *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 class HeidelpayCD_Edition_Model_Convert_Order extends Mage_Sales_Model_Convert_Order
 {
-
     /**
      * Convert order object to invoice
      *
-     * @param   Mage_Sales_Model_Order $order
-     * @return  Mage_Sales_Model_Order_Invoice
+     * @param Mage_Sales_Model_Order $order
+     *
+     * @return Mage_Sales_Model_Order_Invoice
      */
     public function toInvoice(Mage_Sales_Model_Order $order)
     {
@@ -52,5 +54,4 @@ public function toInvoice(Mage_Sales_Model_Order $order)
         Mage::helper('core')->copyFieldset('sales_convert_order', 'to_invoice', $order, $invoice);
         return $invoice;
     }
-
 }
diff --git a/app/code/community/HeidelpayCD/Edition/Model/Observer.php b/app/code/community/HeidelpayCD/Edition/Model/Observer.php
@@ -62,7 +62,9 @@ public function handleWalletDataDuringCheckout($observer)
      * Observer on save shipment to report the shipment to heidelpay
      *
      * @param Varien_Event_Observer $observer
+     *
      * @return $this
+     *
      * @throws \Mage_Core_Exception
      */
     public function reportReversalToHeidelpay($observer)
@@ -278,5 +280,4 @@ protected function log($message, $level = 'DEBUG', $file = false)
         return Mage::helper('hcd/payment')
             ->realLog($callers[1]['function'] . ' ' . $message, $level, $file);
     }
-
 }
diff --git a/app/code/community/HeidelpayCD/Edition/Model/Order/Invoice.php b/app/code/community/HeidelpayCD/Edition/Model/Order/Invoice.php
@@ -5,7 +5,6 @@
  * Date: 08.11.2017
  * Time: 11:56
  */
-
 class HeidelpayCD_Edition_Model_Order_Invoice extends Mage_Sales_Model_Order_Invoice
 {
     protected function _getEmails($configPath)
@@ -22,6 +21,4 @@ protected function _getEmails($configPath)
 
         return $emails;
     }
-
-
-}
+}