From a95cde84391a66679154a7818221f40cc2a45563 Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Wed, 20 Jun 2018 13:58:36 +0200
Subject: [PATCH 01/25] start Push integration

---
 includes/class-wc-heidelpay-response.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/includes/class-wc-heidelpay-response.php b/includes/class-wc-heidelpay-response.php
index bdffd7a..52fec84 100644
--- a/includes/class-wc-heidelpay-response.php
+++ b/includes/class-wc-heidelpay-response.php
@@ -50,7 +50,8 @@ public function init(array $post_data, $secret)
         $order = wc_get_order($orderId);
 
 
-        $this->handleResult($post_data, $order);
+        //$this->handleResult($post_data, $order);
+        $this->handlePush($post_data);
 
         //TODO: if case for distinction between result and push
     }
@@ -111,8 +112,8 @@ public function handleResult($post_data, WC_Order $order)
      * handle push post
      */
 
-    public function handlePush()
+    public function handlePush($input)
     {
-        //TODO
+        wc_get_logger()->log(WC_Log_Levels::DEBUG, print_r($input, 1));
     }
-}
\ No newline at end of file
+}

From 5ddd8e10e5dcf202ec20b0858babfdab6b4df7b3 Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Tue, 26 Jun 2018 11:24:47 +0200
Subject: [PATCH 02/25] add push class

- add WC_Heidelpay_Push
- change callback_handler in Abstract to catch Push
- change default minimum amount value in ivpg from 100 to 10
- remove pushhandling in response class
- add missing docs in response class
---
 .../abstract-wc-heidelpay-payment-gateway.php | 71 ++++++++++---------
 includes/class-wc-heidelpay-push.php          | 43 +++++++++++
 includes/class-wc-heidelpay-response.php      | 22 +++---
 .../class-wc-heidelpay-gateway-ivpg.php       |  2 +-
 woocommerce-heidelpay.php                     |  1 +
 5 files changed, 91 insertions(+), 48 deletions(-)
 create mode 100644 includes/class-wc-heidelpay-push.php

diff --git a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
index 9b9a934..0e4b1a0 100644
--- a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
@@ -51,7 +51,7 @@ public function __construct()
         $this->title = $this->get_option('title');
         $this->description = $this->get_option('description');
         $this->instructions = $this->get_option('instructions');
-        
+
         // Actions
         add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
         add_action('woocommerce_api_' . strtolower(get_class($this)), array($this, 'callback_handler'));
@@ -67,29 +67,6 @@ public function __construct()
      */
     abstract protected function setPayMethod();
 
-    /**
-     * Validate the customer input coming from checkout.
-     * @return boolean
-     */
-    public function checkoutValidation()
-    {
-        //return true;
-    }
-
-    /**
-     * Check whether this paymethod was selected based on
-     * @return bool
-     */
-    public function isGatewayActive()
-    {
-        if(!empty($_POST['payment_method'])) {
-            if($_POST['payment_method'] === $this->id)
-                return true;
-        }
-
-        return false;
-    }
-
     public function init_form_fields()
     {
         $this->form_fields = array(
@@ -173,6 +150,29 @@ public function init_form_fields()
         );
     }
 
+    /**
+     * Validate the customer input coming from checkout.
+     * @return boolean
+     */
+    public function checkoutValidation()
+    {
+        //return true;
+    }
+
+    /**
+     * Check whether this paymethod was selected based on
+     * @return bool
+     */
+    public function isGatewayActive()
+    {
+        if (!empty($_POST['payment_method'])) {
+            if ($_POST['payment_method'] === $this->id)
+                return true;
+        }
+
+        return false;
+    }
+
     /**
      * register scripts and stylesheets for your payment gateway
      */
@@ -280,7 +280,7 @@ protected function setCriterions()
         global $wp_version;
 
         $shopType = 'WordPress: ' . $wp_version . ' - ' . 'WooCommerce: ' . wc()->version;
-        $this->payMethod->getRequest()->getCriterion()->set('PUSH_URL', 'push-url for testing'); //TODO insert URL
+        $this->payMethod->getRequest()->getCriterion()->set('PUSH_URL', get_permalink(wc_get_page_id('shop')) . 'wc-api/' . strtolower(get_class($this))); //TODO insert URL
         $this->payMethod->getRequest()->getCriterion()->set('SHOP.TYPE', $shopType);
         $this->payMethod->getRequest()->getCriterion()->set(
             'SHOPMODULE.VERSION',
@@ -336,6 +336,13 @@ protected function performRequest($order_id)
         }
     }
 
+    /**
+     * process the Form input from customer comimg from checkout.
+     */
+    protected function handleFormPost()
+    {
+    }
+
     /**
      * @return string
      */
@@ -355,13 +362,6 @@ public function addPaymentError(String $message)
         );
     }
 
-    /**
-     * process the Form input from customer comimg from checkout.
-     */
-    protected function handleFormPost()
-    {
-    }
-
     /**
      * Get the mapped Errormessage from Respone wich is html escaped.
      * If a response is given as a parameter that will determine the message. Otherwise the Response from the payMethod
@@ -401,8 +401,13 @@ public function admin_options()
      */
     public function callback_handler()
     {
-        $response = new WC_Heidelpay_Response();
+        if (array_key_exists('<?xml_version', $_POST)) {
+            $push = new WC_Heidelpay_Push();
+            $push->init(file_get_contents('php://input'));
+            exit;
+        }
         if (!empty($_POST)) {
+            $response = new WC_Heidelpay_Response();
             $response->init($_POST, $this->get_option('secret'));
         }
         exit();
diff --git a/includes/class-wc-heidelpay-push.php b/includes/class-wc-heidelpay-push.php
new file mode 100644
index 0000000..4b5cf24
--- /dev/null
+++ b/includes/class-wc-heidelpay-push.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * heidelpay push
+ *
+ * Handles a push notification
+ *
+ * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
+ * @copyright Copyright © 2018-present heidelpay GmbH. All rights reserved.
+ *
+ * @link  http://dev.heidelpay.com/
+ *
+ * @author  Florian Evertz
+ *
+ * @package  woocommerce-heidelpay
+ * @category WooCommerce
+ */
+
+if (!defined('ABSPATH')) {
+    exit; // Exit if accessed directly
+}
+
+require_once(dirname(__DIR__) . '/vendor/autoload.php');
+
+use Heidelpay\PhpPaymentApi\Push;
+
+class WC_Heidelpay_Push
+{
+    public static $push;
+
+    public function init($rawPayload)
+    {
+        if (empty(self::$push)) {
+            self::$push = new Push($rawPayload);
+        }
+
+        $this->handlePush();
+    }
+
+    public function handlePush()
+    {
+        wc_get_logger()->log(WC_Log_Levels::DEBUG, 'PaUSH');
+    }
+}
diff --git a/includes/class-wc-heidelpay-response.php b/includes/class-wc-heidelpay-response.php
index 52fec84..679e57d 100644
--- a/includes/class-wc-heidelpay-response.php
+++ b/includes/class-wc-heidelpay-response.php
@@ -27,6 +27,10 @@ class WC_Heidelpay_Response
 
     public static $response;
 
+    /**
+     * @param array $post_data
+     * @param $secret
+     */
     public function init(array $post_data, $secret)
     {
         if (empty(self::$response)) {
@@ -50,16 +54,15 @@ public function init(array $post_data, $secret)
         $order = wc_get_order($orderId);
 
 
-        //$this->handleResult($post_data, $order);
-        $this->handlePush($post_data);
-
-        //TODO: if case for distinction between result and push
+        $this->handleResult($post_data, $order);
     }
 
     /**
      * handle result post
+     *
+     * @param $post_data
+     * @param WC_Order $order
      */
-
     public function handleResult($post_data, WC_Order $order)
     {
         $uid = self::$response->getIdentification()->getUniqueId();
@@ -107,13 +110,4 @@ public function handleResult($post_data, WC_Order $order)
             echo $order->get_checkout_order_received_url();
         }
     }
-
-    /*
-     * handle push post
-     */
-
-    public function handlePush($input)
-    {
-        wc_get_logger()->log(WC_Log_Levels::DEBUG, print_r($input, 1));
-    }
 }
diff --git a/includes/gateways/class-wc-heidelpay-gateway-ivpg.php b/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
index dc9a797..785c988 100644
--- a/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
+++ b/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
@@ -99,7 +99,7 @@ public function init_form_fields()
         $this->form_fields['min'] = array(
             'title' => __('Minimum Amount', 'woocommerce-heidelpay'),
             'type' => 'text',
-            'default' => 100,
+            'default' => 10,
             'desc_tip' => true,
         );
 
diff --git a/woocommerce-heidelpay.php b/woocommerce-heidelpay.php
index 8b73d40..90117e4 100644
--- a/woocommerce-heidelpay.php
+++ b/woocommerce-heidelpay.php
@@ -132,6 +132,7 @@ public function init()
                 require_once(dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-so.php');
                 require_once(dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-va.php');
                 require_once(dirname(__FILE__) . '/includes/class-wc-heidelpay-response.php');
+                require_once(dirname(__FILE__) . '/includes/class-wc-heidelpay-push.php');
 
                 add_filter('woocommerce_payment_gateways', array($this, 'add_gateways'));
             }

From b7bb4030a835ac8011118123144f8b4455cd6445 Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Tue, 26 Jun 2018 11:29:08 +0200
Subject: [PATCH 03/25] Resolve phpstorm Error Notice

---
 woocommerce-heidelpay.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/woocommerce-heidelpay.php b/woocommerce-heidelpay.php
index 90117e4..2d834ec 100644
--- a/woocommerce-heidelpay.php
+++ b/woocommerce-heidelpay.php
@@ -121,7 +121,11 @@ public function init()
                     return;
                 }
 
-                load_plugin_textdomain('woocommerce-heidelpay', false, plugin_basename(dirname(__FILE__)) . '/languages');
+                load_plugin_textdomain(
+                    'woocommerce-heidelpay',
+                    false,
+                    plugin_basename(dirname(__FILE__)) . '/languages'
+                );
 
                 require_once(dirname(__FILE__) . '/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php');
                 require_once(dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-cc.php');

From 547045c008dbf955e88dfdf7a7c84fe1c2ddca9f Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Tue, 26 Jun 2018 11:40:59 +0200
Subject: [PATCH 04/25] Resolve phpstorm Error Notice

- set visibility for get_environment_warning
- remove parenthesis on requires
---
 woocommerce-heidelpay.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/woocommerce-heidelpay.php b/woocommerce-heidelpay.php
index 2d834ec..898148b 100644
--- a/woocommerce-heidelpay.php
+++ b/woocommerce-heidelpay.php
@@ -127,16 +127,16 @@ public function init()
                     plugin_basename(dirname(__FILE__)) . '/languages'
                 );
 
