Changeset 1542060

Timestamp:

11/28/2016 03:11:03 PM (9 years ago)

Author:

datenwerk

Message:

Bugfix: SyntaxError: JSON.parse: unexpected character at line 1 column 1 of the JSON data (WC 2.3.6 and higher)

Location:

woocommerce-mpay24-gateway/trunk

Files:

• MPay24/MDXI.xsd (modified) (3 diffs)
• gateway-mpay24.php (modified) (2 diffs)
• readme.txt (modified) (5 diffs)

woocommerce-mpay24-gateway/trunk/MPay24/MDXI.xsd

@@ -58 +58 @@
       <xs:enumeration value="KLARNA"/>
       <xs:enumeration value="SOFORT"/>
+      <xs:enumeration value="MASTERPASS"/>
     </xs:restriction>
   </xs:simpleType>
@@ -86 +87 @@
       <xs:enumeration value="INVOICE"/>
       <xs:enumeration value="HP"/>
+      <xs:enumeration value="INTERNATIONAL"/>
+      <xs:enumeration value="MASTERPASS"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="PaymentSubBrandType">
+    <xs:restriction base="xs:string">
+      <xs:maxLength value="3"/>
+      <xs:pattern value="[0-9]{1,3}"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="PriceType">
     <xs:restriction base="xs:float">
-      <xs:pattern value="-?\d{1,9}\.\d{2}|-?\d{1,9}"/>
+      <xs:pattern value="\-?\d{1,9}(\.\d{2})?"/>
     </xs:restriction>
   </xs:simpleType>
@@ -272 +281 @@
                   <xs:attribute name="Type" type="PaymentTypeType" use="required"/>
                   <xs:attribute name="Brand" type="PaymentBrandType"/>
+                  <xs:attribute name="SubBrand" type="PaymentSubBrandType"/>
                 </xs:complexType>
               </xs:element>

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

@@ -541 +541 @@
 
                 $shop->setSuccessUrl( $this->get_return_url( $order ) ); // thank you page
-                $shop->setErrorUrl( $order->get_cancel_order_url() ); // failed orders will also be marked as cancelled
-                $shop->setCancelUrl( $order->get_cancel_order_url() );
+                if( version_compare( $woocommerce->version, '2.3.6', '>=' ) ) {
+                    $shop->setErrorUrl( $order->get_cancel_order_url_raw() ); // failed orders will also be marked as cancelled
+                    $shop->setCancelUrl( $order->get_cancel_order_url_raw() );
+                }
+                else {
+                    $shop->setErrorUrl( $this->get_cancel_order_url_raw($order) ); // failed orders will also be marked as cancelled
+                    $shop->setCancelUrl( $this->get_cancel_order_url_raw($order) );
+                }
                 $shop->setConfirmUrl( $this->protect_url( $this->notify_url ) );
 
@@ -570 +576 @@
                     'redirect' => $result->getLocation()
                 );
+            }
+            
+            /**
+            * Generates a raw (unescaped) cancel-order URL for use by payment gateways.
+            * code adapted from woocommerce version >= 2.3.6 for plugin usage with lower woocommerce versions
+            *
+            * @param object $order
+            * @param string $redirect
+            * @return string The unescaped cancel-order URL.
+            */
+            public function get_cancel_order_url_raw( $order, $redirect = '' ) {
+                $cancel_endpoint = wc_get_page_permalink( 'cart' );
+                if ( ! $cancel_endpoint ) {
+                    $cancel_endpoint = home_url();
+                }
+
+                if ( false === strpos( $cancel_endpoint, '?' ) ) {
+                    $cancel_endpoint = trailingslashit( $cancel_endpoint );
+                }
+
+                return apply_filters('woocommerce_get_cancel_order_url_raw', add_query_arg( array(
+                    'cancel_order' => 'true',
+                    'order'        => $order->order_key,
+                    'order_id'     => $order->id,
+                    'redirect'     => $redirect
+                ), $cancel_endpoint ) );
             }
 

woocommerce-mpay24-gateway/trunk/readme.txt

@@ -5 +5 @@
 Tags: woocommerce, gateway, mpay24
 Requires at least: 3.5
-Tested up to: 4.0.1
-Stable tag: 1.5.1
+Tested up to: 4.6.1
+Stable tag: 1.5.2
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -16 +16 @@
 = Features =
 
-* Uses mPAY24 PHP files (version 2013-06-24), follows mPAY24 SOAP Specification (version 2014-09-12)
+* Uses mPAY24 PHP files (version 2013-06-24), follows mPAY24 SOAP Specification
 * Using the mPAY24 payment page to integrate in website
 * Switching between DEV and PROD mPAY24 environment with SOAP logins
@@ -29 +29 @@
 = mPAY24 =
 
-If there are newer mPAY24 PHP Files you can replace the files in the folder `MPay24`.
+If there are newer mPAY24 PHP Files you can replace the files in the folder `MPay24`. But don't use the current PHP SDK from Github.
 If you want to extend the functionality you have to edit `class-wc-mpay24-shop.php`
 
@@ -40 +40 @@
 * DOM (mPAY24 API)
 * Mcrypt (mPAY24 API)
-* [WooCommerce Plugin](http://www.woothemes.com/woocommerce/) v2.0 or higher
+* [WooCommerce Plugin](http://www.woothemes.com/woocommerce/) v2.1 or higher
 
 = Manual installation =
@@ -76 +76 @@
 
 == Changelog ==
+
+= 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)
 
 = 1.5.1 - 2014-11-28 =