Skip to content

Commit

Permalink
Merge pull request #170 from o-ivanov/AddPaymentTerminal
Browse files Browse the repository at this point in the history
Fixed issue #168
  • Loading branch information
o-ivanov authored Oct 18, 2021
2 parents ca800ea + a5f0e71 commit df53a98
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<Authors>ErpNet and Contributors</Authors>
<PackageLicenseFile>$(SolutionDir)LICENSE.txt</PackageLicenseFile>
<Copyright>(c) ErpNet and Contributors</Copyright>
<AssemblyVersion>1.0.9000.0000</AssemblyVersion>
<FileVersion>1.0.9000.0000</FileVersion>
<Version>1.0.9000.0000</Version>
<AssemblyVersion>1.0.9000.1000</AssemblyVersion>
<FileVersion>1.0.9000.1000</FileVersion>
<Version>1.0.9000.1000</Version>
<IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
<IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
Expand Down
4 changes: 2 additions & 2 deletions ErpNet.FP.Server/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="stylesheet" href="index.css?ver=9BBCF355D0CC1A27CB9536CF2899BFB757586A7D344F504154B8A6A8224479CA">
<link rel="stylesheet" href="index.css?ver=5EDA27DCB2C677E735CFBDC7BB2A4E32E6CE5B71A9F478669DF20B722ABA662D">
<title>ErpNet.FP Admin Page</title>
</head>

Expand Down Expand Up @@ -96,7 +96,7 @@ <h3 class="section">New printer configuration</h3>
<div id="ToastArea"></div>

<script src="index.js"></script>
<script src="app.js?ver=AB116B349D304F3774D90A500CA44ECCF184CCFCBE5565CABE0A9C23C242D66D"></script>
<script src="app.js?ver=554435584E93B2A6954C68CF69690EFD7BDE2730E8E7BE99977D1B734C00F5F9"></script>
</body>

</html>
2 changes: 1 addition & 1 deletion ErpNet.FP.Setup/Product.wxs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Id="*" Name="ErpNet.FP - Fiscal Print Server" Language="1033" Version="1.0.9000.0000" Manufacturer="Erp.Net And Contributors" UpgradeCode="05e58513-a8d9-45bf-a280-d47ccb696623">
<Product Id="*" Name="ErpNet.FP - Fiscal Print Server" Language="1033" Version="1.0.9000.1000" Manufacturer="Erp.Net And Contributors" UpgradeCode="05e58513-a8d9-45bf-a280-d47ccb696623">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" />
<Property Id="MSIFASTINSTALL" Value="7" />
Expand Down
2 changes: 1 addition & 1 deletion output.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputPath>Output</OutputPath>
<OutputType>Published</OutputType>
<!-- Increase version when releasing a build -->
<Version>1.0.9000.0000</Version>
<Version>1.0.9000.1000</Version>
<WixNamespaces>
<Namespace Prefix="wix" Uri="http://schemas.microsoft.com/wix/2006/wi" />
<Namespace Prefix="wixutil" Uri="http://schemas.microsoft.com/wix/UtilExtension" />
Expand Down

0 comments on commit df53a98

Please sign in to comment.