← All changes
|
libraries/freemius/templates/forms/license-activation.php
+13
-8
2.2.1
→
3.4
View file →
| @@ -150,9 +150,9 @@ | ||
| 150 | 150 | ( is_object( $plan ) ? $plan->title : '' ), |
| 151 | 151 | $license->get_html_escaped_masked_secret_key() |
| 152 | 152 | ); |
| 153 | 153 | |
| 154 | - $license_input_html .= "<option data-id='{$license->id}' value='{$license->secret_key}' data-left='{$license->left()}'>{$label}</option>"; | |
| 154 | + $license_input_html .= "<option data-id='{$license->id}' value='{$license->id}' data-left='{$license->left()}'>{$label}</option>"; | |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | $license_input_html .= '</select>'; |
| 158 | 158 | } else { |
| @@ -177,9 +177,8 @@ | ||
| 177 | 177 | class="fs-available-license-key" |
| 178 | 178 | type="text" |
| 179 | 179 | value="{$value}" |
| 180 | 180 | data-id="{$available_license->id}" |
| 181 | - data-license-key="{$available_license->secret_key}" | |
| 182 | 181 | data-left="{$available_license->left()}" |
| 183 | 182 | readonly /> |
| 184 | 183 | HTML; |
| 185 | 184 | } |
| @@ -309,8 +308,9 @@ | ||
| 309 | 308 | * @since 2.3.2 |
| 310 | 309 | */ |
| 311 | 310 | afterLicenseUserDataLoaded = function () { |
| 312 | 311 | if ( |
| 312 | + false !== otherLicenseOwnerID && | |
| 313 | 313 | null !== otherLicenseOwnerID && |
| 314 | 314 | otherLicenseOwnerID != <?php echo $fs->is_registered() ? $fs->get_user()->id : 'null' ?> |
| 315 | 315 | ) { |
| 316 | 316 | $ownershipChangeOptionContainer.show(); |
| @@ -561,10 +561,10 @@ | ||
| 561 | 561 | if ($(this).hasClass('disabled')) { |
| 562 | 562 | return; |
| 563 | 563 | } |
| 564 | 564 | |
| 565 | - var | |
| 566 | - licenseKey = ''; | |
| 565 | + var licenseKey = '', | |
| 566 | + licenseID = ''; | |
| 567 | 567 | |
| 568 | 568 | if ( hasLicenseTypes ) { |
| 569 | 569 | if ( isOtherLicenseKeySelected() ) { |
| 570 | 570 | licenseKey = $otherLicenseKey.val(); |
| @@ -569,11 +569,11 @@ | ||
| 569 | 569 | if ( isOtherLicenseKeySelected() ) { |
| 570 | 570 | licenseKey = $otherLicenseKey.val(); |
| 571 | 571 | } else { |
| 572 | 572 | if ( ! hasLicensesDropdown ) { |
| 573 | - licenseKey = $availableLicenseKey.data( 'license-key' ); | |
| 573 | + licenseID = $availableLicenseKey.data( 'id' ).toString(); | |
| 574 | 574 | } else { |
| 575 | - licenseKey = $licensesDropdown.val(); | |
| 575 | + licenseID = $licensesDropdown.val(); | |
| 576 | 576 | } |
| 577 | 577 | } |
| 578 | 578 | } else { |
| 579 | 579 | licenseKey = $licenseKeyInput.val().trim(); |
| @@ -580,9 +580,9 @@ | ||
| 580 | 580 | } |
| 581 | 581 | |
| 582 | 582 | disableActivateLicenseButton(); |
| 583 | 583 | |
| 584 | - if (0 === licenseKey.length) { | |
| 584 | + if ( 0 === licenseID.length && 0 === licenseKey.length ) { | |
| 585 | 585 | return; |
| 586 | 586 | } |
| 587 | 587 | |
| 588 | 588 | var data = { |
| @@ -587,11 +587,16 @@ | ||
| 587 | 587 | |
| 588 | 588 | var data = { |
| 589 | 589 | action : '<?php echo $fs->get_ajax_action( 'activate_license' ) ?>', |
| 590 | 590 | security : '<?php echo $fs->get_ajax_security( 'activate_license' ) ?>', |
| 591 | - license_key: licenseKey, | |
| 592 | 591 | module_id : '<?php echo $fs->get_id() ?>' |
| 593 | 592 | }; |
| 593 | + | |
| 594 | + if ( licenseID.length > 0 ) { | |
| 595 | + data.license_id = licenseID; | |
| 596 | + } else { | |
| 597 | + data.license_key = licenseKey; | |
| 598 | + } | |
| 594 | 599 | |
| 595 | 600 | if ( isNetworkActivation ) { |
| 596 | 601 | var |
| 597 | 602 | sites = []; |