Skip to content

Commit

Permalink
Merge pull request #530 from HotcakesCommerce/development
Browse files Browse the repository at this point in the history
Syncing branches
  • Loading branch information
WillStrohl authored Jan 20, 2025
2 parents 9e6df64 + 2bcd65d commit 5d43058
Show file tree
Hide file tree
Showing 12 changed files with 139 additions and 131 deletions.
4 changes: 2 additions & 2 deletions Build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

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

<PropertyGroup Condition=" '$(BUILD_NUMBER)' != '' ">
<!-- Build Server Number -->
<Version>03.09.00</Version>
<Version>03.09.01</Version>
<FileVersion>$(BUILD_NUMBER)</FileVersion>
<InformationalVersion>$(BUILD_NUMBER)</InformationalVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: CLSCompliant(false)]
[assembly: ComVisible(false)]

[assembly: AssemblyVersion("3.09.00")]
[assembly: AssemblyVersion("3.09.01")]
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]
Expand Down
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 © 2024. All rights reserved.")]
[assembly: System.Reflection.AssemblyCopyright("Copyright © 2025. All rights reserved.")]
[assembly: System.Reflection.AssemblyFileVersion("01.00.00")]
[assembly: System.Reflection.AssemblyVersion("03.09.00")]
[assembly: System.Reflection.AssemblyVersion("03.09.01")]



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

internal const string AssemblyConfiguration = "Release";

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

internal const string AssemblyFileVersion = "01.00.00";

internal const string AssemblyVersion = "03.09.00";
internal const string AssemblyVersion = "03.09.01";

private ThisAssembly() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
using Hotcakes.Commerce.Catalog;
using Hotcakes.Commerce.Membership;
using Hotcakes.Modules.Core.Admin.AppCode;
using Hotcakes.Commerce;

