From 506751e5fd2ff1b797b426a638d66b4fafba7386 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 22 Dec 2021 15:52:24 +0300 Subject: [PATCH] Update resources --- .../Components/Basket/Default.cshtml | 13 ++++++++++--- .../src/EShopOnAbp.PublicWeb/Pages/Index.cshtml | 2 +- .../src/EShopOnAbp.BasketService.Domain/Basket.cs | 12 ++++++------ .../Localization/EShopOnAbp/en.json | 8 +++++++- .../Localization/EShopOnAbp/tr.json | 9 ++++++++- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml index ef5edc9b..e0057a76 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml @@ -1,4 +1,11 @@ + +@using EShopOnAbp.Localization +@using Microsoft.Extensions.Localization + @model EShopOnAbp.BasketService.BasketDto + +@inject IStringLocalizer L +
@if (!Model.Items.Any()) { @@ -26,15 +33,15 @@ (@("x" + item.Count)) } - $@item.TotalPrice.ToString("0.00") - +
}
- Total: $@Model.TotalPrice.ToString("0.00") + @L["Total"]: $@Model.TotalPrice.ToString("0.00")
- +
} diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml index cd87d01c..9589b904 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml @@ -18,7 +18,7 @@
-

Our Products

+

@L["OurProducts"]

@for (int i = 0; i < Math.Ceiling(Model.Products.Count / (double)productsColumnSize); i++) { diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/Basket.cs b/services/basket/src/EShopOnAbp.BasketService.Domain/Basket.cs index 61064707..30fd4abb 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Domain/Basket.cs +++ b/services/basket/src/EShopOnAbp.BasketService.Domain/Basket.cs @@ -11,10 +11,10 @@ public class Basket : AggregateRoot private Basket() { - + } - - public Basket(Guid id) + + public Basket(Guid id) : base(id) { Items = new List(); @@ -37,20 +37,20 @@ public class Basket : AggregateRoot item.Count += count; } } - + public void RemoveProduct(Guid productId, int? count = null) { if (count is < 1) { throw new ArgumentOutOfRangeException(nameof(count), "Product count should be null, 1 or more!"); } - + var item = Items.FirstOrDefault(x => x.ProductId == productId); if (item == null) { return; } - + if (count == null || item.Count <= count) { Items.Remove(item); diff --git a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json index ab1b0396..44e7594e 100644 --- a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json +++ b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json @@ -3,6 +3,12 @@ "texts": { "Menu:Home": "Home", "Login": "Login", - "Catalog": "Catalog" + "Catalog": "Catalog", + "YourBasket": "Your Basket", + "Purchase": "Purchase", + "Total": "Total", + "OurProducts": "Our Products", + "StockCount": "Stock Count", + "RemoveFromBasket": "Remove from basket" } } diff --git a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json index 8450b569..b803def2 100644 --- a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json +++ b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json @@ -2,6 +2,13 @@ "culture": "tr", "texts": { "Menu:Home": "Ana Sayfa", - "Login": "Giriş" + "Login": "Giriş", + "Catalog": "Katalog", + "YourBasket": "Sepetiniz", + "Purchase": "Alışverişi tamamla", + "Total": "Toplam", + "OurProducts": "Ürünlerimiz", + "StockCount": "Stokta", + "RemoveFromBasket": "Sepetten kaldır" } }