diff --git a/src/Presentation/Nop.Web/Areas/Admin/Views/Order/AddProductToOrderDetails.cshtml b/src/Presentation/Nop.Web/Areas/Admin/Views/Order/AddProductToOrderDetails.cshtml
index afa450cd393..d4c81b8303b 100644
--- a/src/Presentation/Nop.Web/Areas/Admin/Views/Order/AddProductToOrderDetails.cshtml
+++ b/src/Presentation/Nop.Web/Areas/Admin/Views/Order/AddProductToOrderDetails.cshtml
@@ -1,4 +1,4 @@
-@model AddProductToOrderModel
+@model AddProductToOrderModel
 
 @using Nop.Core.Domain.Catalog
 
@@ -10,7 +10,6 @@
 }
 
 @*we add enctype = "multipart/form-data" because "File upload" attribute control type requires it*@
-
 <form asp-controller="Order" asp-action="AddProductToOrderDetails" asp-route-orderId="@Model.OrderId"
       asp-route-productId="@Model.ProductId" enctype="multipart/form-data" method="post" id="product-details-form">
     
@@ -53,7 +52,7 @@
                                     <nop-label asp-for="UnitPriceInclTax" />
                                 </div>
                                 <div class="col-md-9">
-                                    <nop-editor asp-for="UnitPriceInclTax" />
+                                    <nop-editor asp-for="UnitPriceInclTax" class="UnitPriceInclTax" />
                                 </div>
                             </div>
                             <div class="form-group">
@@ -142,4 +141,24 @@
             </div>
         </div>
     </div>
-</form>
\ No newline at end of file
+</form>
+
+<script type="text/javascript">
+    $(document).ready(function () {
+        $("#Quantity, #UnitPriceInclTax, #UnitPriceExclTax").TouchSpin().on('change', function () {
+            updateTotal();
+        });
+    });
+
+    function updateTotal() {
+        var quantity = $("#Quantity").val();
+        var unitPriceInclTax = $("#UnitPriceInclTax").val();
+        var unitPriceExclTax = $("#UnitPriceExclTax").val();
+
+        var priceInclTax = unitPriceInclTax * quantity;
+        $("#SubTotalInclTax").val(priceInclTax.toFixed(4));
+
+        var priceExclTax = unitPriceExclTax * quantity;
+        $("#SubTotalExclTax").val(priceExclTax.toFixed(4));
+    }
+</script>
diff --git a/src/Presentation/Nop.Web/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml b/src/Presentation/Nop.Web/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml
index 109e5ce220c..dcbf7b00adf 100644
--- a/src/Presentation/Nop.Web/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml
+++ b/src/Presentation/Nop.Web/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml
@@ -1,4 +1,4 @@
-@model OrderModel
+@model OrderModel
 
 @using Nop.Core.Domain.Tax;
 @using Nop.Core.Domain.Orders;