-                require_once(dirname(__FILE__) . '/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php');
-                require_once(dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-cc.php');
-                require_once(dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-dc.php');
-                require_once(dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-idl.php');
-                require_once(dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-dd.php');
-                require_once(dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-ivpg.php');
-                require_once(dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-so.php');
-                require_once(dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-va.php');
-                require_once(dirname(__FILE__) . '/includes/class-wc-heidelpay-response.php');
-                require_once(dirname(__FILE__) . '/includes/class-wc-heidelpay-push.php');
+                require_once dirname(__FILE__) . '/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php';
+                require_once dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-cc.php';
+                require_once dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-dc.php';
+                require_once dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-idl.php';
+                require_once dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-dd.php';
+                require_once dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-ivpg.php';
+                require_once dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-so.php';
+                require_once dirname(__FILE__) . '/includes/gateways/class-wc-heidelpay-gateway-va.php';
+                require_once dirname(__FILE__) . '/includes/class-wc-heidelpay-response.php';
+                require_once dirname(__FILE__) . '/includes/class-wc-heidelpay-push.php';
 
                 add_filter('woocommerce_payment_gateways', array($this, 'add_gateways'));
             }
@@ -217,7 +217,7 @@ public function install()
              * Checks the environment for compatibility problems.  Returns a string with the first incompatibility
              * found or false if the environment has no problems.
              */
-            static function get_environment_warning()
+            public static function get_environment_warning()
             {
                 if (version_compare(phpversion(), WC_HEIDELPAY_MIN_PHP_VER, '<')) {
                     $message = __('minimal PHP version error', 'woocommerce-heidelpay');

From 402c1eed5860d1949c7702c166c2cdb99c149cf5 Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Tue, 26 Jun 2018 11:51:33 +0200
Subject: [PATCH 05/25] Resolve phpstorm Error Notice without codesniffer

---
 woocommerce-heidelpay.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/woocommerce-heidelpay.php b/woocommerce-heidelpay.php
index 898148b..70107b3 100644
--- a/woocommerce-heidelpay.php
+++ b/woocommerce-heidelpay.php
@@ -80,7 +80,7 @@ private function __clone()
              *
              * @return void
              */
-            private function __wakeup()
+            public function __wakeup()
             {
             }
 
@@ -143,6 +143,8 @@ public function init()
 
             /**
              * Add the gateways to WooCommerce.
+             * @param $methods
+             * @return array
              */
             public function add_gateways($methods)
             {
@@ -174,6 +176,9 @@ public function check_environment()
 
             /**
              * Allow this class and other classes to add slug keyed notices (to avoid duplication)
+             * @param $slug
+             * @param $class
+             * @param $message
              */
             public function add_admin_notice($slug, $class, $message)
             {
@@ -210,7 +215,7 @@ public function install()
                     define('WC_HEIDELPAY_INSTALLING', true);
                 }
 
-                $this->_update_plugin_version();
+                static::_update_plugin_version();
             }
 
             /**
@@ -222,7 +227,7 @@ public static function get_environment_warning()
                 if (version_compare(phpversion(), WC_HEIDELPAY_MIN_PHP_VER, '<')) {
                     $message = __('minimal PHP version error', 'woocommerce-heidelpay');
 
-                    return sprintf($message, WC_HEIDELPAY_MIN_PHP_VER_MIN_PHP_VER, phpversion());
+                    return sprintf($message, WC_HEIDELPAY_MIN_PHP_VER, phpversion());
                 }
 
                 if (!defined('WC_VERSION')) {
@@ -251,7 +256,7 @@ public static function get_environment_warning()
              */
             public function get_setting_link()
             {
-                $use_id_as_section = function_exists('WC') ? version_compare(WC()->version, '2.6', '>=') : false;
+                $use_id_as_section = function_exists('WC') ? version_compare(wc()->version, '2.6', '>=') : false;
 
                 $section_slug = $use_id_as_section ? 'heidelpay' : strtolower('WC_Heidelpay');
 
@@ -272,6 +277,7 @@ public function admin_notices()
 
             /**
              * logging
+             * @param $message
              */
             public static function log($message)
             {
@@ -288,4 +294,3 @@ public static function log($message)
     endif;
 
 }
-

From a072f7261944fbcdec47129e94c5298925159aff Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Tue, 26 Jun 2018 12:00:32 +0200
Subject: [PATCH 06/25] Add Changelog entry & changed version

---
 CHANGELOG.md              | 7 +++++++
 woocommerce-heidelpay.php | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c1e861..4829451 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Release Notes - heidelpay Payment Gateway for WooCommerce
 
+## 1.2.0
+
+### Added
+
+#### Features:
+- Support for push notifications
+
 ## 1.1.0
 
 ### Added
diff --git a/woocommerce-heidelpay.php b/woocommerce-heidelpay.php
index 70107b3..af4f2bc 100644
--- a/woocommerce-heidelpay.php
+++ b/woocommerce-heidelpay.php
@@ -10,7 +10,7 @@
  * Plugin Name: heidelpay WooCommerce
  * Plugin URI: https://dev.heidelpay.com
  * Description: heidelpay payment integration for WooCommerce
- * Version: 1.1.0
+ * Version: 1.2.0
  * Author: heidelpay
  * Author URI: htts://www.heidelpay.com
  * Developer: heidelpay
@@ -29,7 +29,7 @@
     /**
      * Required minimums and constants
      */
-    define('WC_HEIDELPAY_VERSION', '1.1.0');
+    define('WC_HEIDELPAY_VERSION', '1.2.0');
     define('WC_HEIDELPAY_MIN_PHP_VER', '5.6.0');
     define('WC_HEIDELPAY_MIN_WC_VER', '3.0.0');
     define('WC_HEIDELPAY_MAIN_FILE', __FILE__);
@@ -192,7 +192,7 @@ public function add_admin_notice($slug, $class, $message)
              * Updates the plugin version in db
              *
              * @since 1.0.0
-             * @version 1.0.1
+             * @version 1.2.0
              * @return bool
              */
             private static function _update_plugin_version()
@@ -207,7 +207,7 @@ private static function _update_plugin_version()
              * Handles upgrade routines.
              *
              * @since 1.0.0
-             * @version 1.0.1
+             * @version 1.2.0
              */
             public function install()
             {

From 79fe6223640f20029af0ec82c59ef3306b8d27aa Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Tue, 10 Jul 2018 11:44:32 +0200
Subject: [PATCH 07/25] Add Hashcheck

---
 .../abstract-wc-heidelpay-payment-gateway.php |  2 +-
 includes/class-wc-heidelpay-push.php          | 27 ++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
index 0e4b1a0..119eda3 100644
--- a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
@@ -403,7 +403,7 @@ public function callback_handler()
     {
         if (array_key_exists('<?xml_version', $_POST)) {
             $push = new WC_Heidelpay_Push();
-            $push->init(file_get_contents('php://input'));
+            $push->init(file_get_contents('php://input'), $this->get_option('secret'));
             exit;
         }
         if (!empty($_POST)) {
diff --git a/includes/class-wc-heidelpay-push.php b/includes/class-wc-heidelpay-push.php
index 4b5cf24..aa53186 100644
--- a/includes/class-wc-heidelpay-push.php
+++ b/includes/class-wc-heidelpay-push.php
@@ -25,19 +25,38 @@
 
 class WC_Heidelpay_Push
 {
+    /** @var Heidelpay\PhpPaymentApi\Push */
     public static $push;
 
-    public function init($rawPayload)
+    public function init($rawPayload, $secret)
     {
         if (empty(self::$push)) {
             self::$push = new Push($rawPayload);
         }
+        $response = self::$push->getResponse();
 
-        $this->handlePush();
+        try {
+            $response->verifySecurityHash($secret, $response->getIdentification()->getTransactionId());
+        } catch (\Exception $e) {
+            $callers = debug_backtrace();
+            wc_get_logger()->log(WC_Log_Levels::NOTICE, print_r("Heidelpay - " .
+                $callers [0] ['function'] . ": Invalid push hash from " .
+                $_SERVER ['REMOTE_ADDR'] . ", suspecting manipulation", 1));
+            exit(); //error
+        }
+
+        $this->handlePush($response);
     }
 
-    public function handlePush()
+    public function handlePush($response)
     {
-        wc_get_logger()->log(WC_Log_Levels::DEBUG, 'PaUSH');
+        //TODO: HashSecurityCheck
+        //TODO: Amount mit OrderAmount abgleichen
+        //TODO: Push in Datenbank schreiben?
+
+        $orderID = $response->getIdentification()->getTransactionId();
+        $order = wc_get_order($orderID);
+
+        $order->update_status('processing', 'Bezahlung ist eingegangen');
     }
 }

From 5fe4e6864cbf148a621261f754dafd7895f0d2b6 Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Thu, 12 Jul 2018 16:25:08 +0200
Subject: [PATCH 08/25] extract Push to one URL

---
 .../abstract-wc-heidelpay-payment-gateway.php  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
index ee80c99..7a6a4cb 100644
--- a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
@@ -55,6 +55,7 @@ public function __construct()
         // Actions
         add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
         add_action('woocommerce_api_' . strtolower(get_class($this)), array($this, 'callback_handler'));
+        add_action('woocommerce_api_push', array($this, 'pushHandler'));
         add_action('wp_enqueue_scripts', array($this, 'enqueue_assets'));
         add_action('woocommerce_after_checkout_validation', array($this, 'checkoutValidation'));
 
@@ -67,6 +68,16 @@ public function __construct()
      */
     abstract protected function setPayMethod();
 
+
+    public function pushHandler()
+    {
+        if (array_key_exists('<?xml_version', $_POST)) {
+            $push = new WC_Heidelpay_Push();
+            $push->init(file_get_contents('php://input'), $this->get_option('secret'));
+        }
+        exit;
+    }
+
     public function init_form_fields()
     {
         $this->form_fields = array(
@@ -280,7 +291,7 @@ protected function setCriterions()
         global $wp_version;
 
         $shopType = 'WordPress: ' . $wp_version . ' - ' . 'WooCommerce: ' . wc()->version;
-        $this->payMethod->getRequest()->getCriterion()->set('PUSH_URL', get_permalink(wc_get_page_id('shop')) . 'wc-api/' . strtolower(get_class($this))); //TODO insert URL
+        $this->payMethod->getRequest()->getCriterion()->set('PUSH_URL', get_home_url() . '/wc-api/push');
         $this->payMethod->getRequest()->getCriterion()->set('SHOP.TYPE', $shopType);
         $this->payMethod->getRequest()->getCriterion()->set(
             'SHOPMODULE.VERSION',
@@ -401,11 +412,6 @@ public function admin_options()
      */
     public function callback_handler()
     {
-        if (array_key_exists('<?xml_version', $_POST)) {
-            $push = new WC_Heidelpay_Push();
-            $push->init(file_get_contents('php://input'), $this->get_option('secret'));
-            exit;
-        }
         if (!empty($_POST)) {
             $response = new WC_Heidelpay_Response();
             $response->init($_POST, $this->get_option('secret'));

From 9bd9c57db272b8aea0ffe6f014757616cd4e491f Mon Sep 17 00:00:00 2001
From: "David.Owusu" <david.owusu@heidelpay.de>
Date: Fri, 13 Jul 2018 19:15:24 +0200
Subject: [PATCH 09/25] (WOO-20) Bugfix PaymentInfo: Add paymentInfo to invoice
 as a notice text on "order-received"-page and to the payment mail. Fixed
 email is sent in other payment methods. Fixed error of isAvailable hook if
 called in wrong context.

---
 .../abstract-wc-heidelpay-payment-gateway.php |  8 ++
 includes/class-wc-heidelpay-response.php      | 45 +++++++++++-
 .../class-wc-heidelpay-gateway-idl.php        | 11 ++-
 .../class-wc-heidelpay-gateway-ivpg.php       | 73 ++++++++++++++-----
 4 files changed, 113 insertions(+), 24 deletions(-)

diff --git a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
index 15f1752..63feeed 100644
--- a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
@@ -436,4 +436,12 @@ protected function getBookingSelection()
             'default' => 'DB'
         );
     }
+
+    public function getOrderFromKey()
+    {
+        $order_id = wc_get_order_id_by_order_key($_GET['key']);
+        $order = wc_get_order($order_id);
+
+        return $order;
+    }
 }
diff --git a/includes/class-wc-heidelpay-response.php b/includes/class-wc-heidelpay-response.php
index bdffd7a..ebe20d4 100644
--- a/includes/class-wc-heidelpay-response.php
+++ b/includes/class-wc-heidelpay-response.php
@@ -25,6 +25,9 @@
 class WC_Heidelpay_Response
 {
 
+    /**
+     * @var Response
+     */
     public static $response;
 
     public function init(array $post_data, $secret)
@@ -68,14 +71,16 @@ public function handleResult($post_data, WC_Order $order)
             $note = '';
 
             // If no money has been payed yet.
-            if (strtoupper($payCode[1]) === 'PA' or strtoupper($payCode[1]) === 'RG') {
+            if (strtoupper($payCode[1]) === 'PA' || strtoupper($payCode[1]) === 'RG') {
                 // In not Prepayment and Invoice payment can be captured manually
-                if (strtoupper($payCode [0]) !== 'PP' and strtoupper($payCode [0]) !== 'IV') {
+                if (strtoupper($payCode [0]) !== 'PP' && strtoupper($payCode [0]) !== 'IV') {
                     $note = __(
                         'Payment reservation successful. Please use the hiP to check the payment.',
                         'woocommerce-heidelpay.'
                     );
                     $order->add_order_note($note, false);
+                } else {
+                    $order->add_meta_data('heidelpay-paymentInfo', $this->setPaymentInfo(self::$response));
                 }
 
                 $order->update_status('on-hold', __('Awaiting payment.', 'woocommerce-heidelpay')
@@ -105,6 +110,42 @@ public function handleResult($post_data, WC_Order $order)
             //show thank you page
             echo $order->get_checkout_order_received_url();
         }
+
+        $info = $order->get_meta('heidelpay-paymentInfo', true);
+        wc_get_logger()->log(
+            WC_Log_Levels::DEBUG,
+            'Payment - Meta ' . htmlspecialchars(print_r($info, 1))
+        );
+    }
+
+    public function setPaymentInfo(Response $response)
+    {
+        $payinfo = $response->getConnector();
+        $presentation = $response->getPresentation();
+
+
+        $payInfoTemplate = 'Zahlungsinformationen <br/>
+Bitte überweisen Sie uns den Betrag von %1$s %2$s nach Erhalt der Ware auf folgendes Konto:<br/>
+<br/>
+Kontoinhaber: %3$s<br/>
+IBAN: %4$s<br/>
+BIC: %5$s<br/>
+<br/>
+Geben Sie als Verwendungszweck bitte ausschließlich diese Identifikationsnummer an:<br/>
+<b>%6$s </b>';
+
+        $infoText = sprintf(
+            $payInfoTemplate,
+            $presentation->getAmount(),
+            $presentation->getCurrency(),
+            $payinfo->getAccountHolder(),
+            $payinfo->getAccountIBan(),
+            $payinfo->getAccountBic(),
+            self::$response->getIdentification()->getShortId()
+        );
+
+        wc_get_logger()->log(WC_Log_Levels::DEBUG, 'Payment - info' . htmlspecialchars(print_r($infoText, 1)));
+        return $infoText;
     }
 
     /*
diff --git a/includes/gateways/class-wc-heidelpay-gateway-idl.php b/includes/gateways/class-wc-heidelpay-gateway-idl.php
index d5e2898..2af51f6 100644
--- a/includes/gateways/class-wc-heidelpay-gateway-idl.php
+++ b/includes/gateways/class-wc-heidelpay-gateway-idl.php
@@ -78,10 +78,10 @@ public function payment_fields()
 
         $accountHolder = wc()->customer->get_billing_first_name(). ' ' . wc()->customer->get_last_name();
 
-        if(!empty($brands)) {
+        if (!empty($brands)) {
             echo '<div>';
             echo '<label for="accountholder">' . $accountHolderLabel . ':</label>';
-            echo '<input type="text" id="accountholder" name="accountholder" class="form-row-wide validate-required" value="'. $accountHolder .'"> ';
+            echo '<input type="text" id="accountholder" name="accountholder" class="form-row-wide validate-required" value="' . $accountHolder . '"> ';
             echo '<br/>';
             echo '<label for="bankname">' . $accountHolderLabel . ':</label>';
             echo '<select name ="bankname" id="bankname" class="form-row-wide validate-required">';
@@ -134,7 +134,12 @@ public function setAvailability($available_gateways)
     {
         $available = true;
 
-        if (wc()->customer->get_billing_country() !== 'NL') {
+        $isCustomer = wc()->customer !== null;
+        if ($isCustomer) {
+            if (wc()->customer->get_billing_country() !== 'NL') {
+                $available = false;
+            }
+        } else {
             $available = false;
         }
 
diff --git a/includes/gateways/class-wc-heidelpay-gateway-ivpg.php b/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
index dc9a797..3795542 100644
--- a/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
+++ b/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
@@ -33,6 +33,7 @@ public function __construct()
         parent::__construct();
 
         add_action('woocommerce_email_before_order_table', array($this, 'email_instructions'), 10, 3);
+        add_filter('woocommerce_thankyou_order_received_text', array($this, 'printPayInfo'));
     }
 
     public function checkoutValidation()
@@ -146,24 +147,29 @@ public function setAvailability($available_gateways)
     {
         $security = true;
 
-        if (!empty(wc()->customer->get_billing_company())) {
-            $security = false;
-        }
-
-        if (!in_array(wc()->customer->get_billing_country(), $this->getEnabledCountries(), true)) {
-            $security = false;
-        }
-
-        if (wc()->customer->get_billing_address_1() !== wc()->customer->get_shipping_address_1() ||
-            wc()->customer->get_billing_address_2() !== wc()->customer->get_shipping_address_2() ||
-            wc()->customer->get_billing_city() !== wc()->customer->get_shipping_city() ||
-            wc()->customer->get_billing_postcode() !== wc()->customer->get_shipping_postcode()
-        ) {
-            $security = false;
-        }
-
-        if (wc()->cart->get_totals()['total'] > $this->get_option('max') ||
-            wc()->cart->get_totals()['total'] < $this->get_option('min')) {
+        $isCustomer = wc()->customer !== null;
+        if ($isCustomer) {
+            if (!empty(wc()->customer->get_billing_company())) {
+                $security = false;
+            }
+
+            if (!in_array(wc()->customer->get_billing_country(), $this->getEnabledCountries(), true)) {
+                $security = false;
+            }
+
+            if (wc()->customer->get_billing_address_1() !== wc()->customer->get_shipping_address_1() ||
+                wc()->customer->get_billing_address_2() !== wc()->customer->get_shipping_address_2() ||
+                wc()->customer->get_billing_city() !== wc()->customer->get_shipping_city() ||
+                wc()->customer->get_billing_postcode() !== wc()->customer->get_shipping_postcode()
+            ) {
+                $security = false;
+            }
+
+            if (wc()->cart->get_totals()['total'] > $this->get_option('max') ||
+                wc()->cart->get_totals()['total'] < $this->get_option('min')) {
+                $security = false;
+            }
+        } else {
             $security = false;
         }
 
@@ -251,11 +257,18 @@ public function ErrorHtml()
             '</ul>';
     }
 
-    public function email_instructions($order, $sent_to_admin, $plain_text = false)
+    public function email_instructions(WC_Order $order, $sent_to_admin, $plain_text = false)
     {
+
+        if ($order->get_payment_method() !== $this->id) {
+            return;
+        }
+
+
         if ($this->instructions) {
             echo wpautop(wptexturize($this->instructions)) . PHP_EOL;
         }
+            echo $order->get_meta('heidelpay-paymentInfo');
     }
 
     /**
@@ -278,4 +291,26 @@ protected function handleFormPost()
             $this->payMethod->getRequest()->b2cSecured($_POST['salutation'], $_POST['birthdate']);
         }
     }
+
+    public function printPayInfo($orderReceivedText)
+    {
+        wc_get_logger()->log(
+            WC_Log_Levels::DEBUG,
+            'Payment - Order received Text ' . htmlspecialchars(print_r($orderReceivedText, 1))
+        );
+
+        $order = $this->getOrderFromKey();
+
+        if ($order->get_payment_method() !== $this->id) {
+            return $orderReceivedText;
+        }
+
+        $paymentInfo = $order->get_meta('heidelpay-paymentInfo');
+
+        if(!empty($paymentInfo)) {
+            $orderReceivedText .= '<p>' . $paymentInfo . '</p>';
+        }
+
+        return $orderReceivedText;
+    }
 }

From 6b1df5f6395e81f17d2053f7b3bfe5b99535715b Mon Sep 17 00:00:00 2001
From: "David.Owusu" <david.owusu@heidelpay.de>
Date: Tue, 17 Jul 2018 14:37:34 +0200
Subject: [PATCH 10/25] (WOO-20) Bugfix PaymentInfo: move payment information
 and mail instruction to the abstract class where each payment method only  -
 Add its own instruction to mails when the payment method is used.  - Add
 payment information for direct debit.  - Add english translation files for
 new payment texts. update pot file and translations.

---
 .../abstract-wc-heidelpay-iframe-gateway.php  |   8 +-
 .../abstract-wc-heidelpay-payment-gateway.php |  56 +++++++++++-
 includes/class-wc-heidelpay-response.php      |  81 ++++++++++-------
 .../class-wc-heidelpay-gateway-ivpg.php       |  86 +++++++-----------
 languages/woocommerce-heidelpay-de_DE.mo      | Bin 5002 -> 6211 bytes
 languages/woocommerce-heidelpay-de_DE.po      |  23 +++++
 languages/woocommerce-heidelpay-en_US.mo      | Bin 0 -> 1144 bytes
 languages/woocommerce-heidelpay-en_US.po      |  22 +++++
 languages/woocommerce-heidelpay.pot           |  10 ++
 woocommerce-heidelpay.php                     |   2 +-
 10 files changed, 192 insertions(+), 96 deletions(-)
 create mode 100644 languages/woocommerce-heidelpay-en_US.mo
 create mode 100644 languages/woocommerce-heidelpay-en_US.po

diff --git a/includes/abstracts/abstract-wc-heidelpay-iframe-gateway.php b/includes/abstracts/abstract-wc-heidelpay-iframe-gateway.php
index ada650c..36ea146 100644
--- a/includes/abstracts/abstract-wc-heidelpay-iframe-gateway.php
+++ b/includes/abstracts/abstract-wc-heidelpay-iframe-gateway.php
@@ -102,11 +102,10 @@ public function enqueue_assets()
      */
     public function after_pay()
     {
-        $order_id = wc_get_order_id_by_order_key($_GET['key']);
-        $order = wc_get_order($order_id);
+        $order = $this->getOrderFromKey();
 
-        if ($order->get_payment_method() === $this->id) {
-            $this->performRequest($order_id);
+        if ($order !== null && $order->get_payment_method() === $this->id) {
+            $this->performRequest($order->get_id());
         }
     }
 
@@ -145,6 +144,7 @@ protected function getIFrame( WC_Order $order)
                     . '" frameborder="0" scrolling="no" style="height:360px;"></iframe><br />';
             } else {
                 $iFrame .= '<pre>' . print_r($this->getErrorMessage(), 1) . '</pre>';
+                $this->paymentLog($this->payMethod->getResponse()->getError());
             }
             $iFrame .= '<button type="submit">' . __('Pay Now', 'woocommerce-heidelpay') . '</button>';
             $iFrame .=  '</form>';
diff --git a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
index 63feeed..b512238 100644
--- a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
@@ -57,9 +57,11 @@ public function __construct()
         add_action('woocommerce_api_' . strtolower(get_class($this)), array($this, 'callback_handler'));
         add_action('wp_enqueue_scripts', array($this, 'enqueue_assets'));
         add_action('woocommerce_after_checkout_validation', array($this, 'checkoutValidation'));
+        add_action('woocommerce_email_before_order_table', array($this, 'emailInstructions'), 10, 3);
 
         // Filter
         add_filter('woocommerce_available_payment_gateways', array($this, 'setAvailability'));
+        add_filter('woocommerce_thankyou_order_received_text', array($this, 'addPayInfo'));
     }
 
     /**
@@ -318,6 +320,7 @@ protected function performRequest($order_id)
                 ];
             }
 
+            $this->paymentLog($this->getErrorMessage());
             $this->addPaymentError($this->getErrorMessage());
         } else {
             $this->addPaymentError($this->getErrorMessage());
@@ -326,7 +329,10 @@ protected function performRequest($order_id)
                 WC_Log_Levels::ERROR,
                 htmlspecialchars(
                     print_r(
-                        $this->plugin_id . ' - ' . $this->id . __(' Error: Paymentmethod was not found: ', 'woocommerce-heidelpay') . $this->bookingAction,
+                        $this->plugin_id . ' - ' . $this->id . __(
+                            ' Error: Paymentmethod was not found: ',
+                            'woocommerce-heidelpay'
+                        ) . $this->bookingAction,
                         1
                     )
                 )
@@ -437,11 +443,53 @@ protected function getBookingSelection()
         );
     }
 
+    /**
+     * Get the order using the Get parameter 'key'
+     * @return bool|WC_Order|WC_Refund
+     */
     public function getOrderFromKey()
     {
-        $order_id = wc_get_order_id_by_order_key($_GET['key']);
-        $order = wc_get_order($order_id);
+        if(isset($_GET['key'])) {
+            $order_id = wc_get_order_id_by_order_key($_GET['key']);
+            return wc_get_order($order_id);
+        }
+
+        return null;
+    }
 
-        return $order;
+    protected function paymentLog($logData)
+    {
+        $callers = debug_backtrace();
+        wc_get_logger()->log(WC_Log_Levels::NOTICE, print_r('Heidelpay - ' .
+            $callers [0] ['function'] .': '. print_r($logData, 1), 1));
+    }
+
+    public function addPayInfo($orderReceivedText)
+    {
+        $order = $this->getOrderFromKey();
+
+        if ($order === null || $order->get_payment_method() !== $this->id) {
+            return $orderReceivedText;
+        }
+
+        $paymentInfo = $order->get_meta('heidelpay-paymentInfo');
+
+        if(!empty($paymentInfo)) {
+            $orderReceivedText .= '<p>' . $paymentInfo . '</p>';
+        }
+
+        return $orderReceivedText;
+    }
+
+    public function emailInstructions(WC_Order $order, $sent_to_admin, $plain_text = false)
+    {
+        if ($order->get_payment_method() !== $this->id) {
+            return null;
+        }
+
+        if ($this->instructions) {
+            echo wpautop(wptexturize($this->instructions)) . PHP_EOL;
+        }
+        echo $order->get_meta('heidelpay-paymentInfo');
     }
 }
diff --git a/includes/class-wc-heidelpay-response.php b/includes/class-wc-heidelpay-response.php
index ebe20d4..9894ee4 100644
--- a/includes/class-wc-heidelpay-response.php
+++ b/includes/class-wc-heidelpay-response.php
@@ -70,17 +70,17 @@ public function handleResult($post_data, WC_Order $order)
             $payCode = explode('.', $post_data ['PAYMENT_CODE']);
             $note = '';
 
+            $this->setPaymentInfo($order);
+
             // If no money has been payed yet.
             if (strtoupper($payCode[1]) === 'PA' || strtoupper($payCode[1]) === 'RG') {
                 // In not Prepayment and Invoice payment can be captured manually
                 if (strtoupper($payCode [0]) !== 'PP' && strtoupper($payCode [0]) !== 'IV') {
                     $note = __(
                         'Payment reservation successful. Please use the hiP to check the payment.',
-                        'woocommerce-heidelpay.'
+                        'woocommerce-heidelpay'
                     );
                     $order->add_order_note($note, false);
-                } else {
-                    $order->add_meta_data('heidelpay-paymentInfo', $this->setPaymentInfo(self::$response));
                 }
 
                 $order->update_status('on-hold', __('Awaiting payment.', 'woocommerce-heidelpay')
@@ -110,42 +110,59 @@ public function handleResult($post_data, WC_Order $order)
             //show thank you page
             echo $order->get_checkout_order_received_url();
         }
-
-        $info = $order->get_meta('heidelpay-paymentInfo', true);
-        wc_get_logger()->log(
-            WC_Log_Levels::DEBUG,
-            'Payment - Meta ' . htmlspecialchars(print_r($info, 1))
-        );
     }
 
-    public function setPaymentInfo(Response $response)
+    /**
+     * Add payment information to the order if available.
+     * Information usually are set for invoice, direct debit and prepayment.
+     * @param WC_Order $order
+     * @return null
+     */
+    public function setPaymentInfo(WC_Order $order)
     {
-        $payinfo = $response->getConnector();
-        $presentation = $response->getPresentation();
+        // Load template text for Payment information
+        $payInfoTemplate = $this->getInfoTemplate();
+        if ($payInfoTemplate === null) {
+            return null;
+        }
 
+        $response = self::$response;
+        $payInfo = $response->getConnector();
+        $presentation = $response->getPresentation();
 
-        $payInfoTemplate = 'Zahlungsinformationen <br/>
-Bitte überweisen Sie uns den Betrag von %1$s %2$s nach Erhalt der Ware auf folgendes Konto:<br/>
-<br/>
-Kontoinhaber: %3$s<br/>
-IBAN: %4$s<br/>
-BIC: %5$s<br/>
-<br/>
-Geben Sie als Verwendungszweck bitte ausschließlich diese Identifikationsnummer an:<br/>
-<b>%6$s </b>';
-
-        $infoText = sprintf(
-            $payInfoTemplate,
-            $presentation->getAmount(),
-            $presentation->getCurrency(),
-            $payinfo->getAccountHolder(),
-            $payinfo->getAccountIBan(),
-            $payinfo->getAccountBic(),
-            self::$response->getIdentification()->getShortId()
+        $paymentData = array(
+            '{AMOUNT}' => $presentation->getAmount(),
+            '{CURRENCY}' => $presentation->getCurrency(),
+            '{CONNECTOR_ACCOUNT_HOLDER}' => $payInfo->getAccountHolder(),
+            '{CONNECTOR_ACCOUNT_IBAN}' => $payInfo->getAccountIBan(),
+            '{CONNECTOR_ACCOUNT_BIC}' => $payInfo->getAccountBic(),
+            '{IDENTIFICATION_SHORTID}' => self::$response->getIdentification()->getShortId(),
+            '{Iban}' => $response->getAccount()->getIban(),
+            '{Ident}' => $response->getAccount()->getIdentification(),
+            '{CreditorId}' => $response->getIdentification()->getCreditorId(),
         );
 
-        wc_get_logger()->log(WC_Log_Levels::DEBUG, 'Payment - info' . htmlspecialchars(print_r($infoText, 1)));
-        return $infoText;
+        $paymentText = strtr($payInfoTemplate, $paymentData);
+
+        $order->add_meta_data('heidelpay-paymentInfo', $paymentText);
+    }
+
+    public function getInfoTemplate()
+    {
+        $payCode = explode('.', self::$response->getPayment()->getCode());
+        switch (strtoupper($payCode[0])) {
+            case 'IV':
+                return __('invoice_info', 'woocommerce-heidelpay');
+                break;
+            case 'PP':
+                return __('prepayment_info', 'woocommerce-heidelpay');
+                break;
+            case 'DD':
+                return __('direct_debit_info', 'woocommerce-heidelpay');
+                break;
+            default:
+                return null;
+        }
     }
 
     /*
diff --git a/includes/gateways/class-wc-heidelpay-gateway-ivpg.php b/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
index 3795542..c1cdb55 100644
--- a/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
+++ b/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
@@ -31,15 +31,12 @@ class WC_Gateway_HP_IVPG extends WC_Heidelpay_Payment_Gateway
     public function __construct()
     {
         parent::__construct();
-
-        add_action('woocommerce_email_before_order_table', array($this, 'email_instructions'), 10, 3);
-        add_filter('woocommerce_thankyou_order_received_text', array($this, 'printPayInfo'));
     }
 
     public function checkoutValidation()
     {
         // If gateway is not active no validation is necessary.
-        if($this->isGatewayActive() === false) {
+        if ($this->isGatewayActive() === false) {
             return true;
         }
 
@@ -62,7 +59,6 @@ public function checkoutValidation()
                 'error'
             );
         }
-
     }
 
     private function is18($given)
@@ -83,8 +79,14 @@ public function init_form_fields()
         parent::init_form_fields();
 
         $this->form_fields['title']['default'] = sprintf(__('%s', 'woocommerce-heidelpay'), $this->name);
-        $this->form_fields['description']['default'] = sprintf(__('Insert payment data for %s', 'woocommerce-heidelpay'), $this->name);
-        $this->form_fields['instructions']['default'] = __('please send the money to IBAN BIC ', 'woocommerce-heidelpay');
+        $this->form_fields['description']['default'] = sprintf(
+            __('Insert payment data for %s', 'woocommerce-heidelpay'),
+            $this->name
+        );
+        $this->form_fields['instructions']['default'] = __(
+            'please send the money to IBAN BIC ',
+            'woocommerce-heidelpay'
+        );
         $this->form_fields['enabled']['label'] = sprintf(__('Enable %s', 'woocommerce-heidelpay'), $this->name);
         $this->form_fields['security_sender']['default'] = '31HA07BC8142C5A171745D00AD63D182';
         $this->form_fields['user_login']['default'] = '31ha07bc8142c5a171744e5aef11ffd3';
@@ -114,7 +116,11 @@ public function init_form_fields()
         $this->form_fields['availableCountries'] = array(
             'title' => __('Available Countries for secured invoice', 'woocommerce-heidelpay'),
             'type' => 'title',
-            'description' => __('Here you can enable secured Invoice for specific countries. Be aware that this will not enable the country in your WooCommerce settings and you have to enable them seperately.', 'woocommerce-heidelpay')
+            'description' => __(
+                'Here you can enable secured Invoice for specific countries. Be aware that this will not enable the' .
+                'country in your WooCommerce settings and you have to enable them seperately.',
+                'woocommerce-heidelpay'
+            )
         );
 
         $this->form_fields['availableDE'] = array(
@@ -146,27 +152,30 @@ public function init_form_fields()
     public function setAvailability($available_gateways)
     {
         $security = true;
+        $customer = wc()->customer;
+        $cart = wc()->cart;
 
-        $isCustomer = wc()->customer !== null;
-        if ($isCustomer) {
-            if (!empty(wc()->customer->get_billing_company())) {
+        $environmentCheck = $customer !== null && $cart !== null;
+
+        if ($environmentCheck) {
+            if (!empty($customer->get_billing_company())) {
                 $security = false;
             }
 
-            if (!in_array(wc()->customer->get_billing_country(), $this->getEnabledCountries(), true)) {
+            if (!in_array($customer->get_billing_country(), $this->getEnabledCountries(), true)) {
                 $security = false;
             }
 
-            if (wc()->customer->get_billing_address_1() !== wc()->customer->get_shipping_address_1() ||
-                wc()->customer->get_billing_address_2() !== wc()->customer->get_shipping_address_2() ||
-                wc()->customer->get_billing_city() !== wc()->customer->get_shipping_city() ||
-                wc()->customer->get_billing_postcode() !== wc()->customer->get_shipping_postcode()
+            if ($customer->get_billing_address_1() !== $customer->get_shipping_address_1() ||
+                $customer->get_billing_address_2() !== $customer->get_shipping_address_2() ||
+                $customer->get_billing_city() !== $customer->get_shipping_city() ||
+                $customer->get_billing_postcode() !== $customer->get_shipping_postcode()
             ) {
                 $security = false;
             }
 
-            if (wc()->cart->get_totals()['total'] > $this->get_option('max') ||
-                wc()->cart->get_totals()['total'] < $this->get_option('min')) {
+            if ($cart->get_totals()['total'] > $this->get_option('max') ||
+                $cart->get_totals()['total'] < $this->get_option('min')) {
                 $security = false;
             }
         } else {
@@ -251,26 +260,15 @@ public function payment_fields()
 
     public function ErrorHtml()
     {
-        $errorText = __('You have to be at least 18 years old in order to use secured invoice', 'woocommerce-heidelpay');
+        $errorText = __(
+            'You have to be at least 18 years old in order to use secured invoice',
+            'woocommerce-heidelpay'
+        );
         return '<ul class="woocommerce-error" role="alert">' .
             '<li>' . $errorText . '</li>' .
             '</ul>';
     }
 
-    public function email_instructions(WC_Order $order, $sent_to_admin, $plain_text = false)
-    {
-
-        if ($order->get_payment_method() !== $this->id) {
-            return;
-        }
-
-
-        if ($this->instructions) {
-            echo wpautop(wptexturize($this->instructions)) . PHP_EOL;
-        }
-            echo $order->get_meta('heidelpay-paymentInfo');
-    }
-
     /**
      * Set the id and PaymenMethod
      */
@@ -291,26 +289,4 @@ protected function handleFormPost()
             $this->payMethod->getRequest()->b2cSecured($_POST['salutation'], $_POST['birthdate']);
         }
     }
-
-    public function printPayInfo($orderReceivedText)
-    {
-        wc_get_logger()->log(
-            WC_Log_Levels::DEBUG,
-            'Payment - Order received Text ' . htmlspecialchars(print_r($orderReceivedText, 1))
-        );
-
-        $order = $this->getOrderFromKey();
-
-        if ($order->get_payment_method() !== $this->id) {
-            return $orderReceivedText;
-        }
-
-        $paymentInfo = $order->get_meta('heidelpay-paymentInfo');
-
-        if(!empty($paymentInfo)) {
-            $orderReceivedText .= '<p>' . $paymentInfo . '</p>';
-        }
-
-        return $orderReceivedText;
-    }
 }
diff --git a/languages/woocommerce-heidelpay-de_DE.mo b/languages/woocommerce-heidelpay-de_DE.mo
index feb8235eef8999bc3d5f290239b64e63e824fce6..6cddd77bd19355708d69704c172f6562487c0126 100644
GIT binary patch
delta 2684
zcmcJPU2GIp6vwYX0cmNaD2SjADg_Z*R1_?=xZSOE1-79rAA+RL?o4+lY-eG1mMW#$
z2Oks+Cei>t850wqKw?OYiHR?SNYn=nJQz$wV|>scemxjoh`;~N6iMI(qc?lzcki70
zanAqTor8-{uc&_8JmrX?rLYB9$0TEH_`(z(wD0PSSp>g_xXiSv#x%ki@D4Z+&V)<h
zVz@ef|00~lcn{Q8ufW^kYp@<3hIblMHE%~9b1HV6g`8#1!x`{G{QgJS!1#Bljjlok
zGJRUaxo|e)mU!F_PclwJ1#ku41Fu5uGjF;v3C=eybeeckfZFgSs7zmlli@+g8uJF!
zyrXa(d=K`(%TR%?A}Y=6g2ZN?gPOl7rVXX!9@qho!8*=2=jkZ&3s4(fhLZFOwBR&e
zcETl4Wy(WkavVMcKZOh7B{&B*qOYW11lhu@g334n?}8b)96GQ%kIrE_cf;dQ(w~7^
z@Hv$K>)8JXe1LI1PG!~#58Os@&|-X+sHNObQ0p&2C3Xc$*_k|6!UeDyZfZn-bsS!(
zMk7!Q_e0j015gnkgLB~tNDSso?Eeaqw7Cei?&sM5SL~lmlu~3?%q38Xu7z5+tqJ{4
z)5-Bd0W9W9-w&5T9kc<eR@<NgIui3;sQDkn{19@c`55vupYc#>zJcqZ>Y+Qa0qTzQ
z$KxGUI;v$B5`!6os^ua0AUp{b$T=t}FG5BBCsaUJ;UlmC8N1+WsDMYI6#ED&p)VnS
zH}f0Rd39{IgVI$kI*NQhUP<^ml;m$gW$-@K9XJOi-7ipgWGa(X`vxe9kMg(=o`AX|
zU%-C+zd~SEVb?dQfPz)CjE*9G99x4WFlD*~lay-Om_)C&h4iGtTI^v=2d>1FSqjtN
zRv$C9CnK1r;EK2}C@Evc=hQV;C7g0nTa8ITiK|BVweOnx5^|y;gLxEt0&BrkynC^B
zY&oVT{iLn*R572y)FxqV*kc+Pv)w!$b!z_w6@f2`X~p#KRnrYnn~zzTz6QEZYAQ;y
z){Aa}J~2z<u{m|9uBUFk;{|Rm9CX~Q7Y=&<P{|Zr&vA>p?U%<-Hn)y9)bDKY{JkYF
z=hocgh5D^cy8{>hu<J)lPJL4U!_;cZ4XiFV4D7tMx8z$L<uEAu`OeYA#@@}DfiY_|
zxw)^eJCl5VtfMXVStDNHSe|b=u5bA*c4fG@CRZqjj0WsHPi-_*D$;e_VQYQK4@;Jv
z&AZu3t`N3&WCN?MGkT`0U5QM)HJZ-a{@67KUavFdxmF^pB^5t!5p*FssTf)gu8p?u
z*kL(vhupyR_bpGSv<(r3@jeybsZCs0jMi1MUY=ZQ^OAw<cws3>J3C3si-U>I@AAUX
zwaTSHne=ngP)kJ_29{mnI4@UFT2{)<?NVTNWe6RH6<`^GBd;GN-8%kG^PAOZ!)TMN
z8;rPKIo`SAmuni{s{X#6D_Gq@!Il=}wABvWS|Agmm!tC~bz4>0wRP62;Q0lc5Kt=F
zo5^%12YUMk6Un41J=oK`A=TX{@!C4mQB`i7Bu6x*E1kUQHoT7})Hb4y)pc$*&etxM
ztu0c(caW~UZv+i3ZZLYIZ8=vcdTvX3U(w62DWbE=S9YyhQN1B=mmPW~zwB3rhsoLY
z+vCb{TP7}TI@O&SNI#oSCI-^InZf>^-oAl`bn2h0JHBG}_Wz+Ex&$}V{-)AbZ<O^G
SwV#mo-zmH0Ka=))WzFBdbO^5i

delta 1446
zcmYk+OGwmF6vy$S%}nLn(MEgE)R>l!#z&2sO(~&MLQsStxDX_wqD2rS5e$(8357Y?
z$^>`0$O0Eu&;wkA3pYJPqX+b$h&HvdsOb9}uh7LapL_q0d(Z#e|KF)de`(^a-!o*i
zW?~%?PB-hs3J*WD0k2sJUPDgVB<A1)%)@ES##dO1U)=FLpIJWR5NfJgT#5CVi7i-Y
zmav119qVx?dXYJ-4>Pde9UsCh#-pf-#!-pfb3Vla#<Onx74I<qiArE>x!D>VN6j;h
z&8%;;baFXRykc>}GSrhsaTzuumskvST`RU>2gY#(mFQ>Gbw7|b?HB6$G_sZXSb`yJ
z!Z!4>zV*>j=KZLNMo=Xk!yry#4Cink7IBfDqzl7%7DG6U0epm9YA;bw`VLp&H>|{T
z>c1Kzm?)-mfR0Mu<4zn$9lwa1a2PMAnLWlJ<Nai(3Y|bLa0>MR=TKX673=UO`th0b
z6KX3KQ1|`GrvCITgS(VrF&1GJvX-@?&L2jSw{FypC*Ap8cfJqx<b%#J)B`+0-8YX@
z_z{)BE%sw0-p-}|T4;s?+LL+If&pG_8Ajbu<BTG6SQGMR?fhs9y09HDp!R+S^)9?{
z<JYJy`+#~E{-U-lC&4$enN9?i$PrX2yHS~+K_#N=%JB-e;C)oWzfl!ypw4=tL&#@k
zr%?-DLM1$ks@z>vr5~aaPdulimtg@_GC!;9T_{JDv>G>H9Q7_7LtcecvRb&7&_bGA
z|37vRYO0#%4H9~QDnd=~%~Gq@_s_biQt6-;+(W1|^~8FjnOJINboLTTWGA6UKB>mn
zW@`xwlKNU2P!&|wRC2XlgsRr40j)%}+d`*?P+3X|mCu*_?kO1bdiXn9$#^TVjZleI
z&I&@G7~5#OiT|6bsHXC&MHWf@YO7UU{a=X^+X+>-ZsLtM?oCEBuP5g+J0@aT?|sSh
Kg#*bOfzE%=+;t5A

diff --git a/languages/woocommerce-heidelpay-de_DE.po b/languages/woocommerce-heidelpay-de_DE.po
index e5f1138..56ccba3 100644
--- a/languages/woocommerce-heidelpay-de_DE.po
+++ b/languages/woocommerce-heidelpay-de_DE.po
@@ -13,6 +13,29 @@ msgstr ""
 "Last-Translator: DANIEL KRAUT <DANIEL.KRAUT@HEIDELPAY.DE>\n"
 "Language-Team: GERMAN\n"
 
+msgid "invoice_info"
+msgstr "Bitte &uuml;berweisen Sie uns den Betrag von <strong>{AMOUNT} {CURRENCY}</strong> nach Erhalt der Ware auf folgendes Konto:<br/><br/>"
+        		"Kontoinhaber: {CONNECTOR_ACCOUNT_HOLDER}<br/>"
+        		"IBAN: {CONNECTOR_ACCOUNT_IBAN}<br/>"
+        		"BIC: {CONNECTOR_ACCOUNT_BIC}<br/><br/>"
+        		"<i>Geben Sie als Verwendungszweck bitte ausschlie&szlig;lich diese Identifikationsnummer an:</i><br/>"
+        		"<strong>{IDENTIFICATION_SHORTID}</strong>"
+
+msgid "prepayment_info"
+msgstr "Bitte &uuml;berweisen Sie uns den Betrag von <strong>{AMOUNT} {CURRENCY}</strong> auf folgendes Konto:<br/><br/>"
+        		"Kontoinhaber: {CONNECTOR_ACCOUNT_HOLDER}<br/>"
+        		"IBAN: {CONNECTOR_ACCOUNT_IBAN}<br/><br/>"
+        		"<i>Geben Sie als Verwendungszweck bitte ausschlie&szlig;lich diese Identifikationsnummer an:</i><br/>"
+        		"<strong>{IDENTIFICATION_SHORTID}</strong>"
+
+msgid "direct_debit_info"
+msgstr "Der Betrag von <strong>{AMOUNT} {CURRENCY}</strong> wird in den n&auml;chsten Tagen von folgendem Konto abgebucht:<br /><br />"
+        			"IBAN: {Iban}<br /><br/>"
+        			"<i>Die Abbuchung enth&auml;lt die Mandatsreferenz-ID: {Ident}<br />"
+        			"und die Gl&auml;ubiger ID: {CreditorId}</i><br />"
+        			"<br />"
+        			"Bitte sorgen Sie f&uuml;r ausreichende Deckung auf dem entsprechenden Konto."
+
 #: includes/abstracts/abstract-wc-heidelpay-iframe-gateway.php:57
 msgid "Awaiting payment"
 msgstr "Auf Zahlung warten"
diff --git a/languages/woocommerce-heidelpay-en_US.mo b/languages/woocommerce-heidelpay-en_US.mo
new file mode 100644
index 0000000000000000000000000000000000000000..9d3bbe754ffef34c00dff337822fa67ca4ffeca2
GIT binary patch
literal 1144
zcmc&yO^?$s5G`LfBm`#;bLB!WoT{o)H!W(UB|+Wnfm3ko$*v)_E8E#pRTV#h6Mv5j
ze}v~GT~>k%64F|FaWXS`p7+K-UOfIj!g>U}1l|BofOFtE@DX?lIN%xZ6}WgX8hyk5
z3Hwjr6_7;&thhY{5bBoFj%6qnS2~p1)OMuJjn$I-kFDda*l*Yj$>N$xY;0=+*_x(4
zIBTwEhxxnwGAoXBNG{jwWtMz6PRB!zcDiY(V(N}yMYXdV3fJ0`kg{XiX?z;Qm<)dj
zq{QA&rj?`dtbe9w^K3$gv=Zic8%I*lVn3C&pS8InX-yE?_>O2Jj1qy#am|j6WJ(v2
zLP1K$F+)LDDIF^vtRo$By4LJam<-WWL5d#w=+A!Nu<%T5eCrq#B19g%o|O8wuC>%)
zqq;T9lkLSx>m2*7H7d3{sDC{g_<|G0quH*hfAm<?0Y74rtZyRs-nNdcQ<2SfgtcuN
zySsDlt&ebdWgC=6)p?dJlOkW2^CXEQEm!&ZV!4ivjc3Cc{w#`#zND)=OOwBHA%3R{
z(;JkxaMPM*k4AATPGgWFXc%YOO$8aEAFE<7o!-WAO@_JP9-OXWx>#mK`Zi7GMVe>j
V#VTJH>EicY{2x}|gP-@|)GyrYa47%)

literal 0
HcmV?d00001

diff --git a/languages/woocommerce-heidelpay-en_US.po b/languages/woocommerce-heidelpay-en_US.po
new file mode 100644
index 0000000..7cf39f6
--- /dev/null
+++ b/languages/woocommerce-heidelpay-en_US.po
@@ -0,0 +1,22 @@
+msgid "invoice_info"
+msgstr "Please transfer the amount of <strong>{AMOUNT} {CURRENCY}</strong> after receiving your order to the following account<br /><br />"
+        		"Holder: {CONNECTOR_ACCOUNT_HOLDER}<br/>"
+        		"IBAN: {CONNECTOR_ACCOUNT_IBAN}<br/><br/>"
+        		"BIC: {CONNECTOR_ACCOUNT_BIC}<br/><br/>"
+        		"<i>Please use only this identification number as the descriptor :</i><br/>"
+        		"<strong>{IDENTIFICATION_SHORTID}</strong>"
+
+msgid "prepayment_info"
+msgstr "Please transfer the amount of <strong>{AMOUNT} {CURRENCY}</strong> to the following account<br /><br />"
+        		"Holder: {CONNECTOR_ACCOUNT_HOLDER}<br/>"
+        		"IBAN: {CONNECTOR_ACCOUNT_IBAN}<br/><br/>"
+        		"<i>Please use only this identification number as the descriptor :</i><br/>"
+        		"<strong>{IDENTIFICATION_SHORTID}</strong>"
+
+msgid "direct_debit_info"
+msgstr "The amount of <strong>{AMOUNT} {CURRENCY}</strong> will be debited from this account within the next days:<br /><br />"
+        		"IBAN: {Iban}<br /><br/>"
+        		"<i>The booking contains the mandate reference ID: {Ident}<br >"
+        		"and the creditor identifier: {CreditorId}</i><br />"
+        		"<br />"
+        		"Please ensure that there will be sufficient funds on the corresponding account."
diff --git a/languages/woocommerce-heidelpay.pot b/languages/woocommerce-heidelpay.pot
index da6ce7d..712f373 100644
--- a/languages/woocommerce-heidelpay.pot
+++ b/languages/woocommerce-heidelpay.pot
@@ -13,6 +13,16 @@ msgstr ""
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 
+#: includes/class-wc-heidelpay-response.php:134
+msgid "invoice_info"
+msgstr ""
+
+msgid "prepayment_info"
+msgstr ""
+
+msgid "direct_debit_info"
+msgstr ""
+
 #: includes/abstracts/abstract-wc-heidelpay-iframe-gateway.php:57
 msgid "Awaiting payment"
 msgstr ""
diff --git a/woocommerce-heidelpay.php b/woocommerce-heidelpay.php
index 6fef7b3..85818a9 100644
--- a/woocommerce-heidelpay.php
+++ b/woocommerce-heidelpay.php
@@ -212,7 +212,7 @@ public function install()
              * Checks the environment for compatibility problems.  Returns a string with the first incompatibility
              * found or false if the environment has no problems.
              */
-            static function get_environment_warning()
+            public static function get_environment_warning()
             {
                 if (version_compare(phpversion(), WC_HEIDELPAY_MIN_PHP_VER, '<')) {
                     $message = __('minimal PHP version error', 'woocommerce-heidelpay');

From 18207534aefc0e48f1a25ccade31487d6aebbff8 Mon Sep 17 00:00:00 2001
From: "David.Owusu" <david.owusu@heidelpay.de>
Date: Tue, 17 Jul 2018 14:56:49 +0200
Subject: [PATCH 11/25] (WOO-20) Bugfix PaymentInfo: Log function display the
 name of the function that called the debug function.

---
 includes/abstracts/abstract-wc-heidelpay-payment-gateway.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
index b512238..954d9ef 100644
--- a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
@@ -461,7 +461,7 @@ protected function paymentLog($logData)
     {
         $callers = debug_backtrace();
         wc_get_logger()->log(WC_Log_Levels::NOTICE, print_r('Heidelpay - ' .
-            $callers [0] ['function'] .': '. print_r($logData, 1), 1));
+            $callers [1] ['function'] .': '. print_r($logData, 1), 1));
     }
 
     public function addPayInfo($orderReceivedText)

From cd00980b8ddaaf114217081088cbb7ee4d2e0479 Mon Sep 17 00:00:00 2001
From: "David.Owusu" <david.owusu@heidelpay.de>
Date: Tue, 17 Jul 2018 17:04:06 +0200
Subject: [PATCH 12/25] (WOO-20) Bugfix PaymentInfo: Log function to display
 the name of the function that called the debug function.

---
 .../abstract-wc-heidelpay-payment-gateway.php      | 14 +++++++-------
 .../gateways/class-wc-heidelpay-gateway-idl.php    |  1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
index 954d9ef..9e05427 100644
--- a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
@@ -443,6 +443,13 @@ protected function getBookingSelection()
         );
     }
 
+    protected function paymentLog($logData)
+    {
+        $callers = debug_backtrace();
+        wc_get_logger()->log(WC_Log_Levels::NOTICE, print_r('Heidelpay - ' .
+            $callers [1] ['function'] .': '. print_r($logData, 1), 1));
+    }
+
     /**
      * Get the order using the Get parameter 'key'
      * @return bool|WC_Order|WC_Refund
@@ -457,13 +464,6 @@ public function getOrderFromKey()
         return null;
     }
 
-    protected function paymentLog($logData)
-    {
-        $callers = debug_backtrace();
-        wc_get_logger()->log(WC_Log_Levels::NOTICE, print_r('Heidelpay - ' .
-            $callers [1] ['function'] .': '. print_r($logData, 1), 1));
-    }
-
     public function addPayInfo($orderReceivedText)
     {
         $order = $this->getOrderFromKey();
diff --git a/includes/gateways/class-wc-heidelpay-gateway-idl.php b/includes/gateways/class-wc-heidelpay-gateway-idl.php
index 2af51f6..a5a1806 100644
--- a/includes/gateways/class-wc-heidelpay-gateway-idl.php
+++ b/includes/gateways/class-wc-heidelpay-gateway-idl.php
@@ -149,5 +149,4 @@ public function setAvailability($available_gateways)
 
         return $available_gateways;
     }
-
 }

From e01b111895cc9d8be69bec45972c62e3b638cccc Mon Sep 17 00:00:00 2001
From: "David.Owusu" <david.owusu@heidelpay.de>
Date: Wed, 18 Jul 2018 09:22:50 +0200
Subject: [PATCH 13/25] (WOO-20) Bugfix PaymentInfo: handled issues from merge
 request. fix that abstract class Logs the mapped error message instead of the
 original from the response.

---
 .../abstract-wc-heidelpay-payment-gateway.php | 22 +++++++++++++++++--
 includes/class-wc-heidelpay-response.php      |  9 ++++++++
 .../class-wc-heidelpay-gateway-idl.php        |  3 +--
 .../class-wc-heidelpay-gateway-ivpg.php       |  6 ++---
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
index 9e05427..1700cb4 100644
--- a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
@@ -320,7 +320,7 @@ protected function performRequest($order_id)
                 ];
             }
 
-            $this->paymentLog($this->getErrorMessage());
+            $this->paymentLog($this->payMethod->getResponse()->getError());
             $this->addPaymentError($this->getErrorMessage());
         } else {
             $this->addPaymentError($this->getErrorMessage());
@@ -443,10 +443,15 @@ protected function getBookingSelection()
         );
     }
 
+    /**
+     * Funktion to log Events as a notice. It has a prefix to identify that the log entry is from heidelpay and which
+     * function has created it.
+     * @param  string|array $logData
+     */
     protected function paymentLog($logData)
     {
         $callers = debug_backtrace();
-        wc_get_logger()->log(WC_Log_Levels::NOTICE, print_r('Heidelpay - ' .
+        wc_get_logger()->log(WC_Log_Levels::NOTICE, print_r('heidelpay - ' .
             $callers [1] ['function'] .': '. print_r($logData, 1), 1));
     }
 
@@ -464,6 +469,12 @@ public function getOrderFromKey()
         return null;
     }
 
+    /**
+     * "woocommerce_thankyou_order_received_text" hook to display heidelpay-paymentInfo text on the successpage after
+     * payment.
+     * @param $orderReceivedText
+     * @return string
+     */
     public function addPayInfo($orderReceivedText)
     {
         $order = $this->getOrderFromKey();
@@ -481,6 +492,13 @@ public function addPayInfo($orderReceivedText)
         return $orderReceivedText;
     }
 
+    /**
+     * Hook - "woocommerce_email_before_order_table". Add heidelpay-paymentInfo text to "completed order" email.
+     * @param WC_Order $order
+     * @param $sent_to_admin
+     * @param bool $plain_text
+     * @return null
+     */
     public function emailInstructions(WC_Order $order, $sent_to_admin, $plain_text = false)
     {
         if ($order->get_payment_method() !== $this->id) {
diff --git a/includes/class-wc-heidelpay-response.php b/includes/class-wc-heidelpay-response.php
index 9894ee4..2a7d2a3 100644
--- a/includes/class-wc-heidelpay-response.php
+++ b/includes/class-wc-heidelpay-response.php
@@ -30,6 +30,11 @@ class WC_Heidelpay_Response
      */
     public static $response;
 
+    /**
+     * Setup for Response handling and security.
+     * @param array $post_data
+     * @param $secret
+     */
     public function init(array $post_data, $secret)
     {
         if (empty(self::$response)) {
@@ -147,6 +152,10 @@ public function setPaymentInfo(WC_Order $order)
         $order->add_meta_data('heidelpay-paymentInfo', $paymentText);
     }
 
+    /**
+     * Provide the template text for payment information.
+     * @return null|string
+     */
     public function getInfoTemplate()
     {
         $payCode = explode('.', self::$response->getPayment()->getCode());
diff --git a/includes/gateways/class-wc-heidelpay-gateway-idl.php b/includes/gateways/class-wc-heidelpay-gateway-idl.php
index a5a1806..b7909eb 100644
--- a/includes/gateways/class-wc-heidelpay-gateway-idl.php
+++ b/includes/gateways/class-wc-heidelpay-gateway-idl.php
@@ -134,8 +134,7 @@ public function setAvailability($available_gateways)
     {
         $available = true;
 
-        $isCustomer = wc()->customer !== null;
-        if ($isCustomer) {
+        if (wc()->customer !== null) {
             if (wc()->customer->get_billing_country() !== 'NL') {
                 $available = false;
             }
diff --git a/includes/gateways/class-wc-heidelpay-gateway-ivpg.php b/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
index c1cdb55..06746cf 100644
--- a/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
+++ b/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
@@ -117,7 +117,7 @@ public function init_form_fields()
             'title' => __('Available Countries for secured invoice', 'woocommerce-heidelpay'),
             'type' => 'title',
             'description' => __(
-                'Here you can enable secured Invoice for specific countries. Be aware that this will not enable the' .
+                'Here you can enable secured Invoice for specific countries. Be aware that this will not enable the ' .
                 'country in your WooCommerce settings and you have to enable them seperately.',
                 'woocommerce-heidelpay'
             )
@@ -155,9 +155,7 @@ public function setAvailability($available_gateways)
         $customer = wc()->customer;
         $cart = wc()->cart;
 
-        $environmentCheck = $customer !== null && $cart !== null;
-
-        if ($environmentCheck) {
+        if ($customer !== null && $cart !== null) {
             if (!empty($customer->get_billing_company())) {
                 $security = false;
             }

From ad605d59add7113f9ec710049773043061a58c8d Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Mon, 23 Jul 2018 08:42:55 +0200
Subject: [PATCH 14/25] remove comments & unused function

---
 includes/class-wc-heidelpay-push.php     |  5 -----
 includes/class-wc-heidelpay-response.php | 15 ++++-----------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/includes/class-wc-heidelpay-push.php b/includes/class-wc-heidelpay-push.php
index aa53186..9c0fddc 100644
--- a/includes/class-wc-heidelpay-push.php
+++ b/includes/class-wc-heidelpay-push.php
@@ -44,16 +44,11 @@ public function init($rawPayload, $secret)
                 $_SERVER ['REMOTE_ADDR'] . ", suspecting manipulation", 1));
             exit(); //error
         }
-
         $this->handlePush($response);
     }
 
     public function handlePush($response)
     {
-        //TODO: HashSecurityCheck
-        //TODO: Amount mit OrderAmount abgleichen
-        //TODO: Push in Datenbank schreiben?
-
         $orderID = $response->getIdentification()->getTransactionId();
         $order = wc_get_order($orderID);
 
diff --git a/includes/class-wc-heidelpay-response.php b/includes/class-wc-heidelpay-response.php
index ca55176..2ed618c 100644
--- a/includes/class-wc-heidelpay-response.php
+++ b/includes/class-wc-heidelpay-response.php
@@ -88,8 +88,10 @@ public function handleResult($post_data, WC_Order $order)
                     $order->add_order_note($note, false);
                 }
 
-                $order->update_status('on-hold', __('Awaiting payment.', 'woocommerce-heidelpay')
-                . ' ' . $note) . ' ';
+                $order->update_status(
+                    'on-hold',
+                    __('Awaiting payment.', 'woocommerce-heidelpay') . ' ' . $note
+                );
             } else {
                 $order->payment_complete();
             }
@@ -173,13 +175,4 @@ public function getInfoTemplate()
                 return null;
         }
     }
-
-    /*
-     * handle push post
-     */
-
-    public function handlePush()
-    {
-        //TODO
-    }
 }

From f39c857afa7a0d0b28fb65005055d6628ecc7ef9 Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Mon, 23 Jul 2018 15:52:57 +0200
Subject: [PATCH 15/25] Add AmountCheck

- Checks if the pushed amount equals total amount
- pushed amount equals total
=> Update Status with note
- pushed amount unequals total
=> Status not updated but add note with information
- add phpDocs
---
 includes/class-wc-heidelpay-push.php | 35 +++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/includes/class-wc-heidelpay-push.php b/includes/class-wc-heidelpay-push.php
index 9c0fddc..a10d4c7 100644
--- a/includes/class-wc-heidelpay-push.php
+++ b/includes/class-wc-heidelpay-push.php
@@ -28,11 +28,17 @@ class WC_Heidelpay_Push
     /** @var Heidelpay\PhpPaymentApi\Push */
     public static $push;
 
+    /**
+     * @param $rawPayload
+     * @param $secret
+     * @throws \Heidelpay\PhpPaymentApi\Exceptions\XmlResponseParserException
+     */
     public function init($rawPayload, $secret)
     {
         if (empty(self::$push)) {
             self::$push = new Push($rawPayload);
         }
+        /** @var Heidelpay\PhpPaymentApi\Response $response */
         $response = self::$push->getResponse();
 
         try {
@@ -47,11 +53,38 @@ public function init($rawPayload, $secret)
         $this->handlePush($response);
     }
 
+    /**
+     * @param Heidelpay\PhpPaymentApi\Response $response
+     */
     public function handlePush($response)
     {
         $orderID = $response->getIdentification()->getTransactionId();
         $order = wc_get_order($orderID);
 
-        $order->update_status('processing', 'Bezahlung ist eingegangen');
+        if ($order->get_total() === $response->getPresentation()->getAmount()) {
+            $order->update_status(
+                'processing',
+                $this->getNote($response)
+            );
+        } else {
+            $order->add_order_note(
+                $this->getNote($response),
+                false
+            );
+        }
+    }
+
+    /**
+     * @param Heidelpay\PhpPaymentApi\Response $response
+     * @return string
+     */
+    private function getNote($response)
+    {
+        return sprintf(
+            __('Payment of %s %s received. Heidelpay ShortID %s', 'woocommerce-heidelpay'),
+            $response->getPresentation()->getAmount(),
+            $response->getPresentation()->getCurrency(),
+            $response->getIdentification()->getShortId()
+        );
     }
 }

From 866b03d3c642c1c6189a22e5bc8ade8696ab9173 Mon Sep 17 00:00:00 2001
From: "David.Owusu" <david.owusu@heidelpay.de>
Date: Mon, 23 Jul 2018 16:14:47 +0200
Subject: [PATCH 16/25] (WOO-20) Bugfix PaymentInfo: default instruction is
 empty because - instructions can be different in each payment method. - Add
 an option to whether send payment information or not for dd and iv -
 paymentinfo is added if option is set to yes and order status is pending or
 on-hold. - Update localization file. - Add Changelog and version for 1.1.2

---
 CHANGELOG.md                                  |   9 +++++++++
 .../abstract-wc-heidelpay-payment-gateway.php |   9 +++++++--
 .../class-wc-heidelpay-gateway-dd.php         |  15 ++++++++++-----
 .../class-wc-heidelpay-gateway-ivpg.php       |  17 ++++++++++++-----
 languages/woocommerce-heidelpay-de_DE.mo      | Bin 6211 -> 6374 bytes
 languages/woocommerce-heidelpay-de_DE.po      |   6 ++++++
 languages/woocommerce-heidelpay.pot           |   2 +-
 woocommerce-heidelpay.php                     |   4 ++--
 8 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03eb0bd..8e59ca2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Release Notes - heidelpay Payment Gateway for WooCommerce
 
+## 1.1.2
+### Fixed:
+- missing payment information for secured invoice and direct debit on success page and notification mail.
+- invoice instruction was shown in other mails where other payment methods were used.
+- Exception that can occur in combination with other plugins.
+
+### Added:
+- a checkbox to decide whether payment information should be added to the notification mail or not.
+
 ## 1.1.1
 
 ### Fixed:
diff --git a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
index 1700cb4..883dd47 100644
--- a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
@@ -126,7 +126,7 @@ public function init_form_fields()
                     'Instructions that will be added to the thank you page and emails.',
                     'woocommerce-heidelpay'
                 ),
-                'default' => __('The following account will be billed:', 'woocommerce-heidelpay'),
+                'default' => '',
                 'desc_tip' => true,
             ),
             'security_sender' => array(
@@ -508,6 +508,11 @@ public function emailInstructions(WC_Order $order, $sent_to_admin, $plain_text =
         if ($this->instructions) {
             echo wpautop(wptexturize($this->instructions)) . PHP_EOL;
         }
-        echo $order->get_meta('heidelpay-paymentInfo');
+
+        if($this->get_option('send_payment_info') === 'yes') {
+            if($order->get_status() === 'pending' || $order->get_status() === 'on-hold') {
+                echo $order->get_meta('heidelpay-paymentInfo');
+            }
+        }
     }
 }
diff --git a/includes/gateways/class-wc-heidelpay-gateway-dd.php b/includes/gateways/class-wc-heidelpay-gateway-dd.php
index 1852199..2085d9e 100644
--- a/includes/gateways/class-wc-heidelpay-gateway-dd.php
+++ b/includes/gateways/class-wc-heidelpay-gateway-dd.php
@@ -30,11 +30,6 @@ class WC_Gateway_HP_DD extends WC_Heidelpay_Payment_Gateway
     /** @var array Array of locales */
     public $locale;
 
-
-
-
-
-
     public function checkoutValidation()
     {
         // If gateway is not active no validation is necessary.
@@ -71,6 +66,16 @@ public function init_form_fields()
         $this->form_fields['user_login']['default'] = '31ha07bc8142c5a171744e5aef11ffd3';
         $this->form_fields['user_password']['default'] = '93167DE7';
         $this->form_fields['transaction_channel']['default'] = '31HA07BC8142C5A171744F3D6D155865';
+        $this->form_fields['send_payment_info'] = array(
+            'title' => __('Payment information mail', 'woocommerce-heidelpay'),
+            'type' => 'checkbox',
+            'description' => __(
+                'Add payment information to e-mail',
+                'woocommerce-heidelpay'
+            ),
+            'default' => 'yes',
+            'desc_tip' => true,
+        );
     }
 
     public function payment_fields()
diff --git a/includes/gateways/class-wc-heidelpay-gateway-ivpg.php b/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
index 06746cf..8943459 100644
--- a/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
+++ b/includes/gateways/class-wc-heidelpay-gateway-ivpg.php
@@ -28,11 +28,6 @@ class WC_Gateway_HP_IVPG extends WC_Heidelpay_Payment_Gateway
     /** @var array Array of locales */
     public $locale;
 
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     public function checkoutValidation()
     {
         // If gateway is not active no validation is necessary.
@@ -93,12 +88,24 @@ public function init_form_fields()
         $this->form_fields['user_password']['default'] = '93167DE7';
         $this->form_fields['transaction_channel']['default'] = '31HA07BC81856CAD6D8E05CDDE7E2AC8';
 
+        $this->form_fields['send_payment_info'] = array(
+            'title' => __('Payment information mail', 'woocommerce-heidelpay'),
+            'type' => 'checkbox',
+            'description' => __(
+                'Add payment information to e-mail',
+                'woocommerce-heidelpay'
+            ),
+            'default' => 'yes',
+            'desc_tip' => true,
+        );
+
         $this->form_fields['advanced'] = array(
             'title' => __('Advanced options', 'woocommerce-heidelpay'),
             'type' => 'title',
             'description' => ''
         );
 
+
         $this->form_fields['min'] = array(
             'title' => __('Minimum Amount', 'woocommerce-heidelpay'),
             'type' => 'text',
diff --git a/languages/woocommerce-heidelpay-de_DE.mo b/languages/woocommerce-heidelpay-de_DE.mo
index 6cddd77bd19355708d69704c172f6562487c0126..c8a98ba90fb5e2ea8333ab52522e9bdb28a5eb6c 100644
GIT binary patch
delta 1672
zcmY+@OGs2v9LMp$k5PN6S=!6;nyI~=vX?#8Y^EoqNl?;a!byj8MsyO2Xd-DLEefR|
z$VD&62wd1AA_y8<^jNegkfI2ZXcJaYw2HpJ>m}^K|9;MWoqPWOb8gcAc~#;=UixLD
z1&BgoZ>m`cPp5NG%P=d26y%nbV>T|uVywbkY{F^ShUIw5yM6<wb3Tk3@+nTj=QzbI
zVXx`T<ibbKpW`=da;BM&>jgL&3y~MB9H(L>YM^S=gm!x#!Wo>mdgrHci1Q1m32e$T
zn~T*rmG4^<of^G>Id~T};6qf#&oB*NB4gMq)N>;^8^2%>Q<%+8+=ZHOAL{u5BqzI#
zdhed+BP`|n_L9zK{DI22g142yTGT+hIH<IZ=-^S@ial6|Pf!_UQl3S)5VbTxEWikA
z3C<#)us&1;uVEse&LEu?_!#HlS5#)1Jf#Uas29pO=zb;Y{ytoY$55H|VsDDsRdhHn
zp^U0v9dgNn=*LD>g6FfTKYhE(VGZ8FJbdr@4Yg)zjIIH)P?g9>O}qqWVHGlGtM~37
zL5gC>QSWto_j|ni7g3cN$f5q~+~<NadVzXz6q7iHn!qqyya*qlJ~V<_vQgB8im9)x
zKs~?3vlhw0g2<zG5cRzl)KZ;E(Ah)hCTf$6p*GDg@B9yHZGDu5xtN1mTR)ay18PFu
zsFI#TC2$2bq3gH|hp-mkp(eh7hgG>m6CGvNh58NqQ6Id6O{`@Sl|d2pRw-AaO23JN
zGN?!GiEdN{FQN9#AZjlRp)#)GYYT8cYR|;*Knm;MM~COEikR5=tK3qqL=C)_*g|Y4
zG|{C5#c`VwAhCZ<A5c|l2xYHIts~|U0V0i<Pq<e$xE(UW)kG<w4CeNKPoI&fqo;*Y
z+eqlgQ$5s}xh-*f<NMv~y7j5#WIeH%(8?=!6~2N{D<ia^s*UQX#ZgNoRuTFgXbrY)
zyyLE}R#bnmpU^6+X;IV)iDIIf&<;}5!t8K+<3D&g{pI~{e1W27rz3Q-JsgcYk?65l
zXL~3fiA9}w%n7e(4@KIBXJ=eV&7FA5y?Q&V(dQ2&AGO4t!=cu;6VaBg=1@Ewb(+JS
oPHng=p1c*0wCJ)siqjg2o;or7d)lYeg8!fI;CXk%x4DtbzXEHdvH$=8

delta 1523
zcmYk+OGs2v9LMp0qvQA($F$NctFiKtscBg=nPp?rO9{-4U_q9UTUP~HcM(w*wNTVn
zZGu*s#6ScsMUrY!=pqcVf`Y>AMTDE7@6S0!hxyOv+<WfhfBxs*`>}SS#(R^OI%KqF
zqKIhlnRVfbRQ_mh{bnWj4jHmQnpp@laXA)ZHdbI6M&15Xn9FuA>Qa|61FvBg4&X{N
z&+a5U7Iy<v$h~X^GjZ1K|A0ZZzoRacKqZnMNLqj^*e-S3^*GM<5mW+;xCRrb>lCJ&
z#kjwf(#c^*59)&FQ8T@YDR><@$8MpH8^%L;4-ex4D$xj8>9{5&H#>?tzRlT%s$?%V
z;0XG;zs=B5=Ch~^Euc!eh+zz{b03zYmgy{NCZo6+pI|Z0V?KtcuS#EnT*4x#8OLxH
z9>Xf^Mz4_00G-u1iYomi>V#*g@mFsA2X16Li$Tq-8vB=#9ERDRB5PId6YBhV)WjB1
zmCfd_4vR1k+d|Y|oo;q$jn1J?>_g76epJRISb$?l4mRn=Um}yXIn;Td-S}@eo<f$Y
zNUpOSHPJ@Yc^x^_e}c{#b|`@|9_bBOiMmlMYOOj@2@N^#qK<#ye2CoB9wR?{%Ac0z
zHMXGEL(fDj>KSQw+npXAt>tMX2fK(`%bU0f$5Dw)qe?l4%KRrPp#*NlAZ2XAC@SF#
zsER#8P3Q&ky4g3>{rp_4lcn>*bd-4?qblJIRLO6nW^f<%3{0a+_XYKgq;ZheK8Pyu
zFn{ZD4E2mW$9BfQB3Oj@zo`mT(6dT9%5(>@hlmlHX*r=%s_DW^^j|Bcrz$iOTL|5-
zj?m1S3B9)Zn5pebV!N@%^@S#7Hkj`Zc`BUdq!uMqKowVw^q0PC>Z_1{8)dLsVkc2b
zXz|t&^+Xk+ruwP2s;3rnKcVI$wh`O4VRqd1COb>-f);@<id7SOd)4#=sI4W!guVuP
poYb@^2bOxtCqbW>iosw0gYlDTgT8o1MvFgwCG_4Gzm(e(_yf(8ciaE~

diff --git a/languages/woocommerce-heidelpay-de_DE.po b/languages/woocommerce-heidelpay-de_DE.po
index 56ccba3..20532d8 100644
--- a/languages/woocommerce-heidelpay-de_DE.po
+++ b/languages/woocommerce-heidelpay-de_DE.po
@@ -101,6 +101,12 @@ msgstr "Anweisungen"
 msgid "Instructions that will be added to the thank you page and emails."
 msgstr "Anweisungen auf der Bestellbestätigungsseite und in E-Mails"
 
+msgid "Payment information mail"
+msgstr "Zahlungsdaten per mail"
+
+msgid "Add payment information to e-mail"
+msgstr "Fügt Zahlungsdaten der Bestätigungs-mail hinzu"
+
 #: includes/abstracts/abstract-wc-heidelpay-payment-gateway.php:127
 msgid "The following account will be billed:"
 msgstr "Das folgende Konto wird belastet:"
diff --git a/languages/woocommerce-heidelpay.pot b/languages/woocommerce-heidelpay.pot
index 712f373..ae9f6ae 100644
--- a/languages/woocommerce-heidelpay.pot
+++ b/languages/woocommerce-heidelpay.pot
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the heidelpay WooCommerce package.
 msgid ""
 msgstr ""
-"Project-Id-Version: heidelpay WooCommerce 1.1.1\n"
+"Project-Id-Version: heidelpay WooCommerce 1.1.2\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/support/plugin/woocommerce-"
 "heidelpay\n"
 "POT-Creation-Date: 2018-06-15 08:21:52+00:00\n"
diff --git a/woocommerce-heidelpay.php b/woocommerce-heidelpay.php
index 85818a9..c01ed19 100644
--- a/woocommerce-heidelpay.php
+++ b/woocommerce-heidelpay.php
@@ -10,7 +10,7 @@
  * Plugin Name: heidelpay WooCommerce
  * Plugin URI: https://dev.heidelpay.com
  * Description: heidelpay payment integration for WooCommerce
- * Version: 1.1.1
+ * Version: 1.1.2
  * Author: heidelpay
  * Author URI: htts://www.heidelpay.com
  * Developer: heidelpay
@@ -29,7 +29,7 @@
     /**
      * Required minimums and constants
      */
-    define('WC_HEIDELPAY_VERSION', '1.1.1');
+    define('WC_HEIDELPAY_VERSION', '1.1.2');
     define('WC_HEIDELPAY_MIN_PHP_VER', '5.6.0');
     define('WC_HEIDELPAY_MIN_WC_VER', '3.0.0');
     define('WC_HEIDELPAY_MAIN_FILE', __FILE__);

From f90902f76025a38f037dcc29e212a141655a2797 Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Mon, 23 Jul 2018 16:28:43 +0200
Subject: [PATCH 17/25] Add Check on Push Response Status

---
 includes/class-wc-heidelpay-push.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/includes/class-wc-heidelpay-push.php b/includes/class-wc-heidelpay-push.php
index a10d4c7..d18217f 100644
--- a/includes/class-wc-heidelpay-push.php
+++ b/includes/class-wc-heidelpay-push.php
@@ -61,16 +61,20 @@ public function handlePush($response)
         $orderID = $response->getIdentification()->getTransactionId();
         $order = wc_get_order($orderID);
 
-        if ($order->get_total() === $response->getPresentation()->getAmount()) {
-            $order->update_status(
-                'processing',
-                $this->getNote($response)
-            );
-        } else {
-            $order->add_order_note(
-                $this->getNote($response),
-                false
-            );
+        if ($response->isSuccess()) {
+            if ($order->get_total() === $response->getPresentation()->getAmount()) {
+                $order->update_status(
+                    'processing',
+                    $this->getNote($response)
+                );
+            } else {
+                $order->add_order_note(
+                    $this->getNote($response),
+                    false
+                );
+            }
+        } elseif ($response->isError()) {
+            $order->update_status('failed');
         }
     }
 

From cc3d5bb8afcac2890c79bdc24c977fec36c50324 Mon Sep 17 00:00:00 2001
From: "David.Owusu" <david.owusu@heidelpay.de>
Date: Mon, 23 Jul 2018 16:50:48 +0200
Subject: [PATCH 18/25] (WOO-20) Bugfix PaymentInfo: Code Review issue -
 translation.

---
 languages/woocommerce-heidelpay-de_DE.mo | Bin 6374 -> 6373 bytes
 languages/woocommerce-heidelpay-de_DE.po |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages/woocommerce-heidelpay-de_DE.mo b/languages/woocommerce-heidelpay-de_DE.mo
index c8a98ba90fb5e2ea8333ab52522e9bdb28a5eb6c..da6920b5fc566a43d114550478f756a421f074b6 100644
GIT binary patch
delta 546
zcmXZYy)Q#y6vy$Sxiq<GUFtQ_QZ}J!VrZlbgT<hN1+zgKgX9h*a#OKb2#LgC5Qdr>
z(ZSB<ACQQxVXVn0@%`zO+&rJ>JTLb-=X~Wq^AF`%lryungjpXRBcEL{%wiRL@x%Fz
z9&s#b)`fBG#uWBr76-9_omg`FTj&$-pzeik|0rqE{|`=C7+~YtS;rybSJcG@zF-rT
zz+;bD2A@z5y<rg>sD#FXmNTgHMdv(HgDoOQZ9Rxu4{x(D$-*Hn;VpJx6XW>f;$Ivg
z_Gk;aSO&*2hZDGhN+?8iw1O(&5|!8uPGJof@I7Lp%ttw`)@`6F+rt!IpdPH^W}DeF
zs)98ARx77bt)F910VN#95Y@pmY{z>%;eHL(=>m_XF<54jWwMK_95}z*_x$=nqU`?x
DI&w3l

delta 548
zcmXZYy)Q#y6vy#XTI8a2QEx-5Y7?}HrNPq0U{S=<m<^g3Bsb~eCKZE;kVp&$=~7cA
zHQ0^*0g2ekT9Z+HfBGah&*wSM%YDu{pZTx+W2Gm|nb~gKYz)tk&u$r3uz{oa;rzxZ
zac{zG2nTQ&lbFOTPGSKEvE=sm(IY-Y-3#3QX~M$)A6&37!N#5Q38#o(Q5W0zf*n)>
ztr4>{KBFFb!!>N963X~pmr>`}okgSu+dz)mo*#A}K44*<g%jMwI`&})`|-!czc@o2
zqb=lOvzWmgW^o&pP=M-a4OPGmDzST9z$O;)J!GQHQ=C@o%BaeYaU8Ev4>qtIp$n)A
z()3%cTtc;el|coRa2f+t2QM*(4|vY~CaTi~9!sIW#bl1j5$<r{s$PwHk;PUuUh)0_
D<|;H3

diff --git a/languages/woocommerce-heidelpay-de_DE.po b/languages/woocommerce-heidelpay-de_DE.po
index 20532d8..2118f91 100644
--- a/languages/woocommerce-heidelpay-de_DE.po
+++ b/languages/woocommerce-heidelpay-de_DE.po
@@ -105,7 +105,7 @@ msgid "Payment information mail"
 msgstr "Zahlungsdaten per mail"
 
 msgid "Add payment information to e-mail"
-msgstr "Fügt Zahlungsdaten der Bestätigungs-mail hinzu"
+msgstr "Fügt Zahlungsdaten der Bestätigungsmail hinzu"
 
 #: includes/abstracts/abstract-wc-heidelpay-payment-gateway.php:127
 msgid "The following account will be billed:"

From 0c3636c6fdf3d0f2b4e4c634f54f10cd208fd348 Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Wed, 25 Jul 2018 15:29:16 +0200
Subject: [PATCH 19/25] Add transaction type Test

---
 includes/class-wc-heidelpay-push.php | 29 +++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/includes/class-wc-heidelpay-push.php b/includes/class-wc-heidelpay-push.php
index d18217f..c89dd6c 100644
--- a/includes/class-wc-heidelpay-push.php
+++ b/includes/class-wc-heidelpay-push.php
@@ -60,21 +60,24 @@ public function handlePush($response)
     {
         $orderID = $response->getIdentification()->getTransactionId();
         $order = wc_get_order($orderID);
+        $payCode = explode('.', strtoupper($response->getPayment()->getCode()));
 
-        if ($response->isSuccess()) {
-            if ($order->get_total() === $response->getPresentation()->getAmount()) {
-                $order->update_status(
-                    'processing',
-                    $this->getNote($response)
-                );
-            } else {
-                $order->add_order_note(
-                    $this->getNote($response),
-                    false
-                );
+        if ($payCode[1] === 'CP' || $payCode[1] === 'RC' || $payCode[1] === 'CD' || $payCode[1] === 'DB') {
+            if ($response->isSuccess()) {
+                if ($order->get_total() === $response->getPresentation()->getAmount()) {
+                    $order->update_status(
+                        'processing',
+                        $this->getNote($response)
+                    );
+                } else {
+                    $order->add_order_note(
+                        $this->getNote($response),
+                        false
+                    );
+                }
+            } elseif ($response->isError()) {
+                $order->update_status('failed');
             }
-        } elseif ($response->isError()) {
-            $order->update_status('failed');
         }
     }
 

From f28c3ee2e07774100a0164ea8f295b5a5f82b0b5 Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Thu, 26 Jul 2018 15:06:00 +0200
Subject: [PATCH 20/25] resolve request comments

- remove CD transaction type
- add IV Case
- changed restriction on failed transaction
---
 includes/class-wc-heidelpay-push.php | 42 ++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/includes/class-wc-heidelpay-push.php b/includes/class-wc-heidelpay-push.php
index c89dd6c..fe8701e 100644
--- a/includes/class-wc-heidelpay-push.php
+++ b/includes/class-wc-heidelpay-push.php
@@ -62,13 +62,41 @@ public function handlePush($response)
         $order = wc_get_order($orderID);
         $payCode = explode('.', strtoupper($response->getPayment()->getCode()));
 
-        if ($payCode[1] === 'CP' || $payCode[1] === 'RC' || $payCode[1] === 'CD' || $payCode[1] === 'DB') {
+        wc_get_logger()->log(WC_Log_Levels::DEBUG, $order->get_status());
+
+        if ($payCode[0] === 'IV') {
+            if ($response->isSuccess()) {
+                switch ($payCode[1]) {
+                    case 'FI':
+                        $order->update_status(
+                            'on-hold',
+                            'Order has been finalized'
+                        );
+                        break;
+                    case 'PA':
+                        $order->update_status(
+                            'processing',
+                            'Reservation done'
+                        );
+                        break;
+                }
+            }
+        }
+
+        if ($payCode[1] === 'CP' || $payCode[1] === 'RC' || $payCode[1] === 'DB') {
             if ($response->isSuccess()) {
                 if ($order->get_total() === $response->getPresentation()->getAmount()) {
-                    $order->update_status(
-                        'processing',
-                        $this->getNote($response)
-                    );
+                    if ($payCode[0] === 'IV') {
+                        $order->update_status(
+                            'completed',
+                            $this->getNote($response)
+                        );
+                    } else {
+                        $order->update_status(
+                            'processing',
+                            $this->getNote($response)
+                        );
+                    }
                 } else {
                     $order->add_order_note(
                         $this->getNote($response),
@@ -76,7 +104,9 @@ public function handlePush($response)
                     );
                 }
             } elseif ($response->isError()) {
-                $order->update_status('failed');
+                if ($order->get_status() === 'pending') {
+                    $order->update_status('failed');
+                }
             }
         }
     }

From 74d2789f13b14cefa7508b2e82c8eff8c45ee476 Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Fri, 27 Jul 2018 09:34:16 +0200
Subject: [PATCH 21/25] resolve request comments

- add IV case in response
---
 includes/class-wc-heidelpay-response.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/includes/class-wc-heidelpay-response.php b/includes/class-wc-heidelpay-response.php
index 2ed618c..af95d15 100644
--- a/includes/class-wc-heidelpay-response.php
+++ b/includes/class-wc-heidelpay-response.php
@@ -72,7 +72,7 @@ public function handleResult($post_data, WC_Order $order)
         $uid = self::$response->getIdentification()->getUniqueId();
 
         if (self::$response->isSuccess()) {
-            $payCode = explode('.', $post_data ['PAYMENT_CODE']);
+            $payCode = explode('.', strtoupper($post_data['PAYMENT_CODE']));
             $note = '';
 
             $this->setPaymentInfo($order);
@@ -87,11 +87,12 @@ public function handleResult($post_data, WC_Order $order)
                     );
                     $order->add_order_note($note, false);
                 }
-
-                $order->update_status(
-                    'on-hold',
-                    __('Awaiting payment.', 'woocommerce-heidelpay') . ' ' . $note
-                );
+                if ($payCode[0] !== 'IV') {
+                    $order->update_status(
+                        'on-hold',
+                        __('Awaiting payment.', 'woocommerce-heidelpay') . ' ' . $note
+                    );
+                }
             } else {
                 $order->payment_complete();
             }
@@ -114,7 +115,7 @@ public function handleResult($post_data, WC_Order $order)
             //empty cart
             wc()->cart->empty_cart();
 
-            //show thank you page
+//show thank you page
             echo $order->get_checkout_order_received_url();
         }
     }
@@ -125,7 +126,8 @@ public function handleResult($post_data, WC_Order $order)
      * @param WC_Order $order
      * @return null
      */
-    public function setPaymentInfo(WC_Order $order)
+    public
+    function setPaymentInfo(WC_Order $order)
     {
         // Load template text for Payment information
         $payInfoTemplate = $this->getInfoTemplate();
@@ -158,7 +160,8 @@ public function setPaymentInfo(WC_Order $order)
      * Provide the template text for payment information.
      * @return null|string
      */
-    public function getInfoTemplate()
+    public
+    function getInfoTemplate()
     {
         $payCode = explode('.', self::$response->getPayment()->getCode());
         switch (strtoupper($payCode[0])) {

From 0b605e032f0862a47fbdd8a29626f94cb0847e3b Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Fri, 27 Jul 2018 10:25:07 +0200
Subject: [PATCH 22/25] solved formatting issues

---
 includes/class-wc-heidelpay-response.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/includes/class-wc-heidelpay-response.php b/includes/class-wc-heidelpay-response.php
index af95d15..d880c21 100644
--- a/includes/class-wc-heidelpay-response.php
+++ b/includes/class-wc-heidelpay-response.php
@@ -126,8 +126,7 @@ public function handleResult($post_data, WC_Order $order)
      * @param WC_Order $order
      * @return null
      */
-    public
-    function setPaymentInfo(WC_Order $order)
+    public function setPaymentInfo(WC_Order $order)
     {
         // Load template text for Payment information
         $payInfoTemplate = $this->getInfoTemplate();
@@ -160,8 +159,7 @@ function setPaymentInfo(WC_Order $order)
      * Provide the template text for payment information.
      * @return null|string
      */
-    public
-    function getInfoTemplate()
+    public function getInfoTemplate()
     {
         $payCode = explode('.', self::$response->getPayment()->getCode());
         switch (strtoupper($payCode[0])) {

From 32055d291a9821d2dc54f137acf80b3fa464a716 Mon Sep 17 00:00:00 2001
From: Florian Evertz <florian.evertz@heidelpay.de>
Date: Fri, 27 Jul 2018 10:56:47 +0200
Subject: [PATCH 23/25] resolve MR comments

---
 includes/class-wc-heidelpay-response.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/includes/class-wc-heidelpay-response.php b/includes/class-wc-heidelpay-response.php
index d880c21..206b0a1 100644
--- a/includes/class-wc-heidelpay-response.php
+++ b/includes/class-wc-heidelpay-response.php
@@ -78,21 +78,19 @@ public function handleResult($post_data, WC_Order $order)
             $this->setPaymentInfo($order);
 
             // If no money has been payed yet.
-            if (strtoupper($payCode[1]) === 'PA' || strtoupper($payCode[1]) === 'RG') {
-                // In not Prepayment and Invoice payment can be captured manually
-                if (strtoupper($payCode [0]) !== 'PP' && strtoupper($payCode [0]) !== 'IV') {
+            if ($payCode[0] !== 'IV' && ($payCode[1] === 'PA' || $payCode[1] === 'RG')) {
+                // If not Prepayment and Invoice payment can be captured manually
+                if ($payCode [0] !== 'PP') {
                     $note = __(
                         'Payment reservation successful. Please use the hiP to check the payment.',
                         'woocommerce-heidelpay'
                     );
                     $order->add_order_note($note, false);
                 }
-                if ($payCode[0] !== 'IV') {
-                    $order->update_status(
-                        'on-hold',
-                        __('Awaiting payment.', 'woocommerce-heidelpay') . ' ' . $note
-                    );
-                }
+                $order->update_status(
+                    'on-hold',
+                    __('Awaiting payment.', 'woocommerce-heidelpay') . ' ' . $note
+                );
             } else {
                 $order->payment_complete();
             }

From 4a4abd2d5f879323ff8267dd650eb06b1b7a8378 Mon Sep 17 00:00:00 2001
From: "David.Owusu" <david.owusu@heidelpay.de>
Date: Tue, 31 Jul 2018 16:41:31 +0200
Subject: [PATCH 24/25] (WOO-20) Bugfix PaymentInfo: Adding paymentInfo also
 when status is processing

---
 .../abstract-wc-heidelpay-payment-gateway.php        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
index 883dd47..b5e47d9 100644
--- a/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-heidelpay-payment-gateway.php
@@ -509,8 +509,16 @@ public function emailInstructions(WC_Order $order, $sent_to_admin, $plain_text =
             echo wpautop(wptexturize($this->instructions)) . PHP_EOL;
         }
 
-        if($this->get_option('send_payment_info') === 'yes') {
-            if($order->get_status() === 'pending' || $order->get_status() === 'on-hold') {
+        $status = $order->get_status();
+        // defines the statuses when the mail should be send
+        $mailingArray = array(
+            'pending',
+            'on-hold',
+            'processing'
+        );
+
+        if ($this->get_option('send_payment_info') === 'yes') {
+            if (in_array($status, $mailingArray)) {
                 echo $order->get_meta('heidelpay-paymentInfo');
             }
         }

From 4714fb6f85f7b403b29fbed4590525b7e43d79dd Mon Sep 17 00:00:00 2001
From: "David.Owusu" <david.owusu@heidelpay.de>
Date: Wed, 1 Aug 2018 14:05:10 +0200
Subject: [PATCH 25/25] Release preparation for 1.2.0 - update Changelog

---
 CHANGELOG.md | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffbc56c..d3905ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,19 +2,15 @@
 
 ## 1.2.0
 
-### Added
-
-#### Features:
-- Support for push notifications
-
-## 1.1.2
 ### Fixed:
-- missing payment information for secured invoice and direct debit on success page and notification mail.
-- invoice instruction was shown in other mails where other payment methods were used.
+- Missing payment information for secured invoice and direct debit on success page and notification mail.
+- Invoice instruction was shown in other mails where other payment methods were used.
 - Exception that can occur in combination with other plugins.
 
-### Added:
-- a checkbox to decide whether payment information should be added to the notification mail or not.
+### Added
+#### Features:
+- Support for push notifications
+- A checkbox to decide whether payment information should be added to the notification mail or not.
 
 ## 1.1.1