Merge branch 'release/3.807.0'

.github/workflows/module-ci.yml

@@ -1,5 +1,5 @@
-# v3.800.9
-# https://virtocommerce.atlassian.net/browse/VCST-1260
+# v3.800.10
+# https://virtocommerce.atlassian.net/browse/VCST-1738
 name: Module CI
 
 on:
@@ -239,9 +239,9 @@ jobs:
 
   module-katalon-tests:
     if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
-        (github.event_name == 'workflow_dispatch')}}
+        (github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }}
     needs: 'ci'
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10
 
     with:
       katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
@@ -260,7 +260,7 @@ jobs:
   deploy-cloud:
     if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
     needs: ci
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10
     with:
       releaseSource: module
       moduleId: ${{ needs.ci.outputs.moduleId }}

.github/workflows/module-release-hotfix.yml

@@ -1,5 +1,5 @@
-# v3.800.9
-# https://virtocommerce.atlassian.net/browse/VCST-1260
+# v3.800.10
+# https://virtocommerce.atlassian.net/browse/VCST-1738
 name: Release hotfix
 
 on:
@@ -13,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9    
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10    
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -46,7 +46,7 @@ jobs:
   publish-github-release:
     needs:
       [build, test, get-metadata]
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       changeLog: '${{ needs.get-metadata.outputs.changeLog }}'

.github/workflows/publish-nugets.yml

@@ -1,5 +1,5 @@
-# v3.800.9
-# https://virtocommerce.atlassian.net/browse/VCST-1260
+# v3.800.10
+# https://virtocommerce.atlassian.net/browse/VCST-1738
 name: Publish nuget
 
 on:
@@ -13,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9    
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10    
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9    
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10    
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -29,7 +29,7 @@ jobs:
   publish-nuget:
     needs:
       [build, test]
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9    
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10    
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       forceGithub: false

.github/workflows/release.yml

@@ -1,12 +1,12 @@
-# v3.800.9
-# https://virtocommerce.atlassian.net/browse/VCST-1260
+# v3.800.10
+# https://virtocommerce.atlassian.net/browse/VCST-1738
 name: Release
 
 on:
   workflow_dispatch:
 
 jobs:
   release:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9    
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10    
     secrets:
       envPAT: ${{ secrets.REPO_TOKEN }}

Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.806.0</VersionPrefix>
+    <VersionPrefix>3.807.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

src/VirtoCommerce.InventoryModule.Web/Localizations/de.VirtoCommerce.Inventory.json

