diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index 02142c6..a22d9b0 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -241,7 +241,8 @@ jobs: if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) || (github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }} needs: 'ci' - uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.11 + # uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.11 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@VCST-2469 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' diff --git a/src/VirtoCommerce.XCatalog.Core/VirtoCommerce.XCatalog.Core.csproj b/src/VirtoCommerce.XCatalog.Core/VirtoCommerce.XCatalog.Core.csproj index 882a235..61b1e67 100644 --- a/src/VirtoCommerce.XCatalog.Core/VirtoCommerce.XCatalog.Core.csproj +++ b/src/VirtoCommerce.XCatalog.Core/VirtoCommerce.XCatalog.Core.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/VirtoCommerce.XCatalog.Data/Mapping/FacetMappingProfile.cs b/src/VirtoCommerce.XCatalog.Data/Mapping/FacetMappingProfile.cs index edeee81..c9f5ce4 100644 --- a/src/VirtoCommerce.XCatalog.Data/Mapping/FacetMappingProfile.cs +++ b/src/VirtoCommerce.XCatalog.Data/Mapping/FacetMappingProfile.cs @@ -1,4 +1,5 @@ using System; +using System.Globalization; using System.Linq; using AutoMapper; using VirtoCommerce.CatalogModule.Core.Model.Search; @@ -30,15 +31,15 @@ public FacetMappingProfile() .ToArray() ?? [], Name = request.Field }, - "pricerange" => new CoreFacets.RangeFacetResult + "range" or "pricerange" => new CoreFacets.RangeFacetResult { Ranges = request.Items?.Select(x => new CoreFacets.FacetRange { Count = x.Count, - From = Convert.ToInt64(x.RequestedLowerBound), + From = ToNullableDecimal(x.RequestedLowerBound), IncludeFrom = x.IncludeLower, FromStr = x.RequestedLowerBound, - To = Convert.ToInt64(x.RequestedUpperBound), + To = ToNullableDecimal(x.RequestedUpperBound), IncludeTo = x.IncludeUpper, ToStr = x.RequestedUpperBound, IsSelected = x.IsApplied, @@ -58,5 +59,15 @@ public FacetMappingProfile() return result; }); } + + private static decimal? ToNullableDecimal(string value) + { + if (string.IsNullOrWhiteSpace(value)) + { + return null; + } + + return Convert.ToDecimal(value, CultureInfo.InvariantCulture); + } } } diff --git a/src/VirtoCommerce.XCatalog.Web/module.manifest b/src/VirtoCommerce.XCatalog.Web/module.manifest index 4cf77ae..93a152c 100644 --- a/src/VirtoCommerce.XCatalog.Web/module.manifest +++ b/src/VirtoCommerce.XCatalog.Web/module.manifest @@ -10,7 +10,7 @@ - + Catalog Experience API