final touches

Author: KelvinTegelaar

Modules/CippExtensions/Public/Sherweb/Test-SherwebMigrationAccounts.ps1

@@ -7,13 +7,13 @@ function Test-SherwebMigrationAccounts {
     $Table = Get-CIPPTable -TableName Extensionsconfig
     $Config = ((Get-CIPPAzDataTableEntity @Table).config | ConvertFrom-Json).Sherweb
     #First get a list of all subscribed skus for this tenant, that are in the transfer window.
-    $Licenses = (Get-CIPPLicenseOverview -TenantFilter $TenantFilter) | ForEach-Object { $_.terminfo = ($_.terminfo | ConvertFrom-Json -ErrorAction SilentlyContinue) ; $_ } | Where-Object { $_.terminfo -ne $null -and $_.terminfo.TransferWindow -LE 78 }
+    $Licenses = (Get-CIPPLicenseOverview -TenantFilter $TenantFilter) | ForEach-Object { $_.terminfo = ($_.terminfo | ConvertFrom-Json -ErrorAction SilentlyContinue) ; $_ } | Where-Object { $_.terminfo -ne $null -and $_.terminfo.TransferWindow -LE 7 }
 
     #now check if this exact count of licenses is available at Sherweb, if not, we need to migrate them.
     $SherwebLicenses = Get-SherwebCurrentSubscription -TenantFilter $TenantFilter
     $LicencesToMigrate = foreach ($License in $Licenses) {
         foreach ($termInfo in $License.terminfo) {
-            $matchedSherweb = $SherwebLicenses | Where-Object { $_.quantity -eq 3 -and $_.commitmentTerm.termEndDate -eq $termInfo.NextLifecycle }
+            $matchedSherweb = $SherwebLicenses | Where-Object { $_.quantity -eq $termInfo.TotalLicenses -and $_.commitmentTerm.termEndDate -eq $termInfo.NextLifecycle }
             if (-not $matchedSherweb) {
                 [PSCustomObject]@{
                     LicenseName                  = ($Licenses | Where-Object { $_.skuId -eq $License.skuId }).license