Skip to content

Commit 73a96aa

Browse files
thiennnthiennn
committed
upgrade bootstrap to 4.3
show product image in order details
1 parent 94ec126 commit 73a96aa

24 files changed

Lines changed: 9426 additions & 5458 deletions

‎src/Modules/SimplCommerce.Module.Core/wwwroot/site.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,13 +382,13 @@ li.nav-item-group, li.nav-item-group a {
382382
.btn-order {
383383
background: #18ba9b;
384384
padding: 8px 43px;
385-
font-size: 14px;
385+
font-size: 13px;
386386
color: #fff;
387387
width: 100%;
388388
border: 0;
389389
border-radius: 0;
390390
text-transform: uppercase;
391-
width: 200px;
391+
width: 240px;
392392
}
393393

394394
.btn-order:hover {

‎src/Modules/SimplCommerce.Module.Orders/Areas/Orders/Controllers/OrderController.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,18 @@ public async Task<IActionResult> OrderDetails(long orderId)
124124
ProductPrice = x.ProductPrice,
125125
Quantity = x.Quantity,
126126
DiscountAmount = x.DiscountAmount,
127+
ProductImage = x.Product.ThumbnailImage.FileName,
127128
TaxAmount = x.TaxAmount,
128129
TaxPercent = x.TaxPercent,
129130
VariationOptions = OrderItemVm.GetVariationOption(x.Product)
130131
}).ToList()
131132
};
132133

134+
foreach (var item in model.OrderItems)
135+
{
136+
item.ProductImage = _mediaService.GetMediaUrl(item.ProductImage);
137+
}
138+
133139
return View(model);
134140
}
135141
}

‎src/Modules/SimplCommerce.Module.Orders/Areas/Orders/Views/Order/OrderDetails.cshtml‎

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717
@Localizer["Order date"] @Model.CreatedOn.DateTime
1818
</div>
1919
</div>
20-
<hr />
21-
<div class="row">
22-
<div class="col-md-4">@Localizer["Shipping address"]</div>
23-
<div class="col-md-4">@Localizer["Shipping method"]</div>
24-
<div class="col-md-4">@Localizer["Payment method"]</div>
20+
<div class="row mt-4">
21+
<div class="col-md-4"><strong>@Localizer["Shipping address"]</strong></div>
22+
<div class="col-md-4"><strong>@Localizer["Shipping method"]</strong></div>
23+
<div class="col-md-4"><strong>@Localizer["Payment method"]</strong></div>
2524
</div>
2625
<div class="row">
2726
<div class="col-md-4">
@@ -34,62 +33,66 @@
3433
<div class="col-md-4">@Model.PaymentMethod</div>
3534
</div>
3635

37-
<table class="table table-striped mt-3">
38-
<tr>
39-
<th>@Localizer["Product"]</th>
40-
<th>@Localizer["Price"]</th>
41-
<th>@Localizer["Quantity"]</th>
42-
<th>@Localizer["Discount"]</th>
43-
<th>@Localizer["Row Total"]</th>
44-
</tr>
45-
@foreach (var item in Model.OrderItems)
46-
{
36+
<table class="table table-borderless mt-4">
37+
<thead>
4738
<tr>
48-
<td>
49-
<div class="row">
50-
<div class="col-md-3">
51-
52-
</div>
53-
<div class="col-md-9">
54-
<p>@item.ProductName</p>
55-
<p>Quantity @item.Quantity</p>
56-
</div>
57-
</div>
58-
</td>
59-
<td>@item.ProductPrice</td>
60-
<td>@item.Quantity</td>
61-
<td>@item.DiscountAmountString</td>
62-
<td>@item.RowTotalString</td>
39+
<th class="pl-0">@Localizer["Product"]</th>
40+
<th class="text-right">@Localizer["Price"]</th>
41+
<th class="text-right">@Localizer["Quantity"]</th>
42+
<th class="text-right">@Localizer["Discount"]</th>
43+
<th class="text-right text-nowrap pr-0">@Localizer["Row Total"]</th>
6344
</tr>
64-
}
45+
</thead>
46+
<tbody>
47+
@foreach (var item in Model.OrderItems)
48+
{
49+
<tr>
50+
<td class="pl-0">
51+
<div class="row">
52+
<div class="col-md-3">
53+
<img class="img-fluid" src="@item.ProductImage" />
54+
</div>
55+
<div class="col-md-9">
56+
<p>@item.ProductName</p>
57+
<p>Quantity @item.Quantity</p>
58+
</div>
59+
</div>
60+
</td>
61+
<td class="text-right">@item.ProductPrice</td>
62+
<td class="text-right">@item.Quantity</td>
63+
<td class="text-right">@item.DiscountAmountString</td>
64+
<td class="text-right pr-0">@item.RowTotalString</td>
65+
</tr>
66+
}
67+
</tbody>
6568
</table>
6669
<div class="row">
6770
<div class="col-md-6"></div>
6871
<div class="col-md-6">
6972
<table class="table table-borderless">
7073
<tr>
7174
<td>@Localizer["Subtotal"]</td>
72-
<td class="text-right">@Model.SubtotalString</td>
75+
<td class="text-right pr-0">@Model.SubtotalString</td>
7376
</tr>
7477
<tr>
7578
<td>@Localizer["Shipping"]</td>
76-
<td class="text-right">@Model.ShippingAmountString</td>
79+
<td class="text-right pr-0">@Model.ShippingAmountString</td>
7780
</tr>
7881
<tr>
7982
<td>@Localizer["Tax"]</td>
80-
<td class="text-right">@Model.TaxAmountString</td>
83+
<td class="text-right pr-0">@Model.TaxAmountString</td>
8184
</tr>
8285
<tr>
8386
<td>@Localizer["Discount"]</td>
84-
<td class="text-right">@Model.DiscountAmountString</td>
87+
<td class="text-right pr-0">@Model.DiscountAmountString</td>
8588
</tr>
8689
<tr>
8790
<td>@Localizer["Payment Fee"]</td>
88-
<td class="text-right">@Model.PaymentFeeAmountString</td>
91+
<td class="text-right pr-0">@Model.PaymentFeeAmountString</td>
8992
</tr>
9093
<tr>
91-
<td>@Localizer["Order Total"]</td>
92-
<td class="text-right"><strong>@Model.OrderTotalString</strong></td>
94+
<td><strong>@Localizer["Order Total"]</strong></td>
95+
<td class="text-right pr-0"><strong>@Model.OrderTotalString</strong></td>
9396
</tr>
9497
</table>
9598
</div>

0 commit comments

Comments
 (0)