Merge branch 'develop'

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.1.3
+ * Version:              3.1.4
  * Requires at least:    5.1
  * Requires PHP:         7.2
  * Author:               Shakuras GbR
@@ -15,7 +15,7 @@
  *
  * Woo:                  12345:342928dfsfhsf8429842374wdf4234sfd
  * WC requires at least: 4.2
- * WC tested up to:      4.2.2
+ * WC tested up to:      5.7
  *
  * Copyright: © 2019, Shakuras GbR - kontakt@shakuras.de.
  * License: GNU General Public License v3.0
@@ -122,7 +122,7 @@ define('PHONE_REGEX', '/^(((((((00|\+)[0-9]{2}[ \\\\\-\/]?)|0)[1-9][0-9]{1,4})[
  * Main Class of the CrefoPay payment plugin
  *
  * @class       CrefoPay_Payment_Solution
- * @version     3.1.3
+ * @version     3.1.4
  * @package     CrefoPay-Payment-Solution
  */
 class Crefopay_Payment_Solution

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

@@ -16,7 +16,7 @@ use Upg\Library\Request\Objects\Amount;
  *
  * @class       WC_API_CrefoPay_Api_Callback
  * @extends     WC_API
- * @version     3.1.3
+ * @version     3.1.4
  * @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.1.3
+ * @version     3.1.4
  * @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.1.3
+ * @version     3.1.4
  * @package     CrefoPay-Payment-Solution\Controllers
  */
 class CrefoPay_API_Callback_Processor

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.1.3
+     * @version     3.1.4
      * @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

@@ -15,7 +15,7 @@ use Upg\Library\Mns\ProcessorInterface;
  *
  * @class       CrefoPay_Notification_Callback_Processor
  * @implements  Upg\Library\Mns\ProcessorInterface
- * @version     3.1.3
+ * @version     3.1.4
  * @package     CrefoPay-Payment-Solution\Controllers
  */
 class CrefoPay_Notification_Callback_Processor implements ProcessorInterface

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

@@ -10,7 +10,7 @@ defined('ABSPATH') or die('No script kiddies please!');
  * Process CrefoPay notifications.
  *
  * @class       CrefoPay_Notification_Processor
- * @version     3.1.3
+ * @version     3.1.4
  * @package     CrefoPay-Payment-Solution\Controllers
  */
 class CrefoPay_Notification_Processor

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.1.3
+ * @version     3.1.4
  * @package     CrefoPay Payment Solution
  */
 class WC_Crefo_Exception extends WC_Data_Exception

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.1.3
+ * @version     3.1.4
  * @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.1.3
+ * @version     3.1.4
  * @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.1.3
+ * @version     3.1.4
  * @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.1.3
+ * @version     3.1.4
  * @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.1.3
+ * @version     3.1.4
  * @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.1.3
+ * @version     3.1.4
  * @package     CrefoPay-Payment-Solution\Gateways
  */
 abstract class WC_Crefo_Gateway extends WC_Payment_Gateway
@@ -318,17 +318,20 @@ abstract class WC_Crefo_Gateway extends WC_Payment_Gateway
                 case 1002:
                     switch ($error->getMessage()) {
                         case "PaymentMethod not correct.":
-                            wc_add_notice(__('Payment method not available', 'crefopay-payment-solution'));
+                            wc_add_notice(__('PaymentMethod not correct.', 'crefopay-payment-solution'), 'warning');
+                            $order->cancel_order();
                             break;
 
                         default:
                             wc_add_notice(__(('WC_Crefo_Exeption (' . $error->getCode() . '): ' . $error->getType() . ': ' . $error->getMessage()), 'crefopay-payment-solution'), 'error');
+                            $order->cancel_order();
                             break;
                     }
+                    break;
                 // Payment expired
                 case 2003:
-                    $order->cancel_order();
                     wc_add_notice(__('Payment expired and order has been cancelled; please retry!', 'crefopay-payment-solution'), 'warning');
+                    $order->cancel_order();
                 break;
 
                 // Payment declined by fraud

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.1.3
+ * @version     3.1.4
  * @package     CrefoPay-Payment-Solution\Models
  */
 class WC_Crefo_Error