Skip to content

Commit 153e96f

Browse files
WillStrohlWillStrohl
authored
Merge pull request #503 from HotcakesCommerce/development
Syncing branches
2 parents 603998f + a0ef58a commit 153e96f

File tree

16 files changed

+2379
-2327
lines changed

16 files changed

+2379
-2327
lines changed

‎Build.proj‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,86 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
3-
<PropertyGroup>
4-
<LangVersion>C# 10.0</LangVersion>
5-
</PropertyGroup>
6-
7-
<PropertyGroup>
8-
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\.build</MSBuildCommunityTasksPath>
9-
</PropertyGroup>
10-
11-
<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.targets"/>
12-
13-
<!-- Version Number -->
14-
<PropertyGroup Condition=" '$(BUILD_NUMBER)' == '' ">
15-
<Version>03.08.01</Version>
16-
<FileVersion>01.00.00</FileVersion>
17-
<InformationalVersion>01.00.00</InformationalVersion>
18-
</PropertyGroup>
19-
20-
<PropertyGroup Condition=" '$(BUILD_NUMBER)' != '' ">
21-
<!-- Build Server Number -->
22-
<Version>03.08.01</Version>
23-
<FileVersion>$(BUILD_NUMBER)</FileVersion>
24-
<InformationalVersion>$(BUILD_NUMBER)</InformationalVersion>
25-
</PropertyGroup>
26-
27-
<PropertyGroup Condition=" '$(BuildConfiguration)' == '' ">
28-
<BuildConfiguration>Release</BuildConfiguration>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(BuildPlatform)' == '' ">
31-
<BuildPlatform>Any CPU</BuildPlatform>
32-
</PropertyGroup>
33-
34-
<Target Name="Clean">
35-
<Message Importance="High" Text="======================================= Starting Target Clean ==========================================" />
36-
<DeleteTree Directories="**\obj\**;**\bin\**" />
37-
</Target>
38-
39-
<Target Name="Version">
40-
<Message Importance="High" Text="======================================= Starting Target Version ==========================================" />
41-
<Time>
42-
<Output TaskParameter="Year" PropertyName="Year" />
43-
</Time>
44-
45-
<Message Text="Version: $(Version)"/>
46-
47-
<Attrib Files="$(MSBuildProjectDirectory)\GlobalAssemblyInfo.cs" ReadOnly="False" />
48-
49-
<AssemblyInfo CodeLanguage="CS"
50-
OutputFile="$(MSBuildProjectDirectory)\GlobalAssemblyInfo.cs"
51-
GenerateClass="true"
52-
AssemblyCopyright="Copyright © $(Year). All rights reserved."
53-
AssemblyConfiguration="$(BuildConfiguration)"
54-
AssemblyVersion="$(Version)"
55-
AssemblyFileVersion="$(FileVersion)"
56-
AssemblyInformationalVersion="$(InformationalVersion)" />
57-
</Target>
58-
59-
<Target Name="Compile" DependsOnTargets="Clean;Version">
60-
<Message Importance="High" Text="======================================= Starting Target Compile ==========================================" />
61-
<ItemGroup>
62-
<ProjectFiles Include="$(MSBuildProjectDirectory)\Hotcakes.sln" />
63-
</ItemGroup>
64-
65-
<MSBuild Projects="@(ProjectFiles)" Properties="Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);RootFolder=$(MSBuildProjectDirectory)" />
66-
</Target>
67-
68-
<Target Name="BuildModule" DependsOnTargets="Compile">
69-
<Message Importance="High" Text="======================================= Starting Target BuildModule ==========================================" />
70-
<!-- Code placeholder if we package module separately -->
71-
</Target>
72-
73-
74-
75-
<Target Name="Build">
76-
<Message Importance="High" Text="======================================= Starting Target Build ==========================================" />
77-
<CallTarget Targets="BuildModule" />
78-
79-
<MSBuild Projects="DevSamples\Build.proj" Properties="RootFolder=$(MSBuildProjectDirectory);Version=$(Version)" />
80-
<MSBuild Projects="WebDeploy\Build.proj" Properties="RootFolder=$(MSBuildProjectDirectory);Version=$(Version)" />
81-
82-
<!-- For Testing commented removing of _Build-->
83-
<RemoveDir Directories="_Build" />
84-
</Target>
85-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
3+
<PropertyGroup>
4+
<LangVersion>C# 10.0</LangVersion>
5+
</PropertyGroup>
6+
7+
<PropertyGroup>
8+
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\.build</MSBuildCommunityTasksPath>
9+
</PropertyGroup>
10+
11+
<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.targets"/>
12+
13+
<!-- Version Number -->
14+
<PropertyGroup Condition=" '$(BUILD_NUMBER)' == '' ">
15+
<Version>03.08.02</Version>
16+
<FileVersion>01.00.00</FileVersion>
17+
<InformationalVersion>01.00.00</InformationalVersion>
18+
</PropertyGroup>
19+
20+
<PropertyGroup Condition=" '$(BUILD_NUMBER)' != '' ">
21+
<!-- Build Server Number -->
22+
<Version>03.08.02</Version>
23+
<FileVersion>$(BUILD_NUMBER)</FileVersion>
24+
<InformationalVersion>$(BUILD_NUMBER)</InformationalVersion>
25+
</PropertyGroup>
26+
27+
<PropertyGroup Condition=" '$(BuildConfiguration)' == '' ">
28+
<BuildConfiguration>Release</BuildConfiguration>
29+
</PropertyGroup>
30+
<PropertyGroup Condition=" '$(BuildPlatform)' == '' ">
31+
<BuildPlatform>Any CPU</BuildPlatform>
32+
</PropertyGroup>
33+
34+
<Target Name="Clean">
35+
<Message Importance="High" Text="======================================= Starting Target Clean ==========================================" />
36+
<DeleteTree Directories="**\obj\**;**\bin\**" />
37+
</Target>
38+
39+
<Target Name="Version">
40+
<Message Importance="High" Text="======================================= Starting Target Version ==========================================" />
41+
<Time>
42+
<Output TaskParameter="Year" PropertyName="Year" />
43+
</Time>
44+
45+
<Message Text="Version: $(Version)"/>
46+
47+
<Attrib Files="$(MSBuildProjectDirectory)\GlobalAssemblyInfo.cs" ReadOnly="False" />
48+
49+
<AssemblyInfo CodeLanguage="CS"
50+
OutputFile="$(MSBuildProjectDirectory)\GlobalAssemblyInfo.cs"
51+
GenerateClass="true"
52+
AssemblyCopyright="Copyright © $(Year). All rights reserved."
53+
AssemblyConfiguration="$(BuildConfiguration)"
54+
AssemblyVersion="$(Version)"
55+
AssemblyFileVersion="$(FileVersion)"
56+
AssemblyInformationalVersion="$(InformationalVersion)" />
57+
</Target>
58+
59+
<Target Name="Compile" DependsOnTargets="Clean;Version">
60+
<Message Importance="High" Text="======================================= Starting Target Compile ==========================================" />
61+
<ItemGroup>
62+
<ProjectFiles Include="$(MSBuildProjectDirectory)\Hotcakes.sln" />
63+
</ItemGroup>
64+
65+
<MSBuild Projects="@(ProjectFiles)" Properties="Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);RootFolder=$(MSBuildProjectDirectory)" />
66+
</Target>
67+
68+
<Target Name="BuildModule" DependsOnTargets="Compile">
69+
<Message Importance="High" Text="======================================= Starting Target BuildModule ==========================================" />
70+
<!-- Code placeholder if we package module separately -->
71+
</Target>
72+
73+
74+
75+
<Target Name="Build">
76+
<Message Importance="High" Text="======================================= Starting Target Build ==========================================" />
77+
<CallTarget Targets="BuildModule" />
78+
79+
<MSBuild Projects="DevSamples\Build.proj" Properties="RootFolder=$(MSBuildProjectDirectory);Version=$(Version)" />
80+
<MSBuild Projects="WebDeploy\Build.proj" Properties="RootFolder=$(MSBuildProjectDirectory);Version=$(Version)" />
81+
82+
<!-- For Testing commented removing of _Build-->
83+
<RemoveDir Directories="_Build" />
84+
</Target>
85+
8686
</Project>

