From 47a9c80ce23e70988bb0f56dd56afe5aa267421d Mon Sep 17 00:00:00 2001 From: David Lee Date: Tue, 26 Mar 2024 13:18:20 +0100 Subject: [PATCH] v4.2.0 --- DNNpackager.dnnpack | 2 +- OpenStore.dnn | 224 ++++++++++--------- OpenStoreUpgrade.dnn | 218 +++++++++--------- Properties/AssemblyInfo.cs | 4 +- Providers/PromoProvider/PromoProvider.csproj | 1 - 5 files changed, 230 insertions(+), 219 deletions(-) diff --git a/DNNpackager.dnnpack b/DNNpackager.dnnpack index 166a89f..26620fe 100644 --- a/DNNpackager.dnnpack +++ b/DNNpackager.dnnpack @@ -1,5 +1,5 @@ - 4.1.11 + 4.2.0 \DesktopModules\NBright\NBrightBuy \bin diff --git a/OpenStore.dnn b/OpenStore.dnn index 2fa19f5..5604401 100644 --- a/OpenStore.dnn +++ b/OpenStore.dnn @@ -1,7 +1,7 @@  - + OS_ProductView OpenStore open source e-commerce for DNN. @@ -31,102 +31,108 @@ - v04.00.00.00 - - Public release - - v04.00.01.00 - - Upgrade to use v8.4.0 template system. - - Upgrade SQL to stop localization error. - - v04.00.03.00 - - Add Order CSV export - - v04.00.04.00 - - Add localized hidden product. - - Allow DDRMENU token to select parentitemid. Token can now be [CAT] or [CAT:{xxxxx}]. {xxxxx} = categoryref. - - Improve Product Admin JS - - Add Multi-checkbox select for Categories and Properties, in the Product Admin. - - Replace OS_ProductDisplay and OS_ProductDisplayAjax with OS_ProductView, to remove duplicate code. - - Improved Scheduler error. - - Rename OS_ProductAjaxFilter to OS_ProductFilter. - - WARNING IF UPGRADING: Read "Readme_Upgrade_to_4.0.4.txt" - - v04.00.05 - - Skip Payment page if only 1 payment method. - - v04.00.06 - - Allow documents to be linked a model. - - Display purchased documents on user profile. - - v04.00.07 - - Fix AJAX SEO product list. - - v04.01.00 - - Fix to Product Filter - - Fix Sort cache - - Upgrade .Net Framework to v7.4.2 - - Fix installation of OpenStoreBO.doctype.xml for CKeditor on Edge. - - Add modelid to language model XML - - Image resize in ProductUtils to use store settings value. - - Remove cache from GetByType, so it can be called by Scheduler. - - Simplify the EU tax check, to not use the Alpha chars are the tax country. - - v04.01.01 - - Add Filter ByProduct list. - - Change DNN manifesto to use full skin installation. - - v04.01.02 - - Fix for product list cache issue. - - Update EventInterface to deal with multiple event providers. - - Upgrade GetPropertyLisyByProductIds DB interface. - - v04.01.03 - - Include the "NBrightDNN.dll" and "NBrightCore.dll" (Template System) - - Lax on cookie to help with Chrome cokie issue - - Cache improvments - - UploadImage Interface - - Add SalesRole - - v04.01.04 - - Minor updates - - Option to allow shipping to calculate with discounts. - - v04.01.05 - - Minor updates - - Fix problem with cahce on product header. - - Fix duplicate plugin records. - - Convert Dev to DNNpackager. - - Bi-Directional Related Products option. - - Fix tax on not included tax prices. - - v04.01.06 - - Minor updates - - Fix problem product save being slow. - - Translation improvements NL - - DDRMenu depth fix - - Filter improvments - - remove limit on orders in NBrightBuy_DashboardStats - - v04.01.09 - - Infinite loop with incorrect category URL #241 ** - - origin/feature/236-min-purchase-qty - - origin/feature/229-return-btn - - Merge pull request #217 from openstore-ecommerce/feature/216-fix-for-changes-in-eventrovider-overwritten-by-OS - - Fix language for money format - - Merge branch 'feature/170-product-validaton' into develop - - Merge branch 'bugfix/195-product-options-as-radio' into develop - - Merge remote-tracking branch 'remotes/origin-OpenStore/bugfix/198-default-sorting' into develop - - CopyCart Fix v4.1.11 - - Minicart link fix - - Fix models status stock level checks - - add weight to the order - - v04.01.10 - - Add Categories, Properties, clients and Related products to Product copy. - - Issue: New Categories do not update. #251 - - Tidy Language display on categories in product detail. - - + v04.00.00.00 + - Public release + + v04.00.01.00 + - Upgrade to use v8.4.0 template system. + - Upgrade SQL to stop localization error. + + v04.00.03.00 + - Add Order CSV export + + v04.00.04.00 + - Add localized hidden product. + - Allow DDRMENU token to select parentitemid. Token can now be [CAT] or [CAT:{xxxxx}]. {xxxxx} = categoryref. + - Improve Product Admin JS + - Add Multi-checkbox select for Categories and Properties, in the Product Admin. + - Replace OS_ProductDisplay and OS_ProductDisplayAjax with OS_ProductView, to remove duplicate code. + - Improved Scheduler error. + - Rename OS_ProductAjaxFilter to OS_ProductFilter. + - WARNING IF UPGRADING: Read "Readme_Upgrade_to_4.0.4.txt" + + v04.00.05 + - Skip Payment page if only 1 payment method. + + v04.00.06 + - Allow documents to be linked a model. + - Display purchased documents on user profile. + + v04.00.07 + - Fix AJAX SEO product list. + + v04.01.00 + - Fix to Product Filter + - Fix Sort cache + - Upgrade .Net Framework to v7.4.2 + - Fix installation of OpenStoreBO.doctype.xml for CKeditor on Edge. + - Add modelid to language model XML + - Image resize in ProductUtils to use store settings value. + - Remove cache from GetByType, so it can be called by Scheduler. + - Simplify the EU tax check, to not use the Alpha chars are the tax country. + + v04.01.01 + - Add Filter ByProduct list. + - Change DNN manifesto to use full skin installation. + + v04.01.02 + - Fix for product list cache issue. + - Update EventInterface to deal with multiple event providers. + - Upgrade GetPropertyLisyByProductIds DB interface. + + v04.01.03 + - Include the "NBrightDNN.dll" and "NBrightCore.dll" (Template System) + - Lax on cookie to help with Chrome cokie issue + - Cache improvments + - UploadImage Interface + - Add SalesRole + + v04.01.04 + - Minor updates + - Option to allow shipping to calculate with discounts. + + v04.01.05 + - Minor updates + - Fix problem with cahce on product header. + - Fix duplicate plugin records. + - Convert Dev to DNNpackager. + - Bi-Directional Related Products option. + - Fix tax on not included tax prices. + + v04.01.06 + - Minor updates + - Fix problem product save being slow. + - Translation improvements NL + - DDRMenu depth fix + - Filter improvments + - remove limit on orders in NBrightBuy_DashboardStats + + v04.01.09 + - Infinite loop with incorrect category URL #241 ** + - origin/feature/236-min-purchase-qty + - origin/feature/229-return-btn + - Merge pull request #217 from openstore-ecommerce/feature/216-fix-for-changes-in-eventrovider-overwritten-by-OS + - Fix language for money format + - Merge branch 'feature/170-product-validaton' into develop + - Merge branch 'bugfix/195-product-options-as-radio' into develop + - Merge remote-tracking branch 'remotes/origin-OpenStore/bugfix/198-default-sorting' into develop + - CopyCart Fix + - Minicart link fix + - Fix models status stock level checks + - add weight to the order + + v04.01.10 + - Add Categories, Properties, clients and Related products to Product copy. + - Issue: New Categories do not update. #251 + - Tidy Language display on categories in product detail. + + v04.02.00 + - cf660b1 - Use an integer for stock adjusted cart quantities + - fecdf75 - Add max purchase qty support + - af1987b - Fix first render search query + - 0432151 - fix invalid SQL for static list + + 08.00.04 @@ -258,7 +264,7 @@ - + OpenStoreBO OpenStore Admin Panel @@ -304,7 +310,7 @@ - + OS_DisplaySearch OpenStore open source e-commerce for DNN. @@ -385,7 +391,7 @@ - + OS_AddressAdmin OpenStore open source e-commerce for DNN. Admin for clients addresses from the front office. @@ -460,7 +466,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_Payment OpenStore open source e-commerce for DNN. Process payment of orders. @@ -534,7 +540,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_OrderAdmin OpenStore open source e-commerce for DNN. @@ -610,7 +616,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_ProfileForm OpenStore open source e-commerce for DNN. This module creates a profile form that links to the DNN profile and NBS address. @@ -686,7 +692,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_Checkout OpenStore open source e-commerce for DNN. Checkout process. @@ -760,7 +766,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_MiniCart OpenStore open source e-commerce for DNN. Mini cart view. @@ -834,7 +840,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_FullCart OpenStore open source e-commerce for DNN. full cart view. @@ -908,7 +914,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_CategoryMenu CategoryMenu Display @@ -980,7 +986,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_ProductFilter Filter module for Ajax Product Display @@ -1053,7 +1059,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_ItemList Itemlist admin for shopping/favorites list diff --git a/OpenStoreUpgrade.dnn b/OpenStoreUpgrade.dnn index c44a3e3..a8f3289 100644 --- a/OpenStoreUpgrade.dnn +++ b/OpenStoreUpgrade.dnn @@ -1,7 +1,7 @@  - + OS_ProductView OpenStore open source e-commerce for DNN. @@ -31,100 +31,106 @@ - v04.00.00.00 - - Public release - - v04.00.01.00 - - Upgrade to use v8.4.0 template system. - - Upgrade SQL to stop localization error. - - v04.00.03.00 - - Add Order CSV export - - v04.00.04.00 - - Add localized hidden product. - - Allow DDRMENU token to select parentitemid. Token can now be [CAT] or [CAT:{xxxxx}]. {xxxxx} = categoryref. - - Improve Product Admin JS - - Add Multi-checkbox select for Categories and Properties, in the Product Admin. - - Replace OS_ProductDisplay and OS_ProductDisplayAjax with OS_ProductView, to remove duplicate code. - - Improved Scheduler error. - - Rename OS_ProductAjaxFilter to OS_ProductFilter. - - WARNING IF UPGRADING: Read "Readme_Upgrade_to_4.0.4.txt" - - v04.00.05 - - Skip Payment page if only 1 payment method. - - v04.00.06 - - Allow documents to be linked a model. - - Display purchased documents on user profile. - - v04.00.07 - - Fix AJAX SEO product list. - - v04.01.00 - - Fix to Product Filter - - Fix Sort cache - - Upgrade .Net Framework to v7.4.2 - - Fix installation of OpenStoreBO.doctype.xml for CKeditor on Edge. - - Add modelid to language model XML - - Image resize in ProductUtils to use store settings value. - - Remove cache from GetByType, so it can be called by Scheduler. - - Simplify the EU tax check, to not use the Alpha chars are the tax country. - - v04.01.01 - - Add Filter ByProduct list. - - Change DNN manifesto to use full skin installation. - - v04.01.02 - - Fix for product list cache issue. - - Update EventInterface to deal with multiple event providers. - - Upgrade GetPropertyLisyByProductIds DB interface. - - v04.01.03 - - Include the "NBrightDNN.dll" and "NBrightCore.dll" (Template System) - - Lax on cookie to help with Chrome cokie issue - - Cache improvments - - UploadImage Interface - - Add SalesRole - - v04.01.04 - - Minor updates - - Option to allow shipping to calculate with discounts. - - v04.01.05 - - Minor updates - - Fix problem with cahce on product header. - - Fix duplicate plugin records. - - Convert Dev to DNNpackager. - - v04.01.06 - - Minor updates - - Fix problem product save being slow. - - Translation improvements NL - - DDRMenu depth fix - - Filter improvments - - remove limit on orders in NBrightBuy_DashboardStats - - v04.01.09 - - Infinite loop with incorrect category URL #241 ** - - origin/feature/236-min-purchase-qty - - origin/feature/229-return-btn - - Merge pull request #217 from openstore-ecommerce/feature/216-fix-for-changes-in-eventrovider-overwritten-by-OS - - Fix language for money format - - Merge branch 'feature/170-product-validaton' into develop - - Merge branch 'bugfix/195-product-options-as-radio' into develop - - Merge remote-tracking branch 'remotes/origin-OpenStore/bugfix/198-default-sorting' into develop - - CopyCart Fix v4.1.11 - - Minicart link fix - - Fix models status stock level checks - - add weight to the order - - v04.01.10 - - Add Categories, Properties, clients and Related products to Product copy. - - Issue: New Categories do not update. #251 - - Tidy Language display on categories in product detail. - - + v04.00.00.00 + - Public release + + v04.00.01.00 + - Upgrade to use v8.4.0 template system. + - Upgrade SQL to stop localization error. + + v04.00.03.00 + - Add Order CSV export + + v04.00.04.00 + - Add localized hidden product. + - Allow DDRMENU token to select parentitemid. Token can now be [CAT] or [CAT:{xxxxx}]. {xxxxx} = categoryref. + - Improve Product Admin JS + - Add Multi-checkbox select for Categories and Properties, in the Product Admin. + - Replace OS_ProductDisplay and OS_ProductDisplayAjax with OS_ProductView, to remove duplicate code. + - Improved Scheduler error. + - Rename OS_ProductAjaxFilter to OS_ProductFilter. + - WARNING IF UPGRADING: Read "Readme_Upgrade_to_4.0.4.txt" + + v04.00.05 + - Skip Payment page if only 1 payment method. + + v04.00.06 + - Allow documents to be linked a model. + - Display purchased documents on user profile. + + v04.00.07 + - Fix AJAX SEO product list. + + v04.01.00 + - Fix to Product Filter + - Fix Sort cache + - Upgrade .Net Framework to v7.4.2 + - Fix installation of OpenStoreBO.doctype.xml for CKeditor on Edge. + - Add modelid to language model XML + - Image resize in ProductUtils to use store settings value. + - Remove cache from GetByType, so it can be called by Scheduler. + - Simplify the EU tax check, to not use the Alpha chars are the tax country. + + v04.01.01 + - Add Filter ByProduct list. + - Change DNN manifesto to use full skin installation. + + v04.01.02 + - Fix for product list cache issue. + - Update EventInterface to deal with multiple event providers. + - Upgrade GetPropertyLisyByProductIds DB interface. + + v04.01.03 + - Include the "NBrightDNN.dll" and "NBrightCore.dll" (Template System) + - Lax on cookie to help with Chrome cokie issue + - Cache improvments + - UploadImage Interface + - Add SalesRole + + v04.01.04 + - Minor updates + - Option to allow shipping to calculate with discounts. + + v04.01.05 + - Minor updates + - Fix problem with cahce on product header. + - Fix duplicate plugin records. + - Convert Dev to DNNpackager. + + v04.01.06 + - Minor updates + - Fix problem product save being slow. + - Translation improvements NL + - DDRMenu depth fix + - Filter improvments + - remove limit on orders in NBrightBuy_DashboardStats + + v04.01.09 + - Infinite loop with incorrect category URL #241 ** + - origin/feature/236-min-purchase-qty + - origin/feature/229-return-btn + - Merge pull request #217 from openstore-ecommerce/feature/216-fix-for-changes-in-eventrovider-overwritten-by-OS + - Fix language for money format + - Merge branch 'feature/170-product-validaton' into develop + - Merge branch 'bugfix/195-product-options-as-radio' into develop + - Merge remote-tracking branch 'remotes/origin-OpenStore/bugfix/198-default-sorting' into develop + - CopyCart Fix + - Minicart link fix + - Fix models status stock level checks + - add weight to the order + + v04.01.10 + - Add Categories, Properties, clients and Related products to Product copy. + - Issue: New Categories do not update. #251 + - Tidy Language display on categories in product detail. + + v04.02.00 + - cf660b1 - Use an integer for stock adjusted cart quantities + - fecdf75 - Add max purchase qty support + - af1987b - Fix first render search query + - 0432151 - fix invalid SQL for static list + + 08.00.04 @@ -255,7 +261,7 @@ - + OS_DisplaySearch OpenStore open source e-commerce for DNN. @@ -336,7 +342,7 @@ - + OS_AddressAdmin OpenStore open source e-commerce for DNN. Admin for clients addresses from the front office. @@ -411,7 +417,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_Payment OpenStore open source e-commerce for DNN. Process payment of orders. @@ -485,7 +491,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_OrderAdmin OpenStore open source e-commerce for DNN. @@ -561,7 +567,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_ProfileForm OpenStore open source e-commerce for DNN. This module creates a profile form that links to the DNN profile and NBS address. @@ -637,7 +643,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_Checkout OpenStore open source e-commerce for DNN. Checkout process. @@ -711,7 +717,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_MiniCart OpenStore open source e-commerce for DNN. Mini cart view. @@ -785,7 +791,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_FullCart OpenStore open source e-commerce for DNN. full cart view. @@ -859,7 +865,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_CategoryMenu CategoryMenu Display @@ -931,7 +937,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_ProductFilter Filter module for Ajax Product Display @@ -1004,7 +1010,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - + OS_ItemList Itemlist admin for shopping/favorites list diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 69ba15c..85e89a9 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.1.11.0")] -[assembly: AssemblyFileVersion("4.1.11.0")] +[assembly: AssemblyVersion("4.2.0.0")] +[assembly: AssemblyFileVersion("4.2.0.0")] diff --git a/Providers/PromoProvider/PromoProvider.csproj b/Providers/PromoProvider/PromoProvider.csproj index 9901562..7dda760 100644 --- a/Providers/PromoProvider/PromoProvider.csproj +++ b/Providers/PromoProvider/PromoProvider.csproj @@ -89,7 +89,6 @@ DiscountCodes.ascx - ASPXCodeBehind DiscountCodes.ascx.cs