Skip to content

Commit c8d601d

Browse files
committed
Merge branch 'release/3.826.0'
2 parents f2b5187 + 671a14d commit c8d601d

25 files changed

+652
-580
lines changed

.nuke

Lines changed: 0 additions & 1 deletion
This file was deleted.

.nuke/parameters.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "./build.schema.json",
3+
"Solution": "VirtoCommerce.CustomerModule.sln"
4+
}

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<!-- These properties will be shared for all projects -->
44
<PropertyGroup>
5-
<VersionPrefix>3.825.0</VersionPrefix>
5+
<VersionPrefix>3.826.0</VersionPrefix>
66
<VersionSuffix>
77
</VersionSuffix>
88
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

src/VirtoCommerce.CustomerModule.Core/VirtoCommerce.CustomerModule.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.808.0" />
1414
<PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.809.0" />
1515
<PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.804.0" />
16-
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.879.0" />
16+
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.881.0" />
1717
</ItemGroup>
1818
</Project>

src/VirtoCommerce.CustomerModule.Data/ExportImport/CustomerExportImport.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ public async Task ImportAsync(Stream inputStream, ExportImportOptions options, A
9393
{
9494
var readerValueString = reader.Value?.ToString();
9595

96-
if (readerValueString.EqualsInvariant("MembersTotalCount"))
96+
if (readerValueString.EqualsIgnoreCase("MembersTotalCount"))
9797
{
9898
membersTotalCount = await reader.ReadAsInt32Async() ?? 0;
9999
}
100-
else if (readerValueString.EqualsInvariant("Members"))
100+
else if (readerValueString.EqualsIgnoreCase("Members"))
101101
{
102102
cancellationToken.ThrowIfCancellationRequested();
103103
await reader.ReadAsync();

src/VirtoCommerce.CustomerModule.Data/Handlers/SecurtityAccountChangesEventHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected virtual void InnerHandle(UserChangedEvent @event)
2323
CustomerSearchCacheRegion.ExpireRegion();
2424
CustomerCacheRegion.ExpireMemberById(change.NewEntry.MemberId);
2525

26-
if (!change.NewEntry.MemberId.EqualsInvariant(change.OldEntry.MemberId))
26+
if (!change.NewEntry.MemberId.EqualsIgnoreCase(change.OldEntry.MemberId))
2727
{
2828
CustomerCacheRegion.ExpireMemberById(change.OldEntry.MemberId);
2929
}

src/VirtoCommerce.CustomerModule.Data/Services/MemberService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public virtual Task<Member[]> GetByIdsAsync(string[] memberIds, string responseG
100100

101101
foreach (var hasAccountMember in hasSecurityAccountMembers)
102102
{
103-
hasAccountMember.SecurityAccounts = usersSearchResult.Results.Where(x => x.MemberId.EqualsInvariant(hasAccountMember.Id)).ToList();
103+
hasAccountMember.SecurityAccounts = usersSearchResult.Results.Where(x => x.MemberId.EqualsIgnoreCase(hasAccountMember.Id)).ToList();
104104

105105
if (hasAccountMember.SecurityAccounts.Count > 0)
106106
{

src/VirtoCommerce.CustomerModule.Web/Localizations/de.VirtoCommerce.Customer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"choice-description": "Wählen Sie ein Bild im PNG-, JPG- oder SVG-Format",
211211
"preview": "Vorschau",
212212
"preview-description": "Aktuelles Symbol",
213-
"reset": "Symbol entfernen"
213+
"reset": "Symbol zurücksetzen",
214+
"delete": "Symbol löschen"
214215
}
215216
},
216217
"shared": {
@@ -356,4 +357,4 @@
356357
"description": "Der Kunde erhält eine E-Mail-Benachrichtigung, wenn sein Unternehmen registriert wurde"
357358
}
358359
}
359-
}
360+
}

src/VirtoCommerce.CustomerModule.Web/Localizations/en.VirtoCommerce.Customer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"choice-description": "Select image in the PNG, JPG, or SVG format",
211211
"preview": "Preview",
212212
"preview-description": "Current icon",
213-
"reset": "Remove icon"
213+
"reset": "Reset icon",
214+
"delete": "Delete icon"
214215
}
215216
},
216217
"shared": {
@@ -356,4 +357,4 @@
356357
"description": "The customer gets an email notification when his company has registered"
357358
}
358359
}
359-
}
360+
}

src/VirtoCommerce.CustomerModule.Web/Localizations/es.VirtoCommerce.Customer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"choice-description": "Seleccione una imagen en formato PNG, JPG o SVG",
211211
"preview": "Vista previa",
212212
"preview-description": "Ícono actual",
213-
"reset": "Eliminar ícono"
213+
"reset": "Icono de reinicio",
214+
"delete": "Icono de eliminación"
214215
}
215216
},
216217
"shared": {
@@ -356,4 +357,4 @@
356357
"description": "El cliente recibe una notificación por correo electrónico cuando su empresa se ha registrado"
357358
}
358359
}
359-
}
360+
}

