Changeset 1545972

Timestamp:

12/05/2016 03:45:08 PM (9 years ago)

Author:

datenwerk

Message:

• Bugfix: Deprecated function call in wc_gateway_mpay24_install(), (thanks to [chesio](​https://profiles.wordpress.org/chesio) for bugfix)
• Bugfix: $notify_url throws "403 Forbidden" error
• Enhancement: Changed CSSName in TemplateSet to "MODERN" (better responsive support)
• Enhancement: Add returncode "OK" to successful confirmation call

Location:

woocommerce-mpay24-gateway/trunk

Files:

• admin/gateway-mpay24-install.php (modified) (1 diff)
• class-wc-mpay24-shop.php (modified) (2 diffs)
• gateway-mpay24.php (modified) (6 diffs)
• readme.txt (modified) (2 diffs)

woocommerce-mpay24-gateway/trunk/admin/gateway-mpay24-install.php

@@ -17 +17 @@
 
     $collate = '';
-    if ( $wpdb->supports_collation() ) {
+    if ( $wpdb->has_cap( 'collation' ) ) {
         if ( ! empty( $wpdb->charset ) ) {
             $collate .= "DEFAULT CHARACTER SET $wpdb->charset";

woocommerce-mpay24-gateway/trunk/class-wc-mpay24-shop.php

@@ -567 +567 @@
         $mdxi->Order->TemplateSet = 'WEB';
         $mdxi->Order->TemplateSet->setLanguage( $this->getLanguage() );
-        $mdxi->Order->TemplateSet->setCSSName( 'MOBILE' ); // use responsive template
+        $mdxi->Order->TemplateSet->setCSSName( 'MODERN' ); // use responsive template
         
         $mdxi->Order->PaymentTypes->setEnable( 'true' );
@@ -594 +594 @@
         //$mdxi->Order->Customer->setUseProfile( 'true' ); // proSafe required
 
-        $mdxi->Order->URL->Success      = $this->getSuccessUrl();
-        $mdxi->Order->URL->Error        = $this->getErrorUrl();
-        $mdxi->Order->URL->Confirmation = $this->getConfirmUrl() . '&token=' . $transaction->SECRET;
-        $mdxi->Order->URL->Cancel       = $this->getCancelUrl();
+        $mdxi->Order->URL->Success          = $this->getSuccessUrl();
+        $mdxi->Order->URL->Error            = $this->getErrorUrl();
+        if( false === strpos( $this->getConfirmUrl(), '?wc-api' ) ) {
+            $mdxi->Order->URL->Confirmation = $this->getConfirmUrl() . '?token=' . $transaction->SECRET;
+        } else {
+            $mdxi->Order->URL->Confirmation = $this->getConfirmUrl() . '&token=' . $transaction->SECRET;
+        }
+        $mdxi->Order->URL->Cancel           = $this->getCancelUrl();
 
         /**

woocommerce-mpay24-gateway/trunk/gateway-mpay24.php

@@ -4 +4 @@
     Plugin URI: http://wordpress.org/plugins/woocommerce-mpay24-gateway/
     Description: Add mPAY24 Payment Gateway to WooCommerce Plugin
-    Version: 1.5.2
+    Version: 1.5.3
     Author: datenwerk innovationsagentur GmbH
     Author URI: http://www.datenwerk.at
@@ -22 +22 @@
 
     if ( ! defined( 'GATEWAY_MPAY24_VERSION' ) ) {
-        define( 'GATEWAY_MPAY24_VERSION', '1.5.2' );
+        define( 'GATEWAY_MPAY24_VERSION', '1.5.3' );
     }
     if ( ! defined( 'GATEWAY_MPAY24_TABLE_NAME' ) ) {
@@ -175 +175 @@
                 $this->method_title       = __( 'mPAY24', 'wc-mpay24' ); // backend title
                 $this->method_description = __( 'Online payment via mPAY24 payment page', 'wc-mpay24' ); // backend description
-                $this->notify_url         = add_query_arg( 'wc-api', 'WC_Gateway_MPAY24', home_url( '/' ) );
+                $this->notify_url         = WC()->api_request_url( 'WC_Gateway_MPAY24' );
 
                 require_once( GATEWAY_MPAY24_PATH . 'class-wc-mpay24-shop.php' );
@@ -550 +550 @@
                 }
                 $shop->setConfirmUrl( $this->protect_url( $this->notify_url ) );
+                if ( 'yes' == $this->debug ) {
+                    $this->log->add( 'mpay24', 'Notify URL: ' . $this->protect_url( $this->notify_url ) );
+                }
 
                 $shop->setPageBgColor( $this->page_bg_color );
@@ -690 +693 @@
                 if ( ! empty( $_GET ) && $this->check_ipn_request_is_valid() ) {
                     header( 'HTTP/1.1 200 OK' );
+                    echo "OK"; // by mPAY24 needed to check if confirmation call must be repeated (if no "OK" is shown)
                     do_action( 'valid_mpay24_standard_request', $_GET );
                 } else {
@@ -740 +744 @@
                             }
                         break;
-                        case 'suspended':
+                        case 'suspended':
                         case 'reserved':
                             // Order pending

woocommerce-mpay24-gateway/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 3.5
 Tested up to: 4.6.1
-Stable tag: 1.5.2
+Stable tag: 1.5.3
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -77 +77 @@
 == Changelog ==
 
+= 1.5.3 - 2016-12-05 =
+
+* Bugfix: Deprecated function call in wc_gateway_mpay24_install(), (thanks to [chesio](https://profiles.wordpress.org/chesio) for bugfix)
+* Bugfix: $notify_url throws "403 Forbidden" error
+* Enhancement: Changed CSSName in TemplateSet to "MODERN" (better responsive support)
+* Enhancement: Add returncode "OK" to successful confirmation call
+
 = 1.5.2 - 2016-11-28 =
 
 * Bugfix: SyntaxError: JSON.parse: unexpected character at line 1 column 1 of the JSON data (WC 2.3.6 and higher), (thanks to [jbugella](https://profiles.wordpress.org/jbugella) for bugfix)
+* Change Requirements: WooCommerce v2.1 or higher is needed
 
 = 1.5.1 - 2014-11-28 =