Skip to content

Commit

Permalink
Merge pull request #503 from HotcakesCommerce/development
Browse files Browse the repository at this point in the history
Syncing branches
  • Loading branch information
WillStrohl authored Nov 18, 2024
2 parents 603998f + a0ef58a commit 153e96f
Show file tree
Hide file tree
Showing 16 changed files with 2,379 additions and 2,327 deletions.
170 changes: 85 additions & 85 deletions Build.proj
Original file line number Diff line number Diff line change
@@ -1,86 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
<PropertyGroup>
<LangVersion>C# 10.0</LangVersion>
</PropertyGroup>

<PropertyGroup>
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\.build</MSBuildCommunityTasksPath>
</PropertyGroup>

<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.targets"/>

<!-- Version Number -->
<PropertyGroup Condition=" '$(BUILD_NUMBER)' == '' ">
<Version>03.08.01</Version>
<FileVersion>01.00.00</FileVersion>
<InformationalVersion>01.00.00</InformationalVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(BUILD_NUMBER)' != '' ">
<!-- Build Server Number -->
<Version>03.08.01</Version>
<FileVersion>$(BUILD_NUMBER)</FileVersion>
<InformationalVersion>$(BUILD_NUMBER)</InformationalVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(BuildConfiguration)' == '' ">
<BuildConfiguration>Release</BuildConfiguration>
</PropertyGroup>
<PropertyGroup Condition=" '$(BuildPlatform)' == '' ">
<BuildPlatform>Any CPU</BuildPlatform>
</PropertyGroup>

<Target Name="Clean">
<Message Importance="High" Text="======================================= Starting Target Clean ==========================================" />
<DeleteTree Directories="**\obj\**;**\bin\**" />
</Target>

<Target Name="Version">
<Message Importance="High" Text="======================================= Starting Target Version ==========================================" />
<Time>
<Output TaskParameter="Year" PropertyName="Year" />
</Time>

<Message Text="Version: $(Version)"/>

<Attrib Files="$(MSBuildProjectDirectory)\GlobalAssemblyInfo.cs" ReadOnly="False" />

<AssemblyInfo CodeLanguage="CS"
OutputFile="$(MSBuildProjectDirectory)\GlobalAssemblyInfo.cs"
GenerateClass="true"
AssemblyCopyright="Copyright © $(Year). All rights reserved."
AssemblyConfiguration="$(BuildConfiguration)"
AssemblyVersion="$(Version)"
AssemblyFileVersion="$(FileVersion)"
AssemblyInformationalVersion="$(InformationalVersion)" />
</Target>

<Target Name="Compile" DependsOnTargets="Clean;Version">
<Message Importance="High" Text="======================================= Starting Target Compile ==========================================" />
<ItemGroup>
<ProjectFiles Include="$(MSBuildProjectDirectory)\Hotcakes.sln" />
</ItemGroup>

<MSBuild Projects="@(ProjectFiles)" Properties="Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);RootFolder=$(MSBuildProjectDirectory)" />
</Target>

<Target Name="BuildModule" DependsOnTargets="Compile">
<Message Importance="High" Text="======================================= Starting Target BuildModule ==========================================" />
<!-- Code placeholder if we package module separately -->
</Target>



<Target Name="Build">
<Message Importance="High" Text="======================================= Starting Target Build ==========================================" />
<CallTarget Targets="BuildModule" />

<MSBuild Projects="DevSamples\Build.proj" Properties="RootFolder=$(MSBuildProjectDirectory);Version=$(Version)" />
<MSBuild Projects="WebDeploy\Build.proj" Properties="RootFolder=$(MSBuildProjectDirectory);Version=$(Version)" />

<!-- For Testing commented removing of _Build-->
<RemoveDir Directories="_Build" />
</Target>

<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
<PropertyGroup>
<LangVersion>C# 10.0</LangVersion>
</PropertyGroup>

<PropertyGroup>
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\.build</MSBuildCommunityTasksPath>
</PropertyGroup>