@@ -2,39 +2,124 @@
   "inventory": {
     "blades": {
       "inventory-detail": {
+        "subtitle": "Bestand bearbeiten",
         "labels": {
           "in-stock": "Auf Lager",
           "reserved": "Reserviert",
-          "reorder-min-quantity": "Mindestbestellmenge.",
-          "allow-preorder": "Vorbestellung zulassen",
-          "reorder-quantity": "Menge vorbestellen.",
-          "preorder-availability-date": "Vorbestellung möglich ab Datum",
-          "allow-backorder": "Rückstand zulassen",
-          "backorder-quantity": "Rückstand Anz.",
-          "backorder-availability-date": "Rückstand Verfügbarkeitsdatum"
+          "reorder-min-quantity": "Mindestmenge nachbestellen",
+          "allow-preorder": "Vorbestellung erlauben",
+          "reorder-quantity": "Vorbestellmenge",
+          "preorder-availability-date": "Verfügbarkeitsdatum für Vorbestellungen",
+          "allow-backorder": "Rückbestellung erlauben",
+          "backorder-quantity": "Rückbestellmenge",
+          "backorder-availability-date": "Verfügbarkeitsdatum für Rückbestellungen"
         }
       },
       "inventory-fulfillmentcenters-list": {
         "labels": {
-          "no-fulfillment-centers": "Keine Erfüllungszentren verfügbar"
+          "no-fulfillment-centers": "Keine Erfüllungszentren verfügbar",
+          "fulfillment-center-name": "Erfüllungszentrum",
+          "in-stock-quantity": "Menge auf Lager"
+        }
+      },
+      "fulfillment-center-detail": {
+        "subtitle": "Erfüllungszentrum bearbeiten",
+        "labels": {
+          "name": "Name",
+          "description": "Beschreibung",
+          "short-description": "Kurze Beschreibung",
+          "max-releases": "Maximale Anzahl von Freigaben in der ausgewählten Charge",
+          "pick-delay": "Paketverzögerung"
+        },
+        "placeholders": {
+          "name": "Namen des Erfüllungszentrums angeben",
+          "description": "Beschreibung des Erfüllungszentrums angeben"
+        },
+        "description": {
+          "name": "Name des Erfüllungszentrums",
+          "description": "Beschreibung des Erfüllungszentrums",
+          "short-description": "Kurze Beschreibung des Erfüllungszentrums"
         }
       }
     },
     "dialogs": {
       "inventory-delete": {
-        "title": "Bestätigung löschen",
-        "message": "Möchten Sie dieses Angebot wirklich löschen?"
+        "title": "Löschen bestätigen",
+        "message": "Sind Sie sicher, dass Sie dieses Angebot löschen möchten?"
       },
       "inventory-save": {
         "title": "Änderungen speichern",
-        "message": "Inventar wurde geändert. Möchten Sie die Änderungen speichern?"
+        "message": "Der Bestand wurde geändert. Möchten Sie die Änderungen speichern?"
+      },
+      "fulfillment-delete": {
+        "title": "Löschen bestätigen",
+        "message": "Sind Sie sicher, dass Sie dieses Erfüllungszentrum löschen möchten?"
       }
     },
     "widgets": {
       "inventoryWidget": {
-        "title": "Lager",
-        "blade-subtitle": "Wählen Sie das Erfüllungszentrum aus, um das Inventar zu bearbeiten"
+        "title": "Bestand",
+        "blade-subtitle": "Wählen Sie ein Erfüllungszentrum für die Bestandsverwaltung"
+      },
+      "fulfillmentWidget": {
+        "title": "Erfüllungszentren",
+        "address-detail": {
+          "subtitle": "Adresse bearbeiten",
+          "no-address": "Keine Adresse",
+          "region": "Bundesland/Provinz",
+          "city": "Stadt",
+          "address1": "Adresszeile 1",
+          "zip-code": "Postleitzahl",
+          "email": "E-Mail",
+          "phone": "Telefon"
+        }
       }
+    },
+    "properties": {
+      "geoPoint": {
+        "title": "Standort",
+        "placeholder": "Geben Sie Breiten- und Längengrad ein",
+        "description": "Verwenden Sie das folgende Format: Breitengrad,Längengrad, z.B. 41.40338,2.17403, ohne Leerzeichen nach dem Komma"
+      },
+      "outerId": {
+        "title": "Äußere ID",
+        "placeholder": "Geben Sie die ID in einem externen System ein",
+        "description": "Eindeutige ID zur Verbindung des Erfüllungszentrums mit einem externen System"
+      }
+    }
+  },
+  "permissions": {
+    "inventory:read": "Bestandsdaten lesen",
+    "inventory:create": "Bestandsdaten erstellen",
+    "inventory:update": "Bestandsdaten aktualisieren",
+    "inventory:delete": "Bestandsdaten löschen",
+    "inventory:access": "Bestandsdaten erstellen",
+    "inventory:fulfillment:edit": "Erfüllungszentren verwalten",
+    "inventory:fulfillment:delete": "Erfüllungszentren löschen"
+  },
+  "settings": {
+    "Inventory": {
+      "ExportImport.PageSize": {
+        "description": "Hohe Werte können zu langsamer Leistung führen",
+        "title": "Seitengröße für Export/Import"
+      },
+      "LogInventoryChanges": {
+        "title": "Bestandsänderungen protokollieren",
+        "description": "Protokollieren Sie Änderungen des Produktbestands im Plattformbetriebsprotokoll. Dies kann die Datenbankgröße beeinflussen, wenn der Produktbestand häufig geändert wird"
+      },
+      "Search": {
+        "EventBasedIndexation": {
+          "Enable": {
+            "title": "Ereignisbasierte Indizierung für Bestandsentitäten aktivieren",
+            "description": "Jede Änderung an einer Bestandsentität löst eine Hintergrundaufgabe aus, die diese Änderungen auf den Suchindex anwendet"
+          }
+        }
+      }
+    }
+  },
+  "module": {
+    "VirtoCommerce.Inventory": {
+      "description": "Bestandsdaten exportieren oder importieren"
     }
   }
 }

