Changeset 2962817

Timestamp:

09/05/2023 07:06:03 AM (2 years ago)

Author:

omise

Message:

Update to version 5.3.1 from GitHub

Location:

omise

Files:

• tags/5.3.1 (copied) (copied from omise/trunk)
• tags/5.3.1/CHANGELOG.md (modified) (1 diff)
• tags/5.3.1/includes/class-omise-capabilities.php (modified) (2 diffs)
• tags/5.3.1/omise-woocommerce.php (modified) (2 diffs)
• tags/5.3.1/readme.txt (modified) (2 diffs)
• tags/5.3.1/tests/unit/includes/backends/class-omise-backend-installment-test.php (modified) (1 diff)
• tags/5.3.1/tests/unit/includes/class-omise-capabilities-test.php (added)
• tags/5.3.1/tests/unit/includes/gateway/class-omise-offsite-test.php (modified) (1 diff)
• tags/5.3.1/tests/unit/omise-woocommerce-test.php (modified) (1 diff)
• trunk/CHANGELOG.md (modified) (1 diff)
• trunk/includes/class-omise-capabilities.php (modified) (2 diffs)
• trunk/omise-woocommerce.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/tests/unit/includes/backends/class-omise-backend-installment-test.php (modified) (1 diff)
• trunk/tests/unit/includes/class-omise-capabilities-test.php (added)
• trunk/tests/unit/includes/gateway/class-omise-offsite-test.php (modified) (1 diff)
• trunk/tests/unit/omise-woocommerce-test.php (modified) (1 diff)

omise/tags/5.3.1/CHANGELOG.md

@@ -1 +1 @@
 # CHANGELOG