<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.targets"/>

<!-- Version Number -->
<PropertyGroup Condition=" '$(BUILD_NUMBER)' == '' ">
<Version>03.08.02</Version>
<FileVersion>01.00.00</FileVersion>
<InformationalVersion>01.00.00</InformationalVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(BUILD_NUMBER)' != '' ">
<!-- Build Server Number -->
<Version>03.08.02</Version>
<FileVersion>$(BUILD_NUMBER)</FileVersion>
<InformationalVersion>$(BUILD_NUMBER)</InformationalVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(BuildConfiguration)' == '' ">
<BuildConfiguration>Release</BuildConfiguration>
</PropertyGroup>
<PropertyGroup Condition=" '$(BuildPlatform)' == '' ">
<BuildPlatform>Any CPU</BuildPlatform>
</PropertyGroup>

<Target Name="Clean">
<Message Importance="High" Text="======================================= Starting Target Clean ==========================================" />
<DeleteTree Directories="**\obj\**;**\bin\**" />
</Target>

<Target Name="Version">
<Message Importance="High" Text="======================================= Starting Target Version ==========================================" />
<Time>
<Output TaskParameter="Year" PropertyName="Year" />
</Time>

<Message Text="Version: $(Version)"/>

<Attrib Files="$(MSBuildProjectDirectory)\GlobalAssemblyInfo.cs" ReadOnly="False" />

<AssemblyInfo CodeLanguage="CS"
OutputFile="$(MSBuildProjectDirectory)\GlobalAssemblyInfo.cs"
GenerateClass="true"
AssemblyCopyright="Copyright © $(Year). All rights reserved."
AssemblyConfiguration="$(BuildConfiguration)"
AssemblyVersion="$(Version)"
AssemblyFileVersion="$(FileVersion)"
AssemblyInformationalVersion="$(InformationalVersion)" />
</Target>

<Target Name="Compile" DependsOnTargets="Clean;Version">
<Message Importance="High" Text="======================================= Starting Target Compile ==========================================" />
<ItemGroup>
<ProjectFiles Include="$(MSBuildProjectDirectory)\Hotcakes.sln" />
</ItemGroup>

<MSBuild Projects="@(ProjectFiles)" Properties="Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);RootFolder=$(MSBuildProjectDirectory)" />
</Target>

<Target Name="BuildModule" DependsOnTargets="Compile">
<Message Importance="High" Text="======================================= Starting Target BuildModule ==========================================" />
<!-- Code placeholder if we package module separately -->
</Target>



<Target Name="Build">
<Message Importance="High" Text="======================================= Starting Target Build ==========================================" />
<CallTarget Targets="BuildModule" />

<MSBuild Projects="DevSamples\Build.proj" Properties="RootFolder=$(MSBuildProjectDirectory);Version=$(Version)" />
<MSBuild Projects="WebDeploy\Build.proj" Properties="RootFolder=$(MSBuildProjectDirectory);Version=$(Version)" />

<!-- For Testing commented removing of _Build-->
<RemoveDir Directories="_Build" />
</Target>

</Project>
36 changes: 18 additions & 18 deletions CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
using System;
using System.Reflection;
using System.Resources;
using System.Runtime.InteropServices;

[assembly: AssemblyCompany("Upendo Ventures, LLC")]
[assembly: AssemblyProduct("Hotcakes Commerce")]
[assembly: AssemblyCopyright("Copyright © Upendo Ventures, LLC")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: CLSCompliant(false)]
[assembly: ComVisible(false)]

[assembly: AssemblyVersion("3.08.01")]
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]

using System;
using System.Reflection;
using System.Resources;
using System.Runtime.InteropServices;

[assembly: AssemblyCompany("Upendo Ventures, LLC")]
[assembly: AssemblyProduct("Hotcakes Commerce")]
[assembly: AssemblyCopyright("Copyright © Upendo Ventures, LLC")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: CLSCompliant(false)]
[assembly: ComVisible(false)]