namespace Hotcakes.Modules.Core.Admin.Catalog
{
Expand Down Expand Up @@ -101,6 +102,7 @@ protected void btnSaveChanges_Click(object sender, EventArgs e)
{
if (Save())
{
CacheManager.ClearForStore(HccApp.CurrentStore.Id);
ucMessageBox.ShowOk("Changes Saved!");
}
LoadInventory();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public DateTime EndDate
{
if (RangeType == DateRangeType.Custom)
{
var date = DateTime.Parse(radStartDate.Text.Trim());
var date = DateTime.Parse(radEndDate.Text.Trim());
return date.MaxOutTime();
}
_range.RangeType = RangeType;
Expand Down Expand Up @@ -210,7 +210,7 @@ public DateTime GetEndDateUtc(HotcakesApplication hccApp)
DateTime result;
if (RangeType == DateRangeType.Custom)
{
var date = DateTime.Parse(radStartDate.Text.Trim());
var date = DateTime.Parse(radEndDate.Text.Trim());
result = date.MaxOutTime();
}
else
Expand Down
1 change: 1 addition & 0 deletions Website/DesktopModules/Hotcakes/Hotcakes.Modules.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3789,6 +3789,7 @@
</Content>
<Content Include="Providers\DataProviders\SqlDataProvider\03.06.00.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\03.09.00.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\03.09.01.SqlDataProvider" />
<None Include="web.Debug.config">
<DependentUpon>web.config</DependentUpon>
</None>
Expand Down
59 changes: 32 additions & 27 deletions Website/DesktopModules/Hotcakes/Hotcakes.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Hotcakes.Core" type="Library" version="03.09.00">
<package name="Hotcakes.Core" type="Library" version="03.09.01">
<friendlyName>Hotcakes Commerce</friendlyName>
<description><![CDATA[Hotcakes Commerce will give your company the control it needs to create and manage your e-commerce site.]]></description>
<iconFile>~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -58,7 +58,7 @@
<attributes>
<businessControllerClass>Hotcakes.Modules.Core.HotcakesController, Hotcakes.Modules</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>01.00.00,01.00.07,01.05.00,01.06.00,01.07.00,01.08.00,01.09.00,01.10.00,02.00.00,02.00.01,02.00.02,02.00.03,02.00.04,02.00.05,02.00.06,03.00.00,03.00.01,03.01.00,03.02.00,03.02.01,03.02.02,03.02.03,03.03.00,03.04.00,03.04.01,03.05.00,03.06.00,03.07.00,03.08.00,03.08.01,03.08.02,03.09.00</upgradeVersionsList>
<upgradeVersionsList>01.00.00,01.00.07,01.05.00,01.06.00,01.07.00,01.08.00,01.09.00,01.10.00,02.00.00,02.00.01,02.00.02,02.00.03,02.00.04,02.00.05,02.00.06,03.00.00,03.00.01,03.01.00,03.02.00,03.02.01,03.02.02,03.02.03,03.03.00,03.04.00,03.04.01,03.05.00,03.06.00,03.07.00,03.08.00,03.08.01,03.08.02,03.09.00,03.09.01</upgradeVersionsList>
</attributes>
</eventMessage>
</component>
Expand Down Expand Up @@ -215,10 +215,15 @@
<name>03.09.00.SqlDataProvider</name>
<version>03.09.00</version>
</script>
<script type="Install">
<path>Providers\DataProviders\SqlDataProvider</path>
<name>03.09.01.SqlDataProvider</name>
<version>03.09.01</version>
</script>
<script type="UnInstall">
<path>Providers\DataProviders\SqlDataProvider</path>
<name>Uninstall.SqlDataProvider</name>
<version>03.09.00</version>
<version>03.09.01</version>
</script>
</scripts>
</component>
Expand Down Expand Up @@ -563,7 +568,7 @@
</components>
</package>

<package name="Hotcakes.ExtensionUrlProvider" type="Library" version="03.09.00">
<package name="Hotcakes.ExtensionUrlProvider" type="Library" version="03.09.01">
<friendlyName>Hotcakes Extension Url Provider</friendlyName>
<description><![CDATA[Hotcakes Extension Url Provider allows you to get rid of 'slug' parameter name in friednly urls]]></description>
<iconFile>~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png</iconFile>
Expand All @@ -589,7 +594,7 @@
</components>
</package>

<package name="Hotcakes.AddressBook" type="Module" version="03.09.00">
<package name="Hotcakes.AddressBook" type="Module" version="03.09.01">
<friendlyName>Hotcakes Address Book</friendlyName>
<description><![CDATA[Hotcakes Commerce address book allows your customers to save addresses used for shipping.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -643,7 +648,7 @@
</components>
</package>

<package name="Hotcakes.Cart" type="Module" version="03.09.00">
<package name="Hotcakes.Cart" type="Module" version="03.09.01">
<friendlyName>Hotcakes Cart</friendlyName>
<description><![CDATA[Hotcakes Commerce cart displays products to customers for purchase.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -715,7 +720,7 @@
</components>
</package>

<package name="Hotcakes.CategoryMenu" type="Module" version="03.09.00">
<package name="Hotcakes.CategoryMenu" type="Module" version="03.09.01">
<friendlyName>Hotcakes Category Menu</friendlyName>
<description><![CDATA[Hotcakes Commerce category menu displays categories to help customers find categorized products.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -787,7 +792,7 @@
</components>
</package>

<package name="Hotcakes.CategoryViewer" type="Module" version="03.09.00">
<package name="Hotcakes.CategoryViewer" type="Module" version="03.09.01">
<friendlyName>Hotcakes Category Viewer</friendlyName>
<description><![CDATA[Hotcakes Commerce category viewer displays a listing of categories in a visual way for customers to easily drill down to products of their choice.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -861,7 +866,7 @@
</components>
</package>

<package name="Hotcakes.Checkout" type="Module" version="03.09.00">
<package name="Hotcakes.Checkout" type="Module" version="03.09.01">
<friendlyName>Hotcakes Checkout</friendlyName>
<description><![CDATA[Hotcakes Commerce checkout allows a customer to finalize their shopping experience by purchasing the items saved in their cart.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -963,7 +968,7 @@
</components>
</package>

<package name="Hotcakes.FeaturedProducts" type="Module" version="03.09.00">
<package name="Hotcakes.FeaturedProducts" type="Module" version="03.09.01">
<friendlyName>Hotcakes Featured Products</friendlyName>
<description><![CDATA[Hotcakes Commerce featured products allows you to display products to customers that have been marked as featuresd in the product catalog.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1035,7 +1040,7 @@
</components>
</package>

<package name="Hotcakes.LastProductsViewed" type="Module" version="03.09.00">
<package name="Hotcakes.LastProductsViewed" type="Module" version="03.09.01">
<friendlyName>Hotcakes Last Products Viewed</friendlyName>
<description><![CDATA[Hotcakes Commerce Last Products Viewed allows you to display the last products that a customer viewed to make it easy for them to return and purchase them.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1107,7 +1112,7 @@
</components>
</package>

<package name="Hotcakes.MiniCart" type="Module" version="03.09.00">
<package name="Hotcakes.MiniCart" type="Module" version="03.09.01">
<friendlyName>Hotcakes Mini Cart</friendlyName>
<description><![CDATA[Hotcakes Commerce Mini Cart allows you to provide a minimized cart experience, reducing the amount of things a customer sees.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1179,7 +1184,7 @@
</components>
</package>

<package name="Hotcakes.MiniCartSkinObject" type="SkinObject" version="03.09.00">
<package name="Hotcakes.MiniCartSkinObject" type="SkinObject" version="03.09.01">
<friendlyName>Hotcakes Mini Cart SPA SkinObject</friendlyName>
<description><![CDATA[Hotcakes Commerce Mini Cart allows you to provide a minimized cart experience, reducing the amount of things a customer sees.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1220,7 +1225,7 @@
</components>
</package>

<package name="Hotcakes.SearchInput" type="Module" version="03.09.00">
<package name="Hotcakes.SearchInput" type="Module" version="03.09.01">
<friendlyName>Hotcakes Search Input</friendlyName>
<description><![CDATA[Hotcakes Commerce Search Input displays a search option for customers to use to discover products in your store.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1292,7 +1297,7 @@
</components>
</package>

<package name="Hotcakes.SkinAffiliate" type="SkinObject" version="03.09.00">
<package name="Hotcakes.SkinAffiliate" type="SkinObject" version="03.09.01">
<friendlyName>HCSKINAFFILIATE SkinObject</friendlyName>
<description><![CDATA[Hotcakes Commerce Affiliate skin object allows designers to add capabilities to handle affiliate requests on each page load without adding code to the page.]]></description>
<iconFile>~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1325,7 +1330,7 @@
</components>
</package>

<package name="Hotcakes.SkinSearch" type="SkinObject" version="03.09.00">
<package name="Hotcakes.SkinSearch" type="SkinObject" version="03.09.01">
<friendlyName>HCSKINSEARCH SkinObject</friendlyName>
<description><![CDATA[Hotcakes Commerce Search skin object allows designers to insert the store's search feature into the skin.]]></description>
<iconFile>~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1358,7 +1363,7 @@
</components>
</package>

<package name="Hotcakes.OrderHistory" type="Module" version="03.09.00">
<package name="Hotcakes.OrderHistory" type="Module" version="03.09.01">
<friendlyName>Hotcakes Order History</friendlyName>
<description><![CDATA[Hotcakes Commerce Order History module provides a way for customers to review their past orders.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1430,7 +1435,7 @@
</components>
</package>

<package name="Hotcakes.ProductGrid" type="Module" version="03.09.00">
<package name="Hotcakes.ProductGrid" type="Module" version="03.09.01">
<friendlyName>Hotcakes Product Grid</friendlyName>
<description><![CDATA[Hotcakes Commerce Product Grid allows you to specify a set of products to list anywhere, in a grid layout.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1500,7 +1505,7 @@
</components>
</package>

<package name="Hotcakes.ProductViewer" type="Module" version="03.09.00">
<package name="Hotcakes.ProductViewer" type="Module" version="03.09.01">
<friendlyName>Hotcakes Product Viewer</friendlyName>
<description><![CDATA[Hotcakes Commerce Product Viewer module displays a chosen product to your customers.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1574,7 +1579,7 @@
</components>
</package>

<package name="Hotcakes.ProductReviews" type="Module" version="03.09.00">
<package name="Hotcakes.ProductReviews" type="Module" version="03.09.01">
<friendlyName>Hotcakes Product Reviews</friendlyName>
<description><![CDATA[Hotcakes Commerce Product Reviews will display related reviews for the product currently being displayed on the page.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1646,7 +1651,7 @@
</components>
</package>

<package name="Hotcakes.ContentBlocks" type="Module" version="03.09.00">
<package name="Hotcakes.ContentBlocks" type="Module" version="03.09.01">
<friendlyName>Hotcakes Content Blocks</friendlyName>
<description><![CDATA[Hotcakes Commerce Content Blocks module allows you to display content blocks you've created in the store admin.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1718,7 +1723,7 @@
</components>
</package>

<package name="Hotcakes.Search" type="Module" version="03.09.00">
<package name="Hotcakes.Search" type="Module" version="03.09.01">
<friendlyName>Hotcakes Search</friendlyName>
<description><![CDATA[Hotcakes Commerce Search Module allows you to use different settings to create a search results page for your store just the way you need it.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1790,7 +1795,7 @@
</components>
</package>

<package name="Hotcakes.TopWeeklySellers" type="Module" version="03.09.00">
<package name="Hotcakes.TopWeeklySellers" type="Module" version="03.09.01">
<friendlyName>Hotcakes Top Weekly Sellers</friendlyName>
<description><![CDATA[Hotcakes Commerce Top Weekly Sellers will display a listing of the 10 most popular products sold over the past week.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1862,7 +1867,7 @@
</components>
</package>

<package name="Hotcakes.Top10Products" type="Module" version="03.09.00">
<package name="Hotcakes.Top10Products" type="Module" version="03.09.01">
<friendlyName>Hotcakes Top 10 Products</friendlyName>
<description><![CDATA[Hotcakes Commerce Top 10 Products module will display a listing of the most popular products sold in the store in the past 10 calendar days.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1934,7 +1939,7 @@
</components>
</package>

<package name="Hotcakes.WishList" type="Module" version="03.09.00">
<package name="Hotcakes.WishList" type="Module" version="03.09.01">
<friendlyName>Hotcakes Wish List</friendlyName>
<description><![CDATA[Hotcakes Commerce Wish List module shows your customers products that have been added to their wish list for purchase later.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down Expand Up @@ -1988,7 +1993,7 @@
</components>
</package>

<package name="Hotcakes.AffiliateRegistration" type="Module" version="03.09.00">
<package name="Hotcakes.AffiliateRegistration" type="Module" version="03.09.01">
<friendlyName>Hotcakes Affiliate Registration</friendlyName>
<friendlyName>Hotcakes Wish List</friendlyName>
<description><![CDATA[Hotcakes Commerce Affiliate Registration module.]]></description>
Expand Down Expand Up @@ -2043,7 +2048,7 @@
</components>
</package>

<package name="Hotcakes.AffiliateDashboard" type="Module" version="03.09.00">
<package name="Hotcakes.AffiliateDashboard" type="Module" version="03.09.01">
<friendlyName>Hotcakes Affiliate Dashboard</friendlyName>
<description><![CDATA[Hotcakes Commerce Affiliate Dashboard.]]></description>
<iconFile>Core/Images/hcc-logo.png</iconFile>
Expand Down
4 changes: 2 additions & 2 deletions Website/DesktopModules/Hotcakes/Hotcakes_Symbols.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Hotcakes.Core_Symbols" type="Library" version="03.09.00">
<package name="Hotcakes.Core_Symbols" type="Library" version="03.09.01">
<friendlyName>Hotcakes Commerce Symbols</friendlyName>
<description><![CDATA[Debugging symbols]]></description>
<iconFile>~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png</iconFile>
Expand All @@ -15,7 +15,7 @@
<azureCompatible>true</azureCompatible>
<dependencies>
<dependency type="CoreVersion">09.08.00</dependency>
<dependency type="managedPackage" version="03.09.00">Hotcakes.Core</dependency>
<dependency type="managedPackage" version="03.09.01">Hotcakes.Core</dependency>
</dependencies>
<components>
<component type="ResourceFile">
Expand Down
Loading

0 comments on commit 5d43058

Please sign in to comment.