Changeset 3318616

Timestamp:

06/27/2025 07:33:42 AM (7 months ago)

Author:

DarkoG

Message:

Version 1.8.2

Location:

digital-license-manager/trunk

Files:

• digital-license-manager.php (modified) (2 diffs)
• includes/Enums/LicensePublicStatus.php (modified) (1 diff)
• includes/ListTables/Activations.php (modified) (7 diffs)
• readme.txt (modified) (2 diffs)
• vendor/composer/installed.php (modified) (2 diffs)

digital-license-manager/trunk/digital-license-manager.php

@@ -4 +4 @@
  * Plugin URI: https://codeverve.com/product/digital-license-manager-pro/
  * Description: Easily manage and sell your license keys on your website. Compatible with WooCommerce for selling licenses but also works without it.
- * Version: 1.8.1
+ * Version: 1.8.2
  * Author: CodeVerve
  * Author URI: https://codeverve.com/
@@ -44 +44 @@
 
 if ( ! defined( 'DLM_PLUGIN_VERSION' ) ) {
-    define( 'DLM_PLUGIN_VERSION', '1.8.1' );
+    define( 'DLM_PLUGIN_VERSION', '1.8.2' );
 }
 if ( ! defined( 'DLM_PURCHASE_URL' ) ) {

digital-license-manager/trunk/includes/Enums/LicensePublicStatus.php

@@ -94 +94 @@
         $wrapper = isset( $args['inline'] ) && $args['inline'] ? 'inline' : 'full';
 
-        if ( in_array( $license->getStatus(), [ LicensePrivateStatus::SOLD, LicensePrivateStatus::DELIVERED ] ) ) {
+        if ( in_array( $license->getStatus(), [ LicensePrivateStatus::SOLD, LicensePrivateStatus::DELIVERED, LicensePrivateStatus::ACTIVE ] ) ) {
             if ( $license->isExpired() ) {
                 $status = self::EXPIRED;

digital-license-manager/trunk/includes/ListTables/Activations.php

@@ -105 +105 @@
     private function getRecordsCount( $status = '' ) {
         $query = $this->getRecordsQuery( $status );
-
         return LicenseActivations::instance()->count( $query['where'] );
     }
@@ -119 +118 @@
 
         // Applies the view filter
-        if ( ! empty( $status ) || $this->isViewFilterActive() ) {
-
-            $status = empty( $status ) && ! empty( $_GET['status'] ) ? sanitize_text_field( wp_unslash( $_GET['status'] ) ) : '';
-
-            if ( 'inactive' === $status ) {
+        if ( empty( $status ) && $this->isViewFilterActive() ) {
+            $status = isset( $_REQUEST['status'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['status'] ) ) : '';
+        }
+
+        switch($status) {
+            case 'enabled':
+                $where['deactivated_at'] = [
+                    'operator' => "IS",
+                    'value'    => "NULL",
+                ];
+                break;
+            case 'disabled':
                 $where['deactivated_at'] = [
                     'operator' => "IS",
                     'value'    => "NOT NULL",
                 ];
-            } else {
-                $where['deactivated_at'] = [
-                    'operator' => "IS",
-                    'value'    => "NULL",
-                ];
-            }
         }
 
@@ -316 +316 @@
             $html = sprintf(
                 '<div class="dlm-status dlm-status-inactive"><span class="dashicons dashicons-marker"></span> %s</div>',
-                __( 'Inactive', 'digital-license-manager' )
+                __( 'Disabled', 'digital-license-manager' )
             );
         } else {
             $html = sprintf(
                 '<div class="dlm-status dlm-status-delivered"><span class="dashicons dashicons-marker"></span> %s</div>',
-                __( 'Active', 'digital-license-manager' )
+                __( 'Enabled', 'digital-license-manager' )
             );
         }
@@ -451 +451 @@
     private function isViewFilterActive() {
         if ( array_key_exists( 'status', $_GET )
-             && in_array( $_GET['status'], array( 'active', 'inactive' ) )
+             && in_array( $_GET['status'], array( 'enabled', 'disabled' ) )
         ) {
             return true;
@@ -469 +469 @@
         $current     = ! empty( $_REQUEST['status'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['status'] ) ) : 'all';
 
-        $total_active   = $this->getRecordsCount( 'active' );
-        $total_inactive = $this->getRecordsCount( 'inactive' );
+        $total_active   = $this->getRecordsCount( 'enabled' );
+        $total_inactive = $this->getRecordsCount( 'disabled' );
+
 
         // All link
@@ -483 +484 @@
         );
 
-        // Active link
-        $class                 = $current == 'active' ? ' class="current"' : '';
-        $activeUrl             = esc_url( add_query_arg( 'status', 'active' ) );
-        $statusLinks['active'] = sprintf(
+        // Enabled link
+        $class                 = $current == 'enabled' ? ' class="current"' : '';
+        $activeUrl             = esc_url( add_query_arg( 'status', 'enabled' ) );
+        $statusLinks['enabled'] = sprintf(
             '<a href="%s" %s>%s <span class="count">(%d)</span></a>',
             $activeUrl,
             $class,
-            __( 'Active', 'digital-license-manager' ),
+            __( 'Enabled', 'digital-license-manager' ),
             $total_active
         );
 
-        // Inactive link
-        $class                   = $current == 'inactive' ? ' class="current"' : '';
-        $inactiveUrl             = esc_url( add_query_arg( 'status', 'inactive' ) );
-        $statusLinks['inactive'] = sprintf(
+        // Disabled link
+        $class                   = $current == 'disabled' ? ' class="current"' : '';
+        $inactiveUrl             = esc_url( add_query_arg( 'status', 'disabled' ) );
+        $statusLinks['disabled'] = sprintf(
             '<a href="%s" %s>%s <span class="count">(%d)</span></a>',
             $inactiveUrl,
             $class,
-            __( 'Inactive', 'digital-license-manager' ),
+            __( 'Disabled', 'digital-license-manager' ),
             $total_inactive
         );
@@ -625 +626 @@
         $this->processBulkActions();
 
-        $perPage     = $this->get_items_per_page( 'activations_per_page', 10 );
+        $perPage     = $this->get_items_per_page( 'dlm_activations_per_page', 10 );
         $currentPage = $this->get_pagenum();
         $totalItems  = $this->getRecordsCount();

digital-license-manager/trunk/readme.txt

@@ -5 +5 @@
 Requires PHP: 7.0
 Tested up to: 6.8
-Stable tag: 1.8.1
+Stable tag: 1.8.2
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -208 +208 @@
 
 == Changelog ==
+
+
+= 1.8.2 =
+*Release date - 27 Jun 2025*
+
+* Fix Active license status showing as Inactive in My Account
+* Fix count of License Activations in Activations table in Admin
+* Fix License Activations table view filters
 
 = 1.8.1 =

digital-license-manager/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'df4ff9edac66d38ecd7951a6cf7da22cf60caa8f',
+        'reference' => '8a625a0a8ed26f889d7632240683b379ba113eca',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -23 +23 @@
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'df4ff9edac66d38ecd7951a6cf7da22cf60caa8f',
+            'reference' => '8a625a0a8ed26f889d7632240683b379ba113eca',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',