diff --git a/source/Plugins/AyaNova.Plugin.QBOI/QBOI.cs b/source/Plugins/AyaNova.Plugin.QBOI/QBOI.cs index 69d3e29..8271fee 100644 --- a/source/Plugins/AyaNova.Plugin.QBOI/QBOI.cs +++ b/source/Plugins/AyaNova.Plugin.QBOI/QBOI.cs @@ -114,13 +114,19 @@ namespace AyaNova.PlugIn.QBOI return false; } - + if (AyaNovaVersion.Major != 7) { MessageBox.Show("This AyaNovaQBOI plugin requires AyaNova version 7"); return false; } + if (AyaNovaVersion.Minor < 6) + { + MessageBox.Show("This AyaNovaQBOI plugin requires AyaNova version 7.6 or higher"); + return false; + } + Util.GlobalSettings = AyaBizUtils.GlobalSettings; ObjectsWeCanDealWith = new List(); diff --git a/source/Plugins/AyaNova.Plugin.QBOI/Util.cs b/source/Plugins/AyaNova.Plugin.QBOI/Util.cs index 26e0354..af3c82a 100644 --- a/source/Plugins/AyaNova.Plugin.QBOI/Util.cs +++ b/source/Plugins/AyaNova.Plugin.QBOI/Util.cs @@ -414,10 +414,10 @@ namespace AyaNova.PlugIn.QBOI { //used to tie this session to the auth key on our server for fetching later QBOI2_SESSION_TOKEN = RandomInt64().ToString(); - string LicenseId = GlobalEx.GetItem().DigestValue; + //shell out to browser for user to login to QB - System.Diagnostics.Process.Start("https://qboauth.ayanova.com/start/" + QBOI2_SESSION_TOKEN + "/"+ LicenseId); + System.Diagnostics.Process.Start("https://qboauth.ayanova.com/start/" + QBOI2_SESSION_TOKEN + "/"+ AyaBizUtils.LicId); //Open dialog that polls for token repeatedly, there is a delay built into the server diff --git a/source/WinFormApp/AssemblyInfo.cs b/source/WinFormApp/AssemblyInfo.cs index bfba636..b49001d 100644 --- a/source/WinFormApp/AssemblyInfo.cs +++ b/source/WinFormApp/AssemblyInfo.cs @@ -27,7 +27,7 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("7.5.0.0")] +[assembly: AssemblyVersion("7.6.0.0")] // // In order to sign your assembly you must specify a key to use. Refer to the @@ -62,4 +62,4 @@ using System.Runtime.InteropServices; [assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)] //[assembly: log4net.Config.XmlConfigurator(Watch=true)] [assembly: ComVisibleAttribute(false)] -[assembly: AssemblyFileVersionAttribute("7.5.9.0")] +[assembly: AssemblyFileVersionAttribute("7.6.0.0")] diff --git a/source/bizobjects/AyaLib/AssemblyInfo.cs b/source/bizobjects/AyaLib/AssemblyInfo.cs index 981c288..1614889 100644 --- a/source/bizobjects/AyaLib/AssemblyInfo.cs +++ b/source/bizobjects/AyaLib/AssemblyInfo.cs @@ -64,4 +64,4 @@ using System.Security.Permissions; // Configure log4net using the .config file //[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)] //[assembly: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )] -[assembly: AssemblyFileVersionAttribute("7.5.9.0")] +[assembly: AssemblyFileVersionAttribute("7.5.10.0")] diff --git a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/AyaBizUtils.cs b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/AyaBizUtils.cs index 41adcb6..42ab5e8 100644 --- a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/AyaBizUtils.cs +++ b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL/AyaBizUtils.cs @@ -1718,6 +1718,19 @@ namespace GZTW.AyaNova.BLL return GlobalX.Lite; } + } + + /// + /// AyaNova license id + /// + public static string LicId + { + //case 3712 - added for QBOI with oAuth2 usage + get + { + return GlobalX.DigestValue; + } + } #endregion