+
+### [v5.3.1 _(Sep 05, 2023)_](https://github.com/omise/omise-woocommerce/releases/tag/v5.3.1)
+- Fixed capabilities api calling on every pages. (PR [#398](https://github.com/omise/omise-woocommerce/pull/398))
 
 ### [v5.3.0 _(Aug 23, 2023)_](https://github.com/omise/omise-woocommerce/releases/tag/v5.3.0)

omise/tags/5.3.1/includes/class-omise-capabilities.php

@@ -36 +36 @@
     public static function retrieve($pKey = null, $sKey = null)
     {
+        if ( !self::shouldCallApi() ) {
+            return null;
+        }
+
         $keys = self::getKeys($pKey, $sKey);
 
@@ -68 +72 @@
         return self::$instance;
     }
+
+    /**
+     * @return boolean
+     */
+    public static function shouldCallApi() {
+        $omiseSettingPages = [ 'omise' ];
+        $currentAdminPage = isset( $_GET[ 'page' ] ) ? $_GET[ 'page' ] : '';
+        // If page is omise setting page from admin panel.
+        $isOmiseSettingPage = is_admin() && in_array( $currentAdminPage, $omiseSettingPages );
+
+        // If page is checkout page but not thank you page.
+        // By default thank you page is also part of checkout pages
+        // and we do not need to call capabilities on thank you page.
+        // If endpoint url is `order-received`, it mean thank you page.
+        $isPaymentPage = is_checkout() && !is_wc_endpoint_url( 'order-received' );
+
+        return $isPaymentPage || $isOmiseSettingPage;
+    }
+
 
     /**

omise/tags/5.3.1/omise-woocommerce.php

@@ -5 +5 @@
  * Plugin URI:  https://www.omise.co/woocommerce
  * Description: Opn Payments is a WordPress plugin designed specifically for WooCommerce. The plugin adds support for Opn Payments Payment Gateway's payment methods to WooCommerce.
- * Version:     5.3.0
+ * Version:     5.3.1
  * Author:      Opn Payments and contributors
  * Author URI:  https://github.com/omise/omise-woocommerce/graphs/contributors
@@ -23 +23 @@
      * @var string
      */
-    public $version = '5.3.0';
+    public $version = '5.3.1';
 
     /**

omise/tags/5.3.1/readme.txt

@@ -4 +4 @@
 Requires at least: 4.3.1
 Tested up to: 6.0.2
-Stable tag: 5.3.0
+Stable tag: 5.3.1
 License: MIT
 License URI: https://opensource.org/licenses/MIT
@@ -34 +34 @@
 
 == Changelog ==
+
+= 5.3.1 =
+
+- Fixed capabilities api calling on every pages. (PR [#398](https://github.com/omise/omise-woocommerce/pull/398))
 
 = 5.3.0 =

omise/tags/5.3.1/tests/unit/includes/backends/class-omise-backend-installment-test.php

@@ -248 +248 @@
     }
 }
-
-/**
- * Mock Omise_Capabilities class.
- * NOTE: This might not be an ideal way to mock a class,
- *       feel free to enhance the test or the core code.
- *
- * @see includes/class-omise-capabilities
- */
-class Omise_Capabilities
-{
-    /**
-     * @var self
-     */
-    protected static $the_instance = null;
-
-    public static function retrieve()
-    {
-        self::$the_instance = self::$the_instance ?: new self();
-        return self::$the_instance;
-    }
-
-    public function is_zero_interest()
-    {
-        return false;
-    }
-}

omise/tags/5.3.1/tests/unit/includes/gateway/class-omise-offsite-test.php

@@ -2 +2 @@
 
 use PHPunit\Framework\TestCase;
-use Mockery;
 
 abstract class Offsite_Test extends TestCase

omise/tags/5.3.1/tests/unit/omise-woocommerce-test.php

@@ -1 +1 @@
 <?php
 
-use Omise;
-use Mockery;
 use PHPUnit\Framework\TestCase;
 

omise/trunk/CHANGELOG.md

@@ -1 +1 @@
 # CHANGELOG
+
+### [v5.3.1 _(Sep 05, 2023)_](https://github.com/omise/omise-woocommerce/releases/tag/v5.3.1)
+- Fixed capabilities api calling on every pages. (PR [#398](https://github.com/omise/omise-woocommerce/pull/398))
 
 ### [v5.3.0 _(Aug 23, 2023)_](https://github.com/omise/omise-woocommerce/releases/tag/v5.3.0)

omise/trunk/includes/class-omise-capabilities.php

@@ -36 +36 @@
     public static function retrieve($pKey = null, $sKey = null)
     {
+        if ( !self::shouldCallApi() ) {
+            return null;
+        }
+
         $keys = self::getKeys($pKey, $sKey);
 
@@ -68 +72 @@
         return self::$instance;
     }
+
+    /**
+     * @return boolean
+     */
+    public static function shouldCallApi() {
+        $omiseSettingPages = [ 'omise' ];
+        $currentAdminPage = isset( $_GET[ 'page' ] ) ? $_GET[ 'page' ] : '';
+        // If page is omise setting page from admin panel.
+        $isOmiseSettingPage = is_admin() && in_array( $currentAdminPage, $omiseSettingPages );
+
+        // If page is checkout page but not thank you page.
+        // By default thank you page is also part of checkout pages
+        // and we do not need to call capabilities on thank you page.
+        // If endpoint url is `order-received`, it mean thank you page.
+        $isPaymentPage = is_checkout() && !is_wc_endpoint_url( 'order-received' );
+
+        return $isPaymentPage || $isOmiseSettingPage;
+    }
+
 
     /**

omise/trunk/omise-woocommerce.php

@@ -5 +5 @@
  * Plugin URI:  https://www.omise.co/woocommerce
  * Description: Opn Payments is a WordPress plugin designed specifically for WooCommerce. The plugin adds support for Opn Payments Payment Gateway's payment methods to WooCommerce.
- * Version:     5.3.0
+ * Version:     5.3.1
  * Author:      Opn Payments and contributors
  * Author URI:  https://github.com/omise/omise-woocommerce/graphs/contributors
@@ -23 +23 @@
      * @var string
      */
-    public $version = '5.3.0';
+    public $version = '5.3.1';
 
     /**

omise/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.3.1
 Tested up to: 6.0.2
-Stable tag: 5.3.0
+Stable tag: 5.3.1
 License: MIT
 License URI: https://opensource.org/licenses/MIT
@@ -34 +34 @@
 
 == Changelog ==
+
+= 5.3.1 =
+
+- Fixed capabilities api calling on every pages. (PR [#398](https://github.com/omise/omise-woocommerce/pull/398))
 
 = 5.3.0 =

omise/trunk/tests/unit/includes/backends/class-omise-backend-installment-test.php

@@ -248 +248 @@
     }
 }
-
-/**
- * Mock Omise_Capabilities class.
- * NOTE: This might not be an ideal way to mock a class,
- *       feel free to enhance the test or the core code.
- *
- * @see includes/class-omise-capabilities
- */
-class Omise_Capabilities
-{
-    /**
-     * @var self
-     */
-    protected static $the_instance = null;
-
-    public static function retrieve()
-    {
-        self::$the_instance = self::$the_instance ?: new self();
-        return self::$the_instance;
-    }
-
-    public function is_zero_interest()
-    {
-        return false;
-    }
-}

omise/trunk/tests/unit/includes/gateway/class-omise-offsite-test.php

@@ -2 +2 @@
 
 use PHPunit\Framework\TestCase;
-use Mockery;
 
 abstract class Offsite_Test extends TestCase

omise/trunk/tests/unit/omise-woocommerce-test.php

@@ -1 +1 @@
 <?php
 
-use Omise;
-use Mockery;
 use PHPUnit\Framework\TestCase;