Changeset 2507241

Timestamp:

04/01/2021 08:37:39 AM (5 years ago)

Author:

pureclaritytechnologies

Message:

Version 3.1.0: Fixes to admin only mode & signup (see release notes)

Location:

pureclarity-for-woocommerce/trunk

Files:

• includes/admin/class-pureclarity-signup.php (modified) (1 diff)
• includes/class-pureclarity-settings.php (modified) (1 diff)
• includes/php-sdk/src/PureClarity/Api/Delete/Submit.php (modified) (1 diff)
• includes/php-sdk/src/PureClarity/Api/Delta/Base.php (modified) (1 diff)
• includes/php-sdk/src/PureClarity/Api/Feed/Transfer.php (modified) (1 diff)
• includes/php-sdk/src/PureClarity/Api/Feedback/Submit.php (modified) (1 diff)
• includes/php-sdk/src/PureClarity/Api/Info/Dashboard.php (modified) (1 diff)
• includes/php-sdk/src/PureClarity/Api/NextSteps/Complete.php (modified) (1 diff)
• includes/php-sdk/src/PureClarity/Api/Signup/AddStore/Processor.php (modified) (1 diff)
• includes/php-sdk/src/PureClarity/Api/Signup/Status/Processor.php (modified) (1 diff)
• includes/php-sdk/src/PureClarity/Api/Signup/Submit/Processor.php (modified) (1 diff)
• includes/public/class-pureclarity-bmz.php (modified) (2 diffs)
• includes/public/class-pureclarity-public.php (modified) (1 diff)
• pureclarity.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

pureclarity-for-woocommerce/trunk/includes/admin/class-pureclarity-signup.php

@@ -109 +109 @@
             $this->process_auto_signup( $response['response'] );
             $result['success'] = true;
-        } elseif ( $response['error'] ) {
-            $result['error'] = $response['error'];
+        } elseif ( $response['errors'] ) {
+            $result['error'] = implode( ' | ', $response['errors'] );
         }
 

pureclarity-for-woocommerce/trunk/includes/class-pureclarity-settings.php

@@ -92 +92 @@
                 return true;
             case 'admin':
-                return current_user_can( 'administrator' ) || defined( 'DOING_CRON' );
+                return current_user_can( 'edit_pages' ) || defined( 'DOING_CRON' );
         }
         return false;

pureclarity-for-woocommerce/trunk/includes/php-sdk/src/PureClarity/Api/Delete/Submit.php

@@ -81 +81 @@
         $body = $curl->getBody();
 