src/VirtoCommerce.CustomerModule.Web/Localizations/fr.VirtoCommerce.Customer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"choice-description": "Sélectionnez une image au format PNG, JPG ou SVG",
211211
"preview": "Aperçu",
212212
"preview-description": "Icône actuelle",
213-
"reset": "Supprimer l'icône"
213+
"reset": "Icône de réinitialisation",
214+
"delete": "Icône de suppression"
214215
}
215216
},
216217
"shared": {
@@ -356,4 +357,4 @@
356357
"description": "Le client reçoit une notification par e-mail lorsque son entreprise est enregistrée"
357358
}
358359
}
359-
}
360+
}

src/VirtoCommerce.CustomerModule.Web/Localizations/it.VirtoCommerce.Customer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"choice-description": "Seleziona immagine nel formato PNG, JPG o SVG",
211211
"preview": "Anteprima",
212212
"preview-description": "Icona attuale",
213-
"reset": "Rimuovi icona"
213+
"reset": "Icona di reset",
214+
"delete": "Icona di eliminazione"
214215
}
215216
},
216217
"shared": {
@@ -356,4 +357,4 @@
356357
"description": "Il cliente riceve una notifica email quando la sua azienda è stata registrata"
357358
}
358359
}
359-
}
360+
}

src/VirtoCommerce.CustomerModule.Web/Localizations/ja.VirtoCommerce.Customer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"choice-description": "PNG、JPG、またはSVG形式の画像を選択",
211211
"preview": "プレビュー",
212212
"preview-description": "現在のアイコン",
213-
"reset": "アイコンを削除"
213+
"reset": "リセットアイコン",
214+
"delete": "削除アイコン"
214215
}
215216
},
216217
"shared": {
@@ -356,4 +357,4 @@
356357
"description": "顧客は、彼の会社が登録されたときにメール通知を受け取ります"
357358
}
358359
}
359-
}
360+
}

src/VirtoCommerce.CustomerModule.Web/Localizations/pl.VirtoCommerce.Customer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"choice-description": "Wybierz obraz w formacie PNG, JPG lub SVG",
211211
"preview": "Podgląd",
212212
"preview-description": "Aktualna ikona",
213-
"reset": "Usuń ikonę"
213+
"reset": "Ikona resetowania",
214+
"delete": "Ikona usuwania"
214215
}
215216
},
216217
"shared": {
@@ -356,4 +357,4 @@
356357
"description": "Klient otrzymuje powiadomienie e-mail, gdy jego firma została zarejestrowana"
357358
}
358359
}
359-
}
360+
}

src/VirtoCommerce.CustomerModule.Web/Localizations/pt.VirtoCommerce.Customer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"choice-description": "Selecione uma imagem nos formatos PNG, JPG ou SVG",
211211
"preview": "Pré-visualização",
212212
"preview-description": "Ícone atual",
213-
"reset": "Remover ícone"
213+
"reset": "Ícone de reposição",
214+
"delete": "Ícone de exclusão"
214215
}
215216
},
216217
"shared": {
@@ -356,4 +357,4 @@
356357
"description": "O cliente recebe uma notificação por email quando sua empresa é registrada"
357358
}
358359
}
359-
}
360+
}

src/VirtoCommerce.CustomerModule.Web/Localizations/ru.VirtoCommerce.Customer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"choice-description": "Выберите изображение в формате PNG, JPG или SVG",
211211
"preview": "Предварительный просмотр",
212212
"preview-description": "Текущая иконка",
213-
"reset": "Удалить иконку"
213+
"reset": "Сбросить иконку",
214+
"delete": "Удалить иконку"
214215
}
215216
},
216217
"shared": {
@@ -356,4 +357,4 @@
356357
"description": "Клиент получает уведомление по электронной почте, когда его компания зарегистрирована"
357358
}
358359
}
359-
}
360+
}

src/VirtoCommerce.CustomerModule.Web/Localizations/zh.VirtoCommerce.Customer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"choice-description": "选择PNG、JPG或SVG格式的图像",
211211
"preview": "预览",
212212
"preview-description": "当前图标",
213-
"reset": "移除图标"
213+
"reset": "重置图标",
214+
"delete": "删除图标"
214215
}
215216
},
216217
"shared": {
@@ -356,4 +357,4 @@
356357
"description": "客户在其公司注册时会收到电子邮件通知"
357358
}
358359
}
359-
}
360+
}

0 commit comments

Comments
 (0)