Package updates & added quickbooks path selection.
This commit is contained in:
@@ -24,7 +24,7 @@
|
|||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
|
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
|
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
|
|||||||
@@ -105,8 +105,8 @@
|
|||||||
<Reference Include="GraphQL.Client.Abstractions.Websocket, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="GraphQL.Client.Abstractions.Websocket, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\GraphQL.Client.Abstractions.Websocket.3.2.0\lib\netstandard2.0\GraphQL.Client.Abstractions.Websocket.dll</HintPath>
|
<HintPath>..\packages\GraphQL.Client.Abstractions.Websocket.3.2.0\lib\netstandard2.0\GraphQL.Client.Abstractions.Websocket.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="GraphQL.Client.Serializer.Newtonsoft, Version=3.1.6.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="GraphQL.Client.Serializer.Newtonsoft, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\GraphQL.Client.Serializer.Newtonsoft.3.1.6\lib\netstandard2.0\GraphQL.Client.Serializer.Newtonsoft.dll</HintPath>
|
<HintPath>..\packages\GraphQL.Client.Serializer.Newtonsoft.3.2.0\lib\netstandard2.0\GraphQL.Client.Serializer.Newtonsoft.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="GraphQL.Primitives, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="GraphQL.Primitives, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\GraphQL.Primitives.3.2.0\lib\netstandard2.0\GraphQL.Primitives.dll</HintPath>
|
<HintPath>..\packages\GraphQL.Primitives.3.2.0\lib\netstandard2.0\GraphQL.Primitives.dll</HintPath>
|
||||||
@@ -154,13 +154,13 @@
|
|||||||
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
|
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\NLog.4.7.4\lib\net45\NLog.dll</HintPath>
|
<HintPath>..\packages\NLog.4.7.5\lib\net45\NLog.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\squirrel.windows.2.0.1\lib\Net45\NuGet.Squirrel.dll</HintPath>
|
<HintPath>..\packages\squirrel.windows.2.0.1\lib\Net45\NuGet.Squirrel.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Ookii.Dialogs.Wpf, Version=1.0.0.0, Culture=neutral, PublicKeyToken=66aa232afad40158, processorArchitecture=MSIL">
|
<Reference Include="Ookii.Dialogs.Wpf, Version=3.0.0.0, Culture=neutral, PublicKeyToken=66aa232afad40158, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Ookii.Dialogs.Wpf.1.1.0\lib\net45\Ookii.Dialogs.Wpf.dll</HintPath>
|
<HintPath>..\packages\Ookii.Dialogs.Wpf.3.0.1\lib\net45\Ookii.Dialogs.Wpf.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
|
<Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
|
<HintPath>..\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
|
||||||
@@ -189,8 +189,8 @@
|
|||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
<Reference Include="System.Design" />
|
<Reference Include="System.Design" />
|
||||||
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
|
<HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
|
||||||
@@ -259,8 +259,8 @@
|
|||||||
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Reactive, Version=4.4.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
|
<Reference Include="System.Reactive, Version=5.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Reactive.4.4.1\lib\net46\System.Reactive.dll</HintPath>
|
<HintPath>..\packages\System.Reactive.5.0.0\lib\net472\System.Reactive.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
|
<HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
|
||||||
@@ -272,8 +272,8 @@
|
|||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
|
<HintPath>..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
|
||||||
@@ -501,7 +501,6 @@
|
|||||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
|
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
|
||||||
<Error Condition="!Exists('..\packages\Ookii.Dialogs.1.1.0\build\Ookii.Dialogs.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Ookii.Dialogs.1.1.0\build\Ookii.Dialogs.targets'))" />
|
|
||||||
<Error Condition="!Exists('..\packages\squirrel.windows.2.0.1\build\squirrel.windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\squirrel.windows.2.0.1\build\squirrel.windows.props'))" />
|
<Error Condition="!Exists('..\packages\squirrel.windows.2.0.1\build\squirrel.windows.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\squirrel.windows.2.0.1\build\squirrel.windows.props'))" />
|
||||||
<Error Condition="!Exists('..\packages\MaterialDesignThemes.3.2.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.3.2.0\build\MaterialDesignThemes.targets'))" />
|
<Error Condition="!Exists('..\packages\MaterialDesignThemes.3.2.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.3.2.0\build\MaterialDesignThemes.targets'))" />
|
||||||
</Target>
|
</Target>
|
||||||
@@ -513,6 +512,5 @@
|
|||||||
<Exec Command="squirrel --releasify $(OutDir)ImEXOnlinePartner.$([System.Version]::Parse(%(myAssemblyInfo.Version)).ToString(3)).nupkg" />
|
<Exec Command="squirrel --releasify $(OutDir)ImEXOnlinePartner.$([System.Version]::Parse(%(myAssemblyInfo.Version)).ToString(3)).nupkg" />
|
||||||
</Target>
|
</Target>
|
||||||
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
|
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
|
||||||
<Import Project="..\packages\Ookii.Dialogs.1.1.0\build\Ookii.Dialogs.targets" Condition="Exists('..\packages\Ookii.Dialogs.1.1.0\build\Ookii.Dialogs.targets')" />
|
|
||||||
<Import Project="..\packages\MaterialDesignThemes.3.2.0\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.2.0\build\MaterialDesignThemes.targets')" />
|
<Import Project="..\packages\MaterialDesignThemes.3.2.0\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.2.0\build\MaterialDesignThemes.targets')" />
|
||||||
</Project>
|
</Project>
|
||||||
33
BodyshopUploader/Properties/Resources.Designer.cs
generated
33
BodyshopUploader/Properties/Resources.Designer.cs
generated
@@ -150,6 +150,15 @@ namespace BodyshopPartner.Properties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Browse for QB File.
|
||||||
|
/// </summary>
|
||||||
|
public static string Label_BrowseForQb {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Label_BrowseForQb", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to File Path.
|
/// Looks up a localized string similar to File Path.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -159,6 +168,15 @@ namespace BodyshopPartner.Properties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Interaction Log.
|
||||||
|
/// </summary>
|
||||||
|
public static string Label_InteractionLog {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Label_InteractionLog", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Monitor Status.
|
/// Looks up a localized string similar to Monitor Status.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -168,6 +186,15 @@ namespace BodyshopPartner.Properties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to QuickBooks File Path.
|
||||||
|
/// </summary>
|
||||||
|
public static string Label_QbFilePath {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Label_QbFilePath", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Re_move.
|
/// Looks up a localized string similar to Re_move.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -331,7 +358,7 @@ namespace BodyshopPartner.Properties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Login - Bodyshop Uploader.
|
/// Looks up a localized string similar to Login -ImEX Online Partner.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string Title_Login {
|
public static string Title_Login {
|
||||||
get {
|
get {
|
||||||
@@ -340,7 +367,7 @@ namespace BodyshopPartner.Properties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Bodyshop Partner by ImEX Systems Inc..
|
/// Looks up a localized string similar to ImEX Online Partner.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string Title_Login_Header {
|
public static string Title_Login_Header {
|
||||||
get {
|
get {
|
||||||
@@ -349,7 +376,7 @@ namespace BodyshopPartner.Properties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Bodyshop Partner | ImEX Systems Inc..
|
/// Looks up a localized string similar to ImEX Online Partner | ImEX Systems Inc..
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string Title_Main {
|
public static string Title_Main {
|
||||||
get {
|
get {
|
||||||
|
|||||||
@@ -147,12 +147,21 @@
|
|||||||
<data name="Label_AutoStartMonitor" xml:space="preserve">
|
<data name="Label_AutoStartMonitor" xml:space="preserve">
|
||||||
<value>Auto-start Monitors</value>
|
<value>Auto-start Monitors</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Label_BrowseForQb" xml:space="preserve">
|
||||||
|
<value>Browse for QB File</value>
|
||||||
|
</data>
|
||||||
<data name="Label_FilePath" xml:space="preserve">
|
<data name="Label_FilePath" xml:space="preserve">
|
||||||
<value>File Path</value>
|
<value>File Path</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Label_InteractionLog" xml:space="preserve">
|
||||||
|
<value>Interaction Log</value>
|
||||||
|
</data>
|
||||||
<data name="Label_MonitorStatus" xml:space="preserve">
|
<data name="Label_MonitorStatus" xml:space="preserve">
|
||||||
<value>Monitor Status</value>
|
<value>Monitor Status</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Label_QbFilePath" xml:space="preserve">
|
||||||
|
<value>QuickBooks File Path</value>
|
||||||
|
</data>
|
||||||
<data name="Label_Remove" xml:space="preserve">
|
<data name="Label_Remove" xml:space="preserve">
|
||||||
<value>Re_move</value>
|
<value>Re_move</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -208,13 +217,13 @@
|
|||||||
<value>Password</value>
|
<value>Password</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Title_Login" xml:space="preserve">
|
<data name="Title_Login" xml:space="preserve">
|
||||||
<value>Login - Bodyshop Uploader</value>
|
<value>Login -ImEX Online Partner</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Title_Login_Header" xml:space="preserve">
|
<data name="Title_Login_Header" xml:space="preserve">
|
||||||
<value>Bodyshop Partner by ImEX Systems Inc.</value>
|
<value>ImEX Online Partner</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Title_Main" xml:space="preserve">
|
<data name="Title_Main" xml:space="preserve">
|
||||||
<value>Bodyshop Partner | ImEX Systems Inc.</value>
|
<value>ImEX Online Partner | ImEX Systems Inc.</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Username" xml:space="preserve">
|
<data name="Username" xml:space="preserve">
|
||||||
<value>Username</value>
|
<value>Username</value>
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ namespace BodyshopPartner.Utils.Queries
|
|||||||
}
|
}
|
||||||
catch(ArgumentOutOfRangeException Ex)
|
catch(ArgumentOutOfRangeException Ex)
|
||||||
{
|
{
|
||||||
logger.Trace("No vehicles returned in GQL query.");
|
logger.Trace(Ex,"No vehicles returned in GQL query.");
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
catch (Exception Ex)
|
catch (Exception Ex)
|
||||||
|
|||||||
@@ -119,6 +119,22 @@ namespace BodyshopPartner.ViewModels
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private ICommand _browseForQbFolderCommand;
|
||||||
|
public ICommand BrowseForQbFolderCommand
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_browseForQbFolderCommand == null)
|
||||||
|
{
|
||||||
|
_browseForQbFolderCommand = new RelayCommand(
|
||||||
|
p => true,
|
||||||
|
p => BrowseForQbFolder()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return _browseForQbFolderCommand;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private ICommand _quitCommand;
|
private ICommand _quitCommand;
|
||||||
public ICommand QuitCommand
|
public ICommand QuitCommand
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ using System.Threading.Tasks;
|
|||||||
using System.Windows;
|
using System.Windows;
|
||||||
using Firebase.Auth;
|
using Firebase.Auth;
|
||||||
using ToastNotifications.Messages;
|
using ToastNotifications.Messages;
|
||||||
|
using Microsoft.Win32;
|
||||||
|
|
||||||
namespace BodyshopPartner.ViewModels
|
namespace BodyshopPartner.ViewModels
|
||||||
{
|
{
|
||||||
@@ -138,6 +139,22 @@ namespace BodyshopPartner.ViewModels
|
|||||||
IndeterminateLoading = false;
|
IndeterminateLoading = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void BrowseForQbFolder()
|
||||||
|
{
|
||||||
|
|
||||||
|
OpenFileDialog openFileDialog = new OpenFileDialog();
|
||||||
|
openFileDialog.Multiselect = false;
|
||||||
|
openFileDialog.Filter = "QuickBooks files (*.qbw)|*.qbw|All files (*.*)|*.*";
|
||||||
|
openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
|
||||||
|
if (openFileDialog.ShowDialog() == true)
|
||||||
|
{
|
||||||
|
|
||||||
|
Properties.Settings.Default.QuickBooksFilePath = openFileDialog.FileName;
|
||||||
|
Properties.Settings.Default.Save();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
public void StopAllFolderMonitors()
|
public void StopAllFolderMonitors()
|
||||||
{
|
{
|
||||||
IndeterminateLoading = true;
|
IndeterminateLoading = true;
|
||||||
@@ -229,7 +246,7 @@ namespace BodyshopPartner.ViewModels
|
|||||||
public async Task TestGql()
|
public async Task TestGql()
|
||||||
{
|
{
|
||||||
|
|
||||||
Utils.Notifications.notifier.ShowInformation("The message");
|
Utils.Notifications.notifier.ShowInformation("The message");
|
||||||
|
|
||||||
|
|
||||||
//Notification _n = new Notification()
|
//Notification _n = new Notification()
|
||||||
|
|||||||
@@ -1,17 +1,18 @@
|
|||||||
<Window x:Class="BodyshopPartner.Views.Main"
|
<Window x:Class="BodyshopPartner.Views.Main"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:BodyshopPartner.Views"
|
xmlns:tb="http://www.hardcodet.net/taskbar"
|
||||||
|
xmlns:p="clr-namespace:BodyshopPartner.Properties"
|
||||||
|
xmlns:properties="clr-namespace:BodyshopPartner.Properties"
|
||||||
|
xmlns:util="clr-namespace:BodyshopPartner.Utils"
|
||||||
|
xmlns:vm="clr-namespace:BodyshopPartner.ViewModels"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="{x:Static p:Resources.Title_Main}"
|
Title="{x:Static p:Resources.Title_Main}"
|
||||||
Height="450"
|
Height="450"
|
||||||
xmlns:vm="clr-namespace:BodyshopPartner.ViewModels"
|
|
||||||
Width="800"
|
Width="800"
|
||||||
xmlns:tb="http://www.hardcodet.net/taskbar"
|
|
||||||
xmlns:p="clr-namespace:BodyshopPartner.Properties"
|
|
||||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
|
||||||
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
|
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
|
||||||
TextElement.FontWeight="Regular"
|
TextElement.FontWeight="Regular"
|
||||||
TextElement.FontSize="13"
|
TextElement.FontSize="13"
|
||||||
@@ -20,8 +21,6 @@
|
|||||||
Background="{DynamicResource MaterialDesignPaper}"
|
Background="{DynamicResource MaterialDesignPaper}"
|
||||||
FontFamily="{DynamicResource MaterialDesignFont}"
|
FontFamily="{DynamicResource MaterialDesignFont}"
|
||||||
Loaded="Window_Loaded"
|
Loaded="Window_Loaded"
|
||||||
xmlns:util="clr-namespace:BodyshopPartner.Utils"
|
|
||||||
xmlns:properties="clr-namespace:BodyshopPartner.Properties"
|
|
||||||
Closing="Window_Closing">
|
Closing="Window_Closing">
|
||||||
<Window.DataContext>
|
<Window.DataContext>
|
||||||
<vm:MainViewModel />
|
<vm:MainViewModel />
|
||||||
@@ -109,6 +108,7 @@
|
|||||||
</tb:TaskbarIcon>
|
</tb:TaskbarIcon>
|
||||||
|
|
||||||
<StackPanel DockPanel.Dock="Right">
|
<StackPanel DockPanel.Dock="Right">
|
||||||
|
|
||||||
<ComboBox ItemsSource="{Binding ShopData}"
|
<ComboBox ItemsSource="{Binding ShopData}"
|
||||||
Margin="8"
|
Margin="8"
|
||||||
SelectedItem="{Binding ActiveShop}"
|
SelectedItem="{Binding ActiveShop}"
|
||||||
@@ -121,7 +121,10 @@
|
|||||||
</ItemsPanelTemplate>
|
</ItemsPanelTemplate>
|
||||||
</ComboBox.ItemsPanel>
|
</ComboBox.ItemsPanel>
|
||||||
</ComboBox>
|
</ComboBox>
|
||||||
|
<Separator />
|
||||||
|
<CheckBox IsChecked="{Binding Source={x:Static p:Settings.Default}, Path=AutoStartMonitor}"
|
||||||
|
Margin="8"
|
||||||
|
Content="{x:Static p:Resources.Label_AutoStartMonitor}" />
|
||||||
<Button Command="{Binding AddMonitoringPathCommand, UpdateSourceTrigger=PropertyChanged}"
|
<Button Command="{Binding AddMonitoringPathCommand, UpdateSourceTrigger=PropertyChanged}"
|
||||||
Margin="8"
|
Margin="8"
|
||||||
ToolTip="{x:Static p:Resources.Label_AddMonitoringPath}"
|
ToolTip="{x:Static p:Resources.Label_AddMonitoringPath}"
|
||||||
@@ -132,22 +135,28 @@
|
|||||||
<Button Command="{Binding StopFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}"
|
<Button Command="{Binding StopFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}"
|
||||||
Margin="8"
|
Margin="8"
|
||||||
Content="{x:Static p:Resources.Label_StopAllMonitors}" />
|
Content="{x:Static p:Resources.Label_StopAllMonitors}" />
|
||||||
<CheckBox IsChecked="{Binding Source={x:Static p:Settings.Default}, Path=AutoStartMonitor}"
|
|
||||||
Margin="8"
|
<Button Command="{Binding StopFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}"
|
||||||
Content="{x:Static p:Resources.Label_AutoStartMonitor}" />
|
Margin="8"
|
||||||
|
Content="{x:Static p:Resources.Label_StopAllMonitors}" />
|
||||||
|
<Separator />
|
||||||
|
<Button Command="{Binding BrowseForQbFolderCommand, UpdateSourceTrigger=PropertyChanged}"
|
||||||
|
Margin="8"
|
||||||
|
Content="{x:Static p:Resources.Label_BrowseForQb}" />
|
||||||
|
<Separator />
|
||||||
<Button DockPanel.Dock="Top"
|
<Button DockPanel.Dock="Top"
|
||||||
Margin="8"
|
Margin="8"
|
||||||
Command="{Binding TestCommand}"
|
Command="{Binding TestCommand}"
|
||||||
Content="_TEST" />
|
Background="Tomato"
|
||||||
|
Content="_TEST COMMAND" />
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<RowDefinition Height="*" />
|
||||||
<ColumnDefinition Width="*" />
|
<RowDefinition Height="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<DataGrid Grid.Column="0"
|
<DataGrid Grid.Row="0"
|
||||||
ItemsSource="{Binding MonitoringPaths}"
|
ItemsSource="{Binding MonitoringPaths}"
|
||||||
AutoGenerateColumns="False"
|
AutoGenerateColumns="False"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
@@ -206,16 +215,18 @@
|
|||||||
</DataGridTemplateColumn>
|
</DataGridTemplateColumn>
|
||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
</DataGrid>
|
</DataGrid>
|
||||||
<StackPanel Grid.Column="1"
|
<DockPanel Grid.Row="1"
|
||||||
Height="Auto">
|
Height="Auto">
|
||||||
<TextBox Text="{Binding Source={x:Static properties:Settings.Default},
|
<TextBox DockPanel.Dock="Top" Text="{Binding Source={x:Static properties:Settings.Default},
|
||||||
Path=QuickBooksFilePath}"
|
Path=QuickBooksFilePath}"
|
||||||
materialDesign:HintAssist.Hint="QuickBooks File Path" TextChanged="TextBox_TextChanged"/>
|
materialDesign:HintAssist.Hint="{x:Static p:Resources.Label_QbFilePath}" TextChanged="TextBox_TextChanged"/>
|
||||||
<TextBox Height="Auto"
|
<TextBox Height="Auto"
|
||||||
|
materialDesign:HintAssist.Hint="{x:Static p:Resources.Label_InteractionLog}"
|
||||||
Text="{Binding HttpServerLog}"
|
Text="{Binding HttpServerLog}"
|
||||||
TextWrapping="Wrap"
|
TextWrapping="Wrap"
|
||||||
|
IsReadOnly="True"
|
||||||
AcceptsReturn="True" />
|
AcceptsReturn="True" />
|
||||||
</StackPanel>
|
</DockPanel>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
|||||||
@@ -6,24 +6,23 @@
|
|||||||
<package id="GraphQL.Client" version="3.2.0" targetFramework="net48" />
|
<package id="GraphQL.Client" version="3.2.0" targetFramework="net48" />
|
||||||
<package id="GraphQL.Client.Abstractions" version="3.2.0" targetFramework="net48" />
|
<package id="GraphQL.Client.Abstractions" version="3.2.0" targetFramework="net48" />
|
||||||
<package id="GraphQL.Client.Abstractions.Websocket" version="3.2.0" targetFramework="net48" />
|
<package id="GraphQL.Client.Abstractions.Websocket" version="3.2.0" targetFramework="net48" />
|
||||||
<package id="GraphQL.Client.Serializer.Newtonsoft" version="3.1.6" targetFramework="net472" />
|
<package id="GraphQL.Client.Serializer.Newtonsoft" version="3.2.0" targetFramework="net48" />
|
||||||
<package id="GraphQL.Primitives" version="3.2.0" targetFramework="net48" />
|
<package id="GraphQL.Primitives" version="3.2.0" targetFramework="net48" />
|
||||||
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net472" />
|
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net472" />
|
||||||
<package id="MaterialDesignColors" version="1.2.7" targetFramework="net48" />
|
<package id="MaterialDesignColors" version="1.2.7" targetFramework="net48" />
|
||||||
<package id="MaterialDesignThemes" version="3.2.0" targetFramework="net48" />
|
<package id="MaterialDesignThemes" version="3.2.0" targetFramework="net48" />
|
||||||
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
|
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
|
||||||
<package id="Microsoft.NETCore.Platforms" version="3.1.3" targetFramework="net472" />
|
<package id="Microsoft.NETCore.Platforms" version="5.0.0" targetFramework="net48" />
|
||||||
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
|
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="MimeTypesMap" version="1.0.8" targetFramework="net472" />
|
<package id="MimeTypesMap" version="1.0.8" targetFramework="net472" />
|
||||||
<package id="Mono.Cecil" version="0.11.2" targetFramework="net48" />
|
<package id="Mono.Cecil" version="0.11.2" targetFramework="net48" />
|
||||||
<package id="NETStandard.Library" version="2.0.3" targetFramework="net472" />
|
<package id="NETStandard.Library" version="2.0.3" targetFramework="net472" />
|
||||||
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
|
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
|
||||||
<package id="NLog" version="4.7.4" targetFramework="net472" />
|
<package id="NLog" version="4.7.5" targetFramework="net48" />
|
||||||
<package id="NLog.Config" version="4.6.8" targetFramework="net472" />
|
<package id="NLog.Config" version="4.6.8" targetFramework="net472" />
|
||||||
<package id="NLog.Schema" version="4.6.8" targetFramework="net472" />
|
<package id="NLog.Schema" version="4.6.8" targetFramework="net472" />
|
||||||
<package id="NuGet.CommandLine" version="5.8.0" targetFramework="net48" developmentDependency="true" />
|
<package id="NuGet.CommandLine" version="5.8.0" targetFramework="net48" developmentDependency="true" />
|
||||||
<package id="Ookii.Dialogs" version="1.1.0" targetFramework="net472" />
|
<package id="Ookii.Dialogs.Wpf" version="3.0.1" targetFramework="net48" />
|
||||||
<package id="Ookii.Dialogs.Wpf" version="1.1.0" targetFramework="net472" />
|
|
||||||
<package id="SharpCompress" version="0.17.1" targetFramework="net472" />
|
<package id="SharpCompress" version="0.17.1" targetFramework="net472" />
|
||||||
<package id="Simple-HTTP" version="1.0.6" targetFramework="net472" />
|
<package id="Simple-HTTP" version="1.0.6" targetFramework="net472" />
|
||||||
<package id="squirrel.windows" version="2.0.1" targetFramework="net48" />
|
<package id="squirrel.windows" version="2.0.1" targetFramework="net48" />
|
||||||
@@ -33,7 +32,7 @@
|
|||||||
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net472" />
|
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Console" version="4.3.1" targetFramework="net472" />
|
<package id="System.Console" version="4.3.1" targetFramework="net472" />
|
||||||
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
|
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net472" />
|
<package id="System.Diagnostics.DiagnosticSource" version="5.0.0" targetFramework="net48" />
|
||||||
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net472" />
|
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net472" />
|
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Globalization" version="4.3.0" targetFramework="net472" />
|
<package id="System.Globalization" version="4.3.0" targetFramework="net472" />
|
||||||
@@ -52,13 +51,13 @@
|
|||||||
<package id="System.Net.WebSockets.Client.Managed" version="1.0.22" targetFramework="net472" />
|
<package id="System.Net.WebSockets.Client.Managed" version="1.0.22" targetFramework="net472" />
|
||||||
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
|
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
|
||||||
<package id="System.ObjectModel" version="4.3.0" targetFramework="net472" />
|
<package id="System.ObjectModel" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Reactive" version="4.4.1" targetFramework="net472" />
|
<package id="System.Reactive" version="5.0.0" targetFramework="net48" />
|
||||||
<package id="System.Reflection" version="4.3.0" targetFramework="net472" />
|
<package id="System.Reflection" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net472" />
|
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net472" />
|
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net472" />
|
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Runtime" version="4.3.1" targetFramework="net472" />
|
<package id="System.Runtime" version="4.3.1" targetFramework="net472" />
|
||||||
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net472" />
|
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net48" />
|
||||||
<package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net472" />
|
<package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net472" />
|
||||||
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net472" />
|
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net472" />
|
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net472" />
|
||||||
|
|||||||
Reference in New Issue
Block a user