Browse Source

fixed unit total prices

pull/58/head
Galip Tolga Erdem 5 years ago
parent
commit
18f7865ac0
  1. 6
      apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml
  2. 4
      apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicAutoMapperProfile.cs
  3. 3
      apps/public-web/src/EShopOnAbp.PublicWeb/Pages/OrderReceived.cshtml

6
apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml

@ -32,7 +32,7 @@
@foreach (var item in Model.Items) @foreach (var item in Model.Items)
{ {
string imageName = item.ImageName.IsNullOrEmpty() ? "/product-images/noimage.jpg" : $"/product-images/{item.ImageName}"; string imageName = item.ImageName.IsNullOrEmpty() ? "/product-images/noimage.jpg" : $"/product-images/{item.ImageName}";
var price = (item.TotalPrice * item.Count).ToString("0.00"); var price = item.TotalPrice.ToString("0.00");
<div class="card basket-list-item" data-product-id="@item.ProductId"> <div class="card basket-list-item" data-product-id="@item.ProductId">
<div class="card-body"> <div class="card-body">
<div class="flex-container horizontal"> <div class="flex-container horizontal">
@ -48,7 +48,9 @@
<span>$@price</span> <span>$@price</span>
</div> </div>
<div class="flex-item description-cargo"> <div class="flex-item description-cargo">
<span><i class="fa fa-truck"></i> @L["FreeCargo"]</span> <span>
<i class="fa fa-truck"></i> @L["FreeCargo"]
</span>
</div> </div>
</div> </div>
</div> </div>

4
apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicAutoMapperProfile.cs

@ -18,10 +18,10 @@ namespace EShopOnAbp.PublicWeb
.ForMember(p => p.Quantity, opts => opts.MapFrom(p => p.Count)); .ForMember(p => p.Quantity, opts => opts.MapFrom(p => p.Count));
CreateMap<BasketItemDto, OrderItemCreateDto>() CreateMap<BasketItemDto, OrderItemCreateDto>()
.ForMember(p => p.UnitPrice, opts => opts.MapFrom(q => q.TotalPrice)) .ForMember(p => p.UnitPrice, opts => opts.MapFrom(q => q.TotalPrice / q.Count))
.ForMember(p => p.Units, opts => opts.MapFrom(q => q.Count)) .ForMember(p => p.Units, opts => opts.MapFrom(q => q.Count))
.ForMember(p => p.PictureUrl, opts => opts.MapFrom(q => q.ImageName)) .ForMember(p => p.PictureUrl, opts => opts.MapFrom(q => q.ImageName))
.Ignore(q => q.Discount); .Ignore(q => q.Discount);
} }
} }
} }

3
apps/public-web/src/EShopOnAbp.PublicWeb/Pages/OrderReceived.cshtml

@ -2,8 +2,7 @@
@using System.Globalization @using System.Globalization
@model EShopOnAbp.PublicWeb.Pages.OrderReceivedModel @model EShopOnAbp.PublicWeb.Pages.OrderReceivedModel
@{ @{
decimal orderTotal = 0; decimal orderTotal = Model.ReceivedOrder.Items.Sum(q => q.UnitPrice * q.Units);
Model.ReceivedOrder.Items.ForEach(q => orderTotal += q.Units * q.UnitPrice);
string orderTotalString = orderTotal.ToString("C", new CultureInfo("en-US")); // We work with USD any ways string orderTotalString = orderTotal.ToString("C", new CultureInfo("en-US")); // We work with USD any ways
string orderNoString = Model.ReceivedOrder.OrderNo.ToString("N0", new NumberFormatInfo() {NumberGroupSeparator = " "}); string orderNoString = Model.ReceivedOrder.OrderNo.ToString("N0", new NumberFormatInfo() {NumberGroupSeparator = " "});
} }

Loading…
Cancel
Save