Merge pull request #39 from heidelpay/develop

Develop

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Release Notes - heidelpay Payment Gateway for WooCommerce
 
+## [1.7.0][1.7.0]
+
+### Added:
+- Use context to generate a dedicated heidelpay logfile
+- WooCommerce Subscriptions
+    - Enable / Disable payment for subscription orders
+    - Support for  configuration
+        - Change amount of subscription
+        - Change date of subscription
+    - Direct debit: 
+        - Add creditorId payment information
+        - Payment info text for subscription renewal orders.
+
+###Fixed:
+- Push notifications were not processed
+- IFrame not working if lazyloading is active
+
 ## [1.6.0][1.6.0]
 
 ### Added:
@@ -83,4 +100,5 @@
 [1.3.0]: https://github.com/heidelpay/woocommerce-heidelpay/compare/1.2.0..1.3.0
 [1.4.0]: https://github.com/heidelpay/woocommerce-heidelpay/compare/1.3.0..1.4.0
 [1.5.0]: https://github.com/heidelpay/woocommerce-heidelpay/compare/1.4.0..1.5.0
-[1.6.0]: https://github.com/heidelpay/woocommerce-heidelpay/compare/1.5.0..1.6.0
+[1.6.0]: https://github.com/heidelpay/woocommerce-heidelpay/compare/1.5.0..1.6.0
+[1.7.0]: https://github.com/heidelpay/woocommerce-heidelpay/compare/1.6.0..1.7.0

assets/js/creditCardFrame.js

@@ -49,22 +49,25 @@ function sendMessage(e) {
      * Get the iFrame element
      */
     var paymentFrameIframe = document.getElementById('paymentFrameIframe');
-    /**
-     * Get hostname and protocol from paymentIframe
-     */
-    var targetOrigin = getDomainFromUrl(paymentFrameIframe.src);
+    var targetOrigin = getUrlFromIframe(paymentFrameIframe);
 
     /**
      * Send html postmessage to payment frame
      */
     paymentFrameIframe.contentWindow.postMessage(JSON.stringify(data), targetOrigin);
 }
 
-
 /**
  * Function to get the domain from a given url
  */
-function getDomainFromUrl(url) {
+function getUrlFromIframe(paymentIframe) {
+    /**
+     * Get hostname and protocol from paymentIframe
+     */
+    var url = paymentIframe.getAttribute("src");
+    if (url === null) {
+        url = paymentIframe.getAttribute("data-src");
+    }
     var arr = url.split("/");
     return arr[0] + "//" + arr[2];
 }
@@ -79,15 +82,10 @@ function receiveMessage(e) {
      * Get the iFrame element
      */
     var paymentFrameIframe = document.getElementById('paymentFrameIframe');
-    /**
-     * Get hostname and protocol from paymentIframe
-     */
-
-    var targetOrigin = getDomainFromUrl(paymentFrameIframe.src);
+    var targetOrigin = getUrlFromIframe(paymentFrameIframe);
     if (e.origin !== targetOrigin) {
         return;
     }
 
     var antwort = JSON.parse(e.data);
-    //console.log(antwort);
 }

composer.json

@@ -10,14 +10,18 @@
   "authors": [
     {
       "name": "Daniel Kraut",
-      "email": "[email protected]"
+      "role": "Developer"
     },
     {
       "name": "Florian Evertz",
-      "email": "[email protected]"
+      "role": "Developer"
     },
     {
-      "name": "David Owusu"
+      "name": "David Owusu",
+      "role": "Developer"
     }
-  ]
+  ],
+  "support": {
+    "email": "[email protected]"
+  }
 }

includes/abstracts/abstract-wc-heidelpay-iframe-gateway.php

@@ -143,7 +143,7 @@ protected function getIFrame(WC_Order $order)
         $bookingAction = $this->getBookingAction();
 
         if (method_exists($this->payMethod, $bookingAction)) {
-            if (class_exists('WC_Subscriptions_Order') && wcs_order_contains_subscription($order)) {
+            if (class_exists('WC_Subscriptions') && wcs_order_contains_subscription($order)) {
                 $bookingAction = 'registration';
             }
             $this->payMethod->$bookingAction(
@@ -174,8 +174,7 @@ protected function getIFrame(WC_Order $order)
         $this->addPaymentError($this->getErrorMessage());
         wc_print_notices();
 
-        wc_get_logger()->log(
-            WC_Log_Levels::ERROR,
+        wc_get_logger()->error(
             htmlspecialchars(
                 print_r(
                     $this->plugin_id . ' - ' . $this->id . __(
@@ -184,20 +183,12 @@ protected function getIFrame(WC_Order $order)
                     ) . $bookingAction,
                     1
                 )
-            )
+            ),
+            array('source' => 'heidelpay')
         );
         return null;
     }
 
-    /**
-     * @param $order
-     * @param $uid
-     */
-    public function performNoGuiRequest($order, $uid)
-    {
-        parent::performAfterRegistrationRequest($order, $uid);
-    }
-
     /**
      * @return mixed|string
      */