You've already forked wc-licensed-product
Implement multi-domain licensing for v0.5.0
- Add multi-domain checkout support for WooCommerce Blocks - Fix domain field rendering using ExperimentalOrderMeta slot - Add DOM injection fallback for checkout field rendering - Update translations with new multi-domain strings (de_CH) - Update email templates for grouped license display - Refactor account page to group licenses by product/order Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -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 '<p>' . esc_html__('You have no licenses yet.', 'wc-licensed-product') . '</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
?>
|
||||
<div class="woocommerce-licenses">
|
||||
<?php foreach ($enrichedLicenses as $item): ?>
|
||||
<div class="license-card">
|
||||
<div class="license-header">
|
||||
<?php foreach ($packages as $package): ?>
|
||||
<div class="license-package">
|
||||
<div class="package-header">
|
||||
<h3>
|
||||
<?php if ($item['product_url']): ?>
|
||||
<a href="<?php echo esc_url($item['product_url']); ?>">
|
||||
<?php echo esc_html($item['product_name']); ?>
|
||||
<?php if ($package['product_url']): ?>
|
||||
<a href="<?php echo esc_url($package['product_url']); ?>">
|
||||
<?php echo esc_html($package['product_name']); ?>
|
||||
</a>
|
||||
<?php else: ?>
|
||||
<?php echo esc_html($item['product_name']); ?>
|
||||
<?php echo esc_html($package['product_name']); ?>
|
||||
<?php endif; ?>
|
||||
</h3>
|
||||
<span class="license-status license-status-<?php echo esc_attr($item['license']->getStatus()); ?>">
|
||||
<?php echo esc_html(ucfirst($item['license']->getStatus())); ?>
|
||||
<span class="package-order">
|
||||
<?php
|
||||
printf(
|
||||
/* translators: %s: order number */
|
||||
esc_html__('Order #%s', 'wc-licensed-product'),
|
||||
esc_html($package['order_number'])
|
||||
);
|
||||
?>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="license-details">
|
||||
<div class="license-key-row">
|
||||
<label><?php esc_html_e('License Key:', 'wc-licensed-product'); ?></label>
|
||||
<code class="license-key" data-license-key="<?php echo esc_attr($item['license']->getLicenseKey()); ?>">
|
||||
<?php echo esc_html($item['license']->getLicenseKey()); ?>
|
||||
</code>
|
||||
<button type="button" class="copy-license-btn" data-license-key="<?php echo esc_attr($item['license']->getLicenseKey()); ?>" title="<?php esc_attr_e('Copy to clipboard', 'wc-licensed-product'); ?>">
|
||||
<span class="dashicons dashicons-clipboard"></span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="license-info-row">
|
||||
<span class="license-domain-display" data-license-id="<?php echo esc_attr($item['license']->getId()); ?>">
|
||||
<strong><?php esc_html_e('Domain:', 'wc-licensed-product'); ?></strong>
|
||||
<span class="domain-value"><?php echo esc_html($item['license']->getDomain()); ?></span>
|
||||
<?php if (in_array($item['license']->getStatus(), ['active', 'inactive'], true)): ?>
|
||||
<button type="button" class="wclp-transfer-btn"
|
||||
data-license-id="<?php echo esc_attr($item['license']->getId()); ?>"
|
||||
data-current-domain="<?php echo esc_attr($item['license']->getDomain()); ?>"
|
||||
title="<?php esc_attr_e('Transfer to new domain', 'wc-licensed-product'); ?>">
|
||||
<span class="dashicons dashicons-randomize"></span>
|
||||
<?php esc_html_e('Transfer', 'wc-licensed-product'); ?>
|
||||
</button>
|
||||
<?php endif; ?>
|
||||
</span>
|
||||
<span><strong><?php esc_html_e('Expires:', 'wc-licensed-product'); ?></strong>
|
||||
<?php
|
||||
$expiresAt = $item['license']->getExpiresAt();
|
||||
echo $expiresAt
|
||||
? esc_html($expiresAt->format(get_option('date_format')))
|
||||
: esc_html__('Never', 'wc-licensed-product');
|
||||
?>
|
||||
</span>
|
||||
</div>
|
||||
<div class="package-licenses">
|
||||
<?php foreach ($package['licenses'] as $license): ?>
|
||||
<div class="license-entry license-entry-<?php echo esc_attr($license['status']); ?>">
|
||||
<div class="license-row-primary">
|
||||
<div class="license-key-group">
|
||||
<code class="license-key"><?php echo esc_html($license['license_key']); ?></code>
|
||||
<span class="license-status license-status-<?php echo esc_attr($license['status']); ?>">
|
||||
<?php echo esc_html(ucfirst($license['status'])); ?>
|
||||
</span>
|
||||
</div>
|
||||
<div class="license-actions">
|
||||
<button type="button" class="copy-license-btn" data-license-key="<?php echo esc_attr($license['license_key']); ?>" title="<?php esc_attr_e('Copy to clipboard', 'wc-licensed-product'); ?>">
|
||||
<span class="dashicons dashicons-clipboard"></span>
|
||||
</button>
|
||||
<?php if ($license['is_transferable']): ?>
|
||||
<button type="button" class="wclp-transfer-btn"
|
||||
data-license-id="<?php echo esc_attr($license['id']); ?>"
|
||||
data-current-domain="<?php echo esc_attr($license['domain']); ?>"
|
||||
title="<?php esc_attr_e('Transfer to new domain', 'wc-licensed-product'); ?>">
|
||||
<span class="dashicons dashicons-randomize"></span>
|
||||
</button>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="license-row-secondary">
|
||||
<span class="license-meta-item license-domain">
|
||||
<span class="dashicons dashicons-admin-site-alt3"></span>
|
||||
<?php echo esc_html($license['domain']); ?>
|
||||
</span>
|
||||
<span class="license-meta-item license-expiry">
|
||||
<span class="dashicons dashicons-calendar-alt"></span>
|
||||
<?php
|
||||
echo $license['expires_at']
|
||||
? esc_html($license['expires_at']->format('Y-m-d'))
|
||||
: '<span class="lifetime">' . esc_html__('Lifetime', 'wc-licensed-product') . '</span>';
|
||||
?>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
|
||||
<?php if (!empty($item['downloads'])): ?>
|
||||
<div class="license-downloads">
|
||||
<?php if (!empty($package['downloads'])): ?>
|
||||
<div class="package-downloads">
|
||||
<h4><?php esc_html_e('Available Downloads', 'wc-licensed-product'); ?></h4>
|
||||
<ul class="download-list">
|
||||
<?php foreach ($item['downloads'] as $download): ?>
|
||||
<li>
|
||||
<a href="<?php echo esc_url($download['download_url']); ?>" class="download-link">
|
||||
<?php
|
||||
$latest = $package['downloads'][0];
|
||||
?>
|
||||
<li class="download-item download-item-latest">
|
||||
<div class="download-row-file">
|
||||
<a href="<?php echo esc_url($latest['download_url']); ?>" class="download-link">
|
||||
<span class="dashicons dashicons-download"></span>
|
||||
<?php echo esc_html($download['filename'] ?: sprintf(__('Version %s', 'wc-licensed-product'), $download['version'])); ?>
|
||||
<?php echo esc_html($latest['filename'] ?: sprintf(__('Version %s', 'wc-licensed-product'), $latest['version'])); ?>
|
||||
</a>
|
||||
<span class="download-version">v<?php echo esc_html($download['version']); ?></span>
|
||||
<span class="download-date"><?php echo esc_html($download['released_at']); ?></span>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
<span class="download-version-badge"><?php esc_html_e('Latest', 'wc-licensed-product'); ?></span>
|
||||
</div>
|
||||
<div class="download-row-meta">
|
||||
<span class="download-date"><?php echo esc_html($latest['released_at']); ?></span>
|
||||
<?php if (!empty($latest['file_hash'])): ?>
|
||||
<span class="download-hash" title="<?php echo esc_attr($latest['file_hash']); ?>">
|
||||
<span class="dashicons dashicons-shield"></span>
|
||||
<code><?php echo esc_html(substr($latest['file_hash'], 0, 12)); ?>...</code>
|
||||
</span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<?php if (count($package['downloads']) > 1): ?>
|
||||
<div class="older-versions-section">
|
||||
<button type="button" class="older-versions-toggle" aria-expanded="false">
|
||||
<span class="dashicons dashicons-arrow-down-alt2"></span>
|
||||
<?php
|
||||
printf(
|
||||
esc_html__('Older versions (%d)', 'wc-licensed-product'),
|
||||
count($package['downloads']) - 1
|
||||
);
|
||||
?>
|
||||
</button>
|
||||
<ul class="download-list older-versions-list" style="display: none;">
|
||||
<?php foreach (array_slice($package['downloads'], 1) as $download): ?>
|
||||
<li class="download-item">
|
||||
<div class="download-row-file">
|
||||
<a href="<?php echo esc_url($download['download_url']); ?>" class="download-link">
|
||||
<span class="dashicons dashicons-download"></span>
|
||||
<?php echo esc_html($download['filename'] ?: sprintf(__('Version %s', 'wc-licensed-product'), $download['version'])); ?>
|
||||
</a>
|
||||
</div>
|
||||
<div class="download-row-meta">
|
||||
<span class="download-date"><?php echo esc_html($download['released_at']); ?></span>
|
||||
<?php if (!empty($download['file_hash'])): ?>
|
||||
<span class="download-hash" title="<?php echo esc_attr($download['file_hash']); ?>">
|
||||
<span class="dashicons dashicons-shield"></span>
|
||||
<code><?php echo esc_html(substr($download['file_hash'], 0, 12)); ?>...</code>
|
||||
</span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
</ul>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user