Merge pull request #1489 from sapayth/tweak/for_release_4.0.12

tweak: for release 4.0.12
weDevsOfficial · Oct 14, 2024 · 62c2870 · 62c2870
2 parents f3c4f5c + ebe5313
commit 62c2870
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 88 deletions.
diff --git a/Lib/Appsero/Client.php b/Lib/Appsero/Client.php
@@ -2,6 +2,8 @@
 
 namespace WeDevs\Wpuf\Lib\Appsero;
 
+use WP_Error;
+
 /**
  * Appsero Client
  *
@@ -110,13 +112,9 @@ public function __construct( $hash, $name, $file ) {
     /**
      * Initialize insights class
      *
-     * @return Appsero\Insights
+     * @return object
      */
     public function insights() {
-        if ( ! class_exists( __NAMESPACE__ . '\Insights' ) ) {
-            require_once __DIR__ . '/Insights.php';
-        }
-
         // if already instantiated, return the cached one
         if ( $this->insights ) {
             return $this->insights;
@@ -130,13 +128,9 @@ public function insights() {
     /**
      * Initialize license checker
      *
-     * @return Appsero\License
+     * @return object
      */
     public function license() {
-        if ( ! class_exists( __NAMESPACE__ . '\License' ) ) {
-            require_once __DIR__ . '/License.php';
-        }
-
         // if already instantiated, return the cached one
         if ( $this->license ) {
             return $this->license;

diff --git a/Lib/WeDevs_Insights.php b/Lib/WeDevs_Insights.php
@@ -2,7 +2,7 @@
 
 namespace WeDevs\Wpuf\Lib;
 
-if ( ! class_exists( 'WPUF_WeDevs_Insights' ) ) :
+if ( ! class_exists( 'WeDevs_Insights' ) ) :
 
 /**
  * weDevs Tracker
@@ -17,26 +17,18 @@
  */
 class WeDevs_Insights {
     /**
-     * @var object|Appsero\Insights|Insights
+     * @var object|Appsero\Insights
      */
     public $insights;
 
     /**
      * Initialize the class
      */
     public function __construct( $file ) {
-        if ( ! class_exists( 'Appsero\Client' ) ) {
-            require_once WPUF_ROOT . '/Lib/Appsero/Client.php';
-        }
-
         $client = new Appsero\Client( '958afc63-99f8-4b98-b321-fcbc5cf95694', 'WP User Frontend', $file );
         $this->insights = $client->insights();
         $this->insights->client = $client;
         $this->insights->init();
-
-//        $client = new Appsero\Client( '958afc63-99f8-4b98-b321-fcbc5cf95694', 'WP User Frontend', $file );
-//        $this->insights = $client->insights();
-//        $this->insights->init();
     }
 }
 

diff --git a/includes/Ajax/Frontend_Form_Ajax.php b/includes/Ajax/Frontend_Form_Ajax.php
@@ -19,10 +19,6 @@ class Frontend_Form_Ajax {
     private $expired_post_status = 'wpuf-expired_post_status';
 
     private $post_expiration_message = 'wpuf-post_expiration_message';
-    /**
-     * @var array
-     */
-    private $form_fields;
 
     /**
      * @var array

diff --git a/includes/Setup_Wizard.php b/includes/Setup_Wizard.php
@@ -37,8 +37,14 @@ public function __construct() {
      * @return void
      */
     public function custom_admin_bar_styles() {
-        if ( is_admin_bar_showing() ) {
+        if ( ! is_admin_bar_showing() ) {
+            return;
+        }
+
+        if ( function_exists( 'wp_enqueue_admin_bar_header_styles' ) ) {
             wp_enqueue_admin_bar_header_styles();
+        } else {
+            wp_admin_bar_header();
         }
     }
 

diff --git a/includes/Traits/TaxableTrait.php b/includes/Traits/TaxableTrait.php
@@ -384,11 +384,11 @@ function wpuf_tax_rate_country_state( $country, $state ) {
                 continue;
             }
             if ( $rate['state'] === $state && $rate['country'] === $country ) {
-                $tax_amount = $rate['rate'];
+                $tax_amount = ! empty( $rate['rate'] ) ? $rate['rate'] : 0;
             }
 
             if ( intval( $tax_amount ) === 0 && $rate['country'] === $country && 'country_wide' === $rate['state'] ) {
-                $tax_amount = $rate['rate'];
+                $tax_amount = ! empty( $rate['rate'] ) ? $rate['rate'] : 0;
             }
         }