+ ${settings.fieldDescription || 'Enter a unique domain for each license.'} +
+ ${settings.licensedProducts.map(product => ` ++ ${settings.fieldDescription || 'Enter the domain where you will use the license.'} +
+- -
-+ +
++ +
+- +
@@ -251,7 +283,7 @@ final class OrderLicenseController ?>
- 0 && $orderDomain && $order->is_paid()): ?> + 0 && $hasDomainData && $order->is_paid()): ?>
__('Order must be paid before licenses can be generated.', 'wc-licensed-product')]);
}
- // Get domain
- $domain = $order->get_meta('_licensed_product_domain');
- if (empty($domain)) {
+ // Check for multi-domain format first
+ $multiDomainData = $order->get_meta('_licensed_product_domains');
+ $legacyDomain = $order->get_meta('_licensed_product_domain');
+
+ if (!empty($multiDomainData) && is_array($multiDomainData)) {
+ // Multi-domain format
+ $result = $this->generateMultiDomainLicenses($order, $multiDomainData);
+ } elseif (!empty($legacyDomain)) {
+ // Legacy single domain format
+ $result = $this->generateLegacyLicenses($order, $legacyDomain);
+ } else {
wp_send_json_error(['message' => __('Please set the order domain before generating licenses.', 'wc-licensed-product')]);
+ return;
}
- // Generate licenses for each licensed product
- $generated = 0;
- $skipped = 0;
-
- foreach ($order->get_items() as $item) {
- $product = $item->get_product();
- if ($product && $product->is_type('licensed')) {
- $license = $this->licenseManager->generateLicense(
- $orderId,
- $product->get_id(),
- $order->get_customer_id(),
- $domain
- );
-
- if ($license) {
- // Check if this is a new license or existing
- $existingLicenses = $this->licenseManager->getLicensesByOrder($orderId);
- $isNew = true;
- foreach ($existingLicenses as $existing) {
- if ($existing->getProductId() === $product->get_id() && $existing->getId() !== $license->getId()) {
- $isNew = false;
- break;
- }
- }
- if ($isNew) {
- $generated++;
- } else {
- $skipped++;
- }
- }
- }
- }
-
- if ($generated > 0) {
+ if ($result['generated'] > 0) {
wp_send_json_success([
'message' => sprintf(
/* translators: %d: Number of licenses generated */
_n(
'%d license generated successfully.',
'%d licenses generated successfully.',
- $generated,
+ $result['generated'],
'wc-licensed-product'
),
- $generated
+ $result['generated']
),
- 'generated' => $generated,
- 'skipped' => $skipped,
+ 'generated' => $result['generated'],
+ 'skipped' => $result['skipped'],
'reload' => true,
]);
} else {
wp_send_json_success([
'message' => __('All licenses already exist for this order.', 'wc-licensed-product'),
'generated' => 0,
- 'skipped' => $skipped,
+ 'skipped' => $result['skipped'],
'reload' => false,
]);
}
}
+
+ /**
+ * Generate licenses for multi-domain format
+ */
+ private function generateMultiDomainLicenses(\WC_Order $order, array $domainData): array
+ {
+ $generated = 0;
+ $skipped = 0;
+ $orderId = $order->get_id();
+ $customerId = $order->get_customer_id();
+
+ // Index domains by product ID
+ $domainsByProduct = [];
+ foreach ($domainData as $item) {
+ if (isset($item['product_id']) && isset($item['domains']) && is_array($item['domains'])) {
+ $domainsByProduct[(int) $item['product_id']] = $item['domains'];
+ }
+ }
+
+ foreach ($order->get_items() as $item) {
+ $product = $item->get_product();
+ if (!$product || !$product->is_type('licensed')) {
+ continue;
+ }
+
+ $productId = $product->get_id();
+ $domains = $domainsByProduct[$productId] ?? [];
+
+ // Get existing licenses for this product
+ $existingLicenses = $this->licenseManager->getLicensesByOrderAndProduct($orderId, $productId);
+ $existingDomains = array_map(fn($l) => $l->getDomain(), $existingLicenses);
+
+ foreach ($domains as $domain) {
+ $normalizedDomain = $this->licenseManager->normalizeDomain($domain);
+
+ // Skip if license already exists for this domain
+ if (in_array($normalizedDomain, $existingDomains, true)) {
+ $skipped++;
+ continue;
+ }
+
+ $license = $this->licenseManager->generateLicense(
+ $orderId,
+ $productId,
+ $customerId,
+ $normalizedDomain
+ );
+
+ if ($license) {
+ $generated++;
+ }
+ }
+ }
+
+ return ['generated' => $generated, 'skipped' => $skipped];
+ }
+
+ /**
+ * Generate licenses for legacy single domain format
+ */
+ private function generateLegacyLicenses(\WC_Order $order, string $domain): array
+ {
+ $generated = 0;
+ $skipped = 0;
+ $orderId = $order->get_id();
+ $customerId = $order->get_customer_id();
+
+ foreach ($order->get_items() as $item) {
+ $product = $item->get_product();
+ if (!$product || !$product->is_type('licensed')) {
+ continue;
+ }
+
+ // Check if license already exists
+ $existing = $this->licenseManager->getLicenseByOrderAndProduct($orderId, $product->get_id());
+ if ($existing) {
+ $skipped++;
+ continue;
+ }
+
+ $license = $this->licenseManager->generateLicense(
+ $orderId,
+ $product->get_id(),
+ $customerId,
+ $domain
+ );
+
+ if ($license) {
+ $generated++;
+ }
+ }
+
+ return ['generated' => $generated, 'skipped' => $skipped];
+ }
}
diff --git a/src/Admin/SettingsController.php b/src/Admin/SettingsController.php
index 93b1a1f..24e8679 100644
--- a/src/Admin/SettingsController.php
+++ b/src/Admin/SettingsController.php
@@ -202,6 +202,13 @@ final class SettingsController
'id' => 'wc_licensed_product_default_bind_to_version',
'default' => 'no',
],
+ 'enable_multi_domain' => [
+ 'name' => __('Enable Multi-Domain Licensing', 'wc-licensed-product'),
+ 'type' => 'checkbox',
+ 'desc' => __('Allow customers to purchase multiple licenses for different domains at once. Each unit in cart quantity requires a unique domain.', 'wc-licensed-product'),
+ 'id' => 'wc_licensed_product_enable_multi_domain',
+ 'default' => 'no',
+ ],
'section_end' => [
'type' => 'sectionend',
'id' => 'wc_licensed_product_section_defaults_end',
@@ -387,6 +394,14 @@ final class SettingsController
return get_option('wc_licensed_product_default_bind_to_version', 'no') === 'yes';
}
+ /**
+ * Check if multi-domain licensing is enabled
+ */
+ public static function isMultiDomainEnabled(): bool
+ {
+ return get_option('wc_licensed_product_enable_multi_domain', 'no') === 'yes';
+ }
+
/**
* Check if expiration warning emails are enabled
* This checks both the WooCommerce email setting and the old setting for backwards compatibility
diff --git a/src/Checkout/CheckoutBlocksIntegration.php b/src/Checkout/CheckoutBlocksIntegration.php
index cb759f0..0386265 100644
--- a/src/Checkout/CheckoutBlocksIntegration.php
+++ b/src/Checkout/CheckoutBlocksIntegration.php
@@ -10,6 +10,7 @@ declare(strict_types=1);
namespace Jeremias\WcLicensedProduct\Checkout;
use Automattic\WooCommerce\Blocks\Integrations\IntegrationInterface;
+use Jeremias\WcLicensedProduct\Admin\SettingsController;
/**
* Integration with WooCommerce Checkout Blocks
@@ -30,7 +31,7 @@ final class CheckoutBlocksIntegration implements IntegrationInterface
public function initialize(): void
{
$this->registerScripts();
- $this->registerBlockExtensionData();
+ $this->registerAdditionalCheckoutFields();
}
/**
@@ -45,7 +46,7 @@ final class CheckoutBlocksIntegration implements IntegrationInterface
wp_register_script(
'wc-licensed-product-checkout-blocks',
$scriptUrl,
- ['wc-blocks-checkout', 'wp-element', 'wp-components', 'wp-i18n'],
+ ['wc-blocks-checkout', 'wp-element', 'wp-components', 'wp-i18n', 'wp-plugins', 'wp-data'],
WC_LICENSED_PRODUCT_VERSION,
true
);
@@ -59,20 +60,33 @@ final class CheckoutBlocksIntegration implements IntegrationInterface
}
/**
- * Register block extension data
+ * Register additional checkout fields using WooCommerce Blocks API
*/
- private function registerBlockExtensionData(): void
+ private function registerAdditionalCheckoutFields(): void
{
- // Pass data to the checkout block script
- add_filter(
- 'woocommerce_blocks_checkout_block_registration_data',
- function (array $data): array {
- $data['wc-licensed-product'] = [
- 'hasLicensedProducts' => $this->cartHasLicensedProducts(),
- ];
- return $data;
+ add_action('woocommerce_blocks_loaded', function (): void {
+ // Check if the function exists (WooCommerce 8.9+)
+ if (!function_exists('woocommerce_register_additional_checkout_field')) {
+ return;
}
- );
+
+ // Register the domain field using WooCommerce's checkout fields API
+ // For single domain mode only (multi-domain uses custom JS component)
+ if (!SettingsController::isMultiDomainEnabled()) {
+ woocommerce_register_additional_checkout_field([
+ 'id' => 'wc-licensed-product/domain',
+ 'label' => __('License Domain', 'wc-licensed-product'),
+ 'location' => 'order',
+ 'type' => 'text',
+ 'required' => false,
+ 'attributes' => [
+ 'placeholder' => __('example.com', 'wc-licensed-product'),
+ 'pattern' => '^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$',
+ 'title' => __('Enter a valid domain (without http:// or www)', 'wc-licensed-product'),
+ ],
+ ]);
+ }
+ });
}
/**
@@ -96,13 +110,23 @@ final class CheckoutBlocksIntegration implements IntegrationInterface
*/
public function get_script_data(): array
{
+ $isMultiDomain = SettingsController::isMultiDomainEnabled();
+
return [
'hasLicensedProducts' => $this->cartHasLicensedProducts(),
- 'fieldLabel' => __('Domain for License Activation', 'wc-licensed-product'),
+ 'licensedProducts' => $this->getLicensedProductsFromCart(),
+ 'isMultiDomainEnabled' => $isMultiDomain,
'fieldPlaceholder' => __('example.com', 'wc-licensed-product'),
- 'fieldDescription' => __('Enter the domain where you will use this license (without http:// or www).', 'wc-licensed-product'),
- 'sectionTitle' => __('License Domain', 'wc-licensed-product'),
- 'validationError' => __('Please enter a valid domain for your license activation.', 'wc-licensed-product'),
+ 'fieldDescription' => $isMultiDomain
+ ? __('Enter a unique domain for each license (without http:// or www).', 'wc-licensed-product')
+ : __('Enter the domain where you will use the license (without http:// or www).', 'wc-licensed-product'),
+ 'sectionTitle' => $isMultiDomain
+ ? __('License Domains', 'wc-licensed-product')
+ : __('License Domain', 'wc-licensed-product'),
+ 'validationError' => __('Please enter a valid domain.', 'wc-licensed-product'),
+ 'duplicateError' => __('Each license requires a unique domain.', 'wc-licensed-product'),
+ 'licenseLabel' => __('License %d:', 'wc-licensed-product'),
+ 'singleDomainLabel' => __('Domain', 'wc-licensed-product'),
];
}
@@ -110,18 +134,34 @@ final class CheckoutBlocksIntegration implements IntegrationInterface
* Check if cart contains licensed products
*/
private function cartHasLicensedProducts(): bool
+ {
+ return !empty($this->getLicensedProductsFromCart());
+ }
+
+ /**
+ * Get licensed products from cart with quantities
+ *
+ * @return array
-
+
+
+
+
+
+
+ :
+ :
-
-
-
@@ -302,29 +325,33 @@ final class LicenseEmailController
/**
* Render license info in plain text format
*/
- private function renderPlainTextLicenseInfo(array $licenses, \WC_Order $order): void
+ private function renderPlainTextLicenseInfo(array $products, \WC_Order $order): void
{
- $domain = $order->get_meta('_licensed_product_domain');
-
echo "\n\n";
echo "==========================================================\n";
echo esc_html__('YOUR LICENSE KEYS', 'wc-licensed-product') . "\n";
echo "==========================================================\n\n";
- if ($domain) {
- echo esc_html__('Licensed Domain:', 'wc-licensed-product') . ' ' . esc_html($domain) . "\n\n";
- }
+ foreach ($products as $product) {
+ echo esc_html($product['product_name']);
+ echo ' (' . count($product['licenses']) . ' ' .
+ _n('license', 'licenses', count($product['licenses']), 'wc-licensed-product') . ')';
+ echo "\n";
+ echo "-----------------------------------------------------------\n";
- foreach ($licenses as $item) {
- echo esc_html($item['product_name']) . "\n";
- echo esc_html__('License Key:', 'wc-licensed-product') . ' ' . esc_html($item['license']->getLicenseKey()) . "\n";
+ foreach ($product['licenses'] as $license) {
+ echo esc_html__('License Key:', 'wc-licensed-product') . ' ';
+ echo esc_html($license->getLicenseKey()) . "\n";
+ echo esc_html__('Domain:', 'wc-licensed-product') . ' ';
+ echo esc_html($license->getDomain()) . "\n";
+ echo esc_html__('Expires:', 'wc-licensed-product') . ' ';
- $expiresAt = $item['license']->getExpiresAt();
- echo esc_html__('Expires:', 'wc-licensed-product') . ' ';
- echo $expiresAt
- ? esc_html($expiresAt->format(get_option('date_format')))
- : esc_html__('Never', 'wc-licensed-product');
- echo "\n\n";
+ $expiresAt = $license->getExpiresAt();
+ echo $expiresAt
+ ? esc_html($expiresAt->format(get_option('date_format')))
+ : esc_html__('Never', 'wc-licensed-product');
+ echo "\n\n";
+ }
}
echo esc_html__('You can also view your licenses in your account under "Licenses".', 'wc-licensed-product') . "\n";
diff --git a/src/Frontend/AccountController.php b/src/Frontend/AccountController.php
index 78c0b96..6b26039 100644
--- a/src/Frontend/AccountController.php
+++ b/src/Frontend/AccountController.php
@@ -107,135 +107,248 @@ final class AccountController
$licenses = $this->licenseManager->getLicensesByCustomer($customerId);
- // Enrich licenses with product data and downloads
- $enrichedLicenses = [];
- foreach ($licenses as $license) {
- $product = wc_get_product($license->getProductId());
- $order = wc_get_order($license->getOrderId());
-
- // Get available downloads for this license
- $downloads = [];
- if ($license->getStatus() === 'active') {
- $versions = $this->versionManager->getVersionsByProduct($license->getProductId());
- foreach ($versions as $version) {
- if ($version->isActive() && ($version->getAttachmentId() || $version->getDownloadUrl())) {
- $downloads[] = [
- 'version' => $version->getVersion(),
- 'version_id' => $version->getId(),
- 'filename' => $version->getDownloadFilename(),
- 'download_url' => $this->downloadController->generateDownloadUrl(
- $license->getId(),
- $version->getId()
- ),
- 'release_notes' => $version->getReleaseNotes(),
- 'released_at' => $version->getReleasedAt()->format(get_option('date_format')),
- 'file_hash' => $version->getFileHash(),
- ];
- }
- }
- }
-
- $enrichedLicenses[] = [
- 'license' => $license,
- 'product_name' => $product ? $product->get_name() : __('Unknown Product', 'wc-licensed-product'),
- 'product_url' => $product ? $product->get_permalink() : '',
- 'order_number' => $order ? $order->get_order_number() : '',
- 'order_url' => $order ? $order->get_view_order_url() : '',
- 'downloads' => $downloads,
- ];
- }
+ // Group licenses by product+order into "packages"
+ $packages = $this->groupLicensesIntoPackages($licenses);
try {
echo $this->twig->render('frontend/licenses.html.twig', [
- 'licenses' => $enrichedLicenses,
- 'has_licenses' => !empty($enrichedLicenses),
+ 'packages' => $packages,
+ 'has_packages' => !empty($packages),
]);
} catch (\Exception $e) {
// Fallback to PHP template if Twig fails
- $this->displayLicensesFallback($enrichedLicenses);
+ $this->displayLicensesFallback($packages);
}
}
+ /**
+ * Group licenses into packages by product+order
+ *
+ * @param array $licenses Array of License objects
+ * @return array Array of package data
+ */
+ private function groupLicensesIntoPackages(array $licenses): array
+ {
+ $grouped = [];
+
+ foreach ($licenses as $license) {
+ $productId = $license->getProductId();
+ $orderId = $license->getOrderId();
+ $key = $productId . '_' . $orderId;
+
+ if (!isset($grouped[$key])) {
+ $product = wc_get_product($productId);
+ $order = wc_get_order($orderId);
+
+ $grouped[$key] = [
+ 'product_id' => $productId,
+ 'order_id' => $orderId,
+ 'product_name' => $product ? $product->get_name() : __('Unknown Product', 'wc-licensed-product'),
+ 'product_url' => $product ? $product->get_permalink() : '',
+ 'order_number' => $order ? $order->get_order_number() : '',
+ 'order_url' => $order ? $order->get_view_order_url() : '',
+ 'licenses' => [],
+ 'downloads' => [],
+ 'has_active_license' => false,
+ ];
+ }
+
+ // Add license to package
+ $grouped[$key]['licenses'][] = [
+ 'id' => $license->getId(),
+ 'license_key' => $license->getLicenseKey(),
+ 'domain' => $license->getDomain(),
+ 'status' => $license->getStatus(),
+ 'expires_at' => $license->getExpiresAt(),
+ 'is_transferable' => in_array($license->getStatus(), ['active', 'inactive'], true),
+ ];
+
+ // Track if package has at least one active license
+ if ($license->getStatus() === 'active') {
+ $grouped[$key]['has_active_license'] = true;
+ }
+ }
+
+ // Add downloads for packages with active licenses
+ foreach ($grouped as $key => &$package) {
+ if ($package['has_active_license']) {
+ $package['downloads'] = $this->getDownloadsForProduct(
+ $package['product_id'],
+ $package['licenses'][0]['id'] // Use first license for download URL
+ );
+ }
+ }
+
+ // Sort by order date (newest first) - re-index array
+ return array_values($grouped);
+ }
+
+ /**
+ * Get downloads for a product
+ */
+ private function getDownloadsForProduct(int $productId, int $licenseId): array
+ {
+ $downloads = [];
+ $versions = $this->versionManager->getVersionsByProduct($productId);
+
+ foreach ($versions as $version) {
+ if ($version->isActive() && ($version->getAttachmentId() || $version->getDownloadUrl())) {
+ $downloads[] = [
+ 'version' => $version->getVersion(),
+ 'version_id' => $version->getId(),
+ 'filename' => $version->getDownloadFilename(),
+ 'download_url' => $this->downloadController->generateDownloadUrl(
+ $licenseId,
+ $version->getId()
+ ),
+ 'release_notes' => $version->getReleaseNotes(),
+ 'released_at' => $version->getReleasedAt()->format(get_option('date_format')),
+ 'file_hash' => $version->getFileHash(),
+ ];
+ }
+ }
+
+ return $downloads;
+ }
+
/**
* Fallback display method if Twig is unavailable
*/
- private function displayLicensesFallback(array $enrichedLicenses): void
+ private function displayLicensesFallback(array $packages): void
{
- if (empty($enrichedLicenses)) {
+ if (empty($packages)) {
echo ' ' . esc_html__('You have no licenses yet.', 'wc-licensed-product') . ' {{ __('You have no licenses yet.') }}
+ 1) {
+ printf(' (×%d)', $productData['quantity']);
+ }
+ ?>
+
+
+
+ getSavedDomainValue($productId, $i);
+ ?>
+
+
+
+
+
- getLicenseKey()); ?>
-
+
+
+
+ getLicenseKey()); ?>
+
+
+ getDomain()); ?>
+
+
+
+
+ ()
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- getLicenseKey()); ?>
-
-
- getExpiresAt();
- echo $expiresAt
- ? esc_html($expiresAt->format(get_option('date_format')))
- : esc_html__('Never', 'wc-licensed-product');
- ?>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ getLicenseKey()); ?>
+
+
+ getDomain()); ?>
+
+
+ getExpiresAt();
+ echo $expiresAt
+ ? esc_html($expiresAt->format(get_option('date_format')))
+ : esc_html__('Never', 'wc-licensed-product');
+ ?>
+
+
- getLicenseKey()); ?>
-
-
-
+
+
+
+
- {% if item.product_url %}
- {{ esc_html(item.product_name) }}
- {% else %}
- {{ esc_html(item.product_name) }}
- {% endif %}
-
-
- {{ esc_html(item.license.status)|capitalize }}
+ {% for package in packages %}
+
+ {% if package.product_url %}
+ {{ esc_html(package.product_name) }}
+ {% else %}
+ {{ esc_html(package.product_name) }}
+ {% endif %}
+
+
+ {{ __('Order') }}
+ {% if package.order_url %}
+ #{{ esc_html(package.order_number) }}
+ {% else %}
+ #{{ esc_html(package.order_number) }}
+ {% endif %}
+
+
- {{ esc_html(item.license.licenseKey) }}
-
-
- {{ esc_html(license.license_key) }}
+
+ {{ esc_html(license.status)|capitalize }}
+
+ {{ __('Available Downloads') }}
- {% for download in item.downloads %}
-
+
+ {# Show older versions in collapsible if more than one version exists #}
+ {% if package.downloads|length > 1 %}
+