‎CommonAssemblyInfo.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
using System;
2-
using System.Reflection;
3-
using System.Resources;
4-
using System.Runtime.InteropServices;
5-
6-
[assembly: AssemblyCompany("Upendo Ventures, LLC")]
7-
[assembly: AssemblyProduct("Hotcakes Commerce")]
8-
[assembly: AssemblyCopyright("Copyright © Upendo Ventures, LLC")]
9-
[assembly: AssemblyTrademark("")]
10-
[assembly: AssemblyCulture("")]
11-
[assembly: CLSCompliant(false)]
12-
[assembly: ComVisible(false)]
13-
14-
[assembly: AssemblyVersion("3.08.01")]
15-
[assembly: AssemblyDelaySign(false)]
16-
[assembly: AssemblyKeyFile("")]
17-
[assembly: AssemblyKeyName("")]
18-
1+
using System;
2+
using System.Reflection;
3+
using System.Resources;
4+
using System.Runtime.InteropServices;
5+
6+
[assembly: AssemblyCompany("Upendo Ventures, LLC")]
7+
[assembly: AssemblyProduct("Hotcakes Commerce")]
8+
[assembly: AssemblyCopyright("Copyright © Upendo Ventures, LLC")]
9+
[assembly: AssemblyTrademark("")]
10+
[assembly: AssemblyCulture("")]
11+
[assembly: CLSCompliant(false)]
12+
[assembly: ComVisible(false)]
13+
14+
[assembly: AssemblyVersion("3.08.02")]
15+
[assembly: AssemblyDelaySign(false)]
16+
[assembly: AssemblyKeyFile("")]
17+
[assembly: AssemblyKeyName("")]
18+
1919
[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.MainAssembly)]

