Merge pull request #78 from Codeinwp/dev

fix: license activation workflow, show error message when failed to a…
Codeinwp · Sep 11, 2019 · ade795c · ade795c
2 parents ede4dbd + 2a2559a
commit ade795c
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 15 deletions.
diff --git a/src/Modules/Dashboard_widget.php b/src/Modules/Dashboard_widget.php
@@ -72,7 +72,9 @@ public function can_load( $product ) {
 	 * @return Dashboard_Widget Module instance.
 	 */
 	public function load( $product ) {
-
+		if ( apply_filters( 'themeisle_sdk_hide_dashboard_widget', false ) ) {
+			return;
+		}
 		$this->product        = $product;
 		$this->dashboard_name = apply_filters( 'themeisle_sdk_dashboard_widget_name', 'WordPress Guides/Tutorials' );
 		$this->feeds          = apply_filters(

diff --git a/src/Modules/Licenser.php b/src/Modules/Licenser.php
@@ -89,6 +89,9 @@ public function register_settings() {
 		if ( ! is_admin() ) {
 			return false;
 		}
+		if ( apply_filters( $this->product->get_key() . '_hide_license_field', false ) ) {
+			return;
+		}
 		add_settings_field(
 			$this->product->get_key() . '_license',
 			$this->product->get_name() . ' license',
@@ -109,6 +112,7 @@ public function license_view() {
 		$valid_string      = apply_filters( $this->product->get_key() . '_lc_valid_string', 'Valid' );
 		$invalid_string    = apply_filters( $this->product->get_key() . '_lc_invalid_string', 'Invalid' );
 		$license_message   = apply_filters( $this->product->get_key() . '_lc_license_message', 'Enter your license from %s purchase history in order to get %s updates' );
+		$error_message     = $this->get_error();
 		?>
 		<style type="text/css">
 			input.themeisle-sdk-text-input-valid {
@@ -157,7 +161,7 @@ public function license_view() {
 		</style>
 		<?php
 		echo sprintf(
-			'<p>%s<input class="themeisle-sdk-license-input %s" type="text" id="%s_license" name="%s_license" value="%s" /><a class="%s">%s</a>&nbsp;&nbsp;&nbsp;<button name="%s_btn_trigger" class="button button-primary themeisle-sdk-licenser-button-cta" value="yes" type="submit" >%s</button></p><p class="description">%s</p>',
+			'<p>%s<input class="themeisle-sdk-license-input %s" type="text" id="%s_license" name="%s_license" value="%s" /><a class="%s">%s</a>&nbsp;&nbsp;&nbsp;<button name="%s_btn_trigger" class="button button-primary themeisle-sdk-licenser-button-cta" value="yes" type="submit" >%s</button></p><p class="description">%s</p>%s',
 			( ( 'valid' === $status ) ? sprintf( '<input type="hidden" value="%s" name="%s_license" />', $value, $this->product->get_key() ) : '' ),
 			( ( 'valid' === $status ) ? 'themeisle-sdk-text-input-valid' : '' ),
 			$this->product->get_key(),
@@ -167,7 +171,8 @@ public function license_view() {
 			( 'valid' === $status ? $valid_string : $invalid_string ),
 			$this->product->get_key(),
 			( 'valid' === $status ? $deactivate_string : $activate_string ),
-			sprintf( $license_message, '<a  href="' . $this->get_api_url() . '">' . $this->get_distributor_name() . '</a> ', $this->product->get_type() )
+			sprintf( $license_message, '<a  href="' . $this->get_api_url() . '">' . $this->get_distributor_name() . '</a> ', $this->product->get_type() ),
+			empty( $error_message ) ? '' : sprintf( '<p style="color:#dd3d36">%s</p>', $error_message )
 		);
 
 	}
@@ -224,6 +229,10 @@ function show_notice() {
 		if ( ! is_admin() ) {
 			return false;
 		}
+
+		if ( apply_filters( $this->product->get_key() . '_hide_license_notices', false ) ) {
+			return;
+		}
 		$status                = $this->get_license_status();
 		$no_activations_string = apply_filters( $this->product->get_key() . '_lc_no_activations_string', 'No activations left for %s !!!. You need to upgrade your plan in order to use %s on more websites. Please ask the %s Staff for more details.' );
 		$no_valid_string       = apply_filters( $this->product->get_key() . '_lc_no_valid_string', 'In order to benefit from updates and support for %s, please add your license code from your  <a href="%s" target="_blank">purchase history</a> and validate it <a href="%s">here</a>. ' );
@@ -413,6 +422,26 @@ private function reset_failed_checks() {
 		update_option( $this->product->get_key() . '_failed_checks', $this->failed_checks );
 	}
 
+	/**
+	 * Set license validation error message.
+	 *
+	 * @param string $message Error message.
+	 */
+	public function set_error( $message = '' ) {
+		set_transient( $this->product->get_key() . 'act_err', $message, MINUTE_IN_SECONDS );
+
+		return;
+	}
+
+	/**
+	 * Return the last error message.
+	 *
+	 * @return mixed Error message.
+	 */
+	public function get_error() {
+		return get_transient( $this->product->get_key() . 'act_err' );
+	}
+
 	/**
 	 * Activate the license remotely.
 	 */
@@ -439,19 +468,22 @@ function activate_license() {
 		$response = wp_remote_get( add_query_arg( $api_params, $this->get_api_url() ) );
 		// make sure the response came back okay.
 		if ( is_wp_error( $response ) ) {
-			$license_data          = new \stdClass();
-			$license_data->license = ( 'valid' != $status ) ? 'valid' : 'invalid';
+			$this->set_error( sprintf( 'ERROR: Failed to connect to the license service. Please try again later. Reason: %s', $response->get_error_message() ) );
 
-		} else {
-			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
-			if ( ! is_object( $license_data ) ) {
-				$license_data          = new \stdClass();
-				$license_data->license = ( 'valid' != $status ) ? 'valid' : 'invalid';
-			}
-			if ( ! isset( $license_data->license ) ) {
-				$license_data->license = 'invalid';
-			}
+			return;
 		}
+
+		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+
+		if ( ! is_object( $license_data ) ) {
+			$this->set_error( 'ERROR: Failed to validate license. Please try again in one minute.' );
+
+			return;
+		}
+		if ( ! isset( $license_data->license ) ) {
+			$license_data->license = 'invalid';
+		}
+
 		if ( ! isset( $license_data->key ) ) {
 			$license_data->key = $license;
 		}
@@ -462,7 +494,7 @@ function activate_license() {
 		if ( isset( $license_data->plan ) ) {
 			update_option( $this->product->get_key() . '_license_plan', $license_data->plan );
 		}
-
+		$this->set_error( '' );
 		update_option( $this->product->get_key() . '_license_data', $license_data );
 		set_transient( $this->product->get_key() . '_license_data', $license_data, 12 * HOUR_IN_SECONDS );
 

diff --git a/src/Modules/Notification.php b/src/Modules/Notification.php
@@ -430,6 +430,9 @@ function ( $value ) {
 	 * @return Notification Module instance.
 	 */
 	public function load( $product ) {
+		if ( apply_filters( 'themeisle_sdk_hide_notifications', false ) ) {
+			return;
+		}
 		$this->product = $product;
 
 		$notifications       = apply_filters( 'themeisle_sdk_registered_notifications', [] );

diff --git a/src/Modules/Uninstall_feedback.php b/src/Modules/Uninstall_feedback.php
@@ -836,6 +836,11 @@ public function can_load( $product ) {
 	 * @return Uninstall_Feedback Current module instance.
 	 */
 	public function load( $product ) {
+
+		if ( apply_filters( $product->get_key() . '_hide_uninstall_feedback', false ) ) {
+			return;
+		}
+
 		$this->product = $product;
 		add_action( 'admin_head', array( $this, 'load_resources' ) );
 		add_action( 'wp_ajax_' . $this->product->get_key() . '_uninstall_feedback', array( $this, 'post_deactivate' ) );