updated expiration display logic

Author: nstilt1

README.md

@@ -4,9 +4,8 @@
 
 Ensure that your website is running PHP 8 or later. This plugin is confirmed to be working with PHP 8.3.
 
-1. Clone this repo.
-2. Zip `software-licensor-wp-plugin`
-3. Upload the plugin to your website.
+1. Clone this repo and zip `software-licensor-wp-plugin`, or download the latest release.
+3. Upload the plugin (the zip file) to your website.
 4. Navigate from the admin dashboard to `WooCommerce>Settings>Integration>Software Licensor`.
 5. Fill out the form and click save. If the form is missing data, the request might not go through and you won't be able to see a store ID in the next step.
 6. Navigate from the admin dashboard to `Software Licensor>Software Licensor`. Verify that you can see a roughly 64-character long string at the top under `Store ID`. You will need to include this `store_id` in the client side code.

software-licensor-wp-plugin/Software-Licensor-Integration.php

@@ -5,7 +5,7 @@
  * Description: A plugin for handling software licenses through Software Licensor
  * Author: Noah Stiltner
  * Author URI: https://www.alteredbrainchemistry.com
- * Version: 1.1
+ * Version: 1.1.1
  * Requires PHP: 8.0
  *
  * This program is free software: you can redistribute it and/or modify

software-licensor-wp-plugin/includes/class-wc-software-licensor-integration.php

@@ -125,25 +125,23 @@ function get_license_data_html() {
                 $machines = [];
                 $license_type = $product_data->getLicenseType();
                 $expiration = $product_data->getExpirationOrRenewal();
-                if (is_numeric($expiration) && $expiration > 0) {
-                    $expiration = date("d M Y", $expiration);
-                }
+
                 $offline_machines = $product_data->getOfflineMachines();
                 $online_machines = $product_data->getOnlineMachines();
                 $machine_limit = $product_data->getMachineLimit();
                 $machine_count = count($offline_machines) + count($online_machines);
 
                 foreach ($offline_machines as $index => $m) {
                     array_push($machines, [
-                        'id' => $m->getId(),
+                        'id' => substr((string) $m->getId(), 0, 10),
                         'os' => $m->getOs(),
                         'computer_name' => $m->getComputerName(),
                         'activation_type' => 'offline'
                     ]);
                 }
                 foreach ($online_machines as $index => $m) {
                     array_push($machines, [
-                        'id' => $m->getId(),
+                        'id' => substr((string) $m->getId(), 0, 10),
                         'os' => $m->getOs(),
                         'computer_name' => $m->getComputerName(),
                         'activation_type' => 'online'
@@ -210,7 +208,11 @@ function get_license_data_html() {
                 $output_html .= '<tr class="SL-product-row" data-index="' . htmlspecialchars($item['index']) . '">';
                 $output_html .= '<td>' . stripslashes(htmlspecialchars($item['product_name'])) . '</td>';
                 $output_html .= '<td>' . htmlspecialchars($item['license_type']) . '</td>';
-                $output_html .= '<td>' . htmlspecialchars($item['expiration']) . '</td>';
+                if ($item['expiration'] != '0' && $item['expiration'] != 0 && is_numeric($item['expiration'])) {
+                    $output_html .= '<td class="sl-expiration" data-ts="' . esc_attr($item['expiration']) . '"></td>';
+                } else {
+                    $output_html .= '<td>' . htmlspecialchars($item['expiration']) . '</td>';
+                }
                 $output_html .= '<td>' . htmlspecialchars($item['machine_count']) . '/' . htmlspecialchars($item['machine_limit']) . '</td>';
                 $output_html .= '</tr>';
 
@@ -270,6 +272,24 @@ function regenerateLicense() {
                             }
                         });
                     });
+
+                    document.querySelectorAll(".sl-expiration").forEach(function(el) {
+                        const ts = parseInt(el.dataset.ts, 10);
+
+                        if (!isNaN(ts) && ts > 0) {
+                            const date = new Date(ts * 1000);
+
+                            el.textContent = date.toLocaleString(undefined, {
+                                day: "2-digit",
+                                month: "short",
+                                year: "numeric",
+                                hour: "2-digit",
+                                minute: "2-digit"
+                            });
+                        } else {
+                            el.textContent = "—";
+                        }
+                    });
                 });
             </script></div>';
 
