diff --git a/BodyshopUploader/ImEXOnlinePartner.csproj b/BodyshopUploader/ImEXOnlinePartner.csproj index ca2a4ff..27b6772 100644 --- a/BodyshopUploader/ImEXOnlinePartner.csproj +++ b/BodyshopUploader/ImEXOnlinePartner.csproj @@ -258,9 +258,15 @@ Always + + Always + Always + + Always + diff --git a/BodyshopUploader/Properties/AssemblyInfo.cs b/BodyshopUploader/Properties/AssemblyInfo.cs index 498ecc4..ee7deb6 100644 --- a/BodyshopUploader/Properties/AssemblyInfo.cs +++ b/BodyshopUploader/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.35.0")] +[assembly: AssemblyVersion("1.0.36.0")] [assembly: AssemblyFileVersion("1.0.0.0")] //Setting Squirrel Aware Version. [assembly: AssemblyMetadata("SquirrelAwareVersion", "1")] \ No newline at end of file diff --git a/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs b/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs index 77db10c..5a6ecb5 100644 --- a/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs +++ b/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs @@ -280,12 +280,12 @@ namespace BodyshopPartner.Utils.Decoder j.ownr_zip = readValues[76]; j.ownr_ctry = readValues[77]; j.ownr_ph1 = readValues[78]; - if (String.IsNullOrWhiteSpace(ownerRoot.ownr_ph1.Value)) + if (String.IsNullOrWhiteSpace(j.ownr_ph1.Value)) { j.ownr_ph1 = readValues[80]; } //j.insd_ph1x = readValues[79]; - // j.insd_ph2 = readValues[80]; + j.ownr_ph2 = readValues[80]; // j.insd_ph2x = readValues[81]; j.ownr_ea = readValues[84]; @@ -306,7 +306,7 @@ namespace BodyshopPartner.Utils.Decoder ownerRoot.ownr_ph1 = readValues[80]; } //ownerRoot.insd_ph1x = readValues[79]; - // ownerRoot.insd_ph2 = readValues[80]; + ownerRoot.ownr_ph2 = readValues[80]; // ownerRoot.insd_ph2x = readValues[81]; ownerRoot.ownr_ea = readValues[84]; diff --git a/BodyshopUploader/Utils/Scripts/ProtocolReg.reg b/BodyshopUploader/Utils/Scripts/ProtocolReg.reg new file mode 100644 index 0000000..5a0575e --- /dev/null +++ b/BodyshopUploader/Utils/Scripts/ProtocolReg.reg @@ -0,0 +1,24 @@ +Windows Registry Editor Version 5.00 + +[HKEY_CURRENT_USER\Software\Classes\imexmedia] +"URL Protocol"="\"\"" +@="\"URL:imexmedia Protocol\"" + +[HKEY_CURRENT_USER\Software\Classes\imexmedia\DefaultIcon] +@="\"explorer.exe,1\"" + +[HKEY_CURRENT_USER\Software\Classes\imexmedia\shell] + +[HKEY_CURRENT_USER\Software\Classes\imexmedia\shell\open] + +[HKEY_CURRENT_USER\Software\Classes\imexmedia\shell\open\command] +@="\"C:\\ImEX\\PartnerScripts\\imexmedia.bat\" %1" + +[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Edge] +"ExternalProtocolDialogShowAlwaysOpenCheckbox"=dword:00000001 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Google\Chrome] +"ExternalProtocolDialogShowAlwaysOpenCheckbox"=dword:00000001 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Chromium] +"ExternalProtocolDialogShowAlwaysOpenCheckbox"=dword:00000001 \ No newline at end of file diff --git a/BodyshopUploader/Utils/Scripts/imexmedia.bat b/BodyshopUploader/Utils/Scripts/imexmedia.bat new file mode 100644 index 0000000..44be558 --- /dev/null +++ b/BodyshopUploader/Utils/Scripts/imexmedia.bat @@ -0,0 +1,7 @@ +@if (@This==@IsBatch) @then +wscript //E:JScript "%~dpnx0" %1 +exit /b +@end + +WScript.CreateObject("WScript.Shell").Run( decodeURIComponent(WScript.arguments(0).split("imexmedia://")[1])); +WScript.Quit(0); \ No newline at end of file