Merge branch 'develop' into 'master'

3.3.1

See merge request !41

crefopay-payment-solution/crefopay-payment-solution.php

@@ -3,7 +3,7 @@
  * Plugin Name:          CrefoPay Payment Solution
  * Plugin URI:           https://repo.crefopay.de/crefopay/woocommerce
  * Description:          The complete solution for your eCommerce payments.
- * Version:              3.3.0
+ * Version:              3.3.1
  * Requires at least:    5.1
  * Requires PHP:         7.2
  * Author:               Shakuras GbR
@@ -134,7 +134,7 @@ define( 'WC_LOG_THRESHOLD', $options['crefopay_log_level'] );
  * Main Class of the CrefoPay payment plugin
  *
  * @class       CrefoPay_Payment_Solution
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution
  */
 class Crefopay_Payment_Solution

crefopay-payment-solution/includes/callbacks/class-wc-api-callback.php

@@ -13,7 +13,7 @@ require_once plugin_dir_path(__FILE__) . '../controllers/class-wc-api-callback-p
  *
  * @class       WC_API_CrefoPay_Api_Callback
  * @extends     WC_API
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution\Callbacks
  */
 class WC_API_CrefoPay_Api_Callback extends WC_API

crefopay-payment-solution/includes/callbacks/class-wc-notification-callback.php

@@ -16,7 +16,7 @@ use Upg\Library\Mns\Handler;
  *
  * @class       WC_API_Crefo_Notification_Callback
  * @extends     WC_API
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution\Callbacks
  */
 class WC_API_Crefo_Notification_Callback extends WC_API

crefopay-payment-solution/includes/controllers/class-wc-api-callback-processor.php

@@ -12,7 +12,7 @@ require_once plugin_dir_path(__FILE__) . '../controllers/class-wc-crefopay.php';
  * Process redirect payments
  *
  * @class       WC_API_CrefoPay_Api_Callback
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution\Controllers
  */
 class CrefoPay_API_Callback_Processor

crefopay-payment-solution/includes/controllers/class-wc-crefopay.php

@@ -56,7 +56,7 @@ use Upg\Library\Integration\Type as IntegrationType;
  *
  * @class       CrefoPay
  * @autoloads   Upg\Library
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution\Controllers
  */
 class CrefoPay

crefopay-payment-solution/includes/controllers/class-wc-helper-germanized.php

@@ -14,7 +14,7 @@ if ( class_exists( 'WC_GZD_Email_Customer_Paid_For_Order' ) ) :
      * from the WooCommerce Germanized extension.
      *
      * @class       CrefoPay_GZD_Email_Customer_Paid_For_Order
-     * @version     3.3.0
+     * @version     3.3.1
      * @package     CrefoPay-Payment-Solution\Controllers
      */
     class CrefoPay_GZD_Email_Customer_Paid_For_Order extends WC_GZD_Email_Customer_Paid_For_Order

crefopay-payment-solution/includes/controllers/class-wc-notification-callback-processor.php

@@ -16,7 +16,7 @@ use Upg\Library\Mns\ProcessorInterface;
  *
  * @class       CrefoPay_Notification_Callback_Processor
  * @implements  Upg\Library\Mns\ProcessorInterface
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution\Controllers
  */
 class CrefoPay_Notification_Callback_Processor implements ProcessorInterface

crefopay-payment-solution/includes/controllers/class-wc-notification-processor.php

@@ -12,7 +12,7 @@ require_once plugin_dir_path(__FILE__) . '../controllers/class-wc-helper-categor
  * Process CrefoPay notifications.
  *
  * @class       CrefoPay_Notification_Processor
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution\Controllers
  */
 class CrefoPay_Notification_Processor
@@ -79,8 +79,17 @@ class CrefoPay_Notification_Processor
 
                 // complete payment by tx-state:
                 if ($this->getMnsStatus($mns) == $options['crefopay_orderstate_payment_complete']) {
-                    $this->logger->debug("complete the payment");
-                    $order->payment_complete($this->orderID);
+                    if ($options['crefopay_payment_complete_for_invoice']) {
+                        if ($order->get_payment_method() == "crefopay_invoice") {
+                            $this->logger->debug("skip complete the payment for invoice payment");    
+                        } else {
+                            $this->logger->debug("complete the payment (for not invoice payment)");
+                            $order->payment_complete($this->orderID);
+                        }
+                    } else {
+                        $this->logger->debug("complete the payment for payment method " . $order->get_payment_method());
+                        $order->payment_complete($this->orderID);
+                    }
                 } 
 
                 switch ($this->getMnsStatus($mns)) {
@@ -226,6 +235,10 @@ class CrefoPay_Notification_Processor
                                 $this->logger->error("unable to set new order state " . $newState);
                             }
                         }
