qba-24: toast messages update (#48)

CHANGELOG.md

@@ -1,11 +1,20 @@
 # Changelog
 
-## v0.23.0
+## v0.24.0
+
+- Fix critical bug affecting additional Client licenses
+- Add Toast notifications
+- TLS security improvements
+- Bug fixes and improvements
+
+#### v0.23.0
+
 - Add manual refresh option to update menu head information
 - Fix issue [#43](https://github.com/neuralpain/qbactivator/issues/43) where `qba-22` ignored local available POS installers
 - Minor improvements
 
 #### v0.22.0
+
 - Add new Troubleshooting menu
 - Add option `Lv3` in troubleshooting to potentially fix "Invalid Product Code" error
 - Add 16 more licenses for each version of POS, a total of 64 new licenses; available for client activation
@@ -19,15 +28,18 @@
 - Code refactoring, minor bug fixes and improvements
 
 #### v0.21.2
+
 - Fix validation bug on local patch files
 - Fix bug preventing launch of QuickBooks POS application after installation
 - Minor bug fixes
 
 #### v0.21.1
+
 - Fix licensing issues for POS v19 ([#30](https://github.com/neuralpain/qbactivator/issues/30)) and custom licenses ([#31](https://github.com/neuralpain/qbactivator/issues/31))
 - Code refactoring
 
 #### v0.21.0
+
 - Add progress bar for Point of Sale installer while downloading ✨
 - Add option to install custom licenses from the user
 - Add preventative measure for users who manually run qbactivator as administrator
@@ -36,14 +48,17 @@
 - Minor bug fixes
 
 #### v0.20.3
+
 - Minor bug fix in deleting items from `C:\ProgramData\Intuit`
 
 #### v0.20.2
+
 - Fix error requesting network information
 - Add support for multi-store licensing with help from @Navish360 (removed split store-client licenses)
 - Other bug fixes and improvements
 
 #### v0.20.1
+
 - Add licenses for server and client workstations
 - Bug fixes and improvements
 
@@ -84,14 +99,17 @@
 - Update license keys for POS v11 and v12
 
 #### v0.17.0
+
 - Implement a more robust method of activation ([#1](https://github.com/neuralpain/qbactivator/issues/1))
 - Add automatic run of qb installer
 - Minor bug fixes and improvements
 
 #### v0.16.1
+
 - Minor bug fixes and improvements
 
 #### v0.16.0
+
 - Add UAC prompt before script is run
 - Embed instructions and keys into script
 - Add integrity check for patch file

PowerCMD.sh

@@ -1,15 +1,19 @@
 #!/bin/bash
 
-# PowerCMD.sh, Version 0.2.4
+# PowerCMD.sh, Version 0.3.0
 # Copyright (c) 2024, neuralpain
 # https://github.com/neuralpain/PowerCMD
 # A bundler to integrate PowerShell with CMD
 
-v="0.2.4"
+v="0.3.0"
 return="PowerCMD:"
 
 # --- START CONFIGURATION --- #
 
+# [ TERMINAL WINDOW CONFIG ]
+window_width=60
+window_height=22
+
 # [ SCRIPT INFO ]
 # edit script version in ./VERSION
 version=$(<VERSION)
@@ -61,7 +65,13 @@ remove_files=(
 )
 # declare a list of your PowerShell functions here
 powershell_functions=(
-  "$functions/ObjectsAndVariables.ps1"
+  "$functions/init/Header.ps1"
+  "$functions/init/ScriptVariables.ps1"
+  "$functions/init/InstallerObjectClass.ps1"
+  "$functions/init/PosInstallerObjects.ps1"
+  "$functions/init/InstallerVariables.ps1"
+  "$functions/init/ScriptBlocks.ps1"
+  "$functions/init/Init.ps1"
   # ------------------------------ #
   # -- add misc scripts -- #
   "$functions/misc/ClearIntuitData.ps1"
@@ -73,14 +83,15 @@ powershell_functions=(
   "$functions/utility/Format-Text.ps1"
   "$functions/utility/Invoke-URLInDefaultBrowser.ps1"
   # "$functions/utility/Measure-UserBandwidth.ps1"
+  "$functions/utility/New-ToastNotification.ps1"
   "$functions/utility/Show-WebRequestDownloadJobState.ps1"
   # ------------------------------ #
   # -- add setup scripts -- #
+  "$functions/setup/PosDownload.ps1"
   "$functions/setup/PosLicensing.ps1"
-  "$functions/setup/PosActivation.ps1"
   "$functions/setup/PosInstallation.ps1"
-  "$functions/setup/PosDownload.ps1"
   "$functions/setup/PosClientModule.ps1"
+  "$functions/setup/PosActivation.ps1"
   # ------------------------------ #
   # -- add repair scripts -- #
   "$functions/repair/ClientModuleRepairs.ps1"
@@ -153,18 +164,22 @@ bundle() {
   echo ":: $script_description" >> $cmd_cache
   echo >> $cmd_cache
   echo "@echo off" >> $cmd_cache
-  echo "@mode 60,22" >> $cmd_cache
+  echo "@mode $window_width,$window_height" >> $cmd_cache
   echo "@title $script_title v$version" >> $cmd_cache
   add_pwsh
   echo >> $cmd_cache
-  # -- add batch code | this is optional -- #
-  cat $src/main.cmd >> $cmd_cache
-  echo >> $cmd_cache
-  echo ":qbreadme:" >> $cmd_cache
-  cat $res/doc/instructions.txt >> $cmd_cache
-  echo ":qbreadme:" >> $cmd_cache
-  echo >> $cmd_cache
+
+  # -- add batch code -- #
+  if [[ -f "$src/main.cmd" ]]; then 
+    cat $src/main.cmd >> $cmd_cache
+    echo >> $cmd_cache
+    echo ":qbreadme:" >> $cmd_cache
+    cat $res/doc/instructions.txt >> $cmd_cache
+    echo ":qbreadme:" >> $cmd_cache
+    echo >> $cmd_cache
+  fi
   # -- end batch code -- #
+
   echo "# ---------- PowerShell Script ---------- #>" >> $cmd_cache
 
   # Loop through the powershell_functions
@@ -203,6 +218,7 @@ compress() {
   done
 
   cd dist
+
   # ensure that the 'zip' package should be installed
   zip -q $complete_release * || (echo -e "$return error: Failed to create archive." && return)
   # files to exclude in lightweight release
@@ -215,7 +231,7 @@ compress() {
     rm $file
   done
 
-  [[ -f $complete_release ]] && echo -e "$return Archived to \"/dist\""
+  [[ -f $complete_release ]] && echo -e "$return Archived to '/dist'"
 }
 
 printusage() {

README.md

@@ -35,12 +35,12 @@ Activation script for QuickBooks Point of Sale Software on Windows. — [Downloa
 
 ### A few things before you start
 
-- An internet connection **is not** required for activation or adding users, i.e., offline activation is available; but you can let it have that one free phone call to let Intuit know that it's safe.
+- An internet connection **is not** required for activation or adding users, i.e., you can activate offline; but you can let it have that one free phone call to let Intuit know that it's safe.
 - Manually running the QuickBooks POS installer or entering any keys into the installer **is not required** as the script will handle these tasks. You only need to click on the "Next" and "Finish" buttons.
-- Remember that you **should not** launch QuickBooks Point of Sale after installation. Ensure that you uncheck the "Launch QuickBooks" option before clicking on "Finish" and proceeding with the activation process. If QuickBooks is launched, however, the activator should close it automatically.
+- Remember that you **should not** launch QuickBooks Point of Sale after installation. Ensure that you uncheck the "Launch QuickBooks Point Of Sale" option before clicking on "Finish" and proceeding with the activation process.
 - It is recommended to **avoid** installing updates through the application due to some of the features being blocked (ref. [#27][issue_27]), though they are available here if you want to [download them yourself](https://github.com/neuralpain/qbactivator/wiki#optional-updates-for-quickbooks-pos-software-from-intuit).
 - All versions of QuickBooks Desktop Point of Sale, including v12, v18, and v19, are licensed as `Pro Multistore Level`. The only exception is POS v11, which is licensed as `Pro Level`.
-- [View the instructions][instructions] to run `qbactivator` and activate QuickBooks
+- [View the instructions][instructions] to run `qbactivator` and activate QuickBooks.
 - [Read the FAQs](#faqs) for further information and guidance for any concerns you may have.
 
 > [!WARNING]  
@@ -51,7 +51,13 @@ Activation script for QuickBooks Point of Sale Software on Windows. — [Downloa
 > [!NOTE]
 > ### Latest Release [⧉][release]
 >
-> **v0.23.0**
+> **v0.24.0**
+> - Fix critical bug affecting additional Client licenses
+> - Add Toast notifications
+> - TLS security improvements
+> - Bug fixes and improvements
+>
+> *v0.23.0*
 > - Add manual refresh option to update menu head information
 > - Fix issue [#43](https://github.com/neuralpain/qbactivator/issues/43) where `qba-22` ignored local available POS installers
 > - Minor improvements
@@ -67,21 +73,18 @@ Activation script for QuickBooks Point of Sale Software on Windows. — [Downloa
 > - Enabled transcript log to trace errors encountered during the runtime of the activator
 > - Disabled bandwidth calculation
 > - Code refactoring, minor bug fixes and improvements
-> 
-> *v0.21.2*
-> - Fix validation bug on local patch files
-> - Fix bug preventing launch of QuickBooks POS application after installation
-> - Minor bug fixes
 
 ### Release Breakdown
 
 Each release of qbactivator comes with 3 packages:
 
-- <code>**qbactivator-[version][.zip][download]**</code> – the complete release which contains all the files necessary to activate the QuickBooks POS software **offline**. Also contains the LICENSE and README.
-- <code>**qbactivator-[version][.min.zip][download_min]**</code> – a lightweight release ZIP package (take note of the `.min` in the name) which does not contain any of the larger files which can be downloaded online, e.g. the patch file. Contains the LICENSE and README.
-- <code>**qbactivator-[version][.cmd][download_cmd]**</code> – just the script file.
+- <code>**qbactivator-[version][.zip][download]**</code>: the complete release which contains all the files necessary to activate the QuickBooks POS software **offline**. It also includes the LICENSE and README.
+- <code>**qbactivator-[version][.min.zip][download_min]**</code>: a lightweight release ZIP package (take note of the `.min` in the name) which excludes larger files that can be downloaded online, such as the patch file. It also includes the LICENSE and README.
+- <code>**qbactivator-[version][.cmd][download_cmd]**</code>: just the script file with no other files.
+
+All packages perform the same function as they are derived from a single script, merely packaged in different formats. The regular package is ideal for users who either lack internet access at a specific workstation or prefer to activate the software offline. 
 
-They all do the same job since they are the same single script packaged differently. The regular package is best for people who don't have access to the internet at the location of a specific workstation or prefer to activate offline. The `.min.zip` and single `.cmd` are smallest to carry around and suit people with fast internet speeds for downloads and people who just need a quick fix.
+On the other hand, the `.min.zip` package and the single `.cmd` file are smaller and more portable. These formats are perfect for users with fast internet connections who can quickly download the files, or for those who need a swift, on-the-go solution.
 
 ### Available QuickBooks POS Software from Intuit
 
@@ -129,9 +132,9 @@ Licensed under [BSD 2-Clause](LICENSE).
 [getstarted]: https://github.com/neuralpain/qbactivator/wiki#getting-started
 [update]: https://github.com/neuralpain/qbactivator/wiki#downloads--updates
 [instructions]: https://github.com/neuralpain/qbactivator/wiki/How-to-Use
-[download_cmd]: https://github.com/neuralpain/qbactivator/releases/latest/download/qbactivator-0.23.0.cmd
-[download_min]: https://github.com/neuralpain/qbactivator/releases/latest/download/qbactivator-0.23.0.min.zip
-[download]: https://github.com/neuralpain/qbactivator/releases/latest/download/qbactivator-0.23.0.zip
+[download_cmd]: https://github.com/neuralpain/qbactivator/releases/latest/download/qbactivator-0.24.0.cmd
+[download_min]: https://github.com/neuralpain/qbactivator/releases/latest/download/qbactivator-0.24.0.min.zip
+[download]: https://github.com/neuralpain/qbactivator/releases/latest/download/qbactivator-0.24.0.zip
 [release]: https://github.com/neuralpain/qbactivator/releases/latest
 [powershell]: https://github.com/PowerShell/PowerShell/releases/latest
 [updatepowershell]: https://github.com/neuralpain/qbactivator/wiki/Updating-PowerShell

VERSION

@@ -1 +1 @@
-0.23.0
+0.24.0

src/Main.ps1

@@ -7,9 +7,17 @@ function Invoke-NextProcess {
     $PROC_DOWNLOAD {
       Select-QuickBooksVersion
       Get-QuickBooksObject
-      Get-QuickBooksInstaller
-      if ($Script:INSTALLER_DOWNLOAD_ONLY -or $null -eq $Script:RUN_NEXT_PROCEDURE) { break }
-      else { Invoke-NextProcess $PROC_LICENSE }
+      if ($null -eq $Script:RUN_NEXT_PROCEDURE) { break }
+      elseif ($Script:INSTALLER_DOWNLOAD_ONLY) {
+        &$TestInternetAvailable
+        Start-InstallerDownload
+        break
+      }
+      else {
+        &$TestInternetAvailable
+        Start-InstallerDownload
+        Invoke-NextProcess $PROC_LICENSE
+      }
     }
     $PROC_LICENSE {
       &$LocateQuickBooksInstaller
@@ -23,6 +31,7 @@ function Invoke-NextProcess {
     $PROC_INSTALL {
       if ($Script:INSTALLER_IS_VALID) {
         Invoke-QuickBooksInstaller
+        &$VerifyIfQuickBooksIsInstalled
         if ($Script:QUICKBOOKS_INSTALL_ONLY) { break }
         else { Invoke-NextProcess $PROC_ACTIVATE }
       }