From 73509f91103c0d48cebf55dd8c3f0d9f290056e7 Mon Sep 17 00:00:00 2001
From: Michel Velis <mvelis90@gmail.com>
Date: Thu, 6 Jan 2022 14:41:08 -0500
Subject: [PATCH] Updated License Details view inside my account page > my
 licenses (woo-commerce support) replaced expand view for modal for my
 licenses inside my licenses page Update WP support

---
 includes/slm-scripts.php                   |  17 +-
 public/assets/css/slm-front-end.css        |  25 +++
 public/assets/js/slm-js.js                 |  23 +--
 software-license-manager.php               |  18 +-
 woocommerce/includes/wc_licenses_class.php | 199 +++++++++++----------
 5 files changed, 153 insertions(+), 129 deletions(-)

diff --git a/includes/slm-scripts.php b/includes/slm-scripts.php
index 958dd10..a565f91 100644
--- a/includes/slm-scripts.php
+++ b/includes/slm-scripts.php
@@ -1,5 +1,10 @@
 <?php
 
+// If this file is called directly, abort.
+if (!defined('WPINC')) {
+    die();
+}
+
 // add admin styles and scipts
 function slm_admin_assets()
 {
@@ -9,13 +14,11 @@ function slm_admin_assets()
 }
 
 // load frontend styles
