Merge branch 'main' into v15/cache-docs

Author: sofietoft

.github/README.md

@@ -7,6 +7,6 @@ This is the documentation project for Umbraco. The scope of this project is to p
 # Contributing [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/umbraco/UmbracoDocs/issues) [![GitHub contributors](https://img.shields.io/github/contributors/umbraco/UmbracoDocs.svg)](https://GitHub.com/umbraco/UmbracoDocsgraphs/contributors/)
 We :heart: valuable contributions from everyone who is willing to help. It does not matter to us if it's something trivial like correcting spelling mistakes, raising an issue or writing a tutorial! Every little bit of help counts and it all helps make Umbraco easier to use, for everyone.
 Otherwise, [bug reports](https://github.com/umbraco/UmbracoDocs/issues/), [bug fixes](https://github.com/umbraco/UmbracoDocs/pulls) and any feedback on Umbraco are always appreciated.
-Look at the [Contributor Guidelines](https://docs.umbraco.com/contribute/getting-started) to learn how you can get involved and help with the Umbraco Documentation.
+Look at the [Contributor Guidelines](https://docs.umbraco.com/contributing/documentation/getting-started) to learn how you can get involved and help with the Umbraco Documentation.
 ## License [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md)
 This library is released under the [MIT License](LICENSE.md).

10/umbraco-cms/legacy-documentation/README.md

@@ -8,4 +8,4 @@ This documentation platform covers only major versions of the Umbraco CMS since
 
 The documentation for Umbraco 7 and 8 lives on [our.umbraco.com](https://our.umbraco.com/documentation/).
 
-<table data-card-size="large" data-view="cards"><thead><tr><th align="center"></th><th data-hidden></th><th data-hidden></th><th data-hidden data-card-cover data-type="files"></th><th data-hidden data-card-target data-type="content-ref"></th></tr></thead><tbody><tr><td align="center"><strong>Umbraco 7 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://our.umbraco.com/documentation/">https://our.umbraco.com/documentation/</a></td></tr><tr><td align="center"><strong>Umbraco 8 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://our.umbraco.com/documentation/">https://our.umbraco.com/documentation/</a></td></tr><tr><td align="center"><strong>Umbraco 11 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://github.com/umbraco/UmbracoDocs/tree/umbraco-eol-versions">https://github.com/umbraco/UmbracoDocs/tree/umbraco-eol-versions</a></td></tr></tbody></table>
+<table data-card-size="large" data-view="cards"><thead><tr><th align="center"></th><th data-hidden></th><th data-hidden></th><th data-hidden data-card-cover data-type="files"></th><th data-hidden data-card-target data-type="content-ref"></th></tr></thead><tbody><tr><td align="center"><strong>Umbraco 7 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://our.umbraco.com/documentation/">https://our.umbraco.com/documentation/</a></td></tr><tr><td align="center"><strong>Umbraco 8 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://our.umbraco.com/documentation/">https://our.umbraco.com/documentation/</a></td></tr><tr><td align="center"><strong>Umbraco EOL Documentation</strong></td><td></td><td></td><td></td><td><a href="https://github.com/umbraco/UmbracoDocs/tree/umbraco-eol-versions">https://github.com/umbraco/UmbracoDocs/tree/umbraco-eol-versions</a></td></tr></tbody></table>

10/umbraco-commerce/installation/licensing-model.md

@@ -45,11 +45,11 @@ This is an add-on domain for existing licenses. Refunds will not be given for th
 
 ## Configuring your license
 
-You can look at the pricing, features, and purchase a license on the [Umbraco Commerce](https://umbraco.com/products/add-ons/commerce/) page. A member of the [sales team](mailto:[email protected]) will manage this process. In the process, you will need to provide all domains you wish to have covered by the license such as primary and development/staging/QA domains. You should then receive a license code to be installed in your solution.
+You can look at the pricing, features, and purchase a license on the [Umbraco Commerce](https://umbraco.com/products/add-ons/commerce/) page. A member of the sales team will manage this process. You will need to provide all domains you wish to have covered by the license such as primary and development/staging/QA domains. You should then receive a license code to be installed in your solution.
 
 ### Add additional domains
 
-If you require to add addition domains to the license, please reach out to a member of the [SUITS team](mailto:suits@umbraco.com) with your request and they will manage this process.
+If you require to add addition domains to the license, [reach out the sales team](https://umbraco.com/products/add-ons/commerce/) with your request and they will manage this process.
 
 ## Installing your license
 

10/umbraco-ui-builder/installation/licensing-model.md

@@ -45,11 +45,11 @@ This is an add-on domain for existing licenses. Refunds will not be given for th
 
 ## Configuring your license
 
-You can look at the pricing, features, and purchase a license on the [Umbraco UI Builder](https://umbraco.com/products/add-ons/ui-builder/) page. On this page, you can fill out the form with your project details and requirements. A member of the [Sales team](mailto:[email protected]) will manage this process. In the process, you will need to provide all domains you wish to have covered by the license such as primary and staging/QA domains. You should then receive a license code to be installed in your solution.
+You can look at the pricing, features, and purchase a license on the [Umbraco UI Builder](https://umbraco.com/products/add-ons/ui-builder/) page. On this page, you can fill out the form with your project details and requirements. A member of the Sales team will manage this process. In the process, you will need to provide all domains you wish to have covered by the license such as primary and staging/QA domains. You should then receive a license code to be installed in your solution.
 
 ### Add additional domains
 
-If you require to add additional domains to the license, please reach out to a member of the [Sales team](mailto:suits@umbraco.com). They will manage your request and take care of the process.
+If you require to add additional domains to the license, [reach out to the sales team](https://umbraco.com/products/add-ons/ui-builder/). They will manage your request and take care of the process.
 
 ## Installing your license
 

10/umbraco-workflow/installation/licensing.md

@@ -4,7 +4,7 @@ Umbraco Workflow is a licensed product that does not require a purchase. New ins
 
 ## Purchasing an Umbraco Workflow License
 
-You can look at the pricing, plans, and features on the [Umbraco Workflow](https://umbraco.com/products/add-ons/workflow/) page. If you want to buy an Umbraco Workflow license, reach out to the sales team at [**[email protected]**](mailto:suits@umbraco.com). Existing Plumber license holders who wish to upgrade to Umbraco Workflow should contact [**[email protected]**](mailto:suits@umbraco.com).
+You can look at the pricing, plans, and features on the [Umbraco Workflow](https://umbraco.com/products/add-ons/workflow/) page. If you want to buy an Umbraco Workflow license, use [the contact form to get in touch](https://umbraco.com/products/add-ons/workflow/). Existing Plumber license holders who wish to upgrade to Umbraco Workflow should contact us using the contact from on the [Workflow product page](https://umbraco.com/products/add-ons/workflow/).
 
 ## Installing your license
 

13/umbraco-cms/legacy-documentation/README.md

@@ -8,4 +8,4 @@ This documentation platform covers only major versions of the Umbraco CMS since
 
 The documentation for Umbraco 7 and 8 lives on [our.umbraco.com](https://our.umbraco.com/documentation/).
 
-<table data-card-size="large" data-view="cards"><thead><tr><th align="center"></th><th data-hidden></th><th data-hidden></th><th data-hidden data-card-cover data-type="files"></th><th data-hidden data-card-target data-type="content-ref"></th></tr></thead><tbody><tr><td align="center"><strong>Umbraco 7 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://our.umbraco.com/documentation/">https://our.umbraco.com/documentation/</a></td></tr><tr><td align="center"><strong>Umbraco 8 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://our.umbraco.com/documentation/">https://our.umbraco.com/documentation/</a></td></tr><tr><td align="center"><strong>Umbraco 11 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://github.com/umbraco/UmbracoDocs/tree/umbraco-eol-versions">https://github.com/umbraco/UmbracoDocs/tree/umbraco-eol-versions</a></td></tr></tbody></table>
+<table data-card-size="large" data-view="cards"><thead><tr><th align="center"></th><th data-hidden></th><th data-hidden></th><th data-hidden data-card-cover data-type="files"></th><th data-hidden data-card-target data-type="content-ref"></th></tr></thead><tbody><tr><td align="center"><strong>Umbraco 7 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://our.umbraco.com/documentation/">https://our.umbraco.com/documentation/</a></td></tr><tr><td align="center"><strong>Umbraco 8 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://our.umbraco.com/documentation/">https://our.umbraco.com/documentation/</a></td></tr><tr><td align="center"><strong>Umbraco EOL Documentation</strong></td><td></td><td></td><td></td><td><a href="https://github.com/umbraco/UmbracoDocs/tree/umbraco-eol-versions">https://github.com/umbraco/UmbracoDocs/tree/umbraco-eol-versions</a></td></tr></tbody></table>

13/umbraco-commerce/installation/the-licensing-model.md

@@ -45,11 +45,11 @@ This is an add-on domain for existing licenses. Refunds will not be given for th
 
 ## Configuring your license
 
-You can look at the pricing, features, and purchase a license on the [Umbraco Commerce](https://umbraco.com/products/add-ons/commerce/) page. A member of the [sales team](mailto:[email protected]) will manage this process. In the process, you will need to provide all domains you wish to have covered by the license such as primary and development/staging/QA domains. You should then receive a license code to be installed in your solution.
+You can look at the pricing, features, and purchase a license on the [Umbraco Commerce](https://umbraco.com/products/add-ons/commerce/) page. A member of the sales team will manage this process. You will need to provide all domains you wish to have covered by the license such as primary and development/staging/QA domains. You should then receive a license code to be installed in your solution.
 
 ### Add additional domains
 
-To add additional domains to your license, reach out to a member of the [Sales team](mailto:suits@umbraco.com) with your request and they will manage this process.
+If you require to add addition domains to the license, [reach out the sales team](https://umbraco.com/products/add-ons/commerce/) with your request and they will manage this process.
 
 ## Installing your license
 

13/umbraco-commerce/release-notes/README.md

@@ -1,11 +1,11 @@
 ---
 description: >-
-  Get an overview of the things changed and fixed in each version of Umbraco Commerce.
+  Get an overview of the changes and fixes in each version of Umbraco Commerce.
 ---
 
 # Release Notes
 
-In this section, we have summarized the changes to Umbraco Commerce released in each version. Each version is presented with a link to the [Commerce issue tracker](https://github.com/umbraco/Umbraco.Commerce.Issues/issues) showing a list of issues resolved in the release. We also link to the individual issues themselves from the detail.
+In this section, we have summarized the changes to Umbraco Commerce that were released in each version. Each version has a link to the [Commerce issue tracker](https://github.com/umbraco/Umbraco.Commerce.Issues/issues) showing a list of issues resolved in the release. We also link to the individual issues themselves from the detail.
 
 If there are any breaking changes or other issues to be aware of when upgrading they are also noted here.
 
@@ -17,6 +17,27 @@ If you are upgrading to a new major version, check the breaking changes in the [
 
 This section contains the release notes for Umbraco Commerce 13 including all changes for this version.
 
+#### [13.1.11](https://github.com/umbraco/Umbraco.Commerce.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F13.1.11) (October 25th 2024)
+
+* Fixed regressions due to updates from 13.1.6 not getting merged back into main project [#576](https://github.com/umbraco/Umbraco.Commerce.Issues/issues/576).
+* Fixed bug in group discounts provider based on the issue described in  [#574](https://github.com/umbraco/Umbraco.Commerce.Issues/issues/574).
+
+#### [13.1.10](https://github.com/umbraco/Umbraco.Commerce.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F13.1.10) (October 23rd 2024)
+
+**Important** If you are running on version 13 of Umbraco Commerce it is advised to upgrade to this version as soon as possible. Changes in .NET 8.0.8 cause an error in our `EntityCache` which have been resolved in this release. With some hosting providers automatically applying .NET patch releases, upgrading should be proritised to avoid any unintentional breakages.
+
+* Fixed regression in bug fix for [#571](https://github.com/umbraco/Umbraco.Commerce.Issues/issues/571) preventing order details being returned from search queries [#575](https://github.com/umbraco/Umbraco.Commerce.Issues/issues/575).
+
+#### [13.1.9](https://github.com/umbraco/Umbraco.Commerce.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F13.1.9) (October 23rd 2024)
+
+* Fixed regression in EntityCache updates from 13.1.7/13.1.8 failing under load [#573](https://github.com/umbraco/Umbraco.Commerce.Issues/issues/573).
+* Fixed bug in Order search API throwing ORDER BY clause exception [#571](https://github.com/umbraco/Umbraco.Commerce.Issues/issues/571).
+* Fixed bug in Country create dialog failing if Regions exist within another store instance [#568](https://github.com/umbraco/Umbraco.Commerce.Issues/issues/568).
+* Fixed Price Adjustments applied to bundle sub order line not reflected in the bundle unit price [#564](https://github.com/umbraco/Umbraco.Commerce.Issues/issues/564).
+
+#### [13.1.8](https://github.com/umbraco/Umbraco.Commerce.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F13.1.8) (October 17th 2024)
+* Belt and brace updates to EntityCache and added a logger to log if an attempt is made to set a `NULL` key [#565](https://github.com/umbraco/Umbraco.Commerce.Issues/issues/565).
+
 #### [13.1.7](https://github.com/umbraco/Umbraco.Commerce.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F13.1.7) (October 10th 2024)
 * Fixed issue where the EntityCache fail after the .NET Software Development Kit (SDK) update [#565](https://github.com/umbraco/Umbraco.Commerce.Issues/issues/565).
 * Check the config for being undefined in order's edit properties dialog.

13/umbraco-deploy/getting-started/deploy-settings.md

@@ -55,7 +55,6 @@ For illustration purposes, the following structure represents the full set of op
             "TransferDictionaryAsContent": false,
             "IgnoreMissingLanguagesForDictionaryItems": false,
             "SetEmptyDictionaryItemsOnTransfer": true,
-            "IgnoreMissingLanguagesForDictionaryItems": false,
             "AllowMembersDeploymentOperations": "None",
             "TransferMemberGroupsAsContent": false,
             "ExportMemberGroups": true,

13/umbraco-engage/.gitbook/assets/Migrate-Umbraco-Data.sql

@@ -0,0 +1,114 @@
+-- PURPOSE: Rename the "uMarketingSuite" Media Folder to Engage
+UPDATE [umbracoNode]
+SET text = 'Engage'
+WHERE nodeObjectType = 'B796F64C-1F99-4FFB-B886-4BF4BC011A9C' --Media Type
+AND Text = 'uMarketingSuite' -- We can't go more specific than this as the node ID is different for each client.
+
+-- PURPOSE: Renaming the DataTypeContainer & DataTypes to Engage
+UPDATE [umbracoNode]
+SET text = 'Engage'
+WHERE nodeObjectType = '521231E3-8B37-469C-9F9D-51AFC91FEB7B' --DataTypeContainer Type
+AND Text = 'uMarketingSuite' --In case some clients don't use uniqueId 'C883C2D6-E2FB-4AEA-8867-F0C71ACD5CAC'
+
+--We can go more specific here as the node's uniqueId is the same for all clients.
+UPDATE [umbracoNode]
+SET text = 'Engage - Node Picker'
+WHERE uniqueId = 'E5DAFA00-0393-4AE3-9734-4FF7BDEEF494'
+
+UPDATE [umbracoNode]
+SET text = 'Engage - Time Picker'
+WHERE uniqueId = '19AEDD1B-3E4B-4E1D-B3DC-D34D6AB90754'
+
+UPDATE [umbracoNode]
+SET text = 'Engage - Customer Journey Group Color Picker'
+WHERE uniqueId = '29AEDD1B-3E4B-4E1D-B3DC-D34D6AB90754'
+
+UPDATE [umbracoNode]
+SET text = 'Engage - Customer Journey Icon Picker'
+WHERE uniqueId = '29AEDD2B-4E4C-4E1D-B3DC-D34D6AB90754'
+
+UPDATE [umbracoNode]
+SET text = 'Engage - Persona Group Color Picker'
+WHERE uniqueId = '19AEDD1B-3E4B-4E1D-B3DC-C34D6AB90753'
+
+UPDATE [umbracoNode]
+SET text = 'Engage - Persona Icon Picker'
+WHERE uniqueId = '49ADDD1B-4E3C-4E2D-B3DC-D24D6AB90756'
+
+-- PURPOSE: Renaming the uMarketingSuite UserGroup to Engage
+UPDATE dbo.[umbracoUserGroup2App]
+SET app = 'engage'
+WHERE app = 'uMarketingSuite'
+
+-- PURPOSE: Check & Insert the KeyValue State's for Engage.
+DECLARE @CurrentDateTime DATETIME = GETDATE();
+
+-- Check for uMarketingSuite 2.6.1+ to Engage 13.0.0
+IF EXISTS (
+    SELECT 1
+    FROM [umbracoKeyValue]
+    WHERE [key] = 'Umbraco.Core.Upgrader.State+uMarketingSuite'
+      AND [value] = 'SetRawCustomPageviewDataPkIndexToClustered'
+)
+    BEGIN
+        -- Insert the new key-value pair
+        INSERT INTO [umbracoKeyValue] ([key], [value], [updated])
+        VALUES ('Umbraco.Core.Upgrader.State+Umbraco.Engage', 'SetupDataTypesAndSectionPermissions', @CurrentDateTime);
+    END
+ELSE
+    BEGIN
+        -- Raise an error if the condition is not met
+        RAISERROR ('Cannot upgrade from this version of uMarketingSuite to Umbraco Engage. Minimum UMS version: 2.6.1', 16, 1);
+    END;
+
+-- Check for uMarketingSuite.Commerce 2.0.0+ to Engage.Commerce 13.0.0 (Only executes if it even exists)
+IF EXISTS (
+    SELECT 1
+    FROM [umbracoKeyValue]
+    WHERE [key] = 'Umbraco.Core.Upgrader.State+uMarketingSuite.UmbracoCommerce'
+)
+    BEGIN
+        -- Key exists, now check if the value matches
+        IF NOT EXISTS (
+            SELECT 1
+            FROM [umbracoKeyValue]
+            WHERE [key] = 'Umbraco.Core.Upgrader.State+uMarketingSuite.UmbracoCommerce'
+              AND [value] = 'CreateAnalyticsUmbracoCommerceVisitorOrderTable'
+        )
+            BEGIN
+                -- Raise an error if the value does not match
+                RAISERROR ('Cannot upgrade from this state of uMarketingSuite.Commerce to Umbraco.Engage.Commerce', 16, 1);
+            END
+        ELSE
+            BEGIN
+                -- Insert the new key-value pair if the value matches
+                INSERT INTO [umbracoKeyValue] ([key], [value], [updated])
+                VALUES ('Umbraco.Core.Upgrader.State+Umbraco.Engage.UmbracoCommerce', 'CreateAnalyticsUmbracoCommerceVisitorOrderTable', @CurrentDateTime);
+            END
+    END;
+
+-- Check for uMarketingSuite.UmbracoForms 2.0.0+ to Engage.UmbracoForms 13.0.0 (Only executes if it even exists)
+IF EXISTS ( 
+    SELECT 1
+    FROM [umbracoKeyValue]
+    WHERE [key] = 'Umbraco.Core.Upgrader.State+uMarketingSuite.UmbracoForms'
+)
+    BEGIN
+        -- Key exists, now check if the value matches
+        IF NOT EXISTS (
+            SELECT 1
+            FROM [umbracoKeyValue]
+            WHERE [key] = 'Umbraco.Core.Upgrader.State+uMarketingSuite.UmbracoForms'
+              AND [value] = 'CreateAnalyticsUmbracoFormsSubmissionRecordTable'
+        )
+            BEGIN
+                -- Raise an error if the value does not match
+                RAISERROR ('Cannot upgrade from this state of uMarketingSuite.UmbracoForms to Umbraco.Engage.UmbracoForms', 16, 1);
+            END
+        ELSE
+            BEGIN
+                -- Insert the new key-value pair if the value matches
+                INSERT INTO [umbracoKeyValue] ([key], [value], [updated])
+                VALUES ('Umbraco.Core.Upgrader.State+Umbraco.Engage.UmbracoForms', 'CreateAnalyticsUmbracoFormsSubmissionRecordTable', @CurrentDateTime);
+            END
+    END;