‎GlobalAssemblyInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
[assembly: System.Reflection.AssemblyInformationalVersion("01.00.00")]
1212
[assembly: System.Reflection.AssemblyConfiguration("Release")]
13-
[assembly: System.Reflection.AssemblyCopyright("Copyright © 2023. All rights reserved.")]
13+
[assembly: System.Reflection.AssemblyCopyright("Copyright © 2024. All rights reserved.")]
1414
[assembly: System.Reflection.AssemblyFileVersion("01.00.00")]
15-
[assembly: System.Reflection.AssemblyVersion("03.08.00")]
15+
[assembly: System.Reflection.AssemblyVersion("03.08.02")]
1616

1717

1818

@@ -22,11 +22,11 @@ internal sealed partial class ThisAssembly {
2222

2323
internal const string AssemblyConfiguration = "Release";
2424

25-
internal const string AssemblyCopyright = "Copyright © 2023. All rights reserved.";
25+
internal const string AssemblyCopyright = "Copyright © 2024. All rights reserved.";
2626

2727
internal const string AssemblyFileVersion = "01.00.00";
2828

29-
internal const string AssemblyVersion = "03.08.00";
29+
internal const string AssemblyVersion = "03.08.02";
3030

3131
private ThisAssembly() {
3232
}

‎Libraries/Hotcakes.Commerce.Dnn/App.Config‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,18 @@
4747
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
4848
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
4949
</dependentAssembly>
50+
<dependentAssembly>
51+
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
52+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
53+
</dependentAssembly>
54+
<dependentAssembly>
55+
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
56+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
57+
</dependentAssembly>
58+
<dependentAssembly>
59+
<assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31bf3856ad364e35" culture="neutral" />
60+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
61+
</dependentAssembly>
5062
</assemblyBinding>
5163
</runtime>
5264
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

‎Libraries/Hotcakes.Commerce.NoCms/App.config‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,18 @@
2424
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
2525
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
2626
</dependentAssembly>
27+
<dependentAssembly>
28+
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
29+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
30+
</dependentAssembly>
31+
<dependentAssembly>
32+
<assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31bf3856ad364e35" culture="neutral" />
33+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
34+
</dependentAssembly>
35+
<dependentAssembly>
36+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
37+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
38+
</dependentAssembly>
2739
</assemblyBinding>
2840
</runtime>
2941
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

‎Libraries/Hotcakes.Commerce/Hotcakes.Commerce.csproj‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
<HintPath>..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
8686
<Private>True</Private>
8787
</Reference>
88+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89+
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
90+
</Reference>
8891
<Reference Include="MiniProfiler">
8992
<HintPath>..\..\packages\MiniProfiler.3.1.1.140\lib\net40\MiniProfiler.dll</HintPath>
9093
</Reference>
@@ -116,19 +119,26 @@
116119
<Reference Include="System.ServiceModel.Web" />
117120
<Reference Include="System.Transactions" />
118121
<Reference Include="System.Web" />
122+
<Reference Include="System.Web.Abstractions" />
119123
<Reference Include="System.Web.Extensions" />
120-
<Reference Include="System.Web.Helpers">
121-
<SpecificVersion>False</SpecificVersion>
122-
<HintPath>..\..\References\Dnn\System.Web.Helpers.dll</HintPath>
124+
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
123126
</Reference>
124-
<Reference Include="System.Web.Mvc">
125-
<SpecificVersion>False</SpecificVersion>
127+
<Reference Include="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126128
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.4.0.40804.0\lib\net40\System.Web.Mvc.dll</HintPath>
127129
</Reference>
130+
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
132+
</Reference>
128133
<Reference Include="System.Web.Routing" />
129-
<Reference Include="System.Web.WebPages">
130-
<SpecificVersion>False</SpecificVersion>
131-
<HintPath>..\..\References\Dnn\System.Web.WebPages.dll</HintPath>
134+
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
135+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
136+
</Reference>
137+
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
138+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
139+
</Reference>
140+
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
141+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
132142
</Reference>
133143
<Reference Include="System.Xml.Linq" />
134144
<Reference Include="System.Xml" />

‎Libraries/Hotcakes.Commerce/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<packages>
33
<package id="EntityFramework" version="6.4.4" targetFramework="net472" />
44
<package id="log4net" version="1.2.10" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.Mvc" version="4.0.40804.0" targetFramework="net472" />
6+
<package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net472" />
7+
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net472" />
8+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
59
<package id="MiniProfiler" version="3.1.1.140" targetFramework="net40" />
610
<package id="MiniProfiler.EF6" version="3.0.11" targetFramework="net40" />
711
<package id="PayPalHttp" version="1.0.1" targetFramework="net472" />

‎Libraries/Hotcakes.PaypalWebServices/RestPaypalApi.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ public async Task<HttpResponse> doDirectCheckout(string paymentAmount,
121121
AmountWithBreakdown = new AmountWithBreakdown
122122
{
123123
CurrencyCode = storeCurrency,
124-
Value = paymentAmount,
124+
Value = formatAmount(paymentAmount),
125125
AmountBreakdown = new AmountBreakdown
126126
{
127127
ItemTotal = new Money
128128
{
129129
CurrencyCode = storeCurrency,
130-
Value = paymentAmount
130+
Value = formatAmount(paymentAmount)
131131
},
132132

133133
}
@@ -351,7 +351,7 @@ public async Task<HttpResponse> CaptureAuthorizedOrder(string AuthorizationId,st
351351
{
352352
Amount = new PayPalCheckoutSdk.Payments.Money()
353353
{
354-
Value = value,
354+
Value = formatAmount(value),
355355
CurrencyCode = currencyId
356356
},
357357
InvoiceId = invoiceId,
@@ -375,7 +375,7 @@ public async Task<HttpResponse> CapturesRefund(string CaptureId, string amount,
375375
{
376376
Amount = new PayPalCheckoutSdk.Payments.Money()
377377
{
378-
Value = amount,
378+
Value = formatAmount(amount),
379379
CurrencyCode = storeCurrency
380380
}
381381
};

0 commit comments

Comments
 (0)