Merge branch 'release/3.208.0'

VirtoCommerce · Jul 20, 2022 · 2a07cfc · 2a07cfc
2 parents 1b146e8 + 073555f
commit 2a07cfc
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.207.0</VersionPrefix>
+    <VersionPrefix>3.208.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/en.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/en.VirtoCommerce.Pricing.json
@@ -205,7 +205,8 @@
     },
     "commands": {
       "add-selected": "Add selected",
-      "delete-all-filtered": "Delete all filtered"
+      "delete-all": "Delete all",
+      "delete-filtered": "Delete filtered"
     },
     "selectors": {
       "titles": {

diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.js b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.js
@@ -34,6 +34,9 @@ angular.module('virtoCommerce.pricingModule')
                         blade.currentEntities = priceAssignments;
                     });
                 });
+                blade.toolbarCommands[3].name = (filter.current || filter.keyword)
+                    ? "pricing.commands.delete-filtered"
+                    : "pricing.commands.delete-all";
             };
 
             $scope.selectNode = function (node, isNew) {
@@ -147,7 +150,7 @@ angular.module('virtoCommerce.pricingModule')
                     permission: 'pricing:delete'
                 },
                 {
-                    name: "pricing.commands.delete-all-filtered",
+                    name: "pricing.commands.delete-all",
                     icon: 'fas fa-trash-alt',
                     executeMethod: function () {
                         $scope.deleteAllFiltered();

diff --git a/src/VirtoCommerce.PricingModule.Web/module.manifest b/src/VirtoCommerce.PricingModule.Web/module.manifest
@@ -1 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?><module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><id>VirtoCommerce.Pricing</id><version>3.207.0</version><version-tag /><platformVersion>3.200.0</platformVersion><title>Pricing module</title><description>Robust pricing management functionality based on price list and dynamic evaluation</description><authors><author>Eugeney Tatarincev</author></authors><owners><owner>Virto Commerce</owner></owners><projectUrl>https://virtocommerce.com/apps/extensions/virto-pricing-module</projectUrl><iconUrl>Modules/$(VirtoCommerce.Pricing)/Content/logo.png</iconUrl><requireLicenseAcceptance>false</requireLicenseAcceptance><copyright>Copyright © 2011-2021 Virto Commerce. All rights reserved</copyright><tags>price pricelist merchandise</tags><assemblyFile>VirtoCommerce.PricingModule.Web.dll</assemblyFile><moduleType>VirtoCommerce.PricingModule.Web.Module, VirtoCommerce.PricingModule.Web</moduleType><dependencies><dependency id="VirtoCommerce.Core" version="3.200.0" /><dependency id="VirtoCommerce.Catalog" version="3.200.0" /><dependency id="VirtoCommerce.Export" version="3.200.0" /><dependency id="VirtoCommerce.Search" version="3.202.0" /><dependency id="VirtoCommerce.Assets" version="3.200.0" /></dependencies><groups><group>commerce</group></groups><useFullTypeNameInSwagger>false</useFullTypeNameInSwagger></module>
+<?xml version="1.0" encoding="utf-8"?>
+<module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <id>VirtoCommerce.Pricing</id>
+  <version>3.208.0</version>
+  <version-tag />
+  <platformVersion>3.200.0</platformVersion>
+  <title>Pricing module</title>
+  <description>Robust pricing management functionality based on price list and dynamic evaluation</description>
+  <authors>
+    <author>Eugeney Tatarincev</author>
+  </authors>
+  <owners>
+    <owner>Virto Commerce</owner>
+  </owners>
+  <projectUrl>https://virtocommerce.com/apps/extensions/virto-pricing-module</projectUrl>
+  <iconUrl>Modules/$(VirtoCommerce.Pricing)/Content/logo.png</iconUrl>
+  <requireLicenseAcceptance>false</requireLicenseAcceptance>
+  <copyright>Copyright © 2011-2021 Virto Commerce. All rights reserved</copyright>
+  <tags>price pricelist merchandise</tags>
+  <assemblyFile>VirtoCommerce.PricingModule.Web.dll</assemblyFile>
+  <moduleType>VirtoCommerce.PricingModule.Web.Module, VirtoCommerce.PricingModule.Web</moduleType>
+  <dependencies>
+    <dependency id="VirtoCommerce.Core" version="3.200.0" />
+    <dependency id="VirtoCommerce.Catalog" version="3.200.0" />
+    <dependency id="VirtoCommerce.Export" version="3.200.0" />
+    <dependency id="VirtoCommerce.Search" version="3.202.0" />
+    <dependency id="VirtoCommerce.Assets" version="3.200.0" />
+  </dependencies>
+  <groups>
+    <group>commerce</group>
+  </groups>
+  <useFullTypeNameInSwagger>false</useFullTypeNameInSwagger>
+</module>