Merge branch 'dev' into preprod

wnet-ieg-2 · Mar 7, 2024 · 5d3326d · 5d3326d
2 parents 29fa021 + 5834a37
commit 5d3326d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/assets/js/jquery.pids.js b/assets/js/jquery.pids.js
@@ -204,7 +204,9 @@ jQuery(document).ready(function($) {
             if (user.thumbnail_URL) {thumbimage = "<span><img src='" + user.thumbnail_URL + "' alt='' /></span>";}
             portal_list_entry = '<li><a href="' + userinfolink + '">YOUR ACCOUNT</a></li>';
             if (portallink.length > 0) {
-              portal_list_entry= '<li><a href="' + portallink + '" target=_new >MEMBER PORTAL</a></li>';
+              if (userPBSLoginStatus.memberStatus == 'valid' || userPBSLoginStatus.memberStatus == 'expired') {
+                portal_list_entry= '<li><a href="' + portallink + '" target=_new >MEMBER PORTAL</a></li>';
+              }
             }
              welcomestring = '<a href="#" class="toggle-user-drop userlink">' + thumbimage + '<span class="name">' + user.first_name + '</span></a> <ul class="user-drop">'+ portal_list_entry + '<li><a  class="signout">SIGN OUT</a></li></ul>';
             $('.pbs_passport_authenticate div.messages-new').html(welcomestring);

diff --git a/classes/class-pbs-passport-authenticate.php b/classes/class-pbs-passport-authenticate.php
@@ -23,7 +23,7 @@ public function __construct($file) {
 		$this->assets_url = esc_url( trailingslashit( plugins_url( '/assets/', $file ) ) );
     $this->token = 'pbs_passport_authenticate';
     $this->defaults = get_option($this->token);
-    $this->version = '0.3.2.0';
+    $this->version = '0.3.2.1';
 
 		// Load public-facing style sheet and JavaScript.
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );

diff --git a/pbs-passport-authenticate.php b/pbs-passport-authenticate.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Plugin Name: PBS Passport Authenticate
- * Version: 0.3.2.0 -- donor portal link support
+ * Version: 0.3.2.1 -- donor portal link access tweak
  * Plugin URI: https://github.com/tamw-wnet/pbs-passport-authenticate
  * Description: PBS Passport Authenticate
  * Author: William Tam, Brian Santalone