diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/Default.cshtml index cc029b09..1722a34c 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/Default.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/Default.cshtml @@ -4,21 +4,59 @@ @model PurchaseWidgetViewComponent.PurchaseViewModel @inject IStringLocalizer L -
-
- @{ - var totalCount = Model?.Basket.Items.Count ?? 0; - } -

@L["TotalSelected", totalCount]

-
-
-

$@Model.Basket.TotalPrice.ToString("0.00")

-
-
-
- @Html.AntiForgeryToken() - - - +@{ + var totalCount = Model?.Basket.Items.Count ?? 0; + var totalPrice = Model.Basket.TotalPrice; + var demoDiscountPercentage = 10; + var discountTotal = totalPrice * demoDiscountPercentage / 100; + var grandTotal = totalPrice - discountTotal; +} +
+
+
+
+
@L["TotalSelected", totalCount]
+
+
+

$@totalPrice.ToString("0.00")

+
+
+
+
+

@L["Purchase:OrderSummary"]

+
+
+
+
@L["Purchase:Products"]:
+
@totalPrice.ToString("0.00") $
+
+
+
@L["Purchase:CargoAndPackaging"]:
+
0.00 $
+
+
+
@L["Purchase:Total"]:
+
@totalPrice.ToString("0.00") $
+
+
+
@L["Purchase:GiftCards"]:
+
@discountTotal.ToString("0.00") $
+
+
+
+
+
+
@L["Purchase:OrderTotal"]:
+
+
+
@grandTotal.ToString("0.00") $
+
+
+
+
+ @Html.AntiForgeryToken() + + +
\ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/purchase/purchase-widget.css b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/purchase/purchase-widget.css index e69de29b..3428b345 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/purchase/purchase-widget.css +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/purchase/purchase-widget.css @@ -0,0 +1,12 @@ +.m-result { + text-align: end; +} + +.summary { + color: #0F1111; + font-size: 1rem; +} + +.order-total { + font-size: 1.2rem; +} \ No newline at end of file diff --git a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json index 2ed0c823..f9a57b29 100644 --- a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json +++ b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json @@ -10,6 +10,13 @@ "Total": "Total", "TotalSelected": "Total Selected ({0})", "OurProducts": "Our Products", + "FreeCargo": "Free Cargo", + "Purchase:GiftCards":"Gift Cards", + "Purchase:CargoAndPackaging": "Cargo & Packaging", + "Purchase:Total": "Total", + "Purchase:OrderSummary": "Order Summary", + "Purchase:Products": "Products", + "Purchase:OrderTotal": "Order Total", "CatalogServiceNotAvailable": "Catalog Service is unavailable right now! Try again later...", "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 f01cb1dc..a010152d 100644 --- a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json +++ b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json @@ -10,6 +10,13 @@ "Total": "Toplam", "TotalSelected": "Seçilen Ürünler ({0})", "OurProducts": "Ürünlerimiz", + "FreeCargo": "Ücretsiz Kargo", + "Purchase:GiftCards":"Hediye Çekleri", + "Purchase:CargoAndPackaging": "Kargo ve Paketleme", + "Purchase:Total": "Toplam", + "Purchase:OrderSummary": "Sipariş Özeti", + "Purchase:Products": "Ürünler", + "Purchase:OrderTotal": "Sipariş Toplamı", "CatalogServiceNotAvailable": "Ürün servisine şu anda ulaşılamıyor! Lütfen sonra tekrar deneyiniz...", "StockCount": "Stokta", "RemoveFromBasket": "Sepetten kaldır",