Bug fixes

jayrodksmith · Mar 21, 2024 · fd06349 · fd06349
1 parent a5f3104
commit fd06349
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Private/RMM/Write-WarrantyNinjaRMM.ps1 b/Private/RMM/Write-WarrantyNinjaRMM.ps1
@@ -48,22 +48,28 @@ function Write-WarrantyNinjaRMM {
             return "Warranty details already in NinjaRMM"
         } else {
                 if($Warrantystart){
+                    Write-Verbose "Warrantystart: $Warrantystart"
                     if ($Warrantystart -match "\d{2}-\d{2}-\d{4}"){
                         #$Warrantystart = $Warrantystart.ToString("dd-MM-yyyy")
                     } else {
                         $Warrantystart = [DateTime]::ParseExact($Warrantystart, $dateformat, $null)
                         $Warrantystart = $Warrantystart.ToString("dd-MM-yyyy")
+                        Write-Verbose "Warrantystart Converted: $Warrantystart"
                     }
                     $Warrantystartutc = Get-Date $Warrantystart -Format "yyyy-MM-dd"
+                    Write-Verbose "Warrantystart UTC: $Warrantystartutc"
                 }
                 if($WarrantyExpiry){
+                    Write-Verbose "WarrantyExpiry: $WarrantyExpiry"
                     if ($WarrantyExpiry -match "\d{2}-\d{2}-\d{4}"){
                         #$WarrantyExpiry = $WarrantyExpiry.ToString("dd-MM-yyyy")
                     } else {
                         $WarrantyExpiry = [DateTime]::ParseExact($WarrantyExpiry, $dateformat, $null)
                         $WarrantyExpiry = $WarrantyExpiry.ToString("dd-MM-yyyy")
+                        Write-Verbose "WarrantyExpiryConverted: $WarrantyExpiry"
                     }
                     $WarrantyExpiryutc = Get-Date $WarrantyExpiry -Format "yyyy-MM-dd"
+                    Write-Verbose "WarrantyExpiry UTC: $WarrantyExpiryutc"
                 }
             Write-Verbose "Checking for warranty values to write to NinjaRMM" 
             if($Warrantystartutc){

diff --git a/Public/Get-Warranty.ps1 b/Public/Get-Warranty.ps1
@@ -89,7 +89,7 @@ function Get-Warranty {
     Write-Host "EasyWarrantyCheck Version : 1.0.7"
     # Import Ninja Powershell Module
     Write-Host "Importing Ninja Powershell module"
-    Import-Module NJCliPSh
+    Import-Module NJCliPSh -ErrorAction SilentlyContinue -verbose:$false | Out-Null
     # Set Global Variables
     if ($RMM -eq 'NinjaRMM') {
         Set-Variable ninjawarrantystart -Value $ninjawarrantystart -Scope Global -option ReadOnly -Force

diff --git a/Public/Helpers/Get-MachineInfo.ps1 b/Public/Helpers/Get-MachineInfo.ps1
@@ -26,14 +26,14 @@ function Get-MachineInfo {
 		[String]$Manufacturer= 'Automatic'
 	)
     $SerialNumber = if ($Serial -eq 'Automatic') {
-        (Get-CimInstance win32_bios).SerialNumber
+        (Get-CimInstance win32_bios -verbose:$false).SerialNumber
     } else {
         $Serial
     }
 
     $Mfg = if ($Manufacturer -eq 'Automatic') {
-        $mfg = (Get-CimInstance -ClassName Win32_ComputerSystem).Manufacturer
-        $model = (Get-CimInstance -ClassName Win32_ComputerSystem).Model
+        $mfg = (Get-CimInstance -ClassName Win32_ComputerSystem -verbose:$false).Manufacturer
+        $model = (Get-CimInstance -ClassName Win32_ComputerSystem -verbose:$false).Model
         switch ($Mfg) {
             "IBM" { $Mfg = "LENOVO" }
             "Hewlett-Packard" { $Mfg = "HP" }