src/VirtoCommerce.InventoryModule.Web/Localizations/en.VirtoCommerce.Inventory.json

@@ -2,7 +2,7 @@
   "inventory": {
     "blades": {
       "inventory-detail": {
-        "subtitle": "Edit Inventory",
+        "subtitle": "Edit inventory",
         "labels": {
           "in-stock": "In stock",
           "reserved": "Reserved",
@@ -32,8 +32,8 @@
           "pick-delay": "Package delay"
         },
         "placeholders": {
-          "name": "Please provide fulfillment center name",
-          "description": "Please provide fulfillment center description"
+          "name": "Provide fulfillment center name",
+          "description": "Provide fulfillment center description"
         },
         "description": {
           "name": "Fulfillment center name",
@@ -44,22 +44,22 @@
     },
     "dialogs": {
       "inventory-delete": {
-        "title": "Confirm Delete",
+        "title": "Confirm delete",
         "message": "Are you sure you want to delete this quote?"
       },
       "inventory-save": {
-        "title": "Save Changes",
+        "title": "Save changes",
         "message": "The inventory has been modified. Do you want to save changes?"
       },
       "fulfillment-delete": {
-        "title": "Confirm Delete",
+        "title": "Confirm delete",
         "message": "Are you sure you want to delete this fulfillment center?"
       }
     },
     "widgets": {
       "inventoryWidget": {
         "title": "Inventory",
-        "blade-subtitle": "Select a fulfillment center to edit the inventory in"
+        "blade-subtitle": "Select a fulfillment center for inventory management"
       },
       "fulfillmentWidget": {
         "title": "Fulfillment centers",
@@ -78,13 +78,13 @@
     "properties": {
       "geoPoint": {
         "title": "Location",
-        "placeholder": "Please enter latitude and longitude",
-        "description": "Please use the following format: lat,long, e.g. 41.40338,2.17403, with no space after the comma separator."
+        "placeholder": "Enter latitude and longitude",
+        "description": "Use the following format: lat,long, e.g. 41.40338,2.17403, with no space after the comma separator"
       },
       "outerId": {
         "title": "Outer ID",
-        "placeholder": "Please enter ID in an outer system",
-        "description": "Unique ID for connecting the fulfillment center with an outer system."
+        "placeholder": "Enter ID in an outer system",
+        "description": "Unique ID to connect fulfillment center to external system"
       }
     }
   },
@@ -93,25 +93,25 @@
     "inventory:create": "Create inventory data",
     "inventory:update": "Update inventory data",
     "inventory:delete": "Delete inventory data",
-    "inventory:access": "Create inventory data",
+    "inventory:access": "Access inventory data",
     "inventory:fulfillment:edit": "Manage fulfillment centers",
     "inventory:fulfillment:delete": "Delete fulfillment centers"
   },
   "settings": {
     "Inventory": {
       "ExportImport.PageSize": {
         "description": "Providing high values may lead to slow performance",
-        "title": "Page size being used for Export / Import"
+        "title": "Page size being used for export / import"
       },
       "LogInventoryChanges": {
         "title": "Log inventory changes",
-        "description": "Log product stock changes into the platform operation log. This might impact database size in case the product stock gets changed often."
+        "description": "Log product stock changes into the platform operation log. This may affect the database size if the product stock is changed often"
       },
       "Search": {
         "EventBasedIndexation": {
           "Enable": {
             "title": "Enable event-based indexing for inventory entities",
-            "description": "Any change to an inventory entity will trigger a background task that will apply these changes to the search index."
+            "description": "Any change to an inventory entity triggers a background task that applies these changes to the search index"
           }
         }
       }