-function slm_js_license()
-{
-    wp_enqueue_script('slm_js', SLM_ASSETS_URL . 'js/slm-js.js', array('jquery'), '1.0.1', true);
+function slm_js_license(){
+    //wp_enqueue_script('slm_js', SLM_ASSETS_URL . 'js/slm-js.js', array('jquery'), '1.0.1', true);
 }
 
-function slm_frontend_assets()
-{
+function slm_frontend_assets(){
     /**
      * Check if WooCommerce is activated
      */
@@ -30,7 +33,7 @@ function slm_frontend_assets()
     wp_enqueue_style('softwarelicensemanager', SLM_ASSETS_URL . 'css/slm-front-end.css');
 }
 
-//add_action('wp_enqueue_scripts', 'slm_frontend_assets');
+add_action('wp_enqueue_scripts', 'slm_frontend_assets');
 add_action('admin_enqueue_scripts', 'slm_admin_assets');
 
 
@@ -43,7 +46,7 @@ function slm_frontend_assets()
     function slm_get_page()
     {
         if (is_page('my-account')) {
-            add_action('wp_enqueue_scripts', 'slm_js_license');
+            //add_action('wp_enqueue_scripts', 'slm_js_license');
         }
     }
 }
diff --git a/public/assets/css/slm-front-end.css b/public/assets/css/slm-front-end.css
index ef8f63f..3f9d4eb 100644
--- a/public/assets/css/slm-front-end.css
+++ b/public/assets/css/slm-front-end.css
@@ -44,3 +44,28 @@ background: #f0283e;
 
 #slm_licenses_table tbody tr:nth-child(even) {background: #fbfbfb}
 #slm_licenses_table tbody tr:nth-child(odd) {background: #FFF}
+
+.lic-group-details li span {
+    font-weight: bold;
+}
+ul#myLics {
+    margin: 0;
+}
+#myLics a {
+    text-decoration: none;
+    font-weight: bold;
+}
+#MyLicDetails {
+    border: 1px solid #ddd;
+    padding: 16px;
+}
+.lic-group-details {
+    margin-left: 0;
+}
+.lic-copy-code pre {
+ white-space: pre-wrap;       /* css-3 */
+ white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+ white-space: -pre-wrap;      /* Opera 4-6 */
+ white-space: -o-pre-wrap;    /* Opera 7 */
+ word-wrap: break-word;       /* Internet Explorer 5.5+ */
+}
\ No newline at end of file
diff --git a/public/assets/js/slm-js.js b/public/assets/js/slm-js.js
index 8147722..056fd75 100644
--- a/public/assets/js/slm-js.js
+++ b/public/assets/js/slm-js.js
@@ -1,9 +1,3 @@
-jQuery(document).ready(function($) {
-    $('#slm_licenses_table .collapse').on('show.bs.collapse', function () {
-        $('#slm_licenses_table .collapse.in').collapse('hide');
-    });
-});
-
 function download(filename, text) {
     var element = document.createElement('a');
     element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
@@ -15,11 +9,12 @@ function download(filename, text) {
 }
 
 // Start file download.
-document.getElementById("export-lic-key").addEventListener("click", function () {
-    // Generate download of hello.txt file with some content
-    var license_data    = this.getAttribute('data-licdata');
-    var text            = license_data;
-    var filename        = "license.json";
-    download(filename, text);
-}, false);
-
+if (document.getElementById('export-lic-key') !=null) {
+    document.getElementById("export-lic-key").addEventListener("click", function () {
+        // Generate download of hello.txt file with some content
+        var license_data    = this.getAttribute('data-licdata');
+        var text            = license_data;
+        var filename        = "slm_license.json";
+        download(filename, text);
+    }, false);
+}
\ No newline at end of file
diff --git a/software-license-manager.php b/software-license-manager.php
index 47e7d58..b3778e8 100755
--- a/software-license-manager.php
+++ b/software-license-manager.php
@@ -1,15 +1,15 @@
 <?php
 /*
 Plugin Name: Software License Manager
-Version: 5.5.12
+Version: 5.6.1
 Plugin URI: https://github.com/michelve/software-license-manager/
 Author: Michel Velis
-Author URI: https://www.epikly.com/
-Description: Software license management solution for your web applications (WordPress plugins, Themes, Applications, PHP based membership script etc.). Supports WooCommerce.
+Author URI: http://www.epikly.com/
+Description: Software license management solution for your web applications (WordPress plugins, Themes, Applications, PHP based license software script etc.). Supports WooCommerce.
 Author2: <a href="https://www.tipsandtricks-hq.com/">Tips and Tricks HQ</a>
 Text Domain: softwarelicensemanager
 Domain Path: /i18n/languages/
-WC tested up to: 4.3.0
+WC tested up to: 5.9.2
 */
 
 // If this file is called directly, abort.
@@ -19,9 +19,9 @@
 global $wpdb, $slm_debug_logger;
 
 //Short name/slug "SLM" or "slm"
-define('SLM_VERSION',               '5.5.12');
-define('SLM_DB_VERSION',            '4.3.3');
-define('SLM_REWRITE_VERSION',       '2.4.4');
+define('SLM_VERSION',               '5.6.1');
+define('SLM_DB_VERSION',            '4.3.5');
+define('SLM_REWRITE_VERSION',       '2.4.5');
 define('SLM_FOLDER',                dirname(plugin_basename(__FILE__)));
 define('SLM_URL',                   plugins_url('', __FILE__));
 define('SLM_ASSETS_URL',            SLM_URL   . '/public/assets/');
@@ -49,10 +49,6 @@
 if (file_exists(SLM_LIB .  'slm-plugin-core.php')) {
     include_once SLM_LIB . 'slm-plugin-core.php';
 }
-// TODO: Addons Loader
-if (file_exists(SLM_ADDONS .  'stripe/stripe.php')) {
-    include_once SLM_ADDONS . 'stripe/stripe.php';
-}
 
 // Options and filters
 define('WOO_SLM_API_SECRET',    SLM_Helper_Class::slm_get_option('lic_creation_secret'));
diff --git a/woocommerce/includes/wc_licenses_class.php b/woocommerce/includes/wc_licenses_class.php
index c673955..94a26e3 100755
--- a/woocommerce/includes/wc_licenses_class.php
+++ b/woocommerce/includes/wc_licenses_class.php
@@ -5,6 +5,11 @@
  * @link   https://github.com/michelve/software-license-manager
  */
 
+// If this file is called directly, abort.
+if (!defined('WPINC')) {
+    die();
+}
+
 class SLM_Woo_Account
 {
     public static $endpoint = 'my-licenses';
@@ -98,52 +103,6 @@ public function endpoint_content()
         }
         ?>
 
-        <?php
-        if (SLM_Helper_Class::slm_get_option('slm_front_conflictmode') == 1) : ?>
-            <?php
-            add_action('wp_footer', function () {
-                wp_enqueue_style('slm-bootstrap', esc_url("https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"), array(), '', 'all');
-                wp_enqueue_script('slm-bootstrap', esc_url('https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js'), array(), '', true);
-            });
-            ?>
-        <?php endif; ?>
-
-
-
-
-        <!-- Button trigger modal -->
-        <!-- <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal">
-            Launch demo modal
-        </button> -->
-
-        <!-- Modal -->
-        <!-- <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalLabel">Modal title</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        ...
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        <button type="button" class="btn btn-primary">Save changes</button>
-                    </div>
-                </div>
-            </div>
-        </div> -->
-
-
-
-
-
-
-
-
         <div class="woocommerce-slm-content" <?php echo esc_html__($slm_hide); ?>>
             <table id="slm_licenses_table" class="woocommerce-orders-table woocommerce-MyAccount-orders shop_table shop_table_responsive my_account_orders account-orders-table" style="border-collapse:collapse;">
                 <thead>
@@ -159,7 +118,7 @@ public function endpoint_content()
                 <tbody>
                     <?php
                     foreach ($result as $license_info) : ?>
-                        <tr data-toggle="collapse" data-target=".demo<?php echo $class_++; ?>" class="woocommerce-orders-table__row woocommerce-orders-table__row--status-completed order">
+                        <tr class="woocommerce-orders-table__row woocommerce-orders-table__row--status-completed order">
                             <td class="woocommerce-orders-table__cell woocommerce-orders-table__cell-order-number slm-order" data-title="<?php echo __('Order', 'softwarelicensemanager'); ?>"><a href="<?php echo get_home_url() . '/my-account/view-order/' . $license_info->purchase_id_; ?>">#<?php echo $license_info->purchase_id_; ?></a></td>
 
                             <td class="slm-status" data-title="<?php echo esc_html__('Status', 'softwarelicensemanager'); ?>">
@@ -198,60 +157,107 @@ public function endpoint_content()
                                 ?>
                             </td>
                             <td class="slm-view" data-title="<?php echo esc_html__('view', 'softwarelicensemanager'); ?>">
-                                <a href="#" class="woocommerce-button button view">
-                                    <?php echo esc_html__('view', 'softwarelicensemanager'); ?>
-                                </a>
+
+
+                                <button type="button" class="btn btn-default lic-view-details-btn" data-toggle="modal" data-target="#licModal_<?php echo $license_info->id; ?>">
+                                    View
+                                </button>
+
                             </td>
                         </tr>
-                        <tr class="parent">
+                        <tr>
+
+                            <td colspan="5">
+                                <div>
 
-                            <td colspan="5" class="hiddenRow">
-                                <div class="collapse demo<?php echo $class_id_++; ?> slm-shadow">
-                                    <div class="slm_ajax_msg"></div>
                                     <?php
                                     global $wpdb;
-                                    $detailed_license_info =  $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "lic_key_tbl WHERE `license_key` = '" . $license_info->license_key . "' ORDER BY `id` LIMIT 0,1000;", ARRAY_A);
+                                    $detailed_license_info =  $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "lic_key_tbl WHERE `id` = '" . $license_info->id . "' ORDER BY `id` LIMIT 0,1000;", ARRAY_A);
                                     ?>
