display_name)); ?>
- - -- -
- -- -
- - -| - | - |
| - |
-
- getLicenseKey()); ?>
-
- |
-
| - | getDomain()); ?> | -
| - | - |
- - - -
- -- ' . esc_html($siteName) . '' - ); ?> -
-
getLicenseKey()); ?>
@@ -324,7 +243,7 @@ final class LicenseEmailController
-
+
@@ -340,7 +259,7 @@ final class LicenseEmailController
-
+
diff --git a/src/Email/LicenseExpirationEmail.php b/src/Email/LicenseExpirationEmail.php
new file mode 100644
index 0000000..d695c4b
--- /dev/null
+++ b/src/Email/LicenseExpirationEmail.php
@@ -0,0 +1,240 @@
+id = 'wclp_license_expiration';
+ $this->customer_email = true;
+ $this->title = __('License Expiration Warning', 'wc-licensed-product');
+ $this->description = __('License expiration warning emails are sent to customers when their licenses are about to expire.', 'wc-licensed-product');
+
+ $this->template_html = 'emails/license-expiration.php';
+ $this->template_plain = 'emails/plain/license-expiration.php';
+ $this->template_base = WC_LICENSED_PRODUCT_PLUGIN_DIR . 'templates/';
+
+ $this->placeholders = [
+ '{site_title}' => $this->get_blogname(),
+ '{product_name}' => '',
+ '{days_remaining}' => '',
+ '{expiration_date}' => '',
+ ];
+
+ // Call parent constructor
+ parent::__construct();
+ }
+
+ /**
+ * Get email subject
+ */
+ public function get_default_subject(): string
+ {
+ return __('[{site_title}] Your license for {product_name} expires in {days_remaining} days', 'wc-licensed-product');
+ }
+
+ /**
+ * Get email heading
+ */
+ public function get_default_heading(): string
+ {
+ return __('License Expiration Notice', 'wc-licensed-product');
+ }
+
+ /**
+ * Trigger the email
+ *
+ * @param License $license License object
+ * @param int $days_remaining Days until expiration
+ */
+ public function trigger(License $license, int $days_remaining): bool
+ {
+ $this->setup_locale();
+
+ $customer = get_userdata($license->getCustomerId());
+ if (!$customer || !$customer->user_email) {
+ $this->restore_locale();
+ return false;
+ }
+
+ $this->license = $license;
+ $this->days_remaining = $days_remaining;
+ $this->recipient = $customer->user_email;
+
+ $product = wc_get_product($license->getProductId());
+ $this->product_name = $product ? $product->get_name() : __('Unknown Product', 'wc-licensed-product');
+
+ $expiresAt = $license->getExpiresAt();
+ $this->expiration_date = $expiresAt ? $expiresAt->format(get_option('date_format')) : '';
+
+ // Update placeholders
+ $this->placeholders['{product_name}'] = $this->product_name;
+ $this->placeholders['{days_remaining}'] = (string) $days_remaining;
+ $this->placeholders['{expiration_date}'] = $this->expiration_date;
+
+ if (!$this->is_enabled() || !$this->get_recipient()) {
+ $this->restore_locale();
+ return false;
+ }
+
+ $result = $this->send(
+ $this->get_recipient(),
+ $this->get_subject(),
+ $this->get_content(),
+ $this->get_headers(),
+ $this->get_attachments()
+ );
+
+ $this->restore_locale();
+
+ return $result;
+ }
+
+ /**
+ * Get content HTML
+ */
+ public function get_content_html(): string
+ {
+ return wc_get_template_html(
+ $this->template_html,
+ [
+ 'license' => $this->license,
+ 'days_remaining' => $this->days_remaining,
+ 'product_name' => $this->product_name,
+ 'expiration_date' => $this->expiration_date,
+ 'email_heading' => $this->get_heading(),
+ 'additional_content' => $this->get_additional_content(),
+ 'sent_to_admin' => false,
+ 'plain_text' => false,
+ 'email' => $this,
+ ],
+ '',
+ $this->template_base
+ );
+ }
+
+ /**
+ * Get content plain text
+ */
+ public function get_content_plain(): string
+ {
+ return wc_get_template_html(
+ $this->template_plain,
+ [
+ 'license' => $this->license,
+ 'days_remaining' => $this->days_remaining,
+ 'product_name' => $this->product_name,
+ 'expiration_date' => $this->expiration_date,
+ 'email_heading' => $this->get_heading(),
+ 'additional_content' => $this->get_additional_content(),
+ 'sent_to_admin' => false,
+ 'plain_text' => true,
+ 'email' => $this,
+ ],
+ '',
+ $this->template_base
+ );
+ }
+
+ /**
+ * Default content to show below main email content
+ */
+ public function get_default_additional_content(): string
+ {
+ return __('To continue using this product, please renew your license before the expiration date.', 'wc-licensed-product');
+ }
+
+ /**
+ * Initialize settings form fields
+ */
+ public function init_form_fields(): void
+ {
+ $placeholder_text = sprintf(
+ /* translators: %s: list of placeholders */
+ __('Available placeholders: %s', 'wc-licensed-product'),
+ '{site_title}, {product_name}, {days_remaining}, {expiration_date}'
+ );
+
+ $this->form_fields = [
+ 'enabled' => [
+ 'title' => __('Enable/Disable', 'wc-licensed-product'),
+ 'type' => 'checkbox',
+ 'label' => __('Enable this email notification', 'wc-licensed-product'),
+ 'default' => 'yes',
+ ],
+ 'subject' => [
+ 'title' => __('Subject', 'wc-licensed-product'),
+ 'type' => 'text',
+ 'desc_tip' => true,
+ 'description' => $placeholder_text,
+ 'placeholder' => $this->get_default_subject(),
+ 'default' => '',
+ ],
+ 'heading' => [
+ 'title' => __('Email heading', 'wc-licensed-product'),
+ 'type' => 'text',
+ 'desc_tip' => true,
+ 'description' => $placeholder_text,
+ 'placeholder' => $this->get_default_heading(),
+ 'default' => '',
+ ],
+ 'additional_content' => [
+ 'title' => __('Additional content', 'wc-licensed-product'),
+ 'description' => __('Text to appear below the main email content.', 'wc-licensed-product') . ' ' . $placeholder_text,
+ 'css' => 'width:400px; height: 75px;',
+ 'placeholder' => $this->get_default_additional_content(),
+ 'type' => 'textarea',
+ 'default' => '',
+ 'desc_tip' => true,
+ ],
+ 'email_type' => [
+ 'title' => __('Email type', 'wc-licensed-product'),
+ 'type' => 'select',
+ 'description' => __('Choose which format of email to send.', 'wc-licensed-product'),
+ 'default' => 'html',
+ 'class' => 'email_type wc-enhanced-select',
+ 'options' => $this->get_email_type_options(),
+ 'desc_tip' => true,
+ ],
+ ];
+ }
+}
diff --git a/src/Product/LicensedProduct.php b/src/Product/LicensedProduct.php
index 17ae0f4..d628f80 100644
--- a/src/Product/LicensedProduct.php
+++ b/src/Product/LicensedProduct.php
@@ -11,6 +11,7 @@ namespace Jeremias\WcLicensedProduct\Product;
use Jeremias\WcLicensedProduct\Admin\SettingsController;
use WC_Product;
+use Jeremias\WcLicensedProduct\Product\VersionManager;
/**
* Licensed Product type extending WooCommerce Product
@@ -121,11 +122,14 @@ class LicensedProduct extends WC_Product
}
/**
- * Get current software version
+ * Get current software version (derived from latest product version)
*/
public function get_current_version(): string
{
- return $this->get_meta('_licensed_current_version', true) ?: '';
+ $versionManager = new VersionManager();
+ $latestVersion = $versionManager->getLatestVersion($this->get_id());
+
+ return $latestVersion ? $latestVersion->getVersion() : '';
}
/**
@@ -133,12 +137,13 @@ class LicensedProduct extends WC_Product
*/
public function get_major_version(): int
{
- $version = $this->get_current_version();
- if (empty($version)) {
- return 1;
+ $versionManager = new VersionManager();
+ $latestVersion = $versionManager->getLatestVersion($this->get_id());
+
+ if ($latestVersion) {
+ return $latestVersion->getMajorVersion();
}
- $parts = explode('.', $version);
- return (int) ($parts[0] ?? 1);
+ return 1;
}
}
diff --git a/src/Product/LicensedProductType.php b/src/Product/LicensedProductType.php
index 78b3bef..3b30e28 100644
--- a/src/Product/LicensedProductType.php
+++ b/src/Product/LicensedProductType.php
@@ -164,14 +164,6 @@ final class LicensedProductType
'value' => $currentBindToVersion ?: ($defaultBindToVersion ? 'yes' : 'no'),
'cbvalue' => 'yes',
]);
-
- woocommerce_wp_text_input([
- 'id' => '_licensed_current_version',
- 'label' => __('Current Version', 'wc-licensed-product'),
- 'description' => __('Current software version (e.g., 1.0.0)', 'wc-licensed-product'),
- 'desc_tip' => true,
- 'placeholder' => '1.0.0',
- ]);
?>
@@ -223,12 +215,6 @@ final class LicensedProductType
// phpcs:ignore WordPress.Security.NonceVerification.Missing
$bindToVersion = isset($_POST['_licensed_bind_to_version']) ? 'yes' : 'no';
update_post_meta($postId, '_licensed_bind_to_version', $bindToVersion);
-
- // phpcs:ignore WordPress.Security.NonceVerification.Missing
- $currentVersion = isset($_POST['_licensed_current_version'])
- ? sanitize_text_field($_POST['_licensed_current_version'])
- : '';
- update_post_meta($postId, '_licensed_current_version', $currentVersion);
}
/**
diff --git a/templates/emails/license-expiration.php b/templates/emails/license-expiration.php
new file mode 100644
index 0000000..461ca7b
--- /dev/null
+++ b/templates/emails/license-expiration.php
@@ -0,0 +1,97 @@
+getCustomerId());
+$customer_name = $customer ? $customer->display_name : __('Customer', 'wc-licensed-product');
+$account_url = wc_get_account_endpoint_url('licenses');
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ getLicenseKey()); ?>
+
+
+
+
+ getDomain()); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+getCustomerId());
+$customer_name = $customer ? $customer->display_name : __('Customer', 'wc-licensed-product');
+
+echo sprintf(esc_html__('Hello %s,', 'wc-licensed-product'), esc_html($customer_name)) . "\n\n";
+
+if ($days_remaining === 1) {
+ echo sprintf(
+ esc_html__('Your license for %s will expire tomorrow (%s).', 'wc-licensed-product'),
+ esc_html($product_name),
+ esc_html($expiration_date)
+ ) . "\n\n";
+} else {
+ echo sprintf(
+ esc_html__('Your license for %1$s will expire in %2$d days (%3$s).', 'wc-licensed-product'),
+ esc_html($product_name),
+ $days_remaining,
+ esc_html($expiration_date)
+ ) . "\n\n";
+}
+
+echo "----------\n";
+echo esc_html__('License Details', 'wc-licensed-product') . "\n";
+echo "----------\n\n";
+
+echo esc_html__('Product:', 'wc-licensed-product') . ' ' . esc_html($product_name) . "\n";
+echo esc_html__('License Key:', 'wc-licensed-product') . ' ' . esc_html($license->getLicenseKey()) . "\n";
+echo esc_html__('Domain:', 'wc-licensed-product') . ' ' . esc_html($license->getDomain()) . "\n";
+echo esc_html__('Expires:', 'wc-licensed-product') . ' ' . esc_html($expiration_date) . "\n\n";
+
+if ($additional_content) {
+ echo "----------\n\n";
+ echo esc_html(wp_strip_all_tags(wptexturize($additional_content)));
+ echo "\n\n";
+}
+
+echo esc_html__('View My Licenses', 'wc-licensed-product') . ': ' . esc_url(wc_get_account_endpoint_url('licenses')) . "\n\n";
+
+echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n";
diff --git a/wc-licensed-product.php b/wc-licensed-product.php
index d63c429..e8cb07d 100644
--- a/wc-licensed-product.php
+++ b/wc-licensed-product.php
@@ -3,7 +3,7 @@
* Plugin Name: WooCommerce Licensed Product
* Plugin URI: https://src.bundespruefstelle.ch/magdev/wc-licensed-product
* Description: WooCommerce plugin to sell software products using license keys with domain-based validation.
- * Version: 0.0.7
+ * Version: 0.0.8
* Author: Marco Graetsch
* Author URI: https://src.bundespruefstelle.ch/magdev
* License: GPL-2.0-or-later
@@ -28,7 +28,7 @@ if (!defined('ABSPATH')) {
}
// Plugin constants
-define('WC_LICENSED_PRODUCT_VERSION', '0.0.7');
+define('WC_LICENSED_PRODUCT_VERSION', '0.0.8');
define('WC_LICENSED_PRODUCT_PLUGIN_FILE', __FILE__);
define('WC_LICENSED_PRODUCT_PLUGIN_DIR', plugin_dir_path(__FILE__));
define('WC_LICENSED_PRODUCT_PLUGIN_URL', plugin_dir_url(__FILE__));