@@ -6,13 +6,81 @@
 
 @if (!Model.IsLoggedInAsVendor)
 {
-    <script>
-        $(document).ready(function () {
+    <script type="text/javascript">
+	
+	$(document).ready(function () {
             toggleChangeOrderStatus(false);
             toggleOrderTotals(false);
             toggleCC(false);
+
+            $("#OrderSubtotalInclTaxValue, #OrderSubTotalDiscountInclTaxValue, #OrderShippingInclTaxValue, #PaymentMethodAdditionalFeeInclTaxValue, #TaxValue, #OrderTotalDiscountValue").on('change', function () {
+                updateTotal();
+            });
         });
 
+        function updateTotal() {
+
+            var TaxRatesValue = $("#TaxRatesValue").val();
+
+            // Get taxRate from TaxRatesValue
+            var TaxRatesValue = $("#TaxRatesValue").val().split(":");
+
+            var taxRate = 0;
+            if (TaxRatesValue.length > 1)
+                taxRate = parseFloat(TaxRatesValue[0]);
+
+            // Order subtotal with tax
+            var orderSubtotalInclTaxValue = parseFloat($("#OrderSubtotalInclTaxValue").val());
+
+            //  Order subtotal without tax
+            var orderSubtotalExclTaxValue = orderSubtotalInclTaxValue / ((100 + taxRate) / 100); 
+            $("#OrderSubtotalExclTaxValue").val(orderSubtotalExclTaxValue.toFixed(4));
+
+
+            // Order subTotal discount with tax
+            var orderSubTotalDiscountInclTaxValue = parseFloat($("#OrderSubTotalDiscountInclTaxValue").val());
+
+            // Order subtotal discount without tax
+            var orderSubTotalDiscountExclTaxValue = orderSubTotalDiscountInclTaxValue / ((100 + taxRate) / 100);
+            $("#OrderSubTotalDiscountExclTaxValue").val(orderSubTotalDiscountExclTaxValue.toFixed(4));
+
+
+            // Order shipping with tax
+            var orderShippingInclTaxValue = parseFloat($("#OrderShippingInclTaxValue").val());
+
+            // Order shipping without tax
+            var orderShippingExclTaxValue = orderShippingInclTaxValue / ((100 + taxRate) / 100);
+            $("#OrderShippingExclTaxValue").val(orderShippingExclTaxValue.toFixed(4));
+
+
+            // Payment method additional fee with tax
+            var paymentMethodAdditionalFeeInclTaxValue = parseFloat($("#PaymentMethodAdditionalFeeInclTaxValue").val());
+
+            // Order shipping without tax
+            var paymentMethodAdditionalFeeExclTaxValue = paymentMethodAdditionalFeeInclTaxValue / ((100 + taxRate) / 100);
+            $("#PaymentMethodAdditionalFeeExclTaxValue").val(paymentMethodAdditionalFeeExclTaxValue.toFixed(4));
+
+            //  Total order without tax
+            var orderTotalExclTaxValue = orderSubtotalExclTaxValue - orderSubTotalDiscountExclTaxValue + orderShippingExclTaxValue + paymentMethodAdditionalFeeExclTaxValue;
+            
+            // Total order with tax
+            var orderTotalInclTaxValue = orderSubtotalInclTaxValue - orderSubTotalDiscountInclTaxValue + orderShippingInclTaxValue + paymentMethodAdditionalFeeInclTaxValue;
+            
+            // Tax value
+            var taxValue = orderTotalInclTaxValue - orderTotalExclTaxValue;
+            $("#TaxValue").val(taxValue.toFixed(4));
+
+            // Discount
+            var orderTotalDiscountValue = parseFloat($("#OrderTotalDiscountValue").val());
+
+            // orderTotalInclTaxValue = orderTotalInclTaxValue - orderTotalDiscountValue
+            orderTotalInclTaxValue -= orderTotalDiscountValue;
+
+            // Total order with tax
+            $("#OrderTotalValue").val(orderTotalInclTaxValue.toFixed(4));                                                              
+            
+        }
+
         function toggleChangeOrderStatus(editmode) {
             if (editmode) {
                 $('#pnlChangeOrderStatus').show();
@@ -74,7 +142,8 @@
         }
     </script>
 }
-<div class="panel-body">
+<div class="panel-group">
+    @await Component.InvokeAsync("AdminWidget", new { widgetZone = "admin_order_details_info_top", additionalData = Model.Id })
     <div class="panel panel-default">
         <div class="panel-body">
             @if (!Model.IsLoggedInAsVendor)
@@ -402,7 +471,7 @@
                             <nop-label asp-for="RedeemedRewardPoints" />
                         </div>
                         <div class="col-md-9">
-                            <div class="form-text-row">@($"{Model.RedeemedRewardPoints}{T("Admin.Orders.Fields.RedeemedRewardPoints.Points")} {Model.RedeemedRewardPointsAmount}")</div>
+                            <div class="form-text-row">@Model.RedeemedRewardPoints + @T("Admin.Orders.Fields.RedeemedRewardPoints.Points").Text + "/" + @Model.RedeemedRewardPointsAmount</div>
                         </div>
                     </div>
                 }
@@ -822,4 +891,5 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+    @await Component.InvokeAsync("AdminWidget", new { widgetZone = "admin_order_details_info_bottom", additionalData = Model.Id })
+</div>
diff --git a/src/Presentation/Nop.Web/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml b/src/Presentation/Nop.Web/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml
index 56ef3801de2..0bc6eb67fda 100644
--- a/src/Presentation/Nop.Web/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml
+++ b/src/Presentation/Nop.Web/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml
@@ -1,391 +1,416 @@
-@model OrderModel
+@model OrderModel
 
 @using Nop.Core.Domain.Tax;
 @using Nop.Core.Domain.Catalog;
 
-<div class="panel-body">
-    <div class="form-group">
-        <div class="col-md-12" style="overflow-x: auto;">
-            @foreach (var item in Model.Items)
-            {
-                <script>
-                    $(document).ready(function () {
-                        toggleOrderItemEdit@(item.Id)(false);
-                    });
-                </script>
-
-                <script>
-                    function toggleOrderItemEdit@(item.Id)(editMode) {
-                        if (editMode) {
-                            $('#pnlEditPvUnitPrice@(item.Id)').show();
-                            $('#pnlEditPvQuantity@(item.Id)').show();
-                            $('#pnlEditPvDiscount@(item.Id)').show();
-                            $('#pnlEditPvPrice@(item.Id)').show();
-                            $('#btnEditOrderItem@(item.Id)').hide();
-                            $('#btnDeleteOrderItem@(item.Id)').hide();
-                            $('#btnSaveOrderItem@(item.Id)').show();
-                            $('#btnCancelOrderItem@(item.Id)').show();
-                        } else {
-                            $('#pnlEditPvUnitPrice@(item.Id)').hide();
-                            $('#pnlEditPvQuantity@(item.Id)').hide();
-                            $('#pnlEditPvDiscount@(item.Id)').hide();
-                            $('#pnlEditPvPrice@(item.Id)').hide();
-                            $('#btnEditOrderItem@(item.Id)').show();
-                            $('#btnDeleteOrderItem@(item.Id)').show();
-                            $('#btnSaveOrderItem@(item.Id)').hide();
-                            $('#btnCancelOrderItem@(item.Id)').hide();
-                        }
-                    }
-                </script>
-            }
-
-            <table class="table table-hover table-bordered">
-                <col />
-                <col />
-                @if (Model.HasDownloadableProducts)
-                {
-                    <col />
-                }
-                <col />
-                <col />
-                <col />
-                <col />
-                @if (!Model.IsLoggedInAsVendor)
-                {
-                    <col />
-                }
-            <thead>
-            <tr>
-                <th>
-                    @T("Admin.Orders.Products.Picture")
-                </th>
-                <th>
-                    @T("Admin.Orders.Products.ProductName")
-                </th>
-                @if (Model.HasDownloadableProducts)
-                {
-                    <th>
-                        @T("Admin.Orders.Products.Download")
-                    </th>
-                }
-                <th>
-                    @T("Admin.Orders.Products.Price")
-                </th>
-                <th>
-                    @T("Admin.Orders.Products.Quantity")
-                </th>
-                <th>
-                    @T("Admin.Orders.Products.Discount")
-                </th>
-                <th>
-                    @T("Admin.Orders.Products.Total")
-                </th>
-                @if (!Model.IsLoggedInAsVendor)
-                {
-                    <th>
-                        @T("Admin.Common.Edit")
-                    </th>
-                }
-            </tr>
-            </thead>
-                <tbody>
+<div class="panel-group">
+    @await Component.InvokeAsync("AdminWidget", new { widgetZone = AdminWidgetZones.OrderDetailsProductsTop, additionalData = Model })
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <div class="form-group">
+                <div class="col-md-12" style="overflow-x: auto;">
                     @foreach (var item in Model.Items)
                     {
-                        <tr>
-                        <td class="text-center">
-                            <img src="@item.PictureThumbnailUrl" alt="" title=""/>
-                        </td>
-                        <td style="width: 15%;" class="text-left">
-                            <em><a asp-controller="Product" asp-action="Edit" asp-route-id="@item.ProductId">@item.ProductName</a></em>
-                            @if (!string.IsNullOrEmpty(item.AttributeInfo))
-                            {
-                                <p>
-                                    @Html.Raw(item.AttributeInfo)
-                                </p>
-                            }
-                            @if (!string.IsNullOrEmpty(item.RecurringInfo))
-                            {
-                                <p>
-                                    @Html.Raw(item.RecurringInfo)
-                                </p>
-                            }
-                            @if (!string.IsNullOrEmpty(item.RentalInfo))
-                            {
-                                <p>
-                                    @Html.Raw(item.RentalInfo)
-                                </p>
-                            }
-                            @if (!string.IsNullOrEmpty(item.Sku))
-                            {
-                                <p>
-                                    <strong>@T("Admin.Orders.Products.SKU")</strong><text>:</text>
-                                    @item.Sku
-                                </p>
+                        <script type="text/javascript">
+                            $(document).ready(function () {
+                                toggleOrderItemEdit@(item.Id)(false);
+                                $("#pvQuantity@(item.Id)").TouchSpin({
+                                    verticalbuttons: true,
+                                    verticalupclass: 'glyphicon glyphicon-plus',
+                                    verticaldownclass: 'glyphicon glyphicon-minus'
+                                })
+                                .on('change', function () {
+                                    updateTotal@(item.Id)();
+                                });
+                            });
+                        </script>
+
+                        <script type="text/javascript">
+                            function updateTotal@(item.Id)() {
+                                var quantity = $("#pvQuantity@(item.Id)").val();
+                                var pvUnitPriceInclTax = $("#pvUnitPriceInclTax@(item.Id)").val();
+                                var pvPriceInclTax = pvUnitPriceInclTax * quantity;
+
+                                var pvUnitPriceExclTax = $("#pvUnitPriceExclTax@(item.Id)").val();
+                                var pvPriceExclTax = pvUnitPriceExclTax * quantity;
+
+                                $("#pvPriceInclTax@(item.Id)").val(pvPriceInclTax.toFixed(4));
+                                $("#pvPriceExclTax@(item.Id)").val(pvPriceExclTax.toFixed(4));
                             }
-                            @if (!string.IsNullOrEmpty(item.VendorName))
-                            {
-                                <p>
-                                    <strong>@T("Admin.Orders.Products.Vendor")</strong><text>:</text>
-                                    @item.VendorName
-                                </p>
+                            function toggleOrderItemEdit@(item.Id)(editMode) {
+                                if (editMode) {
+                                    $('#pnlEditPvUnitPrice@(item.Id)').show();
+                                    $('#pnlEditPvQuantity@(item.Id)').show();
+                                    $('#pnlEditPvDiscount@(item.Id)').show();
+                                    $('#pnlEditPvPrice@(item.Id)').show();
+                                    $('#btnEditOrderItem@(item.Id)').hide();
+                                    $('#btnDeleteOrderItem@(item.Id)').hide();
+                                    $('#btnSaveOrderItem@(item.Id)').show();
+                                    $('#btnCancelOrderItem@(item.Id)').show();
+                                } else {
+                                    $('#pnlEditPvUnitPrice@(item.Id)').hide();
+                                    $('#pnlEditPvQuantity@(item.Id)').hide();
+                                    $('#pnlEditPvDiscount@(item.Id)').hide();
+                                    $('#pnlEditPvPrice@(item.Id)').hide();
+                                    $('#btnEditOrderItem@(item.Id)').show();
+                                    $('#btnDeleteOrderItem@(item.Id)').show();
+                                    $('#btnSaveOrderItem@(item.Id)').hide();
+                                    $('#btnCancelOrderItem@(item.Id)').hide();
+                                }
                             }
-                            @if (item.ReturnRequests.Count > 0)
+                        </script>
+                    }
+
+                    <table class="table table-hover table-bordered">
+                        <col />
+                        <col />
+                        @if (Model.HasDownloadableProducts)
+                        {
+                            <col />
+                        }
+                        <col />
+                        <col />
+                        <col />
+                        <col />
+                        @if (!Model.IsLoggedInAsVendor)
+                        {
+                            <col />
+                        }
+                        <thead>
+                            <tr>
+                                <th>
+                                    @T("Admin.Orders.Products.Picture")
+                                </th>
+                                <th>
+                                    @T("Admin.Orders.Products.ProductName")
+                                </th>
+                                @if (Model.HasDownloadableProducts)
+                                {
+                                    <th>
+                                        @T("Admin.Orders.Products.Download")
+                                    </th>
+                                }
+                                <th>
+                                    @T("Admin.Orders.Products.Price")
+                                </th>
+                                <th>
+                                    @T("Admin.Orders.Products.Quantity")
+                                </th>
+                                <th>
+                                    @T("Admin.Orders.Products.Discount")
+                                </th>
+                                <th>
+                                    @T("Admin.Orders.Products.Total")
+                                </th>
+                                @if (!Model.IsLoggedInAsVendor)
+                                {
+                                    <th>
+                                        @T("Admin.Common.Edit")
+                                    </th>
+                                }
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var item in Model.Items)
                             {
-                                <p>
-                                    @T("Admin.Orders.Products.ReturnRequests")<text>:</text>
-                                    @for (var i = 0; i < item.ReturnRequests.Count; i++)
-                                    {
-                                        <a asp-controller="ReturnRequest" asp-action="Edit" asp-route-id="@item.ReturnRequests[i].Id">@item.ReturnRequests[i].CustomNumber</a>
-                                        if (i != item.ReturnRequests.Count - 1)
+                                <tr>
+                                    <td class="text-center">
+                                        <img src="@item.PictureThumbnailUrl" alt="" title="" />
+                                    </td>
+                                    <td style="width: 15%;" class="text-left">
+                                        <em><a asp-controller="Product" asp-action="Edit" asp-route-id="@item.ProductId">@item.ProductName</a></em>
+                                        @if (!string.IsNullOrEmpty(item.AttributeInfo))
                                         {
-                                            <text>,</text>
+                                            <p>
+                                                @Html.Raw(item.AttributeInfo)
+                                            </p>
                                         }
-                                    }
-                                </p>
-                            }
-                            @if (item.PurchasedGiftCardIds.Count > 0)
-                            {
-                                <p>
-                                    @T("Admin.Orders.Products.GiftCards")<text>:</text>
-                                    @for (var i = 0; i < item.PurchasedGiftCardIds.Count; i++)
-                                    {
-                                        <a asp-controller="GiftCard" asp-action="Edit" asp-route-id="@item.PurchasedGiftCardIds[i]">@item.PurchasedGiftCardIds[i]</a>
-                                        if (i != item.PurchasedGiftCardIds.Count - 1)
+                                        @if (!string.IsNullOrEmpty(item.RecurringInfo))
                                         {
-                                            <text>,</text>
+                                            <p>
+                                                @Html.Raw(item.RecurringInfo)
+                                            </p>
                                         }
-                                    }
-                                </p>
-                            }
-                        </td>
+                                        @if (!string.IsNullOrEmpty(item.RentalInfo))
+                                        {
+                                            <p>
+                                                @Html.Raw(item.RentalInfo)
+                                            </p>
+                                        }
+                                        @if (!string.IsNullOrEmpty(item.Sku))
+                                        {
+                                            <p>
+                                                <strong>@T("Admin.Orders.Products.SKU")</strong><text>:</text>
+                                                @item.Sku
+                                            </p>
+                                        }
+                                        @if (!string.IsNullOrEmpty(item.VendorName))
+                                        {
+                                            <p>
+                                                <strong>@T("Admin.Orders.Products.Vendor")</strong><text>:</text>
+                                                @item.VendorName
+                                            </p>
+                                        }
+                                        @if (item.ReturnRequests.Count > 0)
+                                        {
+                                            <p>
+                                                @T("Admin.Orders.Products.ReturnRequests")<text>:</text>
+                                                @for (var i = 0; i < item.ReturnRequests.Count; i++)
+                                                {
+                                                    <a asp-controller="ReturnRequest" asp-action="Edit" asp-route-id="@item.ReturnRequests[i].Id">@item.ReturnRequests[i].CustomNumber</a>
+                                                    if (i != item.ReturnRequests.Count - 1)
+                                                    {
+                                                        <text>,</text>
+                                                    }
+                                                }
+                                            </p>
+                                        }
+                                        @if (item.PurchasedGiftCardIds.Count > 0)
+                                        {
+                                            <p>
+                                                @T("Admin.Orders.Products.GiftCards")<text>:</text>
+                                                @for (var i = 0; i < item.PurchasedGiftCardIds.Count; i++)
+                                                {
+                                                    <a asp-controller="GiftCard" asp-action="Edit" asp-route-id="@item.PurchasedGiftCardIds[i]">@item.PurchasedGiftCardIds[i]</a>
+                                                    if (i != item.PurchasedGiftCardIds.Count - 1)
+                                                    {
+                                                        <text>,</text>
+                                                    }
+                                                }
+                                            </p>
+                                        }
+                                    </td>
 
-                        @if (Model.HasDownloadableProducts)
-                        {
-                            <td style="width: 15%;" class="text-center">
-                                @if (item.IsDownload)
-                                {
-                                    <div>
-                                        @string.Format(T("Admin.Orders.Products.Download.DownloadCount").Text, item.DownloadCount)
-                                        <button type="submit" name="btnResetDownloadCount@(item.Id)" title="@T("Admin.Orders.Products.Download.ResetDownloadCount.Title")" id="btnResetDownloadCount@(item.Id)" class="btn btn-sm bg-navy">
-                                            @T("Admin.Orders.Products.Download.ResetDownloadCount")
-                                        </button>
-                                        <hr/>
-                                    </div>
-                                    if (item.DownloadActivationType == DownloadActivationType.Manually)
+                                    @if (Model.HasDownloadableProducts)
                                     {
-                                        <div>
-                                            <button type="submit" name="btnPvActivateDownload@(item.Id)" id="btnPvActivateDownload@(item.Id)" class="btn btn-sm bg-green">
-                                                @(item.IsDownloadActivated ? T("Admin.Orders.Products.Download.Deactivate") : T("Admin.Orders.Products.Download.Activate"))
-                                            </button>
-                                            <hr/>
-                                        </div>
+                                        <td style="width: 15%;" class="text-center">
+                                            @if (item.IsDownload)
+                                            {
+                                                <div>
+                                                    @string.Format(T("Admin.Orders.Products.Download.DownloadCount").Text, item.DownloadCount)
+                                                    <button type="submit" name="btnResetDownloadCount@(item.Id)" title="@T("Admin.Orders.Products.Download.ResetDownloadCount.Title")" id="btnResetDownloadCount@(item.Id)" class="btn btn-sm bg-navy">
+                                                        @T("Admin.Orders.Products.Download.ResetDownloadCount")
+                                                    </button>
+                                                    <hr />
+                                                </div>
+                                                if (item.DownloadActivationType == DownloadActivationType.Manually)
+                                                {
+                                                    <div>
+                                                        <button type="submit" name="btnPvActivateDownload@(item.Id)" id="btnPvActivateDownload@(item.Id)" class="btn btn-sm bg-green">
+                                                            @(item.IsDownloadActivated ? T("Admin.Orders.Products.Download.Deactivate") : T("Admin.Orders.Products.Download.Activate"))
+                                                        </button>
+                                                        <hr />
+                                                    </div>
+                                                }
+                                                <div>
+                                                    <div>
+                                                        <strong>
+                                                            @T("Admin.Orders.Products.License")
+                                                        </strong>
+                                                    </div>
+                                                    @if (item.LicenseDownloadGuid != Guid.Empty)
+                                                    {
+                                                        <div>
+                                                            <a asp-controller="Download" asp-action="DownloadFile" asp-route-downloadGuid="@item.LicenseDownloadGuid">@T("Admin.Orders.Products.License.DownloadLicense")</a>
+                                                        </div>
+                                                    }
+                                                    <button type="submit" id="pvlicensefile" name="pvlicensefile" onclick="javascript:OpenWindow('@(Url.Action("UploadLicenseFilePopup", "Order", new {id = Model.Id, orderItemId = item.Id, btnId = "btnRefreshPage", formId = "order-form"}))', 500, 400, true); return false;" class="btn btn-sm bg-olive">
+                                                        @T("Admin.Orders.Products.License.UploadFile")
+                                                    </button>
+                                                </div>
+                                            }
+                                        </td>
                                     }
-                                    <div>
-                                        <div>
-                                            <strong>
-                                                @T("Admin.Orders.Products.License")
-                                            </strong>
-                                        </div>
-                                        @if (item.LicenseDownloadGuid != Guid.Empty)
+                                    <td style="width: 15%;" class="text-center">
+                                        @if (Model.AllowCustomersToSelectTaxDisplayType)
                                         {
-                                            <div>
-                                                <a asp-controller="Download" asp-action="DownloadFile" asp-route-downloadGuid="@item.LicenseDownloadGuid">@T("Admin.Orders.Products.License.DownloadLicense")</a>
+                                            <div>@item.UnitPriceInclTax</div>
+                                            <div>@item.UnitPriceExclTax</div>
+                                        }
+                                        else
+                                        {
+                                            switch (Model.TaxDisplayType)
+                                            {
+                                                case TaxDisplayType.ExcludingTax:
+                                                    {
+                                                        @item.UnitPriceExclTax
+                                                    }
+                                                    break;
+                                                case TaxDisplayType.IncludingTax:
+                                                    {
+                                                        @item.UnitPriceInclTax
+                                                    }
+                                                    break;
+                                                default:
+                                                    break;
+                                            }
+                                        }
+                                        <div id="pnlEditPvUnitPrice@(item.Id)">
+                                            <div class="form-group">
+                                                <div class="col-md-5">
+                                                    @T("Admin.Orders.Products.Edit.InclTax")
+                                                </div>
+                                                <div class="col-md-7">
+                                                    <input name="pvUnitPriceInclTax@(item.Id)" type="text" value="@item.UnitPriceInclTaxValue" id="pvUnitPriceInclTax@(item.Id)" class="form-control input-sm" onblur="updateTotal@(item.Id)()" />
+                                                </div>
+                                            </div>
+                                            <div class="form-group">
+                                                <div class="col-md-5">
+                                                    @T("Admin.Orders.Products.Edit.ExclTax")
+                                                </div>
+                                                <div class="col-md-7">
+                                                    <input name="pvUnitPriceExclTax@(item.Id)" type="text" value="@item.UnitPriceExclTaxValue" id="pvUnitPriceExclTax@(item.Id)" class="form-control input-sm" onblur="updateTotal@(item.Id)()" />
+                                                </div>
                                             </div>
+                                        </div>
+                                    </td>
+                                    <td style="width: 10%;" class="text-center">
+                                        <div>@item.Quantity</div>
+                                        <div id="pnlEditPvQuantity@(item.Id)">
+                                            <div class="form-group">
+                                                <div class="col-md-8 col-md-offset-2">
+                                                    <input name="pvQuantity@(item.Id)" type="text" value="@item.Quantity" id="pvQuantity@(item.Id)" class="form-control input-sm" />
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td style="width: 15%;" class="text-center">
+                                        @if (Model.AllowCustomersToSelectTaxDisplayType)
+                                        {
+                                            <div>@item.DiscountInclTax</div>
+                                            <div>@item.DiscountExclTax</div>
                                         }
-                                        <button type="submit" id="pvlicensefile" name="pvlicensefile" onclick="javascript:OpenWindow('@(Url.Action("UploadLicenseFilePopup", "Order", new {id = Model.Id, orderItemId = item.Id, btnId = "btnRefreshPage", formId = "order-form"}))', 500, 400, true); return false;" class="btn btn-sm bg-olive">
-                                            @T("Admin.Orders.Products.License.UploadFile")
-                                        </button>
-                                    </div>
-                                }
-                            </td>
-                        }
-                        <td style="width: 15%;" class="text-center">
-                            @if (Model.AllowCustomersToSelectTaxDisplayType)
-                            {
-                                <div>@item.UnitPriceInclTax</div>
-                                <div>@item.UnitPriceExclTax</div>
-                            }
-                            else
-                            {
-                                switch (Model.TaxDisplayType)
-                                {
-                                    case TaxDisplayType.ExcludingTax:
-                                    {
-                                        @item.UnitPriceExclTax
-                                    }
-                                        break;
-                                    case TaxDisplayType.IncludingTax:
-                                    {
-                                        @item.UnitPriceInclTax
-                                    }
-                                        break;
-                                    default:
-                                        break;
-                                }
-                            }
-                            <div id="pnlEditPvUnitPrice@(item.Id)">
-                                <div class="form-group">
-                                    <div class="col-md-5">
-                                        @T("Admin.Orders.Products.Edit.InclTax")
-                                    </div>
-                                    <div class="col-md-7">
-                                        <input name="pvUnitPriceInclTax@(item.Id)" type="text" value="@item.UnitPriceInclTaxValue" id="pvUnitPriceInclTax@(item.Id)" class="form-control input-sm"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <div class="col-md-5">
-                                        @T("Admin.Orders.Products.Edit.ExclTax")
-                                    </div>
-                                    <div class="col-md-7">
-                                        <input name="pvUnitPriceExclTax@(item.Id)" type="text" value="@item.UnitPriceExclTaxValue" id="pvUnitPriceExclTax@(item.Id)" class="form-control input-sm"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
-                        <td style="width: 10%;" class="text-center">
-                            <div>@item.Quantity</div>
-                            <div id="pnlEditPvQuantity@(item.Id)">
-                                <div class="form-group">
-                                    <div class="col-md-8 col-md-offset-2">
-                                        <input name="pvQuantity@(item.Id)" type="text" value="@item.Quantity" id="pvQuantity@(item.Id)" class="form-control input-sm"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
-                        <td style="width: 15%;" class="text-center">
-                            @if (Model.AllowCustomersToSelectTaxDisplayType)
-                            {
-                                <div>@item.DiscountInclTax</div>
-                                <div>@item.DiscountExclTax</div>
-                            }
-                            else
-                            {
-                                switch (Model.TaxDisplayType)
-                                {
-                                    case TaxDisplayType.ExcludingTax:
+                                        else
                                         {
-                                        @item.DiscountExclTax
-                                    }
-                                        break;
-                                    case TaxDisplayType.IncludingTax:
-                                    {
-                                        @item.DiscountInclTax
-                                    }
-                                        break;
-                                    default:
-                                        break;
-                                }
-                            }
-                            <div id="pnlEditPvDiscount@(item.Id)">
-                                <div class="form-group">
-                                    <div class="col-md-5">
-                                        @T("Admin.Orders.Products.Edit.InclTax")
-                                    </div>
-                                    <div class="col-md-7">
-                                        <input name="pvDiscountInclTax@(item.Id)" type="text" value="@item.DiscountInclTaxValue" id="pvDiscountInclTax@(item.Id)" class="form-control input-sm"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <div class="col-md-5">
-                                        @T("Admin.Orders.Products.Edit.ExclTax")
-                                    </div>
-                                    <div class="col-md-7">
-                                        <input name="pvDiscountExclTax@(item.Id)" type="text" value="@item.DiscountExclTaxValue" id="pvDiscountExclTax@(item.Id)" class="form-control input-sm"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
-                        <td style="width: 15%;" class="text-center">
-                            @if (Model.AllowCustomersToSelectTaxDisplayType)
-                            {
-                                <div>@item.SubTotalInclTax</div>
-                                <div>@item.SubTotalExclTax</div>
-                            }
-                            else
-                            {
-                                switch (Model.TaxDisplayType)
-                                {
-                                    case TaxDisplayType.ExcludingTax:
+                                            switch (Model.TaxDisplayType)
+                                            {
+                                                case TaxDisplayType.ExcludingTax:
+                                                    {
+                                                        @item.DiscountExclTax
+                                                    }
+                                                    break;
+                                                case TaxDisplayType.IncludingTax:
+                                                    {
+                                                        @item.DiscountInclTax
+                                                    }
+                                                    break;
+                                                default:
+                                                    break;
+                                            }
+                                        }
+                                        <div id="pnlEditPvDiscount@(item.Id)">
+                                            <div class="form-group">
+                                                <div class="col-md-5">
+                                                    @T("Admin.Orders.Products.Edit.InclTax")
+                                                </div>
+                                                <div class="col-md-7">
+                                                    <input name="pvDiscountInclTax@(item.Id)" type="text" value="@item.DiscountInclTaxValue" id="pvDiscountInclTax@(item.Id)" class="form-control input-sm" />
+                                                </div>
+                                            </div>
+                                            <div class="form-group">
+                                                <div class="col-md-5">
+                                                    @T("Admin.Orders.Products.Edit.ExclTax")
+                                                </div>
+                                                <div class="col-md-7">
+                                                    <input name="pvDiscountExclTax@(item.Id)" type="text" value="@item.DiscountExclTaxValue" id="pvDiscountExclTax@(item.Id)" class="form-control input-sm" />
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td style="width: 15%;" class="text-center">
+                                        @if (Model.AllowCustomersToSelectTaxDisplayType)
                                         {
-                                        @item.SubTotalExclTax
-                                    }
-                                        break;
-                                    case TaxDisplayType.IncludingTax:
+                                            <div>@item.SubTotalInclTax</div>
+                                            <div>@item.SubTotalExclTax</div>
+                                        }
+                                        else
+                                        {
+                                            switch (Model.TaxDisplayType)
+                                            {
+                                                case TaxDisplayType.ExcludingTax:
+                                                    {
+                                                        @item.SubTotalExclTax
+                                                    }
+                                                    break;
+                                                case TaxDisplayType.IncludingTax:
+                                                    {
+                                                        @item.SubTotalInclTax
+                                                    }
+                                                    break;
+                                                default:
+                                                    break;
+                                            }
+                                        }
+                                        <div id="pnlEditPvPrice@(item.Id)">
+                                            <div class="form-group">
+                                                <div class="col-md-5">
+                                                    @T("Admin.Orders.Products.Edit.InclTax")
+                                                </div>
+                                                <div class="col-md-7">
+                                                    <input name="pvPriceInclTax@(item.Id)" type="text" value="@item.SubTotalInclTaxValue" id="pvPriceInclTax@(item.Id)" class="form-control input-sm" />
+                                                </div>
+                                            </div>
+                                            <div class="form-group">
+                                                <div class="col-md-5">
+                                                    @T("Admin.Orders.Products.Edit.ExclTax")
+                                                </div>
+                                                <div class="col-md-7">
+                                                    <input name="pvPriceExclTax@(item.Id)" type="text" value="@item.SubTotalExclTaxValue" id="pvPriceExclTax@(item.Id)" class="form-control input-sm" />
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </td>
+                                    @if (!Model.IsLoggedInAsVendor)
                                     {
-                                        @item.SubTotalInclTax
-                                    }
-                                        break;
-                                    default:
-                                        break;
-                                }
-                            }
-                            <div id="pnlEditPvPrice@(item.Id)">
-                                <div class="form-group">
-                                    <div class="col-md-5">
-                                        @T("Admin.Orders.Products.Edit.InclTax")
-                                    </div>
-                                    <div class="col-md-7">
-                                        <input name="pvPriceInclTax@(item.Id)" type="text" value="@item.SubTotalInclTaxValue" id="pvPriceInclTax@(item.Id)" class="form-control input-sm"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <div class="col-md-5">
-                                        @T("Admin.Orders.Products.Edit.ExclTax")
-                                    </div>
-                                    <div class="col-md-7">
-                                        <input name="pvPriceExclTax@(item.Id)" type="text" value="@item.SubTotalExclTaxValue" id="pvPriceExclTax@(item.Id)" class="form-control input-sm"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
-                        @if (!Model.IsLoggedInAsVendor)
-                        {
-                            <td style="width: 15%;" class="text-center">
-                                <button type="submit" class="btn btn-default" name="btnEditOrderItem@(item.Id)" onclick="toggleOrderItemEdit@(item.Id)(true);return false;" id="btnEditOrderItem@(item.Id)">
-                                    <i class="fa fa-pencil"></i>
-                                    @T("Admin.Common.Edit")
-                                </button>
+                                        <td style="width: 15%;" class="text-center">
+                                            <button type="submit" class="btn btn-default" name="btnEditOrderItem@(item.Id)" onclick="toggleOrderItemEdit@(item.Id)(true);return false;" id="btnEditOrderItem@(item.Id)">
+                                                <i class="fa fa-pencil"></i>
+                                                @T("Admin.Common.Edit")
+                                            </button>
 
-                                <button type="submit" class="btn btn-default" name="btnDeleteOrderItem@(item.Id)" id="btnDeleteOrderItem@(item.Id)">
-                                    <i class="fa fa-trash"></i>
-                                    @T("Admin.Common.Delete")
-                                </button>
-                                <nop-action-confirmation asp-button-id="@("btnDeleteOrderItem" + item.Id)" />
+                                            <button type="submit" class="btn btn-default" name="btnDeleteOrderItem@(item.Id)" id="btnDeleteOrderItem@(item.Id)">
+                                                <i class="fa fa-trash"></i>
+                                                @T("Admin.Common.Delete")
+                                            </button>
+                                            <nop-action-confirmation asp-button-id="@("btnDeleteOrderItem" + item.Id)" />
 
-                                <button type="submit" class="btn btn-default" name="btnSaveOrderItem@(item.Id)" id="btnSaveOrderItem@(item.Id)" style="display: none;">
-                                    <i class="fa fa-floppy-o"></i>
-                                    @T("Admin.Common.Save")
-                                </button>
-                                <nop-action-confirmation asp-button-id="@("btnSaveOrderItem" + item.Id)" />
+                                            <button type="submit" class="btn btn-default" name="btnSaveOrderItem@(item.Id)" id="btnSaveOrderItem@(item.Id)" style="display: none;">
+                                                <i class="fa fa-floppy-o"></i>
+                                                @T("Admin.Common.Save")
+                                            </button>
+                                            <nop-action-confirmation asp-button-id="@("btnSaveOrderItem" + item.Id)" />
 
-                                <button type="submit" class="btn btn-default" name="btnCancelOrderItem@(item.Id)" onclick="toggleOrderItemEdit@(item.Id)(false);return false;" id="btnCancelOrderItem@(item.Id)" style="display: none;">
-                                    <i class="fa fa-close"></i>
-                                    @T("Admin.Common.Cancel")
-                                </button>
-                            </td>
-                        }
-                        </tr>
-                    }
-                </tbody>
-            </table>
-        </div>
-    </div>
-    @if (!string.IsNullOrEmpty(Model.CheckoutAttributeInfo) && !Model.IsLoggedInAsVendor)
-    {
-        <div class="form-group">
-            <div class="col-md-12">
-                @Html.Raw(Model.CheckoutAttributeInfo)
-            </div>
-        </div>
-    }
-    @if (!Model.IsLoggedInAsVendor)
-    {
-        <div class="form-group">
-            <div class="col-md-12">
-                <button type="submit" id="btnAddNewProduct" name="btnAddNewProduct" onclick="javascript:setLocation('@(Url.Action("AddProductToOrder", "Order", new {orderId = Model.Id}))'); return false;" class="btn btn-primary">
-                    @T("Admin.Orders.Products.AddNew")
-                </button>
+                                            <button type="submit" class="btn btn-default" name="btnCancelOrderItem@(item.Id)" onclick="toggleOrderItemEdit@(item.Id)(false);return false;" id="btnCancelOrderItem@(item.Id)" style="display: none;">
+                                                <i class="fa fa-close"></i>
+                                                @T("Admin.Common.Cancel")
+                                            </button>
+                                        </td>
+                                    }
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
             </div>
+            @if (!string.IsNullOrEmpty(Model.CheckoutAttributeInfo) && !Model.IsLoggedInAsVendor)
+            {
+                <div class="form-group">
+                    <div class="col-md-12">
+                        @Html.Raw(Model.CheckoutAttributeInfo)
+                    </div>
+                </div>
+            }
+            @if (!Model.IsLoggedInAsVendor)
+            {
+                <div class="form-group">
+                    <div class="col-md-12">
+                        <button type="submit" id="btnAddNewProduct" name="btnAddNewProduct" onclick="javascript:setLocation('@(Url.Action("AddProductToOrder", "Order", new {orderId = Model.Id}))'); return false;" class="btn btn-primary">
+                            @T("Admin.Orders.Products.AddNew")
+                        </button>
+                    </div>
+                </div>
+            }
         </div>
-    }
+    </div>
+    @await Component.InvokeAsync("AdminWidget", new { widgetZone = AdminWidgetZones.OrderDetailsProductsBottom, additionalData = Model })
 </div>