Merge pull request #1395 from laterpay/develop

Tag 2.9.4

composer.json

@@ -2,7 +2,7 @@
     "name": "laterpay/laterpay-wordpress-plugin",
     "description": "This is the official LaterPay plugin for selling digital content with WordPress",
     "license": "MIT",
-    "version": "2.9.3",
+    "version": "2.9.4",
     "config": {
         "vendor-dir": "laterpay/vendor",
         "secure-http": true

gulpfile.js

@@ -39,7 +39,7 @@ var gulp                        = require('gulp'),
 // OPTIONS -------------------------------------------------------------------------------------------------------------
 var gulpKnownOptions = {
     string: 'version',
-    default: { version: '2.9.3' }
+    default: { version: '2.9.4' }
 };
 var gulpOptions = minimist(process.argv.slice(2), gulpKnownOptions);
 gulpOptions.svn = {};

laterpay/README.txt

@@ -4,9 +4,9 @@ Contributors: laterpay, dominik-rodler, mihail-turalenka, avahura, ahryb
 Donate link: https://laterpay.net
 Tags: contribution, conversion, earn-money, micropayment, monetization, monetize-content, paid-content, payment, paywall, sell-article, sell-content, subscription
 Requires at least: 4.6
-Tested up to: 5.3.2
+Tested up to: 5.4
 Requires PHP: 5.6
-Stable tag: 2.9.3
+Stable tag: 2.9.4
 Author URI: https://laterpay.net
 Plugin URI: https://github.com/laterpay/laterpay-wordpress-plugin
 License: MIT
@@ -90,6 +90,10 @@ Yes!
 7. The plugin provides a variety of advanced settings to customize the LaterPay plugin and adjust it to your needs.
 
 == Changelog ==
+= 2.9.4 ( April 16, 2020 ) =
+* Disable additional requests on home page if disabled by merchant.
+* Validate account status before `/access` check to avoid unnecessary request.
+
 = 2.9.3 ( March 19, 2020 ) =
 * Lower Pay Now limit from 1.49€ to 1.00€ for EU region.
 * Reduce unnecessary API request to `validatesignature` endpoint.
@@ -706,8 +710,8 @@ KNOWN BUGS:
 
 == Upgrade notice ==
 
-= 2.9.3 =
-Reduces unnecessary API call to `validatesignature` endpoint.
+= 2.9.4 =
+Reduces unnecessary API calls to `/validatesignature` and `/access` endpoint.
 
 == Arbitrary section ==
 

laterpay/application/Helper/Request.php

@@ -22,6 +22,11 @@ class LaterPay_Helper_Request {
      */
     public static function isLpApiAvailability()
     {
+        // Check if access check is disabled and current page is home page.
+        if ( LaterPay_Helper_Pricing::is_access_check_disabled_on_home() ) {
+            return false;
+        }
+
         if ( null === self::$lp_api_availability ) {
             $client_options = LaterPay_Helper_Config::get_php_client_options();
             $action         = (int) get_option( 'laterpay_api_fallback_behavior', 0 );
@@ -142,6 +147,11 @@ public static function laterpay_api_get_access( $article_ids, $product_key = nul
         $result = array();
         $action = (int) get_option( 'laterpay_api_fallback_behavior', 0 );
 
+        // Check if access check is disabled and current page is home page.
+        if ( LaterPay_Helper_Pricing::is_access_check_disabled_on_home() ) {
+            return $result;
+        }
+
         try {
             $client_options = LaterPay_Helper_Config::get_php_client_options();
             $client = new LaterPay_Client(
@@ -152,8 +162,6 @@ public static function laterpay_api_get_access( $article_ids, $product_key = nul
                 $client_options['token_name']
             );
 
-            $result = $client->get_access($article_ids, $product_key);
-
             // Check if current config is valid or not.
             $health_check = json_decode( $client->check_health( true ), true );
 
@@ -170,8 +178,13 @@ public static function laterpay_api_get_access( $article_ids, $product_key = nul
                 return false;
             }
 
+            $result = $client->get_access($article_ids, $product_key);
+
             // Possible value of status is ok or error in case of wrong params which means api is working.
-            if ( ( is_array( $result ) && array_key_exists( 'status', $result ) ) ||  ( empty( $result ) && array_key_exists( 'status', $health_check ) ) ) {
+            if (
+                ( is_array( $result ) && array_key_exists( 'status', $result ) ) ||
+                ( empty( $result ) && ( ! empty( $health_check ) && array_key_exists( 'status', $health_check ) ) )
+            ) {
                 self::$lp_api_availability = true;
             } else {
                 throw new Exception( 'Unable to reach LaterPay API' );

laterpay/languages/laterpay-de_DE.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LaterPay 0.9.6\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tag/laterpay\n"
-"POT-Creation-Date: 2020-03-18 22:13+0530\n"
-"PO-Revision-Date: 2020-03-18 22:13+0530\n"
+"POT-Creation-Date: 2020-04-15 19:42+0530\n"
+"PO-Revision-Date: 2020-04-15 19:42+0530\n"
 "Last-Translator: Kimberly Moore <[email protected]>\n"
 "Language-Team: German\n"
 "Language: de_DE\n"

laterpay/languages/laterpay.po

@@ -2,9 +2,8 @@
 # This file is distributed under the same license as the LaterPay plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: LaterPay 2.9.3\n"
+"Project-Id-Version: LaterPay 2.9.4\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/laterpay\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Last-Translator: Kimberly Moore <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

laterpay/laterpay.php

@@ -4,7 +4,7 @@
  * Plugin URI: https://github.com/laterpay/laterpay-wordpress-plugin
  * Description: Sell digital content with LaterPay. It allows super easy and fast payments from as little as 5 cent up to 149.99 Euro at a 15% fee and no fixed costs.
  * Author: LaterPay
- * Version: 2.9.3
+ * Version: 2.9.4
  * Author URI: https://laterpay.net/
  * Textdomain: laterpay
  * Domain Path: /languages

package.json

@@ -1,6 +1,6 @@
 {
   "name": "laterpay-wordpress-plugin",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "description": "LaterPay WordPress plugin",
   "main": "index.js",
   "dependencies": {},
@@ -41,7 +41,7 @@
     "gulp-zip": "^4.1.0",
     "jshint-stylish": "^1.0.0",
     "lodash": ">=4.17.11",
-    "minimist": "^1.2.2",
+    "minimist": "^1.2.3",
     "prompt": "^0.2.14",
     "q": "^1.4.1",
     "run-sequence": "^1.1.2"