@@ -406,7 +426,17 @@ public function init_form_fields() {
                 'share_customer_info' => array(
                     'title' => __( 'Share Customer Info', 'software-licensor' ),
                     'type' => 'checkbox',
-                    'description' => __( 'Optionally share customer info with Software Licensor. Sharing this will enable the possibility of customer\'s contact information to be visible in the licensed software (you would also need to display it with your client side code). We do not sell or share personal customer information, and the information will be encrypted in transit and at rest. If you check this box, you will need to include a statement in your privacy policy that Software Licensor is one of the 3rd parties that you are sharing customer data with. The collected data primarily includes names and emails, and can also include computer names, OS names, MAC addresses, and some hardware information.', 'software-licensor' ),
+                    'description' => __( 'Optionally share customer info with ' . 
+                        'Software Licensor. Sharing this will enable the ' . 
+                        'possibility of customer\'s contact information to be ' . 
+                        'visible in your licensed software (you would also need ' . 
+                        'to display it with your client side code). We do not ' . 
+                        'sell or share personal customer information, and the ' . 
+                        'information will be encrypted in transit and at rest. ' . 
+                        'If you check this box, you will need to include a ' . 
+                        'statement in your privacy policy that Software Licensor ' . 
+                        'is one of the 3rd parties that you are sharing customer  ' .
+                        'data with. The collected data primarily includes names and emails, and can also include computer names, OS names, MAC addresses, and some hardware information.', 'software-licensor' ),
                     'default' => '',
                     'label' => 'Share customer info',
                 ),
@@ -440,7 +470,6 @@ public function init_form_fields() {
          */
         public function process_admin_options()
         {
-            echo 'Reached process_admin_options() function';
             $all_settings_valid = true;
             $settings = $this->get_form_fields();
 
@@ -498,6 +527,16 @@ function software_licensor_admin_menus() {
                 'dashicons-admin-network'
             );
 
+            // store registration
+            add_submenu_page(
+                'software-licensor',
+                'Store Registration',
+                'Store Registration',
+                'manage_options',
+                'software-licensor-store-registration',
+                array($this, 'software_licensor_store_registration_page')
+            );
+
             // product creation page
             add_submenu_page(
                 'software-licensor',
@@ -521,6 +560,38 @@ function software_licensor_admin_menus() {
             add_action('load-' . $import_export_page, array($this, 'user_export_handler'));
         }
 
+        public function software_licensor_store_registration_page() {
+            if (!current_user_can('manage_options')) {
+                wp_die(__('You do not have sufficient permissions to access this page.', 'software-licensor'));
+            }
+
+            if (
+                isset($_POST['software_licensor_store_registration_nonce']) &&
+                wp_verify_nonce(
+                    sanitize_text_field(wp_unslash($_POST['software_licensor_store_registration_nonce'])),
+                    'software_licensor_store_registration_save'
+                )
+            ) {
+                $this->process_admin_options();
+                echo '<div class="updated"><p>' . esc_html__('Settings saved.', 'software-licensor') . '</p></div>';
+            }
+
+            echo '<div class="wrap">';
+            echo '<h1>' . esc_html__('Store Registration', 'software-licensor') . '</h1>';
+            echo '<form method="post" action="">';
+
+            wp_nonce_field('software_licensor_store_registration_save', 'software_licensor_store_registration_nonce');
+
+            echo '<table class="form-table">';
+            $this->generate_settings_html();
+            echo '</table>';
+
+            submit_button();
+
+            echo '</form>';
+            echo '</div>';
+        }
+
         /**
          * Prevents HTML from being appended to Exported data.
          */