From 2613dd5c7eb506ecbe822a2f2faf6af5fc909ff4 Mon Sep 17 00:00:00 2001 From: Basil Kotov Date: Thu, 26 Mar 2026 15:28:40 +0000 Subject: [PATCH 1/3] Migrate pricing delete dialogs to platform shared dialog --- .../de.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../en.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../es.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../fi.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../fr.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../it.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../ja.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../no.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../pl.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../pt.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../ru.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../sv.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../zh.VirtoCommerce.Pricing.json | 18 ++++++++--------- .../Scripts/blades/assignment-list.js | 10 ++++++---- .../Scripts/blades/item/item-prices.js | 4 ++-- .../Scripts/blades/pricelist-item-list.js | 4 ++-- .../Scripts/blades/pricelist-list.js | 4 ++-- .../Scripts/dialogs/deleteAll-dialog.tpl.html | 20 ------------------- 18 files changed, 116 insertions(+), 160 deletions(-) delete mode 100644 src/VirtoCommerce.PricingModule.Web/Scripts/dialogs/deleteAll-dialog.tpl.html diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/de.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/de.VirtoCommerce.Pricing.json index 46e25b48..4f25dac9 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/de.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/de.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "Löschen bestätigen", - "message": "Sind Sie sicher, dass Sie die ausgewählten Preislistezuweisungen löschen möchten?" - }, - "assignments-delete-all": { - "title": "Löschen bestätigen", - "warning": "WARNUNG: Diese Änderung ist endgültig und kann nicht rückgängig gemacht werden. Durch Anwenden dieser Änderung kann es zu Datenverlust kommen", - "message": "Alle gefilterten Elemente werden gelöscht", - "instruction": "Geben Sie 'yes' ein, um zu löschen:" + "message": "Sind Sie sicher, dass Sie die ausgewählten Preislistezuweisungen löschen möchten?", + "assignment": "{{count}} Zuordnung(en)" }, "pricelists-delete": { "title": "Löschen bestätigen", - "message": "Sind Sie sicher, dass Sie die ausgewählten Preislisten löschen möchten?" + "message": "Sind Sie sicher, dass Sie die ausgewählten Preislisten löschen möchten?", + "pricelist": "{{count}} Preisliste(n)" }, "pricelist-item-list-delete": { "title": "Löschen bestätigen", - "message": "Sind Sie sicher, dass Sie alle Preise für die ausgewählten Produkte in dieser Preisliste löschen möchten?" + "message": "Sind Sie sicher, dass Sie alle Preise für die ausgewählten Produkte in dieser Preisliste löschen möchten?", + "price": "{{count}} Preis(e)" }, "item-prices-delete-confirmation": { "title": "Löschen bestätigen", - "message": "Sind Sie sicher, dass Sie die ausgewählten Preise löschen möchten?" + "message": "Sind Sie sicher, dass Sie die ausgewählten Preise löschen möchten?", + "price": "{{count}} Preis(e)" }, "item-prices-delete-error": { "title": "Fehler", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/en.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/en.VirtoCommerce.Pricing.json index f723c94b..9848dc17 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/en.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/en.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "Confirm delete", - "message": "Are you sure you want to delete the selected price list assignment(s)?" - }, - "assignments-delete-all": { - "title": "Confirm delete", - "warning": "WARNING: This change is final and cannot be undone. Applying this change may result in a data loss", - "message": "All filtered items will be deleted", - "instruction": "Type 'yes' to delete:" + "message": "Are you sure you want to delete the selected price list assignment(s)?", + "assignment": "{{count}} assignment(s)" }, "pricelists-delete": { "title": "Confirm delete", - "message": "Are you sure you want to delete the selected price list(s)?" + "message": "Are you sure you want to delete the selected price list(s)?", + "pricelist": "{{count}} price list(s)" }, "pricelist-item-list-delete": { "title": "Confirm delete", - "message": "Are you sure you want to delete all prices for the selected product(s) in this price list?" + "message": "Are you sure you want to delete all prices for the selected product(s) in this price list?", + "price": "{{count}} price(s)" }, "item-prices-delete-confirmation": { "title": "Confirm delete", - "message": "Are you sure you want to delete the selected price(s)?" + "message": "Are you sure you want to delete the selected price(s)?", + "price": "{{count}} price(s)" }, "item-prices-delete-error": { "title": "Error", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/es.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/es.VirtoCommerce.Pricing.json index 5d2062ee..14c8f58b 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/es.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/es.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "Confirmar eliminación", - "message": "¿Estás seguro de que deseas eliminar las asignaciones de listas de precios seleccionadas?" - }, - "assignments-delete-all": { - "title": "Confirmar eliminación", - "warning": "ADVERTENCIA: Este cambio es final y no se puede deshacer. Aplicar este cambio puede resultar en una pérdida de datos", - "message": "Todos los elementos filtrados serán eliminados", - "instruction": "Escribe 'yes' para eliminar:" + "message": "¿Estás seguro de que deseas eliminar las asignaciones de listas de precios seleccionadas?", + "assignment": "{{count}} asignación(es)" }, "pricelists-delete": { "title": "Confirmar eliminación", - "message": "¿Estás seguro de que deseas eliminar las listas de precios seleccionadas?" + "message": "¿Estás seguro de que deseas eliminar las listas de precios seleccionadas?", + "pricelist": "{{count}} lista(s) de precios" }, "pricelist-item-list-delete": { "title": "Confirmar eliminación", - "message": "¿Estás seguro de que deseas eliminar todos los precios de los productos seleccionados en esta lista de precios?" + "message": "¿Estás seguro de que deseas eliminar todos los precios de los productos seleccionados en esta lista de precios?", + "price": "{{count}} precio(s)" }, "item-prices-delete-confirmation": { "title": "Confirmar eliminación", - "message": "¿Estás seguro de que deseas eliminar los precios seleccionados?" + "message": "¿Estás seguro de que deseas eliminar los precios seleccionados?", + "price": "{{count}} precio(s)" }, "item-prices-delete-error": { "title": "Error", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/fi.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/fi.VirtoCommerce.Pricing.json index 11200157..a30ee4b2 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/fi.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/fi.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "Vahvista poisto", - "message": "Oletko varma, että haluat poistaa valitut hintalistan osoitukset?" - }, - "assignments-delete-all": { - "title": "Vahvista poisto", - "warning": "VAROITUS: Tämä muutos on lopullinen eikä sitä voi peruuttaa. Tämän muutoksen soveltaminen voi johtaa tietojen menetykseen", - "message": "Kaikki suodatetut kohteet poistetaan", - "instruction": "Kirjoita 'kyllä' poistaaksesi:" + "message": "Oletko varma, että haluat poistaa valitut hintalistan osoitukset?", + "assignment": "{{count}} määritys(tä)" }, "pricelists-delete": { "title": "Vahvista poisto", - "message": "Oletko varma, että haluat poistaa valitut hintalistat?" + "message": "Oletko varma, että haluat poistaa valitut hintalistat?", + "pricelist": "{{count}} hinnasto(a)" }, "pricelist-item-list-delete": { "title": "Vahvista poisto", - "message": "Oletko varma, että haluat poistaa kaikki hinnat valituille tuotteille tässä hintalistassa?" + "message": "Oletko varma, että haluat poistaa kaikki hinnat valituille tuotteille tässä hintalistassa?", + "price": "{{count}} hinta(a)" }, "item-prices-delete-confirmation": { "title": "Vahvista poisto", - "message": "Oletko varma, että haluat poistaa valitut hinnat?" + "message": "Oletko varma, että haluat poistaa valitut hinnat?", + "price": "{{count}} hinta(a)" }, "item-prices-delete-error": { "title": "Virhe", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/fr.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/fr.VirtoCommerce.Pricing.json index d656328a..e7385898 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/fr.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/fr.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "Confirmer la suppression", - "message": "Êtes-vous sûr de vouloir supprimer les attributions de listes de prix sélectionnées ?" - }, - "assignments-delete-all": { - "title": "Confirmer la suppression", - "warning": "ATTENTION : Ce changement est définitif et ne peut pas être annulé. Appliquer ce changement peut entraîner une perte de données", - "message": "Tous les éléments filtrés seront supprimés", - "instruction": "Tapez 'yes' pour supprimer :" + "message": "Êtes-vous sûr de vouloir supprimer les attributions de listes de prix sélectionnées ?", + "assignment": "{{count}} attribution(s)" }, "pricelists-delete": { "title": "Confirmer la suppression", - "message": "Êtes-vous sûr de vouloir supprimer les listes de prix sélectionnées ?" + "message": "Êtes-vous sûr de vouloir supprimer les listes de prix sélectionnées ?", + "pricelist": "{{count}} liste(s) de prix" }, "pricelist-item-list-delete": { "title": "Confirmer la suppression", - "message": "Êtes-vous sûr de vouloir supprimer tous les prix des produits sélectionnés dans cette liste de prix ?" + "message": "Êtes-vous sûr de vouloir supprimer tous les prix des produits sélectionnés dans cette liste de prix ?", + "price": "{{count}} prix" }, "item-prices-delete-confirmation": { "title": "Confirmer la suppression", - "message": "Êtes-vous sûr de vouloir supprimer les prix sélectionnés ?" + "message": "Êtes-vous sûr de vouloir supprimer les prix sélectionnés ?", + "price": "{{count}} prix" }, "item-prices-delete-error": { "title": "Erreur", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/it.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/it.VirtoCommerce.Pricing.json index 6990dc25..f9b2bb75 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/it.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/it.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "Conferma eliminazione", - "message": "Sei sicuro di voler eliminare le assegnazioni delle liste dei prezzi selezionate?" - }, - "assignments-delete-all": { - "title": "Conferma eliminazione", - "warning": "AVVISO: Questa modifica è definitiva e non può essere annullata. Applicare questa modifica potrebbe comportare una perdita di dati", - "message": "Tutti gli elementi filtrati saranno eliminati", - "instruction": "Digita 'yes' per eliminare:" + "message": "Sei sicuro di voler eliminare le assegnazioni delle liste dei prezzi selezionate?", + "assignment": "{{count}} assegnazione(i)" }, "pricelists-delete": { "title": "Conferma eliminazione", - "message": "Sei sicuro di voler eliminare le liste dei prezzi selezionate?" + "message": "Sei sicuro di voler eliminare le liste dei prezzi selezionate?", + "pricelist": "{{count}} listino(i) prezzi" }, "pricelist-item-list-delete": { "title": "Conferma eliminazione", - "message": "Sei sicuro di voler eliminare tutti i prezzi dei prodotti selezionati in questa lista dei prezzi?" + "message": "Sei sicuro di voler eliminare tutti i prezzi dei prodotti selezionati in questa lista dei prezzi?", + "price": "{{count}} prezzo(i)" }, "item-prices-delete-confirmation": { "title": "Conferma eliminazione", - "message": "Sei sicuro di voler eliminare i prezzi selezionati?" + "message": "Sei sicuro di voler eliminare i prezzi selezionati?", + "price": "{{count}} prezzo(i)" }, "item-prices-delete-error": { "title": "Errore", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/ja.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/ja.VirtoCommerce.Pricing.json index d427228f..ce7fca47 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/ja.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/ja.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "削除を確認", - "message": "選択された価格リストの割り当てを削除してもよろしいですか？" - }, - "assignments-delete-all": { - "title": "削除を確認", - "warning": "警告：この変更は最終的であり、元に戻すことはできません。この変更を適用するとデータが失われる可能性があります", - "message": "フィルターされたすべての項目が削除されます", - "instruction": "削除するには 'yes' と入力してください：" + "message": "選択された価格リストの割り当てを削除してもよろしいですか？", + "assignment": "{{count}} 件の割り当て" }, "pricelists-delete": { "title": "削除を確認", - "message": "選択された価格リストを削除してもよろしいですか？" + "message": "選択された価格リストを削除してもよろしいですか？", + "pricelist": "{{count}} 件の価格表" }, "pricelist-item-list-delete": { "title": "削除を確認", - "message": "この価格リストの選択された製品のすべての価格を削除してもよろしいですか？" + "message": "この価格リストの選択された製品のすべての価格を削除してもよろしいですか？", + "price": "{{count}} 件の価格" }, "item-prices-delete-confirmation": { "title": "削除を確認", - "message": "選択された価格を削除してもよろしいですか？" + "message": "選択された価格を削除してもよろしいですか？", + "price": "{{count}} 件の価格" }, "item-prices-delete-error": { "title": "エラー", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/no.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/no.VirtoCommerce.Pricing.json index b9448d59..01cd238f 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/no.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/no.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "Bekreft sletting", - "message": "Er du sikker på at du vil slette de valgte prislistetildelingene?" - }, - "assignments-delete-all": { - "title": "Bekreft sletting", - "warning": "ADVARSEL: Denne endringen er endelig og kan ikke angres. Å bruke denne endringen kan føre til tap av data", - "message": "Alle filtrerte elementer vil bli slettet", - "instruction": "Skriv 'ja' for å slette:" + "message": "Er du sikker på at du vil slette de valgte prislistetildelingene?", + "assignment": "{{count}} tilordning(er)" }, "pricelists-delete": { "title": "Bekreft sletting", - "message": "Er du sikker på at du vil slette de valgte prislistene?" + "message": "Er du sikker på at du vil slette de valgte prislistene?", + "pricelist": "{{count}} prisliste(r)" }, "pricelist-item-list-delete": { "title": "Bekreft sletting", - "message": "Er du sikker på at du vil slette alle priser for de valgte produktene i denne prislisten?" + "message": "Er du sikker på at du vil slette alle priser for de valgte produktene i denne prislisten?", + "price": "{{count}} pris(er)" }, "item-prices-delete-confirmation": { "title": "Bekreft sletting", - "message": "Er du sikker på at du vil slette de valgte prisene?" + "message": "Er du sikker på at du vil slette de valgte prisene?", + "price": "{{count}} pris(er)" }, "item-prices-delete-error": { "title": "Feil", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/pl.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/pl.VirtoCommerce.Pricing.json index ff92e03d..1e760f43 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/pl.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/pl.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "Potwierdź usunięcie", - "message": "Czy na pewno chcesz usunąć wybrane przypisania list cen?" - }, - "assignments-delete-all": { - "title": "Potwierdź usunięcie", - "warning": "OSTRZEŻENIE: Ta zmiana jest ostateczna i nie można jej cofnąć. Zastosowanie tej zmiany może spowodować utratę danych", - "message": "Wszystkie filtrowane elementy zostaną usunięte", - "instruction": "Wpisz 'yes', aby usunąć:" + "message": "Czy na pewno chcesz usunąć wybrane przypisania list cen?", + "assignment": "{{count}} przypisanie(ń)" }, "pricelists-delete": { "title": "Potwierdź usunięcie", - "message": "Czy na pewno chcesz usunąć wybrane listy cen?" + "message": "Czy na pewno chcesz usunąć wybrane listy cen?", + "pricelist": "{{count}} cennik(ów)" }, "pricelist-item-list-delete": { "title": "Potwierdź usunięcie", - "message": "Czy na pewno chcesz usunąć wszystkie ceny dla wybranych produktów na tej liście cen?" + "message": "Czy na pewno chcesz usunąć wszystkie ceny dla wybranych produktów na tej liście cen?", + "price": "{{count}} cena(y)" }, "item-prices-delete-confirmation": { "title": "Potwierdź usunięcie", - "message": "Czy na pewno chcesz usunąć wybrane ceny?" + "message": "Czy na pewno chcesz usunąć wybrane ceny?", + "price": "{{count}} cena(y)" }, "item-prices-delete-error": { "title": "Błąd", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/pt.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/pt.VirtoCommerce.Pricing.json index b28d1af3..8b4e695b 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/pt.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/pt.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "Confirmar Exclusão", - "message": "Tem certeza de que deseja excluir as atribuições de listas de preços selecionadas?" - }, - "assignments-delete-all": { - "title": "Confirmar Exclusão", - "warning": "AVISO: Esta alteração é definitiva e não pode ser desfeita. Aplicar esta alteração pode resultar na perda de dados", - "message": "Todos os itens filtrados serão excluídos", - "instruction": "Digite 'yes' para excluir:" + "message": "Tem certeza de que deseja excluir as atribuições de listas de preços selecionadas?", + "assignment": "{{count}} atribuição(ões)" }, "pricelists-delete": { "title": "Confirmar Exclusão", - "message": "Tem certeza de que deseja excluir as listas de preços selecionadas?" + "message": "Tem certeza de que deseja excluir as listas de preços selecionadas?", + "pricelist": "{{count}} lista(s) de preços" }, "pricelist-item-list-delete": { "title": "Confirmar Exclusão", - "message": "Tem certeza de que deseja excluir todos os preços dos produtos selecionados nesta lista de preços?" + "message": "Tem certeza de que deseja excluir todos os preços dos produtos selecionados nesta lista de preços?", + "price": "{{count}} preço(s)" }, "item-prices-delete-confirmation": { "title": "Confirmar Exclusão", - "message": "Tem certeza de que deseja excluir os preços selecionados?" + "message": "Tem certeza de que deseja excluir os preços selecionados?", + "price": "{{count}} preço(s)" }, "item-prices-delete-error": { "title": "Erro", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/ru.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/ru.VirtoCommerce.Pricing.json index dc8e9e66..ae74e7bf 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/ru.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/ru.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "Подтвердите удаление", - "message": "Вы уверены, что хотите удалить выбранные назначения прайс-листов?" - }, - "assignments-delete-all": { - "title": "Подтвердите удаление", - "warning": "ВНИМАНИЕ: Это изменение окончательное и не может быть отменено. Применение этого изменения может привести к потере данных", - "message": "Все отфильтрованные элементы будут удалены", - "instruction": "Введите 'yes' для удаления:" + "message": "Вы уверены, что хотите удалить выбранные назначения прайс-листов?", + "assignment": "{{count}} назначение(й)" }, "pricelists-delete": { "title": "Подтвердите удаление", - "message": "Вы уверены, что хотите удалить выбранные прайс-листы?" + "message": "Вы уверены, что хотите удалить выбранные прайс-листы?", + "pricelist": "{{count}} прайс-лист(ов)" }, "pricelist-item-list-delete": { "title": "Подтвердите удаление", - "message": "Вы уверены, что хотите удалить все цены для выбранных товаров в этом прайс-листе?" + "message": "Вы уверены, что хотите удалить все цены для выбранных товаров в этом прайс-листе?", + "price": "{{count}} цена(ы)" }, "item-prices-delete-confirmation": { "title": "Подтвердите удаление", - "message": "Вы уверены, что хотите удалить выбранные цены?" + "message": "Вы уверены, что хотите удалить выбранные цены?", + "price": "{{count}} цена(ы)" }, "item-prices-delete-error": { "title": "Ошибка", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/sv.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/sv.VirtoCommerce.Pricing.json index 068253db..d2d7d151 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/sv.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/sv.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "Bekräfta radering", - "message": "Är du säker på att du vill ta bort de valda prislistetilldelningarna?" - }, - "assignments-delete-all": { - "title": "Bekräfta radering", - "warning": "VARNING: Denna ändring är slutgiltig och kan inte ångras. Att tillämpa denna ändring kan leda till dataförlust", - "message": "Alla filtrerade objekt kommer att raderas", - "instruction": "Skriv 'ja' för att radera:" + "message": "Är du säker på att du vill ta bort de valda prislistetilldelningarna?", + "assignment": "{{count}} tilldelning(ar)" }, "pricelists-delete": { "title": "Bekräfta radering", - "message": "Är du säker på att du vill ta bort de valda prislistorna?" + "message": "Är du säker på att du vill ta bort de valda prislistorna?", + "pricelist": "{{count}} prislista(or)" }, "pricelist-item-list-delete": { "title": "Bekräfta radering", - "message": "Är du säker på att du vill ta bort alla priser för de valda produkterna i denna prislista?" + "message": "Är du säker på att du vill ta bort alla priser för de valda produkterna i denna prislista?", + "price": "{{count}} pris(er)" }, "item-prices-delete-confirmation": { "title": "Bekräfta radering", - "message": "Är du säker på att du vill ta bort de valda priserna?" + "message": "Är du säker på att du vill ta bort de valda priserna?", + "price": "{{count}} pris(er)" }, "item-prices-delete-error": { "title": "Fel", diff --git a/src/VirtoCommerce.PricingModule.Web/Localizations/zh.VirtoCommerce.Pricing.json b/src/VirtoCommerce.PricingModule.Web/Localizations/zh.VirtoCommerce.Pricing.json index da7e55cf..2e6bf45d 100644 --- a/src/VirtoCommerce.PricingModule.Web/Localizations/zh.VirtoCommerce.Pricing.json +++ b/src/VirtoCommerce.PricingModule.Web/Localizations/zh.VirtoCommerce.Pricing.json @@ -162,25 +162,23 @@ "dialogs": { "assignments-delete": { "title": "确认删除", - "message": "您确定要删除所选的价格表分配吗？" - }, - "assignments-delete-all": { - "title": "确认删除", - "warning": "警告：此更改是最终的，无法撤消。应用此更改可能会导致数据丢失", - "message": "所有筛选的项目都将被删除", - "instruction": "输入'yes'以删除：" + "message": "您确定要删除所选的价格表分配吗？", + "assignment": "{{count}} 个分配" }, "pricelists-delete": { "title": "确认删除", - "message": "您确定要删除所选的价格表吗？" + "message": "您确定要删除所选的价格表吗？", + "pricelist": "{{count}} 个价格表" }, "pricelist-item-list-delete": { "title": "确认删除", - "message": "您确定要删除此价格表中所选产品的所有价格吗？" + "message": "您确定要删除此价格表中所选产品的所有价格吗？", + "price": "{{count}} 个价格" }, "item-prices-delete-confirmation": { "title": "确认删除", - "message": "您确定要删除所选的价格吗？" + "message": "您确定要删除所选的价格吗？", + "price": "{{count}} 个价格" }, "item-prices-delete-error": { "title": "错误", diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.js b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.js index d4d24ba8..f11162f2 100644 --- a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.js +++ b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.js @@ -75,7 +75,7 @@ angular.module('virtoCommerce.pricingModule') var dialog = { id: "confirmDeleteItem", title: "pricing.dialogs.assignments-delete.title", - message: "pricing.dialogs.assignments-delete.message", + data: [{ key: 'pricing.dialogs.assignments-delete.assignment', count: list.length }], callback: function (remove) { if (remove) { closeChildrenBlades(); @@ -89,17 +89,19 @@ angular.module('virtoCommerce.pricingModule') } } }; - dialogService.showConfirmationDialog(dialog); + dialogService.showDeleteConfirmationDialog(dialog); }; $scope.deleteAllFiltered = function () { var dialog = { id: "confirmDeleteItems", + title: "pricing.dialogs.assignments-delete.title", + data: [{ key: 'pricing.dialogs.assignments-delete.assignment', count: blade.currentEntities ? blade.currentEntities.length : 0 }], callback: function (confirm) { if (!confirm) return; closeChildrenBlades(); - blade.isLoading = true; + blade.isLoading = true; var pricelistIds; if (filter.current) { pricelistIds = filter.current.pricelistIds; @@ -114,7 +116,7 @@ angular.module('virtoCommerce.pricingModule') }); } }; - dialogService.showDialog(dialog, 'Modules/$(VirtoCommerce.Pricing)/Scripts/dialogs/deleteAll-dialog.tpl.html', 'platformWebApp.confirmDialogController'); + dialogService.showDeleteConfirmationDialog(dialog); }; function closeChildrenBlades() { diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.js b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.js index 7203224a..0d096249 100644 --- a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.js +++ b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.js @@ -194,7 +194,7 @@ angular.module('virtoCommerce.pricingModule') var dialog = { id: "confirmDeleteItem", title: "pricing.dialogs.item-prices-delete-confirmation.title", - message: "pricing.dialogs.item-prices-delete-confirmation.message", + data: [{ key: 'pricing.dialogs.item-prices-delete-confirmation.price', count: selection.length }], callback: function (remove) { if (remove) { prices.removePrice({ priceIds: ids }, function () { @@ -208,7 +208,7 @@ angular.module('virtoCommerce.pricingModule') } } }; - dialogService.showConfirmationDialog(dialog); + dialogService.showDeleteConfirmationDialog(dialog); }, canExecuteMethod: function () { return $scope.gridApi && _.any($scope.gridApi.selection.getSelectedRows()); diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-item-list.js b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-item-list.js index 7512f1b4..e8b51c34 100644 --- a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-item-list.js +++ b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-item-list.js @@ -141,7 +141,7 @@ angular.module('virtoCommerce.pricingModule') var dialog = { id: "confirmDeleteItem", title: "pricing.dialogs.pricelist-item-list-delete.title", - message: "pricing.dialogs.pricelist-item-list-delete.message", + data: [{ key: 'pricing.dialogs.pricelist-item-list-delete.price', count: list.length }], callback: function (remove) { if (remove) { bladeNavigationService.closeChildrenBlades(blade, function () { @@ -154,7 +154,7 @@ angular.module('virtoCommerce.pricingModule') } } } - dialogService.showConfirmationDialog(dialog); + dialogService.showDeleteConfirmationDialog(dialog); } blade.exportPrices = function() { diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-list.js b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-list.js index 07c7490c..e6051fe2 100644 --- a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-list.js +++ b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-list.js @@ -70,7 +70,7 @@ angular.module('virtoCommerce.pricingModule') var dialog = { id: "confirmDeleteItem", title: "pricing.dialogs.pricelists-delete.title", - message: "pricing.dialogs.pricelists-delete.message", + data: [{ key: 'pricing.dialogs.pricelists-delete.pricelist', count: list.length }], callback: function (remove) { if (remove) { bladeNavigationService.closeChildrenBlades(blade, function () { @@ -82,7 +82,7 @@ angular.module('virtoCommerce.pricingModule') } } } - dialogService.showConfirmationDialog(dialog); + dialogService.showDeleteConfirmationDialog(dialog); } blade.headIcon = 'fa fa-usd'; diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/dialogs/deleteAll-dialog.tpl.html b/src/VirtoCommerce.PricingModule.Web/Scripts/dialogs/deleteAll-dialog.tpl.html deleted file mode 100644 index 83025768..00000000 --- a/src/VirtoCommerce.PricingModule.Web/Scripts/dialogs/deleteAll-dialog.tpl.html +++ /dev/null @@ -1,20 +0,0 @@ -
-

{{ 'pricing.dialogs.assignments-delete-all.title' | translate }}

-
-
-
-
{{ 'pricing.dialogs.assignments-delete-all.warning' | translate }}
-
-

{{ 'pricing.dialogs.assignments-delete-all.message' | translate }}

- - {{ 'pricing.dialogs.assignments-delete-all.instruction' | translate }} -
- -
-
-
- - -
From 42289e9d62539b1a156075b2cbdbf5c38312e065 Mon Sep 17 00:00:00 2001 From: Basil Kotov Date: Wed, 1 Apr 2026 12:07:16 +0100 Subject: [PATCH 2/3] use new interface for confirmation delete dialog --- .../Scripts/blades/assignment-list.js | 4 ++-- .../Scripts/blades/item/item-prices.js | 2 +- .../Scripts/blades/pricelist-item-list.js | 2 +- .../Scripts/blades/pricelist-list.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.js b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.js index f11162f2..96c8ac52 100644 --- a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.js +++ b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.js @@ -75,7 +75,7 @@ angular.module('virtoCommerce.pricingModule') var dialog = { id: "confirmDeleteItem", title: "pricing.dialogs.assignments-delete.title", - data: [{ key: 'pricing.dialogs.assignments-delete.assignment', count: list.length }], + items: [{ key: 'pricing.dialogs.assignments-delete.assignment', count: list.length }], callback: function (remove) { if (remove) { closeChildrenBlades(); @@ -96,7 +96,7 @@ angular.module('virtoCommerce.pricingModule') var dialog = { id: "confirmDeleteItems", title: "pricing.dialogs.assignments-delete.title", - data: [{ key: 'pricing.dialogs.assignments-delete.assignment', count: blade.currentEntities ? blade.currentEntities.length : 0 }], + items: [{ key: 'pricing.dialogs.assignments-delete.assignment', count: blade.currentEntities ? blade.currentEntities.length : 0 }], callback: function (confirm) { if (!confirm) return; diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.js b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.js index 0d096249..d00f5f4c 100644 --- a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.js +++ b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.js @@ -194,7 +194,7 @@ angular.module('virtoCommerce.pricingModule') var dialog = { id: "confirmDeleteItem", title: "pricing.dialogs.item-prices-delete-confirmation.title", - data: [{ key: 'pricing.dialogs.item-prices-delete-confirmation.price', count: selection.length }], + items: [{ key: 'pricing.dialogs.item-prices-delete-confirmation.price', count: selection.length }], callback: function (remove) { if (remove) { prices.removePrice({ priceIds: ids }, function () { diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-item-list.js b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-item-list.js index e8b51c34..7e2c24ea 100644 --- a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-item-list.js +++ b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-item-list.js @@ -141,7 +141,7 @@ angular.module('virtoCommerce.pricingModule') var dialog = { id: "confirmDeleteItem", title: "pricing.dialogs.pricelist-item-list-delete.title", - data: [{ key: 'pricing.dialogs.pricelist-item-list-delete.price', count: list.length }], + items: [{ key: 'pricing.dialogs.pricelist-item-list-delete.price', count: list.length }], callback: function (remove) { if (remove) { bladeNavigationService.closeChildrenBlades(blade, function () { diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-list.js b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-list.js index e6051fe2..418bcfee 100644 --- a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-list.js +++ b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-list.js @@ -70,7 +70,7 @@ angular.module('virtoCommerce.pricingModule') var dialog = { id: "confirmDeleteItem", title: "pricing.dialogs.pricelists-delete.title", - data: [{ key: 'pricing.dialogs.pricelists-delete.pricelist', count: list.length }], + items: [{ key: 'pricing.dialogs.pricelists-delete.pricelist', count: list.length }], callback: function (remove) { if (remove) { bladeNavigationService.closeChildrenBlades(blade, function () { From bc99b00460089b1874eaaf8218d46328427d7af6 Mon Sep 17 00:00:00 2001 From: Basil Kotov Date: Thu, 2 Apr 2026 14:35:39 +0100 Subject: [PATCH 3/3] update platform version to 1013 --- .../VirtoCommerce.PricingModule.Core.csproj | 2 +- .../VirtoCommerce.PricingModule.Data.MySql.csproj | 2 +- .../VirtoCommerce.PricingModule.Data.PostgreSql.csproj | 2 +- .../VirtoCommerce.PricingModule.Data.SqlServer.csproj | 2 +- .../VirtoCommerce.PricingModule.Data.csproj | 4 ++-- src/VirtoCommerce.PricingModule.Web/module.manifest | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/VirtoCommerce.PricingModule.Core/VirtoCommerce.PricingModule.Core.csproj b/src/VirtoCommerce.PricingModule.Core/VirtoCommerce.PricingModule.Core.csproj index de28476d..4c1418f3 100644 --- a/src/VirtoCommerce.PricingModule.Core/VirtoCommerce.PricingModule.Core.csproj +++ b/src/VirtoCommerce.PricingModule.Core/VirtoCommerce.PricingModule.Core.csproj @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/src/VirtoCommerce.PricingModule.Data.MySql/VirtoCommerce.PricingModule.Data.MySql.csproj b/src/VirtoCommerce.PricingModule.Data.MySql/VirtoCommerce.PricingModule.Data.MySql.csproj index fa613bbb..019d46db 100644 --- a/src/VirtoCommerce.PricingModule.Data.MySql/VirtoCommerce.PricingModule.Data.MySql.csproj +++ b/src/VirtoCommerce.PricingModule.Data.MySql/VirtoCommerce.PricingModule.Data.MySql.csproj @@ -11,7 +11,7 @@ runtime; build; native; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.PricingModule.Data.PostgreSql/VirtoCommerce.PricingModule.Data.PostgreSql.csproj b/src/VirtoCommerce.PricingModule.Data.PostgreSql/VirtoCommerce.PricingModule.Data.PostgreSql.csproj index 87c27486..db82b26d 100644 --- a/src/VirtoCommerce.PricingModule.Data.PostgreSql/VirtoCommerce.PricingModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.PricingModule.Data.PostgreSql/VirtoCommerce.PricingModule.Data.PostgreSql.csproj @@ -10,7 +10,7 @@ runtime; build; native; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.PricingModule.Data.SqlServer/VirtoCommerce.PricingModule.Data.SqlServer.csproj b/src/VirtoCommerce.PricingModule.Data.SqlServer/VirtoCommerce.PricingModule.Data.SqlServer.csproj index 064c9ae4..1592bde4 100644 --- a/src/VirtoCommerce.PricingModule.Data.SqlServer/VirtoCommerce.PricingModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.PricingModule.Data.SqlServer/VirtoCommerce.PricingModule.Data.SqlServer.csproj @@ -10,7 +10,7 @@ runtime; build; native; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.PricingModule.Data/VirtoCommerce.PricingModule.Data.csproj b/src/VirtoCommerce.PricingModule.Data/VirtoCommerce.PricingModule.Data.csproj index 95502117..9dc50bf4 100644 --- a/src/VirtoCommerce.PricingModule.Data/VirtoCommerce.PricingModule.Data.csproj +++ b/src/VirtoCommerce.PricingModule.Data/VirtoCommerce.PricingModule.Data.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/src/VirtoCommerce.PricingModule.Web/module.manifest b/src/VirtoCommerce.PricingModule.Web/module.manifest index 3aa4a29b..1019a92b 100644 --- a/src/VirtoCommerce.PricingModule.Web/module.manifest +++ b/src/VirtoCommerce.PricingModule.Web/module.manifest @@ -4,7 +4,7 @@ 3.1001.0 - 3.1002.0 + 3.1013.0