Merge pull request #192 from wpswings/v3.0.6

V3.0.6
wpswings · Nov 29, 2024 · b175e6e · b175e6e
2 parents 353174e + e089f7f
commit b175e6e
Show file tree

Hide file tree

Showing 9 changed files with 202 additions and 193 deletions.
diff --git a/admin/class-woocommerce-gift-cards-lite-admin.php b/admin/class-woocommerce-gift-cards-lite-admin.php
@@ -1776,11 +1776,19 @@ public function wps_wgm_hide_specific_product_from_backend($query) {
 		// Check if we are in admin and on the products page.
 		if (is_admin() && $query->is_main_query() && $query->get('post_type') === 'product') {
 
-			$excluded_product_id =  get_option( 'contributor_product_id' );
+			$excluded_product_id  = get_option( 'contributor_product_id' );
 			$excluded_product_id1 = get_option( 'wps_gccoupon_rechargeable_product_id' );
-
+			$extension_product_id = get_option( 'gc_expiry_extension_product_id' );
+			$product_settings     = get_option( 'wps_wgm_product_settings', true );
+			$wps_wgm_product_setting_expiry_extension = $this->wps_common_fun->wps_wgm_get_template_data( $product_settings, 'wps_wgm_product_setting_expiry_extension' );
+
+			$excluded_products = array( $excluded_product_id, $excluded_product_id1 );
+
+			if ( 'on' != $wps_wgm_product_setting_expiry_extension || ! wps_uwgc_pro_active() ) {
+				array_push( $excluded_products, $extension_product_id );
+			}
 			// Exclude the specific product from the query.
-			$query->set('post__not_in', array($excluded_product_id,$excluded_product_id1));
+			$query->set('post__not_in', $excluded_products );
 		}
 	}
 

diff --git a/includes/class-makewebbetter-onboarding-helper.php b/includes/class-makewebbetter-onboarding-helper.php
@@ -117,7 +117,7 @@ public function __construct() {
 		if ( defined( 'WPS_WGC_VERSION' ) ) {
 			self::$version = WPS_WGC_VERSION;
 		} else {
-			self::$version = '3.0.5';
+			self::$version = '3.0.6';
 		}
 
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_styles' ) );

diff --git a/includes/class-woocommerce-gift-cards-lite.php b/includes/class-woocommerce-gift-cards-lite.php
@@ -72,7 +72,7 @@ public function __construct() {
 		if ( defined( 'WPS_WGC_VERSION' ) ) {
 			$this->version = WPS_WGC_VERSION;
 		} else {
-			$this->version = '3.0.5';
+			$this->version = '3.0.6';
 		}
 		$this->plugin_name = 'woo-gift-cards-lite';
 

diff --git a/languages/woo-gift-cards-lite-en_US.mo b/languages/woo-gift-cards-lite-en_US.mo