From 902a5c13d3fb3034d5290d0fcc725a94c20e4ab3 Mon Sep 17 00:00:00 2001 From: Basil Kotov Date: Thu, 5 Dec 2024 17:09:52 +0000 Subject: [PATCH] VCST-2401: use ui-scrol-drop-down on csv export blade (#109) --- ...toCommerce.CatalogCsvImportModule.Data.csproj | 6 ++++++ .../Scripts/blades/export/catalog-CSV-export.js | 12 +++--------- .../blades/export/catalog-CSV-export.tpl.html | 16 +++++++--------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/VirtoCommerce.CatalogCsvImportModule.Data/VirtoCommerce.CatalogCsvImportModule.Data.csproj b/src/VirtoCommerce.CatalogCsvImportModule.Data/VirtoCommerce.CatalogCsvImportModule.Data.csproj index 60a92ae..7339a69 100644 --- a/src/VirtoCommerce.CatalogCsvImportModule.Data/VirtoCommerce.CatalogCsvImportModule.Data.csproj +++ b/src/VirtoCommerce.CatalogCsvImportModule.Data/VirtoCommerce.CatalogCsvImportModule.Data.csproj @@ -24,4 +24,10 @@ + + + + + + \ No newline at end of file diff --git a/src/VirtoCommerce.CatalogCsvImportModule.Web/Scripts/blades/export/catalog-CSV-export.js b/src/VirtoCommerce.CatalogCsvImportModule.Web/Scripts/blades/export/catalog-CSV-export.js index c3e9f07..880cb6f 100644 --- a/src/VirtoCommerce.CatalogCsvImportModule.Web/Scripts/blades/export/catalog-CSV-export.js +++ b/src/VirtoCommerce.CatalogCsvImportModule.Web/Scripts/blades/export/catalog-CSV-export.js @@ -62,15 +62,9 @@ angular.module('virtoCommerce.catalogCsvImportModule') $scope.formScope = form; }; - pricelists.search({ take: 1000 }, function (result) { - $scope.pricelists = _.filter(result.results, - function (x) { - return _.some(x.assignments, - function (y) { - return y.catalogId === blade.catalog.id - }) - }); - }); + $scope.blade.fetchPricelists = function (criteria) { + return pricelists.search(criteria); + } $scope.blade.headIcon = 'fa fa-file-archive-o'; diff --git a/src/VirtoCommerce.CatalogCsvImportModule.Web/Scripts/blades/export/catalog-CSV-export.tpl.html b/src/VirtoCommerce.CatalogCsvImportModule.Web/Scripts/blades/export/catalog-CSV-export.tpl.html index c7c0190..5089fc5 100644 --- a/src/VirtoCommerce.CatalogCsvImportModule.Web/Scripts/blades/export/catalog-CSV-export.tpl.html +++ b/src/VirtoCommerce.CatalogCsvImportModule.Web/Scripts/blades/export/catalog-CSV-export.tpl.html @@ -1,4 +1,4 @@ -
+
@@ -22,14 +22,12 @@
-
- - {{$select.selected.name}} - - - - -
+
+ + +

{{ 'catalogCsvImportModule.blades.catalog-CSV-export.labels.note' | translate }}