-        if ($status !== 200) {
+        if ($status < 200 || $status > 299) {
             throw new Exception(
                 'Error: HTTP ' . $status . ' Response | ' .

pureclarity-for-woocommerce/trunk/includes/php-sdk/src/PureClarity/Api/Delta/Base.php

@@ -167 +167 @@
         $body = $curl->getBody();
 
-        if ($status !== 200) {
+        if ($status < 200 || $status > 299) {
             throw new Exception(
                 'Error: HTTP ' . $status . ' Response | ' .

pureclarity-for-woocommerce/trunk/includes/php-sdk/src/PureClarity/Api/Feed/Transfer.php

@@ -145 +145 @@
         $body = $curl->getBody();
 
-        if ($status !== 200) {
+        if ($status < 200 || $status > 299) {
             throw new Exception(
                 'Error: HTTP ' . $status . ' Response | ' .

pureclarity-for-woocommerce/trunk/includes/php-sdk/src/PureClarity/Api/Feedback/Submit.php

@@ -88 +88 @@
         $body = $curl->getBody();
 
-        if ($status !== 200) {
+        if ($status < 200 || $status > 299) {
             throw new Exception(
                 'Error: HTTP ' . $status . ' Response | ' .

pureclarity-for-woocommerce/trunk/includes/php-sdk/src/PureClarity/Api/Info/Dashboard.php

@@ -76 +76 @@
         $body = $curl->getBody();
 
-        if ($status !== 200) {
+        if ($status < 200 || $status > 299) {
             throw new Exception(
                 'Error: HTTP ' . $status . ' Response | ' .

pureclarity-for-woocommerce/trunk/includes/php-sdk/src/PureClarity/Api/NextSteps/Complete.php

@@ -76 +76 @@
         $body = $curl->getBody();
 
-        if ($status !== 200) {
+        if ($status < 200 || $status > 299) {
             throw new Exception(
                 'Error: HTTP ' . $status . ' Response | ' .

pureclarity-for-woocommerce/trunk/includes/php-sdk/src/PureClarity/Api/Signup/AddStore/Processor.php

@@ -40 +40 @@
             $result['errors'] = $this->processErrors($result['response'], $response);
 
-            if ($response['status'] === 200) {
+            if ($response['status'] >= 200 && $response['status'] <= 299) {
                 $result['success'] = true;
             }

pureclarity-for-woocommerce/trunk/includes/php-sdk/src/PureClarity/Api/Signup/Status/Processor.php

@@ -93 +93 @@
     {
         $complete = false;
-        if ($response['status'] === 200 &&
+        if (($response['status'] >= 200 && $response['status'] <= 299) &&
             $this->isResponseBodyValid($response['response']) &&
             $response['response']['Complete'] === true

pureclarity-for-woocommerce/trunk/includes/php-sdk/src/PureClarity/Api/Signup/Submit/Processor.php

@@ -40 +40 @@
             $result['errors'] = $this->processErrors($result['response'], $response);
 
-            if ($response['status'] === 200) {
+            if ($response['status'] >= 200 && $response['status'] <= 299) {
                 $result['success'] = true;
             }

pureclarity-for-woocommerce/trunk/includes/public/class-pureclarity-bmz.php

@@ -62 +62 @@
      */
     public function init() {
-        add_shortcode( 'pureclarity-bmz', array( $this, 'pureclarity_render_bmz' ) );
-        add_action( 'template_redirect', array( $this, 'render_bmzs' ), 10, 1 );
+        if ( $this->settings->is_pureclarity_enabled() ) {
+            add_shortcode( 'pureclarity-bmz', array( $this, 'pureclarity_render_bmz' ) );
+            add_action( 'template_redirect', array( $this, 'render_bmzs' ), 10, 1 );
+        } else {
+            add_shortcode( 'pureclarity-bmz', array( $this, 'pureclarity_render_empty_bmz' ) );
+        }
     }
 
@@ -370 +374 @@
             )
         );
+    }
+
+    /**
+     * Renders an empty zone (for when PC is disabled and shortcodes exist).
+     *
+     * @return string
+     */
+    public function pureclarity_render_empty_bmz() {
+        return '';
     }
 

pureclarity-for-woocommerce/trunk/includes/public/class-pureclarity-public.php

@@ -57 +57 @@
             add_action( 'wp_enqueue_scripts', array( $this, 'register_assets' ) );
             $this->configuration_display->init();
-            $this->bmz->init();
         }
+        $this->bmz->init();
     }
 

pureclarity-for-woocommerce/trunk/pureclarity.php

@@ -8 +8 @@
  * Description:  Use PureClarity's wide range of ecommerce personalisation features to create engaging online shopping experiences for your customers. Drive revenue, average order value, conversion rate and customer loyalty.
  * Plugin URI:   https://www.pureclarity.com
- * Version:      3.1.0
+ * Version:      3.1.1
  * Author:       PureClarity
  * Author URI:   https://www.pureclarity.com/?utm_source=marketplace&utm_medium=woocommerce&utm_campaign=aboutpureclarity
@@ -21 +21 @@
 
 // Set version and path constants.
-define( 'PURECLARITY_VERSION', '3.1.0' );
+define( 'PURECLARITY_VERSION', '3.1.1' );
 define( 'PURECLARITY_DB_VERSION', 1 );
 

pureclarity-for-woocommerce/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.7
 Tested up to: 5.6.1
-Stable tag: 3.1.0
+Stable tag: 3.1.1
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl.html
@@ -189 +189 @@
 = 3.1.0 =
 * Added ability to modify feed data using add_filter
+
+= 3.1.1 =
+* Tweaking admin only mode so that anyone who has "edit page" permissions can see Zones on the frontend
+* Fixed an issue with shortcodes displaying to customers when in admin-only mode
+* Fixing undefined index error being logged on signup