-                                    <div class="row" style="padding: 16px;">
-                                        <table>
-                                            <thead>
-                                                <tr>
-                                                    <th data-title=<?php echo esc_html__('Expiration', 'softwarelicensemanager'); ?> class="woocommerce-orders-table__header woocommerce-orders-table__header-order-number"><?php echo esc_html__('Expiration', 'softwarelicensemanager'); ?></th>
-                                                    <th data-title=<?php echo esc_html__('Allowed devices', 'softwarelicensemanager'); ?> class="woocommerce-orders-table__header woocommerce-orders-table__header-order-number"><?php echo esc_html__('Allowed devices', 'softwarelicensemanager'); ?></th>
-                                                    <th data-title=<?php echo esc_html__('Allowed Domains', 'softwarelicensemanager'); ?> class="woocommerce-orders-table__header woocommerce-orders-table__header-order-number"><?php echo esc_html__('Allowed Domains', 'softwarelicensemanager'); ?></th>
-                                                    <th data-title=<?php echo esc_html__('License type', 'softwarelicensemanager'); ?> class="woocommerce-orders-table__header woocommerce-orders-table__header-order-number"><?php echo esc_html__('License type', 'softwarelicensemanager'); ?></th>
-                                                    <th data-title=<?php echo esc_html__('Date renewed', 'softwarelicensemanager'); ?> class="woocommerce-orders-table__header woocommerce-orders-table__header-order-number"><?php echo esc_html__('Date renewed', 'softwarelicensemanager'); ?></th>
-                                                    <th data-title=<?php echo esc_html__('Activation Date', 'softwarelicensemanager'); ?> class="woocommerce-orders-table__header woocommerce-orders-table__header-order-number"><?php echo esc_html__('Activation Date', 'softwarelicensemanager'); ?></th>
-                                                </tr>
-                                            </thead>
-                                            <tr>
-                                                <td data-title=<?php echo __('Expiration', 'softwarelicensemanager'); ?> class="slm-expiration"><time datetime="<?php echo $license_info->date_expiry; ?>"><?php echo $license_info->date_expiry; ?></time></td>
-                                                <td data-title=<?php echo esc_html__('Allowed Devices', 'softwarelicensemanager'); ?>><?php echo $license_info->max_allowed_devices; ?></td>
-                                                <td data-title=<?php echo esc_html__('Allowed Domains', 'softwarelicensemanager'); ?>><?php echo $license_info->max_allowed_domains; ?></td>
-                                                <td data-title=<?php echo esc_html__('License type', 'softwarelicensemanager'); ?>><?php echo $license_info->lic_type; ?></td>
-                                                <td data-title=<?php echo esc_html__('Date renewed', 'softwarelicensemanager'); ?>><?php echo $license_info->date_renewed; ?></td>
-                                                <td data-title=<?php echo esc_html__('Activation date', 'softwarelicensemanager'); ?>><?php echo $license_info->date_activated; ?></td>
-                                            </tr>
-                                        </table>
-
-                                        <br>
-                                        <div class="row" style="width: 100%;">
-                                            <div class="slm-activated-on domains-list col-md-6">
-                                                <?php SLM_Utility::get_license_activation($license_info->license_key, SLM_TBL_LIC_DOMAIN, 'Domains', 'Domains', $allow_domain_removal); ?>
-                                            </div>
-
-                                            <div class="slm-activated-on domains-list col-md-6">
-                                                <?php SLM_Utility::get_license_activation($license_info->license_key, SLM_TBL_LIC_DEVICES, 'Devices', 'Devices', $allow_domain_removal); ?>
-                                            </div>
-                                        </div>
-                                        <div class="clear"></div>
-
-                                        <div class="row slm-export">
-                                            <?php
-                                            $license_key_json_data  = json_encode(array_values($detailed_license_info));
-                                            ?>
-                                            <div class="col-md-12 slm-action-export">
-                                                <input type="button" id="export-lic-key" data-licdata='<?php echo esc_html__($license_key_json_data); ?>' value="<?php echo esc_html__('Export license', 'softwarelicensemanager'); ?>" class="btn btn-secondary slm-button" />
+                                    <div>
+
+                                        <!-- Modal -->
+                                        <div class="modal fade" id="licModal_<?php echo $license_info->id; ?>" tabindex="-1" role="dialog" aria-labelledby="licModal_<?php echo $license_info->id; ?>Label" aria-hidden="true">
+                                            <div class="modal-dialog modal-md modal-dialog-centered" role="document">
+                                                <div class="modal-content">
+                                                    <div class="modal-header">
+                                                        <h5 class="modal-title" id="Label"><?php echo esc_html__('License Key:', 'softwarelicensemanager'); ?> <span class="badge badge-dark"><?php echo $license_info->license_key; ?></span></h5>
+                                                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                                            <span aria-hidden="true">&times;</span>
+                                                        </button>
+                                                    </div>
+                                                    <div class="modal-body">
+
+                                                        <ul class="nav nav-tabs npm" id="myLics" role="tablist">
+                                                            <li class="nav-item">
+                                                                <a class="nav-link active" id="lic-info-<?php echo $license_info->id; ?>-tab" data-toggle="tab" href="#lic-info-<?php echo $license_info->id; ?>" role="tab" aria-controls="lic-info-<?php echo $license_info->id; ?>" aria-selected="true"><?php echo esc_html__('License Information', 'softwarelicensemanager'); ?></a>
+                                                            </li>
+
+                                                            <li class="nav-item">
+                                                                <a class="nav-link" id="lic-devices-<?php echo $license_info->id; ?>-tab" data-toggle="tab" href="#lic-devices-<?php echo $license_info->id; ?>" role="tab" aria-controls="lic-devices-<?php echo $license_info->id; ?>" aria-selected="false"><?php echo esc_html__('Activations', 'softwarelicensemanager'); ?></a>
+                                                            </li>
+
+                                                            <li class="nav-item">
+                                                                <a class="nav-link" id="lic-code-<?php echo $license_info->id; ?>-tab" data-toggle="tab" href="#lic-code-<?php echo $license_info->id; ?>" role="tab" aria-controls="lic-code-<?php echo $license_info->id; ?>" aria-selected="false"><?php echo esc_html__('Copy License', 'softwarelicensemanager'); ?></a>
+                                                            </li>
+                                                        </ul>
+
+                                                        <div class="tab-content" id="MyLicDetails">
+                                                            <div class="tab-pane fade show active" id="lic-info-<?php echo $license_info->id; ?>" role="tabpanel" aria-labelledby="lic-info-<?php echo $license_info->id; ?>-tab">
+
+                                                                <div class="card" style="width: 18rem;">
+                                                                    <div class="card-header">
+                                                                        <?php echo esc_html__('License information', 'softwarelicensemanager'); ?>
+                                                                    </div>
+                                                                    <ul class="list-group list-group-flush lic-group-details">
+                                                                        <li class="list-group-item"><?php echo esc_html__('Expiration', 'softwarelicensemanager'); ?> <span><time datetime="<?php echo $license_info->date_expiry; ?>"><?php echo $license_info->date_expiry; ?></time></span></li>
+                                                                        <li class="list-group-item"><?php echo esc_html__('Allowed devices', 'softwarelicensemanager'); ?> <span><?php echo $license_info->max_allowed_devices; ?></span></li>
+                                                                        <li class="list-group-item"><?php echo esc_html__('Allowed Domains', 'softwarelicensemanager'); ?> <span><?php echo $license_info->max_allowed_domains; ?></span></li>
+                                                                        <li class="list-group-item"><?php echo esc_html__('License type', 'softwarelicensemanager'); ?> <span class="badge badge-pill badge-info"><?php echo $license_info->lic_type; ?></span></li>
+                                                                        <li class="list-group-item"><?php echo esc_html__('Date renewed', 'softwarelicensemanager'); ?> <span><?php echo $license_info->date_renewed; ?></span></li>
+                                                                        <li class="list-group-item"><?php echo esc_html__('Activation Date', 'softwarelicensemanager'); ?> <span><?php echo $license_info->date_activated; ?></span></li>
+                                                                    </ul>
+                                                                </div>
+                                                            </div>
+                                                            <div class="clear"></div>
+
+                                                            <div class="tab-pane fade" id="lic-devices-<?php echo $license_info->id; ?>" role="tabpanel" aria-labelledby="lic-devices-<?php echo $license_info->id; ?>-tab">
+                                                                <div class="row" style="width: 100%;">
+                                                                    <div class="slm-activated-on domains-list col-md-6">
+                                                                        <?php SLM_Utility::get_license_activation($license_info->license_key, SLM_TBL_LIC_DOMAIN, 'Domains', 'Domains', $allow_domain_removal); ?>
+                                                                    </div>
+
+                                                                    <div class="slm-activated-on domains-list col-md-6">
+                                                                        <?php SLM_Utility::get_license_activation($license_info->license_key, SLM_TBL_LIC_DEVICES, 'Devices', 'Devices', $allow_domain_removal); ?>
+                                                                    </div>
+
+                                                                </div>
+                                                                <div class="clear"></div>
+                                                                <div class="slm_ajax_msg"></div>
+                                                                <div class="clear"></div>
+                                                            </div>
+                                                            <div class="clear"></div>
+
+                                                            <div class="tab-pane fade" id="lic-code-<?php echo $license_info->id; ?>" role="tabpanel" aria-labelledby="lic-code-<?php echo $license_info->id; ?>-tab">
+                                                                <div class="row">
+
+                                                                    <div class="col-md-12 lic-copy-code">
+                                                                        <pre style="max-height: 200px;">
+                                                                            <?php
+                                                                            $license_key_json_data  = json_encode($detailed_license_info, JSON_PRETTY_PRINT);
+                                                                            echo esc_html__($license_key_json_data);
+                                                                            ?>
+                                                                        </pre>
+
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="modal-footer lic-details-footer">
+                                                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
@@ -268,9 +274,8 @@ public function endpoint_content()
             </table>
         </div>
         <?php
-        if ($allow_domain_removal == true) :
+        if ($allow_domain_removal == true && is_user_logged_in()) :
         ?>
-
             <script>
                 jQuery(document).ready(function() {
                     jQuery('.deactivate_lic_key').click(function(event) {