+                        // perform payment_complete for invoice payments
+                        if ($options['crefopay_payment_complete_for_invoice'] && $order->get_payment_method() == "crefopay_invoice") {
+                            $order->payment_complete($this->orderID);
+                        }
                         break;
 
                     case self::STATE_PAYMENTFAILED:

crefopay-payment-solution/includes/gateways/class-wc-crefopay-gateway-exception.php

@@ -19,7 +19,7 @@ require_once plugin_dir_path(__FILE__) . '../models/class-wc-crefopay-error.php'
  *
  * @class       WC_Crefo_Exception
  * @extends     WC_Data_Exception
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay Payment Solution
  */
 class WC_Crefo_Exception extends WC_Data_Exception

crefopay-payment-solution/includes/gateways/class-wc-payment-gateway-creditcard.php

@@ -14,7 +14,7 @@ require_once plugin_dir_path(__FILE__) . '../controllers/class-wc-crefopay.php';
  *
  * @class       WC_Crefo_Credit Card
  * @extends     WC_Crefo_Gateway
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay Payment Solution
  */
 class WC_Crefo_CreditCard extends WC_Crefo_Gateway

crefopay-payment-solution/includes/gateways/class-wc-payment-gateway-debit.php

@@ -15,7 +15,7 @@ require_once plugin_dir_path(__FILE__) . 'class-wc-payment-gateway.php';
  *
  * @class       WC_Crefo_Debit
  * @extends     WC_Crefo_Gateway
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution\Gateways
  */
 class WC_Crefo_Debit extends WC_Crefo_Gateway

crefopay-payment-solution/includes/gateways/class-wc-payment-gateway-invoice.php

@@ -13,7 +13,7 @@ require_once plugin_dir_path(__FILE__) . 'class-wc-payment-gateway.php';
  *
  * @class       WC_Crefo_Invoice
  * @extends     WC_Crefo_Gateway
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution\Gateways
  */
 class WC_Crefo_Invoice extends WC_Crefo_Gateway

crefopay-payment-solution/includes/gateways/class-wc-payment-gateway-paypal.php

@@ -13,7 +13,7 @@ require_once plugin_dir_path(__FILE__) . 'class-wc-payment-gateway.php';
  *
  * @class       WC_Crefo_PayPal
  * @extends     WC_Crefo_Gateway
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay Payment Solution
  */
 class WC_Crefo_PayPal extends WC_Crefo_Gateway

crefopay-payment-solution/includes/gateways/class-wc-payment-gateway-prepaid.php

@@ -13,7 +13,7 @@ require_once plugin_dir_path(__FILE__) . 'class-wc-payment-gateway.php';
  *
  * @class       WC_Crefo_Prepaid
  * @extends     WC_Crefo_Gateway
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay Payment Solution
  */
 class WC_Crefo_Prepaid extends WC_Crefo_Gateway

crefopay-payment-solution/includes/gateways/class-wc-payment-gateway-sofort.php

@@ -13,7 +13,7 @@ require_once plugin_dir_path(__FILE__) . 'class-wc-payment-gateway.php';
  *
  * @class       WC_Crefo_Sofort
  * @extends     WC_Crefo_Gateway
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay Payment Solution
  */
 class WC_Crefo_Sofort extends WC_Crefo_Gateway

crefopay-payment-solution/includes/gateways/class-wc-payment-gateway.php

@@ -15,7 +15,7 @@ use Upg\Library\Request\Objects\PaymentInstrument;
  *
  * @class       WC_Crefo_Gateway
  * @extends     WC_Payment_Gateway
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution\Gateways
  */
 abstract class WC_Crefo_Gateway extends WC_Payment_Gateway

crefopay-payment-solution/includes/models/class-wc-crefopay-error.php

@@ -10,7 +10,7 @@ defined('ABSPATH') or die('No script kiddies please!');
  * Represents CrefoPay error details.
  *
  * @class       WC_Crefo_Error
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution\Models
  */
 class WC_Crefo_Error

crefopay-payment-solution/includes/models/class-wc-crefopay-order.php

@@ -10,7 +10,7 @@ defined('ABSPATH') or die('No script kiddies please!');
  * Extends WC_Order
  *
  * @class       WC_Crefo_Order
- * @version     3.3.0
+ * @version     3.3.1
  * @package     CrefoPay-Payment-Solution\Models
  */
 class WC_Crefo_Order extends WC_Order