Merge branch 'updates-and-fixes-customer-number'

adeprimo · Oct 19, 2022 · 55b6847 · 55b6847
2 parents 105d91c + a848cc2
commit 55b6847
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -103,6 +103,7 @@ Here you can add IP addresses that should have access to the content regardless
 
 * [tulo_user_name]
 * [tulo_user_email]
+* [tulo_user_customer_number]
 
 
 ## Login and logout management
@@ -144,6 +145,7 @@ If a user is authenticated with Tulo Payway SSO2 and logged into Wordpress sessi
  $session->is_logged_in();
  $session->get_user_name();
  $session->get_user_email();
+ $session->get_user_customer_number();
  $session->get_user_active_products();
  $session->user_has_subscription();
 ```

diff --git a/includes/class-tulo-payway-sso2-api.php b/includes/class-tulo-payway-sso2-api.php
@@ -19,6 +19,7 @@ class Tulo_Payway_API_SSO2 {
     private $sso_session_established_key = "sso2_session_established";
     private $sso_session_user_name_key = "sso2_session_user_name";
     private $sso_session_user_email_key = "sso2_session_user_email";
+    private $sso_session_user_custno_key = "sso2_session_user_customer_number";
     private $sso_session_user_active_products_key = "sso2_session_user_active_products";
 
     /**
@@ -82,6 +83,11 @@ protected function get_session_user_email() {
             return $_SESSION[$this->sso_session_user_email_key];
     }
 
+    protected function get_session_user_customer_number() {
+        if (isset($_SESSION[$this->sso_session_user_custno_key]))
+            return $_SESSION[$this->sso_session_user_custno_key];
+    }
+
     protected function get_session_user_active_products() {
         if (isset($_SESSION[$this->sso_session_user_active_products_key]))
             return $_SESSION[$this->sso_session_user_active_products_key]; 
@@ -248,6 +254,7 @@ protected function authenticate_user($email, $password) {
                     $this->register_basic_session($decoded);
                     $status["name"] = $this->get_user_name();
                     $status["email"] = $this->get_user_email();
+                    $status["customer_number"] = $this->get_user_customer_number();
                     $status["products"] = $this->get_user_active_products();
                 } else {
                     $status["error_code"] = $decoded->err;
@@ -367,6 +374,7 @@ private function fetch_user_and_login($auth_ticket) {
         if ($data != null) {
             $this->set_user_name($data["user"]->first_name." ".$data["user"]->last_name);
             $this->set_user_email($data["user"]->email);
+            $this->set_user_customer_number($data["user"]->customer_number);
             $this->set_user_active_products($data["active_products"]);
             $this->set_session_loggedin();
         } else {
@@ -381,6 +389,10 @@ private function set_user_name($name) {
     private function set_user_email($email) {
         $_SESSION[$this->sso_session_user_email_key] = $email;
     }
+
+    private function set_user_customer_number($customer_number) {
+        $_SESSION[$this->sso_session_user_custno_key] = $customer_number;
+    }
 
     private function set_user_active_products($products) {
         $_SESSION[$this->sso_session_user_active_products_key] = $products;

diff --git a/includes/class-tulo-payway.php b/includes/class-tulo-payway.php
@@ -8,7 +8,7 @@
  * public-facing side of the site and the admin area.
  *
  * @link       http://example.com
- * @since      1.0.0
+ * @since      1.0.1
  *
  * @package    Tulo_Payway_Server
  * @subpackage Tulo_Payway_Server/includes
@@ -222,7 +222,8 @@ private function define_public_hooks() {
           $this->loader->add_shortcode( 'tulo_buy_button', $plugin_public, 'shortcode_buy_button' );
           $this->loader->add_shortcode( 'tulo_product_link', $plugin_public, 'shortcode_product_link' );
           $this->loader->add_shortcode( 'tulo_user_name', $plugin_public, 'shortcode_loggedin_user_name' );
-          $this->loader->add_shortcode( 'tulo_user_email', $plugin_public, 'shortcode_loggedin_email' );
+          $this->loader->add_shortcode( 'tulo_user_email', $plugin_public, 'shortcode_loggedin_user_email' );
+          $this->loader->add_shortcode( 'tulo_user_customer_number', $plugin_public, 'shortcode_loggedin_user_customer_number' );
           $this->loader->add_shortcode( 'tulo_authentication_url', $plugin_public, 'shortcode_authentication_url' );
 
           $this->loader->add_action( 'wp_ajax_tulo_getproducts', $plugin_public, 'ajax_list_products', 1 );

diff --git a/public/class-tulo-payway-public.php b/public/class-tulo-payway-public.php
@@ -4,7 +4,7 @@
  * The public-facing functionality of the plugin.
  *
  * @link       http://example.com
- * @since      1.0.0
+ * @since      1.0.1
  *
  * @package    Tulo_Payway_Server
  * @subpackage Tulo_Payway_Server/public
@@ -275,6 +275,10 @@ public function shortcode_loggedin_user_email() {
         return $this->session->get_user_email();
     }
 
+    public function shortcode_loggedin_user_customer_number() {
+        return $this->session->get_user_customer_number();
+    }
+
     public function shortcode_buy_button($atts) {
         $retval = '<button class="js-tuloBuy '.$atts['class'].'" data-product="'.$atts['product'].'">';
         $retval .= __('Buy', 'tulo');

diff --git a/public/js/wp-tulo.js b/public/js/wp-tulo.js
@@ -38,6 +38,7 @@
                                         localStorage.setItem('tulo_products', parsedResponse.products);
                                         localStorage.setItem('tulo_account_name', parsedResponse.name);
                                         localStorage.setItem('tulo_account_email', parsedResponse.email);
+                                        localStorage.setItem('tulo_account_customer_number', parsedResponse.customer_number);
                                     }
                                     window.location.reload();