Merge branch 'main' into next-32619/write-document-for-order-approval

shopware · Jan 17, 2024 · da2b194 · da2b194
2 parents d55c189 + f0a8224
commit da2b194
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/concepts/commerce/checkout-concept/payments.md b/concepts/commerce/checkout-concept/payments.md
@@ -82,7 +82,7 @@ The actual implementation of payment integrations differs between providers. The
 
 ### Session and state
 
-The session should not be used in headless payment integrations. Read more about Session usage [here](../../../resources/guidelines/code/session-and-state)
+The session should not be used in headless payment integrations. Read more about [session guidelines](../../../resources/guidelines/code/session-and-state).
 
 ### Controllers and API
 

diff --git a/guides/plugins/apps/shipping-methods.md b/guides/plugins/apps/shipping-methods.md
@@ -135,6 +135,7 @@ The functionality offers more than one identifier name. The following examples r
             <name>First shipping method</name>
             <name lang="de-DE">Erste Versandmethode</name>
             <delivery-time>
+                <!-- Remember to remove the dashes from generated UUID -->
                 <id>c8864e36a4d84bd4a16cc31b5953431b</id>
                 <name>From 2 to 4 days</name>
                 <min>2</min>

diff --git a/guides/plugins/plugins/plugin-fundamentals/add-plugin-configuration.md b/guides/plugins/plugins/plugin-fundamentals/add-plugin-configuration.md
@@ -36,9 +36,7 @@ All you need to do is creating a `config.xml` file inside of a `Resources/config
 
 ## Fill your plugin configuration with settings
 
-As we now know how to create your configuration, we can start to fill it with life
-
-* or options to configure, in this case.
+As you now know how to create configurations, you can start to fill it with life using various configuration options.
 
 ### Cards in your configuration
 

diff --git a/products/extensions/b2b-components/employee-management/guides/index.md b/products/extensions/b2b-components/employee-management/guides/index.md
@@ -22,10 +22,10 @@ A permission can be dependent on another permission, without which this permissi
 ### Shopware base permissions
 The following permissions are already included and used in the B2B Employee Management component. More "base" permissions will be duly added with future B2B Components.
 
-|Group|Permission|Dependencies|
-|---|---|---|---|
-|employee|employee.read| |
-|employee |employee.edit|employee.read|
-|employee |employee.create|employee.read, employee.edit|
-|employee |employee.delete|employee.read, employee.edit |
-|order|order.read.all|
+| Group | Permission | Dependencies  |
+|---------|----------|-----------|
+| employee | employee.read | |
+| employee | employee.edit | employee.read |
+| employee | employee.create | employee.read, employee.edit |
+| employee | employee.delete | employee.read, employee.edit |
+| order | order.read.all | |