[assembly: AssemblyVersion("3.08.02")]
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]

[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.MainAssembly)]
8 changes: 4 additions & 4 deletions GlobalAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

[assembly: System.Reflection.AssemblyInformationalVersion("01.00.00")]
[assembly: System.Reflection.AssemblyConfiguration("Release")]
[assembly: System.Reflection.AssemblyCopyright("Copyright © 2023. All rights reserved.")]
[assembly: System.Reflection.AssemblyCopyright("Copyright © 2024. All rights reserved.")]
[assembly: System.Reflection.AssemblyFileVersion("01.00.00")]
[assembly: System.Reflection.AssemblyVersion("03.08.00")]
[assembly: System.Reflection.AssemblyVersion("03.08.02")]



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

internal const string AssemblyConfiguration = "Release";

internal const string AssemblyCopyright = "Copyright © 2023. All rights reserved.";
internal const string AssemblyCopyright = "Copyright © 2024. All rights reserved.";

internal const string AssemblyFileVersion = "01.00.00";

internal const string AssemblyVersion = "03.08.00";
internal const string AssemblyVersion = "03.08.02";

private ThisAssembly() {
}
Expand Down
12 changes: 12 additions & 0 deletions Libraries/Hotcakes.Commerce.Dnn/App.Config
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,18 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>
12 changes: 12 additions & 0 deletions Libraries/Hotcakes.Commerce.NoCms/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>
26 changes: 18 additions & 8 deletions Libraries/Hotcakes.Commerce/Hotcakes.Commerce.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@
<HintPath>..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="MiniProfiler">
<HintPath>..\..\packages\MiniProfiler.3.1.1.140\lib\net40\MiniProfiler.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -116,19 +119,26 @@
<Reference Include="System.ServiceModel.Web" />
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Helpers">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\References\Dnn\System.Web.Helpers.dll</HintPath>
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.4.0.40804.0\lib\net40\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.Routing" />
<Reference Include="System.Web.WebPages">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\References\Dnn\System.Web.WebPages.dll</HintPath>
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
Expand Down
4 changes: 4 additions & 0 deletions Libraries/Hotcakes.Commerce/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<packages>
<package id="EntityFramework" version="6.4.4" targetFramework="net472" />
<package id="log4net" version="1.2.10" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="4.0.40804.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net472" />
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net472" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
<package id="MiniProfiler" version="3.1.1.140" targetFramework="net40" />
<package id="MiniProfiler.EF6" version="3.0.11" targetFramework="net40" />
<package id="PayPalHttp" version="1.0.1" targetFramework="net472" />
Expand Down
8 changes: 4 additions & 4 deletions Libraries/Hotcakes.PaypalWebServices/RestPaypalApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ public async Task<HttpResponse> doDirectCheckout(string paymentAmount,
AmountWithBreakdown = new AmountWithBreakdown
{
CurrencyCode = storeCurrency,
Value = paymentAmount,
Value = formatAmount(paymentAmount),
AmountBreakdown = new AmountBreakdown
{
ItemTotal = new Money
{
CurrencyCode = storeCurrency,
Value = paymentAmount
Value = formatAmount(paymentAmount)
},

}
Expand Down Expand Up @@ -351,7 +351,7 @@ public async Task<HttpResponse> CaptureAuthorizedOrder(string AuthorizationId,st
{
Amount = new PayPalCheckoutSdk.Payments.Money()
{
Value = value,
Value = formatAmount(value),
CurrencyCode = currencyId
},
InvoiceId = invoiceId,
Expand All @@ -375,7 +375,7 @@ public async Task<HttpResponse> CapturesRefund(string CaptureId, string amount,
{
Amount = new PayPalCheckoutSdk.Payments.Money()
{
Value = amount,
Value = formatAmount(amount),
CurrencyCode = storeCurrency
}
};
Expand Down
Loading

0 comments on commit 153e96f

Please sign in to comment.