diff --git a/Build.proj b/Build.proj index ae8b35555..f92ec0f1c 100644 --- a/Build.proj +++ b/Build.proj @@ -12,14 +12,14 @@ - 03.08.00 + 03.08.01 01.00.00 01.00.00 - 03.08.00 + 03.08.01 $(BUILD_NUMBER) $(BUILD_NUMBER) diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs index 67ba8c5e7..12540af71 100644 --- a/CommonAssemblyInfo.cs +++ b/CommonAssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: CLSCompliant(false)] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("3.08.00")] +[assembly: AssemblyVersion("3.08.01")] [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")] diff --git a/Libraries/Hotcakes.PaypalWebServices/RestPaypalApi.cs b/Libraries/Hotcakes.PaypalWebServices/RestPaypalApi.cs index 076108e1e..6c88bd1f7 100644 --- a/Libraries/Hotcakes.PaypalWebServices/RestPaypalApi.cs +++ b/Libraries/Hotcakes.PaypalWebServices/RestPaypalApi.cs @@ -25,6 +25,7 @@ using System; using System.Collections.Generic; +using System.Text.RegularExpressions; using System.Threading.Tasks; using PayPalCheckoutSdk.Core; using PayPalCheckoutSdk.Orders; @@ -207,23 +208,23 @@ public async Task createOrder( AmountWithBreakdown = new AmountWithBreakdown { CurrencyCode = currencyCodeType, - Value = orderTotal, + Value = formatAmount(orderTotal), AmountBreakdown = new AmountBreakdown { ItemTotal = new Money { CurrencyCode = currencyCodeType, - Value = itemsTotal + Value = formatAmount(itemsTotal) }, Shipping = new Money { CurrencyCode = currencyCodeType, - Value = shippingTotal + Value = formatAmount(shippingTotal) }, TaxTotal = new Money { CurrencyCode = currencyCodeType, - Value = taxTotal + Value = formatAmount(taxTotal) }, } }, @@ -282,18 +283,18 @@ public async Task createOrder( AmountWithBreakdown = new AmountWithBreakdown() { CurrencyCode = currencyCodeType, - Value = orderTotal, + Value = formatAmount(orderTotal), AmountBreakdown = new AmountBreakdown() { ItemTotal = new Money { CurrencyCode = currencyCodeType, - Value = itemsTotal + Value = formatAmount(itemsTotal) }, TaxTotal = new Money { CurrencyCode = currencyCodeType, - Value = taxTotal + Value = formatAmount(taxTotal) }, } } @@ -310,6 +311,10 @@ public async Task createOrder( return response; } + private string formatAmount(string amount) + { + return string.IsNullOrEmpty(amount) ? amount : Regex.Replace(amount, "[, ]", ""); + } public async Task GetOrder(string orderId) { diff --git a/Website/DesktopModules/Hotcakes/Core/Admin/SetupWizard/App_LocalResources/Step0Dashboard.ascx.resx b/Website/DesktopModules/Hotcakes/Core/Admin/SetupWizard/App_LocalResources/Step0Dashboard.ascx.resx index a73e57846..3495072b0 100644 --- a/Website/DesktopModules/Hotcakes/Core/Admin/SetupWizard/App_LocalResources/Step0Dashboard.ascx.resx +++ b/Website/DesktopModules/Hotcakes/Core/Admin/SetupWizard/App_LocalResources/Step0Dashboard.ascx.resx @@ -1,153 +1,153 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NO - Close Window - - - YES - Create Pages - - - Skip - - - Start Configuration Wizard - - - Don't show this again - - - Would you like to install store pages now? - - - Category - - - Checkout - - - Products - - - Welcome to Hotcakes Commerce - - - Our setup wizard will guide you through setting up payment options, shipping, taxes, and business information in just four simple steps. Hotcakes Commerce offers businesses an easy to use solution that will get your online store up and running in no time. Please visit our resources section at <a target="_blank" href="https://hotcakes.org/Resources">Hotcakes.org</a> to review our documentation or ask questions regarding setup. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NO - Close Window + + + YES - Create Pages + + + Skip + + + Start Configuration Wizard + + + Don't show this again + + + Would you like to install store pages now? + + + Category + + + Checkout + + + Products + + + Welcome to Hotcakes Commerce + + + Our setup wizard will guide you through setting up payment options, shipping, taxes, and business information in just four simple steps. Hotcakes Commerce offers businesses an easy to use solution that will get your online store up and running in no time. Please visit our resources section at <a target="_blank" href="https://mmmcommerce.com/Resources">MmmCommerce.com</a> to review our documentation or ask questions regarding setup. + \ No newline at end of file diff --git a/Website/DesktopModules/Hotcakes/Hotcakes.dnn b/Website/DesktopModules/Hotcakes/Hotcakes.dnn index 016af5b06..e29cf80f1 100644 --- a/Website/DesktopModules/Hotcakes/Hotcakes.dnn +++ b/Website/DesktopModules/Hotcakes/Hotcakes.dnn @@ -1,6 +1,6 @@ - + Hotcakes Commerce ~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png @@ -28,7 +28,7 @@ 0 - + DesktopModules/Hotcakes/CategoryViewer/CategoryViewerView.ascx False @@ -58,7 +58,7 @@ Hotcakes.Modules.Core.HotcakesController, Hotcakes.Modules [DESKTOPMODULEID] - 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 + 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 @@ -213,7 +213,7 @@ @@ -558,7 +558,7 @@ - + Hotcakes Extension Url Provider ~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png @@ -584,7 +584,7 @@ - + Hotcakes Address Book Core/Images/hcc-logo.png @@ -611,7 +611,7 @@ 0 - + DesktopModules/Hotcakes/AddressBook/AddressBookView.ascx False @@ -638,7 +638,7 @@ - + Hotcakes Cart Core/Images/hcc-logo.png @@ -665,7 +665,7 @@ 0 - + DesktopModules/Hotcakes/Cart/CartView.ascx False @@ -710,7 +710,7 @@ - + Hotcakes Category Menu Core/Images/hcc-logo.png @@ -737,7 +737,7 @@ 0 - + DesktopModules/Hotcakes/CategoryMenu/CategoryMenuView.ascx False @@ -782,7 +782,7 @@ - + Hotcakes Category Viewer Core/Images/hcc-logo.png @@ -811,7 +811,7 @@ 0 - + DesktopModules/Hotcakes/CategoryViewer/CategoryViewerView.ascx False @@ -856,7 +856,7 @@ - + Hotcakes Checkout Core/Images/hcc-logo.png @@ -883,7 +883,7 @@ 0 - + DesktopModules/Hotcakes/Checkout/CheckoutView.ascx False @@ -958,7 +958,7 @@ - + Hotcakes Featured Products Core/Images/hcc-logo.png @@ -985,7 +985,7 @@ 0 - + DesktopModules/Hotcakes/FeaturedProducts/FeaturedProductsView.ascx False @@ -1030,7 +1030,7 @@ - + Hotcakes Last Products Viewed Core/Images/hcc-logo.png @@ -1057,7 +1057,7 @@ 0 - + DesktopModules/Hotcakes/LastProductsViewed/LastProductsViewed.ascx False @@ -1102,7 +1102,7 @@ - + Hotcakes Mini Cart Core/Images/hcc-logo.png @@ -1129,7 +1129,7 @@ 0 - + DesktopModules/Hotcakes/MiniCart/MiniCartView.ascx False @@ -1174,7 +1174,7 @@ - + Hotcakes Mini Cart SPA SkinObject Core/Images/hcc-logo.png @@ -1191,7 +1191,7 @@ - + DesktopModules/Hotcakes/MiniCartSkinObject/MiniCartView.ascx False @@ -1215,7 +1215,7 @@ - + Hotcakes Search Input Core/Images/hcc-logo.png @@ -1242,7 +1242,7 @@ 0 - + DesktopModules/Hotcakes/SearchInput/SearchInputView.ascx False @@ -1287,7 +1287,7 @@ - + HCSKINAFFILIATE SkinObject ~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png @@ -1320,7 +1320,7 @@ - + HCSKINSEARCH SkinObject ~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png @@ -1353,7 +1353,7 @@ - + Hotcakes Order History Core/Images/hcc-logo.png @@ -1380,7 +1380,7 @@ 0 - + DesktopModules/Hotcakes/OrderHistory/OrderHistoryView.ascx False @@ -1425,7 +1425,7 @@ - + Hotcakes Product Grid Core/Images/hcc-logo.png @@ -1452,7 +1452,7 @@ 0 - + DesktopModules/Hotcakes/ProductGrid/ProductGridView.ascx False @@ -1495,7 +1495,7 @@ - + Hotcakes Product Viewer Core/Images/hcc-logo.png @@ -1524,7 +1524,7 @@ 0 - + DesktopModules/Hotcakes/ProductViewer/ProductViewerView.ascx False @@ -1569,7 +1569,7 @@ - + Hotcakes Product Reviews Core/Images/hcc-logo.png @@ -1596,7 +1596,7 @@ 0 - + DesktopModules/Hotcakes/ProductReviews/ProductReviewsView.ascx False @@ -1641,7 +1641,7 @@ - + Hotcakes Content Blocks Core/Images/hcc-logo.png @@ -1668,7 +1668,7 @@ 0 - + DesktopModules/Hotcakes/ContentBlocks/ContentBlocksView.ascx False @@ -1713,7 +1713,7 @@ - + Hotcakes Search Core/Images/hcc-logo.png @@ -1740,7 +1740,7 @@ 0 - + DesktopModules/Hotcakes/Search/SearchView.ascx False @@ -1785,7 +1785,7 @@ - + Hotcakes Top Weekly Sellers Core/Images/hcc-logo.png @@ -1812,7 +1812,7 @@ 0 - + DesktopModules/Hotcakes/TopWeeklySellers/TopWeeklySellersView.ascx False @@ -1857,7 +1857,7 @@ - + Hotcakes Top 10 Products Core/Images/hcc-logo.png @@ -1884,7 +1884,7 @@ 0 - + DesktopModules/Hotcakes/Top10Products/Top10ProductsView.ascx False @@ -1929,7 +1929,7 @@ - + Hotcakes Wish List Core/Images/hcc-logo.png @@ -1956,7 +1956,7 @@ 0 - + DesktopModules/Hotcakes/WishList/WishListView.ascx False @@ -1983,7 +1983,7 @@ - + Hotcakes Affiliate Registration Hotcakes Wish List @@ -2011,7 +2011,7 @@ 0 - + DesktopModules/Hotcakes/AffiliateRegistration/AffiliateRegistrationView.ascx False @@ -2038,7 +2038,7 @@ - + Hotcakes Affiliate Dashboard Core/Images/hcc-logo.png @@ -2065,7 +2065,7 @@ 0 - + DesktopModules/Hotcakes/AffiliateDashboard/AffiliateDashboardView.ascx False diff --git a/Website/DesktopModules/Hotcakes/Hotcakes_Symbols.dnn b/Website/DesktopModules/Hotcakes/Hotcakes_Symbols.dnn index 03ee9b3ae..a03c41ade 100644 --- a/Website/DesktopModules/Hotcakes/Hotcakes_Symbols.dnn +++ b/Website/DesktopModules/Hotcakes/Hotcakes_Symbols.dnn @@ -1,6 +1,6 @@ - + Hotcakes Commerce Symbols ~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png @@ -15,7 +15,7 @@ true 09.08.00 - Hotcakes.Core + Hotcakes.Core diff --git a/Website/DesktopModules/Hotcakes/License.txt b/Website/DesktopModules/Hotcakes/License.txt index 5cfad9c43..a12f81e3a 100644 --- a/Website/DesktopModules/Hotcakes/License.txt +++ b/Website/DesktopModules/Hotcakes/License.txt @@ -6,9 +6,9 @@

The MIT License (MIT)

-

Copyright (c) 2013-2019 Hotcakes Commerce, LLC (https://hotcakes.org)

+

Copyright (c) 2013-2019 Hotcakes Commerce, LLC (https://mmmcommerce.com)

-

Copyright (c) 2020-2023 Upendo Ventures, LLC (https://upendoventures.com)

+

Copyright (c) 2020-2023 Upendo Ventures, LLC (https://upendoventures.com/What/CMS/DNN)

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

diff --git a/Website/DesktopModules/Hotcakes/ReleaseNotes.txt b/Website/DesktopModules/Hotcakes/ReleaseNotes.txt index 622597ab0..94dc7bde7 100644 --- a/Website/DesktopModules/Hotcakes/ReleaseNotes.txt +++ b/Website/DesktopModules/Hotcakes/ReleaseNotes.txt @@ -4,7 +4,7 @@ .muy-importante { color:red;font-weight:bold; }
-

Hotcakes Commerce: Version 03.08.00

+

Hotcakes Commerce: Version 03.08.01

The release notes continue after the Sponsors and Contributors below.

@@ -17,6 +17,7 @@
  • Dan Rice, Pure Systems
  • Matt Rutledge, Believe Kids
  • Adam Bernstein, PracticeWise
  • +
  • Jeremy Farrance, Accuraty
  • (two private sponsors)
  • @@ -24,7 +25,6 @@

    THANK YOU to the following community members for participating in this release!

    @@ -45,8 +45,7 @@

    Enhancements

      -
    • SI: New Mini Cart SPA Theme Object - You can now not only use a SPA implementation of the mini cart module, but also as a theme object. (Issue 51), Thanks @ismaelTartola
    • -
    • DNN 9.8+ Support - Hotcakes Commmerce now works against DNN 9.8 and newer. (Pull 470), Thanks @WillStrohl
    • +
    • None at this time.
    • @@ -54,9 +53,7 @@

      Maintenance Updates

        -
      • Issue 474 - SI: Product Grid doesn't allow products to be deleted (2). Thanks @ismaelTartola
      • -
      • Issue 454 - Resolved exception caused by abandoned cart email logic. Thanks @libanlsilva
      • -
      • (no issue) - Updated the source code copyright.
      • +
      • Issue 479 - SI: PayPal Payments Pro currency format bug resolved. Thanks @libanlsilva