Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
refactor(arch001): migrate Order views to Grand.Web.AdminShared, add per-host WidgetZone overrides if applicable
KrzysztofPajak23794791dd92
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddProductToOrderDetails.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddProductToOrderDetails.cshtmldeleted file mode 100644index 17a070d97..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddProductToOrderDetails.cshtml+++ /dev/null@@ -1,111 +0,0 @@-@model OrderModel.AddOrderProductModel.ProductDetailsModel-@{- ViewBag.Title = string.Format(Loc["Admin.Orders.Products.AddNew.Title2"], Model.Name, Model.OrderNumber);-}-<form asp-area="@Constants.AreaAdmin" 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">- <div asp-validation-summary="All"></div>- <vc:admin-widget widget-zone="order_add_products_details_top" additional-data="Model"/>- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <i class="fa fa-cubes"></i>- @string.Format(Loc["Admin.Orders.Products.AddNew.Title2"], Model.Name, Model.OrderNumber)- @Html.ActionLink("(" + Loc["Admin.Orders.Products.AddNew.BackToList"] + ")", "AddProductToOrder", new { orderId = Model.OrderId })- </div>- </div>- <div class="x_content form">- <div class="offset-md-1 col-md-11 col-sm-11">- @if (Model.Warnings.Count > 0)- {- <div class="note note-danger">- @foreach (var warning in Model.Warnings)- {- @warning- <br/>- }- </div>- }- </div>- @if (Model.ProductType == ProductType.SimpleProduct)- {- <div class="form-horizontal">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="UnitPriceInclTax"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="UnitPriceInclTax"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="UnitPriceExclTax"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="UnitPriceExclTax"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="Quantity"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Quantity"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="TaxRate"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="TaxRate"/>- </div>- </div>- @{- var dataDict = new ViewDataDictionary(ViewData) { new("productId", Model.ProductId) };- <partial name="Partials/ProductAddAttributes" model="Model.ProductAttributes" view-data="dataDict"/>- }- @{- var dataDictGiftVoucher = new ViewDataDictionary(ViewData)- {- TemplateInfo =- {- HtmlFieldPrefix = "giftvoucher"- }- };- <partial name="Partials/ProductAddGiftVoucherInfo" model="Model.GiftVoucher" view-data="dataDictGiftVoucher"/>- }- <div class="form-actions">- <div class="row">- <div class="offset-md-3 col-md-9 col-sm-9">- <input type="submit" class="k-button" value="@Loc["Admin.Orders.Products.AddNew"]"/>- </div>- </div>- </div>- </div>- </div>- }- else if (Model.ProductType == ProductType.GroupedProduct)- {- <div>- <div class="note note-info">- Grouped products are not currently supported for adding to an existing order- </div>- </div>- }- else if (Model.ProductType == ProductType.Reservation)- {- <div>- <div class="note note-info">- Reservation products are not currently supported for adding to an existing order- </div>- </div>- }- else- {- <div class="note note-info">- This product type (unknown) is not currently supported for adding to an existing order- </div>- }- </div>- </div>- </div>- </div>- <vc:admin-widget widget-zone="order_add_products_details_bottom" additional-data="Model"/>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddressEdit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddressEdit.cshtmldeleted file mode 100644index a1b8c29ff..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddressEdit.cshtml+++ /dev/null@@ -1,36 +0,0 @@-@model OrderAddressModel-@{- //page title- ViewBag.Title = Loc["Admin.Orders.Address.EditAddress"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="AddressEdit"- asp-route-addressId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["addressId"])"- asp-route-billingAddress="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["BillingAddress"])"- asp-route-orderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["orderId"])">-- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <i class="fa fa-cube"></i>- @Loc["Admin.Orders.Address.EditAddress"]- <small>- <i class="fa fa-arrow-circle-left"></i>- @Html.ActionLink(Loc["Admin.Orders.Address.BackToOrder"], "Edit", new { id = Model.OrderId })- </small>- </div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- <vc:admin-widget widget-zone="order_address_details_buttons" additional-data="Model"/>- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdateAddress" model="Model"/>- </div>- </div>- </div>- </div>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtmldeleted file mode 100644index 8695293df..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml+++ /dev/null@@ -1,133 +0,0 @@-@using Grand.Business.Core.Interfaces.Common.Security-@using Grand.Domain.Permissions-@model OrderModel-@inject IPermissionService permissionService-@{- //page title- ViewBag.Title = Loc["Admin.Orders.EditOrderDetails"];- //has "Manage Documents" permission?- var canManageDocuments = await permissionService.Authorize(StandardPermission.ManageDocuments);- var canManageMessageQueue = await permissionService.Authorize(StandardPermission.ManageMessageQueue);-}-<form asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="Edit" method="post" id="order-form">- <input type="hidden" asp-for="Id"/>- <div asp-validation-summary="All"></div>- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <i class="icon-basket"></i>- @Loc["Admin.Orders.EditOrderDetails"] - @Model.OrderNumber- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Orders.BackToList"], "List")- </small>- </div>- <div class="actions">- <div class="btn-group btn-group-devided util-btn-margin-bottom-5">- <a href="@Url.Action("PdfInvoice", new { orderId = Model.Id, area = Constants.AreaAdmin })" class="btn purple">- <i class="fa fa-file-pdf-o"></i> @Loc["Admin.Orders.PdfInvoice"]- </a>- <span id="order-delete" class="btn red">- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]- </span>- <a asp-action="CancelOrder" asp-route-id="@Model.Id" class="btn border-red" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]');">- <i class="red fa fa-times-circle-o"></i>- @Loc["Admin.Common.Cancel"]- </a>- <input type="submit" id="btnRefreshPage" style="display: none"/>- <script>- $(document).ready(function () {- $('#btnRefreshPage').click(function () {- //refresh page- location.reload();- });- });- </script>- <vc:admin-widget widget-zone="order_details_buttons" additional-data="Model"/>- </div>- </div>- </div>- <div class="x_content form">- <admin-tabstrip name="order-edit" SetTabPos="true" BindGrid="true">- <items>- <tabstrip-item text="@Loc["Admin.Orders.Info"]" tab-index="0">- <content>- <div>- <partial name="Partials/OrderDetails.Info" model="Model"/>- </div>- </content>- </tabstrip-item>-- <tabstrip-item text="@Loc["Admin.Orders.Addresses"]" tab-index="1">- <content>- <div>- <partial name="Partials/OrderDetails.Addresses" model="Model"/>- </div>- </content>- </tabstrip-item>- @if (Model.IsShippable)- {- <tabstrip-item text="@Loc["Admin.Orders.Shipments"]" tab-index="2">- <content>- <div>- <partial name="Partials/OrderDetails.Shipment" model="Model"/>- </div>- </content>- </tabstrip-item>- }- <tabstrip-item text="@Loc["Admin.Orders.Products"]" tab-index="3">- <content>- <div>- <partial name="Partials/OrderDetails.Products" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Orders.OrderNotes"]" tab-index="4">- <content>- <div>- <partial name="Partials/OrderDetails.Notes" model="Model"/>- </div>- </content>- </tabstrip-item>- @if (canManageDocuments)- {- <tabstrip-item text="@Loc["Admin.Orders.Documents"]" tab-index="5">- <content>- <div>- <partial name="Partials/OrderDetails.Documents" model="Model"/>- </div>- </content>- </tabstrip-item>- }- <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="6">- <content>- <div>- <div class="form-actions">- <input type="submit" value="@Loc["Admin.Common.Save"]" id="btnSaveUserFields" name="save-generic-attributes" asp-action="EditUserFields" class="k-button"/>- </div>- <div class="form-horizontal">- <partial name="Partials/UserFields" model="Model"/>- </div>- </div>- </content>- </tabstrip-item>- @if (canManageMessageQueue)- {- <tabstrip-item text="@Loc["Admin.Orders.Notifications"]" tab-index="7">- <content>- <div>- <partial name="Partials/OrderDetails.Notifications" model="Model"/>- </div>- </content>- </tabstrip-item>- }- <vc:admin-widget widget-zone="order_details_tabs" additional-data="Model"/>- </items>- </admin-tabstrip>- </div>- </div>- </div>- </div>-</form>-<admin-delete-confirmation button-id="order-delete"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/CreateOrUpdateAddress.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/CreateOrUpdateAddress.cshtmldeleted file mode 100644index 02aab8b36..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/CreateOrUpdateAddress.cshtml+++ /dev/null@@ -1,5 +0,0 @@-@model OrderAddressModel-<vc:admin-widget widget-zone="order_address_details_top" additional-data="Model"/>-<div asp-validation-summary="All"></div>-<admin-input asp-for="Address" asp-template="Address"/>-<vc:admin-widget widget-zone="order_address_details_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Notes.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Notes.cshtmldeleted file mode 100644index 5d5ee809d..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Notes.cshtml+++ /dev/null@@ -1,205 +0,0 @@-@using Grand.Domain.Media-@model OrderModel-@{- ViewData["DownloadType"] = DownloadType.Order;- ViewData["ReferenceId"] = Model.Id;-}-<div class="panel panel-default">- <vc:admin-widget widget-zone="order_details_notes_top" additional-data="Model"/>- <div class="panel-body">- <div id="ordernotes-grid"></div>- </div>- <vc:admin-widget widget-zone="order_details_notes_bottom" additional-data="Model"/>-</div>-<script>- $(document).ready(function () {- $("#ordernotes-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("OrderNotesSelect", "Order", new { orderId = Model.Id, area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("OrderNoteDelete", "Order", new { orderId = Model.Id, area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id",- fields: {- //do not implicitly specify all fields- //we do it only for fields which implicitly require it- //otherwise, they'll be formatted wrong way- CreatedOn: {type: "date" }- }- }- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- autoBind: false,- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "CreatedOn",- title: "@Loc["Admin.Orders.OrderNotes.Fields.CreatedOn"]",- width: 180,- type: "date",- format: "{0:G}"- }, {- field: "Note",- title: "@Loc["Admin.Orders.OrderNotes.Fields.Note"]",- width: 350,- encoded: false- }, {- field: "DownloadId",- title: "@Loc["Admin.Orders.OrderNotes.Fields.Download"]",- width: 100,- template: '# if(DownloadId != "") {# <a href="@Url.Action("DownloadFile", "Download", new { area = Constants.AreaAdmin })/?downloadGuid=#=DownloadGuid#">@Loc["Admin.Orders.OrderNotes.Fields.Download.Link"]</a> #} else {# @Loc["Admin.Orders.OrderNotes.Fields.Download.Link.No"] #} #'- }, {- field: "CreatedByCustomer",- title: "@Loc["Admin.Orders.OrderNotes.Fields.CreatedByCustomer"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(CreatedByCustomer) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'- }, {- field: "DisplayToCustomer",- title: "@Loc["Admin.Orders.OrderNotes.Fields.DisplayToCustomer"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(DisplayToCustomer) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'- }, {- command: { name: "destroy", text: "@Loc["Admin.Common.Delete"]" },- title: "@Loc["Admin.Common.Delete"]",- width: 100- }]- });- });-</script>-<p>- <strong>- @Loc["Admin.Orders.OrderNotes.AddTitle"]- </strong>-</p>-<script>- $(document).ready(function () {- $("#@Html.IdFor(model => model.AddOrderNoteHasDownload)").change(toggleAddOrderNoteHasDownload);- toggleAddOrderNoteHasDownload();- });- function toggleAddOrderNoteHasDownload() {- if ($('#@Html.IdFor(model => model.AddOrderNoteHasDownload)').is(':checked')) {- $('#pnlAddOrderNoteDownloadId').show();- }- else {- $('#pnlAddOrderNoteDownloadId').hide();- }- }--</script>--<div class="form-horizontal">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="AddOrderNoteMessage"/>- <div class="col-md-9 col-sm-9">- <admin-textarea asp-for="AddOrderNoteMessage"></admin-textarea>- <span asp-validation-for="AddOrderNoteMessage"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="AddOrderNoteDownloadId"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="AddOrderNoteHasDownload"/>- <div class="control__indicator"></div>- </label>- <div id="pnlAddOrderNoteDownloadId">- <admin-input asp-for="AddOrderNoteDownloadId"/>- <span asp-validation-for="AddOrderNoteDownloadId"></span>- </div>- </div>- </div>- <div class="form-group">- <admin-label asp-for="AddOrderNoteDisplayToCustomer"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="AddOrderNoteDisplayToCustomer"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="AddOrderNoteDisplayToCustomer"></span>- </div>- </div>- <div class="form-actions">- <div class="offset-md-3 col-md-9 col-sm-9">- <button type="button" id="addOrderNote" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Orders.OrderNotes.AddButton"]</button>- </div>- </div>- </div>-</div>--<script>- $(document).ready(function () {- $('#addOrderNote').click(function () {- var orderNoteMessage = $("#@Html.IdFor(model => model.AddOrderNoteMessage)").val();- if (orderNoteMessage.length == 0) {- alert('Message text is required');- return;- }- var orderNoteDownloadId = '';- if ($('#@Html.IdFor(model => model.AddOrderNoteHasDownload)').is(':checked')) {- orderNoteDownloadId = $("#@Html.IdFor(model => model.AddOrderNoteDownloadId)").val();- }- var orderNoteDisplayToCustomer = $("#@Html.IdFor(model => model.AddOrderNoteDisplayToCustomer)").is(':checked');- $('#addOrderNote').attr('disabled', true);- var postData = {- DisplayToCustomer: orderNoteDisplayToCustomer,- message: orderNoteMessage,- downloadId: orderNoteDownloadId,- orderId: '@Model.Id'- };- addAntiForgeryToken(postData);-- $.ajax({- cache:false,- type: "POST",- url: "@(Url.Action("OrderNoteAdd", "Order", new { area = Constants.AreaAdmin }))",- data: postData,- success: function (data) {- var grid = $("#ordernotes-grid").data('kendoGrid');- grid.dataSource.read();- $('#addOrderNote').attr('disabled', false);- },- error:function (xhr, ajaxOptions, thrownError){- alert('Failed to add order note.');- $('#addOrderNote').attr('disabled', false);- }- });- });- });-</script>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Products.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Products.cshtmldeleted file mode 100644index b2bac2cf8..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Products.cshtml+++ /dev/null@@ -1,355 +0,0 @@-@using Grand.Domain.Tax-@model OrderModel--<vc:admin-widget widget-zone="order_details_products_top" additional-data="Model"/>-<div class="table-responsive order-table">- <table class="table table-bordered table-striped table-hover">- <tr>- <td>- @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();- $('#btnEditOrderItem@(item.Id)').hide();- $('#btnDeleteOrderItem@(item.Id)').hide();- $('#btnSaveOrderItem@(item.Id)').show();- $('#btnCancel@(item.Id)').show();- $('#btnCancelOrderItem@(item.Id)').hide();- }- else {- $('#pnlEditPvUnitPrice@(item.Id)').hide();- $('#pnlEditPvQuantity@(item.Id)').hide();- $('#btnEditOrderItem@(item.Id)').show();- $('#btnDeleteOrderItem@(item.Id)').show();- $('#btnSaveOrderItem@(item.Id)').hide();- $('#btnCancel@(item.Id)').hide();- $('#btnCancelOrderItem@(item.Id)').show();- }- }- </script>- }- <table class="table table-bordered table-striped table-hover">- <col/>- <col/>- @if (Model.HasDownloadableProducts)- {- <col/>- }- <col/>- <col/>- <col/>- <col/>- <col/>- <thead>- <tr>- <th>- @Loc["Admin.Orders.Products.Picture"]- </th>- <th>- @Loc["Admin.Orders.Products.ProductName"]- </th>- <th>- @Loc["Admin.Orders.Products.Price"]- </th>- <th class="qty-head">- @Loc["Admin.Orders.Products.Quantity"]- </th>- @if (Model.Items.Sum(x => x.DiscountInclTaxValue) > 0)- {- <th>- @Loc["Admin.Orders.Products.Discount"]- </th>- }- @if (Model.Items.Sum(x => x.CommissionValue) > 0)- {- <th>- @Loc["Admin.Orders.Products.Commission"]- </th>- }- <th>- @Loc["Admin.Orders.Products.Total"]- </th>- <th>- @Loc["Admin.Common.Edit"]- </th>- </tr>- </thead>- <tbody>- @for (var j = 0; j < Model.Items.Count; j++)- {- var item = Model.Items[j];- <input asp-for="@Model.Items[j].Id" type="hidden"/>- <tr>- <td>- <img src="@item.PictureThumbnailUrl" alt="" title=""/>- </td>- <td>- <div>- <em>- <a href="@Url.Action("Edit", "Product", new { id = item.ProductId, area = Constants.AreaAdmin })">@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>@Loc["Admin.Orders.Products.SKU"]</strong><text>:</text>- @item.Sku- </p>- }- @if (!string.IsNullOrEmpty(item.VendorName))- {- <p>- <strong>@Loc["Admin.Orders.Products.Vendor"]</strong><text>:</text>- @item.VendorName- </p>- }- @if (item.MerchandiseReturnIds.Count > 0)- {- <p>- @Loc["Admin.Orders.Products.MerchandiseReturns"]<text>:</text>- @for (var i = 0; i < item.MerchandiseReturnIds.Count; i++)- {- <a href="@Url.Action("Edit", "MerchandiseReturn", new { id = item.MerchandiseReturnIds[i], area = Constants.AreaAdmin })" class="k-button"><span class="k-icon k-i-eye"></span> @Loc["Admin.Orders.MerchandiseReturns.View"]</a>- if (i != item.MerchandiseReturnIds.Count - 1)- {- <text>,</text>- }- }- </p>- }- @if (item.PurchasedGiftVoucherIds.Count > 0)- {- <p>- @Loc["Admin.Orders.Products.GiftVouchers"]<text>:</text>- @for (var i = 0; i < item.PurchasedGiftVoucherIds.Count; i++)- {- <a href="@Url.Action("Edit", "GiftVoucher", new { id = item.PurchasedGiftVoucherIds[i], area = Constants.AreaAdmin })" class="k-button"><span class="k-icon k-i-eye"></span> @Loc["Admin.Orders.Products.GiftVoucher.View"]</a>- if (i != item.PurchasedGiftVoucherIds.Count - 1)- {- <text>,</text>- }- }- </p>- }- @if (Model.HasDownloadableProducts)- {- <p>- @if (item.IsDownload)- {- <div>- @string.Format(Loc["Admin.Orders.Products.Download.DownloadCount"], item.DownloadCount)- <input type="submit" asp-action="ResetDownloadCount" asp-route-orderItemId="@(item.Id)"- name="btnResetDownloadCount@(item.Id)" value="@Loc["Admin.Orders.Products.Download.ResetDownloadCount"]" title="@Loc["Admin.Orders.Products.Download.ResetDownloadCount.Title"]" id="btnResetDownloadCount@(item.Id)" class="k-button"/>- <hr/>- </div>- if (item.DownloadActivationType == DownloadActivationType.Manually)- {- <div>- <input type="submit" name="btnPvActivateDownload@(item.Id)"- value="@(item.IsDownloadActivated ? Loc["Admin.Orders.Products.Download.Deactivate"] : Loc["Admin.Orders.Products.Download.Activate"])"- id="btnPvActivateDownload@(item.Id)" class="k-button" asp-action="ActivateDownloadItem" asp-route-orderItemId="@(item.Id)"/>- <hr/>- </div>- }-- <div>- <strong>- @Loc["Admin.Orders.Products.License"]- </strong>- <br/>- @if (item.LicenseDownloadGuid != Guid.Empty)- {- <a href="@Url.Action("DownloadFile", "Download", new { downloadGuid = item.LicenseDownloadGuid, area = Constants.AreaAdmin })" class="btn purple">@Loc["Admin.Orders.Products.License.DownloadLicense"]</a>- }- <br/>- <a id="pvlicensefile" name="pvlicensefile" href="@(Url.Action("UploadLicenseFilePopup", "Order", new { id = Model.Id, orderItemId = item.Id, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))" class="k-button">- @Loc["Admin.Orders.Products.License.UploadFile"]- </a>- </div>- <script>- $(document).ready(function () {- $('#pvlicensefile').magnificPopup({- type: 'ajax',- settings: { cache: false, async: false },- midClick: true,- callbacks: {- parseAjax: function (mfpResponse) {- mfpResponse.data = $('<div></div>').html(mfpResponse.data);- },- ajaxContentAdded: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- });- </script>- }- </p>- }- </div>- </td>- <td>- @switch (Model.TaxDisplayType)- {- case TaxDisplayType.ExcludingTax:- {- @item.UnitPriceExclTax- }- break;- case TaxDisplayType.IncludingTax:- {- @item.UnitPriceInclTax- }- break;- }-- <div id="pnlEditPvUnitPrice@(item.Id)">- <table class="order-edit">- <tr>- <td>- @Loc["Admin.Orders.Products.Edit.ExclTax"]- </td>- <td>- @*- <input name="pvUnitPriceExclTax@(item.Id)" type="text" value="@item.UnitPriceExclTaxValue" id="pvUnitPriceExclTax@(item.Id)" class="adminInput" style="width:80px;" />- *@- <input asp-for="@Model.Items[j].UnitPriceExclTaxValue" class="adminInput" style="width:40px;"/>- </td>- </tr>- </table>- </div>- </td>- <td>- @item.Quantity- <div id="pnlEditPvQuantity@(item.Id)">- <table class="order-edit">- <tr>- <td colspan="2">- @*- <input name="pvQuantity@(item.Id)" type="text" value="@item.Quantity" id="pvQuantity@(item.Id)" class="adminInput" style="width:40px;" />- *@- <input asp-for="@Model.Items[j].Quantity" class="adminInput" style="width:40px;"/>- </td>- </tr>- </table>- </div>- @if (item.OpenQty > 0)- {- <div>- Open: @item.OpenQty- </div>- }- @if (item.CancelQty > 0)- {- <div>- Canceled: @item.CancelQty- </div>- }- </td>- @if (Model.Items.Sum(x => x.DiscountInclTaxValue) > 0)- {- <td>- @switch (Model.TaxDisplayType)- {- case TaxDisplayType.ExcludingTax:- {- @item.DiscountExclTax- }- break;- case TaxDisplayType.IncludingTax:- {- @item.DiscountInclTax- }- break;- }-- </td>- }- @if (Model.Items.Sum(x => x.CommissionValue) > 0)- {- <td>- <div>@item.Commission</div>- </td>- }- <td>-- @switch (Model.TaxDisplayType)- {- case TaxDisplayType.ExcludingTax:- {- @item.SubTotalExclTax- }- break;- case TaxDisplayType.IncludingTax:- {- @item.SubTotalInclTax- }- break;- }-- </td>-- <td align="center">- <div class="btn-group">- <button type="submit" name="btnEditOrderItem@(item.Id)" id="btnEditOrderItem@(item.Id)" onclick="toggleOrderItemEdit@(item.Id)(true);return false; " class="k-button" title="@Loc["Admin.Common.Edit"]">- <span class="k-icon k-i-edit"></span>- </button>- <button type="submit" name="btnDeleteOrderItem@(item.Id)" asp-action="DeleteOrderItem" asp-route-orderItemId="@(item.Id)" id="btnDeleteOrderItem@(item.Id)" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]'); " class="k-button" title="@Loc["Admin.Common.Delete"]">- <span class="k-icon k-i-delete"></span>- </button>- <button type="submit" name="btnCancelOrderItem@(item.Id)" asp-action="CancelOrderItem" asp-route-orderItemId="@(item.Id)" id="btnCancelOrderItem@(item.Id)" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]'); " class="k-button" title="@Loc["Admin.Common.Cancel"]">- <span class="k-icon k-i-cancel"></span>- </button>- <button type="submit" name="btnSaveOrderItem@(item.Id)" asp-action="SaveOrderItem" asp-route-orderItemId="@(item.Id)" id="btnSaveOrderItem@(item.Id)" style="display:none;" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]'); " class="k-button" title="@Loc["Admin.Common.Save"]">- <span class="k-icon k-i-save"></span>- </button>- <button type="submit" name="btnCancel@(item.Id)" id="btnCancel@(item.Id)" onclick="toggleOrderItemEdit@(item.Id) (false);return false; " class="k-button">- <span class="k-icon k-i-cancel" title="@Loc["Admin.Common.Cancel"]"></span>- </button>- </div>- </td>- </tr>- }- </tbody>- </table>- </td>- </tr>- </table>-</div>-<vc:admin-widget widget-zone="order_details_products_bottom" additional-data="Model"/>--@if (!string.IsNullOrEmpty(Model.CheckoutAttributeInfo))-{- <div class="note note-info">- @Html.Raw(Model.CheckoutAttributeInfo)- </div>-}-<div class="form-actions">- <button type="submit" id="btnAddNewProduct" name="btnAddNewProduct" onclick=" javascript:setLocation('@(Url.Action("AddProductToOrder", "Order", new { orderId = Model.Id, area = Constants.AreaAdmin }))'); return false; " class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Orders.Products.AddNew"]</button>-</div>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Shipment.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Shipment.cshtmldeleted file mode 100644index 619073d3d..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Shipment.cshtml+++ /dev/null@@ -1,167 +0,0 @@-@using Grand.Business.Core.Interfaces.Common.Security-@using Grand.Domain.Permissions-@model OrderModel-@inject IPermissionService permissionService;-<vc:admin-widget widget-zone="order_details_address_top" additional-data="Model"/>-@if (Model.IsShippable)-{- @if (await permissionService.Authorize(PermissionSystemName.Shipments))- {- <div class="card col-md-12">- <div class="card-body">- <h4 class="card-title">@Loc["Admin.Orders.Shipments"]</h4>- <div class="card-text">- <div class="panel panel-default">- <vc:admin-widget widget-zone="order_details_shipping_top" additional-data="Model"/>- <div class="panel-body">- <div id="shipments-grid"></div>- </div>- <div class="panel-footer">- @if (Model.CanAddNewShipments)- {- <button type="submit" id="btnAddNewShipment" name="btnAddNewShipment" onclick="javascript:setLocation('@(Url.Action("AddShipment", "Shipment", new { orderId = Model.Id, area = Constants.AreaAdmin }))'); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Orders.Shipments.AddNew"]</button>- }- </div>- <vc:admin-widget widget-zone="order_details_shipping_bottom" additional-data="Model"/>- </div>- </div>- </div>- </div>--- <script>- $(document).ready(function () {- $("#shipments-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ShipmentsByOrder", "Shipment", new { orderId = Model.Id, area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- autoBind: false,- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- //details grid- detailInit: detailInit,- scrollable: false,- columns: [{- field: "ShipmentNumber",- title: "@Loc["Admin.Orders.Shipments.ID"]",- width: 50,- template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = Constants.AreaAdmin })/#=Id#">#=ShipmentNumber#</a>'- }, {- field: "TrackingNumber",- title: "@Loc["Admin.Orders.Shipments.TrackingNumber"]",- width: 100,- template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(TrackingNumber)#</a>'- }, {- field: "TotalWeight",- title: "@Loc["Admin.Orders.Shipments.TotalWeight"]",- width: 100- }, {- field: "ShippedDate",- title: "@Loc["Admin.Orders.Shipments.ShippedDate"]",- width: 200,- type: "date",- format: "{0:G}"- }, {- field: "DeliveryDate",- title: "@Loc["Admin.Orders.Shipments.DeliveryDate"]",- width: 200,- type: "date",- format: "{0:G}"- }]- });- });-- //details grid- function detailInit(e) {- $("<div/>").appendTo(e.detailCell).kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ShipmentsItemsByShipmentId", "Shipment", new { area = Constants.AreaAdmin }))?shipmentId="+e.data.Id,- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- scrollable: false,- sortable: true,- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- columns: [- {- field: "ProductName",- title: "@Loc["Admin.Orders.Shipments.Products.ProductName"]",- width: 400- },{- field: "ShippedFromWarehouse",- title: "@Loc["Admin.Orders.Shipments.Products.Warehouse"]",- width: 150- },{- field: "QuantityInThisShipment",- title: "@Loc["Admin.Orders.Shipments.Products.QtyShipped"]",- width: 150- },{- field: "ItemWeight",- title: "@Loc["Admin.Orders.Shipments.Products.ItemWeight"]",- width: 150- },{- field: "ItemDimensions",- title: "@Loc["Admin.Orders.Shipments.Products.ItemDimensions"]",- width: 150- }- ]- });- }- </script>- }-}-else-{- <div class="card col-md-6">- <div class="note note-info">@Loc["Admin.Orders.ShippingInfo.NotRequired"]</div>- </div>-}--<vc:admin-widget widget-zone="order_details_address_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProducts.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProducts.Bottom.cshtmlnew file mode 100644index 000000000..1a26b9069--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProducts.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel.AddOrderProductModel+<vc:admin-widget widget-zone="order_add_products_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProducts.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProducts.Top.cshtmlnew file mode 100644index 000000000..8bd2cd330--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProducts.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel.AddOrderProductModel+<vc:admin-widget widget-zone="order_add_products_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProductsDetails.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProductsDetails.Bottom.cshtmlnew file mode 100644index 000000000..0c9c94f10--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProductsDetails.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel.AddOrderProductModel.ProductDetailsModel+<vc:admin-widget widget-zone="order_add_products_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProductsDetails.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProductsDetails.Top.cshtmlnew file mode 100644index 000000000..752daacdb--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddProductsDetails.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel.AddOrderProductModel.ProductDetailsModel+<vc:admin-widget widget-zone="order_add_products_details_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddressDetails.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddressDetails.Bottom.cshtmlnew file mode 100644index 000000000..93bdf1e23--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddressDetails.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderAddressModel+<vc:admin-widget widget-zone="order_address_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddressDetails.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddressDetails.Top.cshtmlnew file mode 100644index 000000000..7b8c2aec6--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddressDetails.Top.cshtml@@ -0,0 +1,2 @@+@model OrderAddressModel+<vc:admin-widget widget-zone="order_address_details_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddressEditButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddressEditButtons.cshtmlnew file mode 100644index 000000000..8ff6481bf--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.AddressEditButtons.cshtml@@ -0,0 +1,2 @@+@model OrderAddressModel+<vc:admin-widget widget-zone="order_address_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Addresses.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Addresses.Bottom.cshtmlnew file mode 100644index 000000000..e4ee34fc0--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Addresses.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_address_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Addresses.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Addresses.Top.cshtmlnew file mode 100644index 000000000..40d452ae9--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Addresses.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_address_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..bdb854259--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.DetailsTabs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.DetailsTabs.cshtmlnew file mode 100644index 000000000..add3da962--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.DetailsTabs.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Documents.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Documents.Bottom.cshtmlnew file mode 100644index 000000000..fddb1e590--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Documents.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_documents_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Documents.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Documents.Top.cshtmlnew file mode 100644index 000000000..2cb7444b9--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Documents.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_documents_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..70d6d33b7--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..a3b52af3f--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notes.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notes.Bottom.cshtmlnew file mode 100644index 000000000..b7ef13c8d--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notes.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_notes_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notes.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notes.Top.cshtmlnew file mode 100644index 000000000..f82a97e62--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notes.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_notes_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notifications.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notifications.Bottom.cshtmlnew file mode 100644index 000000000..94e49af76--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notifications.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_notifications_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notifications.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notifications.Top.cshtmlnew file mode 100644index 000000000..299d67f6f--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Notifications.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_notifications_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Products.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Products.Bottom.cshtmlnew file mode 100644index 000000000..db034bb90--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Products.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_products_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Products.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Products.Top.cshtmlnew file mode 100644index 000000000..2344e98ba--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Products.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_products_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.AddressBottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.AddressBottom.cshtmlnew file mode 100644index 000000000..e4ee34fc0--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.AddressBottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_address_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.AddressTop.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.AddressTop.cshtmlnew file mode 100644index 000000000..40d452ae9--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.AddressTop.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_address_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.ShippingBottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.ShippingBottom.cshtmlnew file mode 100644index 000000000..a2f07ec50--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.ShippingBottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_shipping_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.ShippingTop.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.ShippingTop.cshtmlnew file mode 100644index 000000000..c7d90b715--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.Shipment.ShippingTop.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:admin-widget widget-zone="order_details_shipping_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.UploadLicenseButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.UploadLicenseButtons.cshtmlnew file mode 100644index 000000000..7cfda5363--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/WidgetZone.UploadLicenseButtons.cshtml@@ -0,0 +1,2 @@+@model OrderModel.UploadLicenseModel+<vc:admin-widget widget-zone="order_upload_license_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/UploadLicenseFilePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/UploadLicenseFilePopup.cshtmldeleted file mode 100644index d8a1b0cc7..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/UploadLicenseFilePopup.cshtml+++ /dev/null@@ -1,64 +0,0 @@-@model OrderModel.UploadLicenseModel-@{- Layout = "";- //page title- ViewBag.Title = Loc["Admin.Orders.Products.License.UploadFile"];-}-<form id="UploadLicenseFilePopup" asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="UploadLicenseFilePopup" method="post">-- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <i class="fa fa-comment"></i>- @Loc["Admin.Orders.Products.License.UploadFile"]- </div>- </div>- <div class="x_content form">- <input type="submit" name="uploadlicense" value="@Loc["Admin.Common.Save"]" id="uploadlicense" class="btn green"/>- @if (!string.IsNullOrEmpty(Model.LicenseDownloadId))- {- <input type="submit" name="deletelicense" asp-action="DeleteLicenseFilePopup" value="@Loc["Admin.Common.Delete"]" id="deletelicense" class="btn red"/>- }- </div>- <vc:admin-widget widget-zone="order_upload_license_buttons" additional-data="null"/>- </div>- </div>- </div>- <div asp-validation-summary="All"></div>- @if (ViewBag.RefreshPage == true)- {- <script>- try {- window.location.href = window.location.href;- }- catch (e){}- </script>- }-- <input asp-for="OrderId" type="hidden"/>- <input asp-for="OrderItemId" type="hidden"/>- <admin-input asp-for="LicenseDownloadId"/>- <script>- var mfp = $.magnificPopup.instance;- $("#UploadLicenseFilePopup").submit(function (e) {- e.preventDefault();- var url;- var form = $(this);- if (e.originalEvent.submitter.id == "deletelicense") {- url = e.originalEvent.submitter.getAttribute('formaction');- } else {- url = form.attr('action');- }- $.ajax({- type: "POST",- url: url,- data: form.serialize(),- success: function (data) {- window.location.href = window.location.href;- }- });- });- </script>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.AdminShared/Grand.Web.AdminShared.csproj b/src/Web/Grand.Web.AdminShared/Grand.Web.AdminShared.csprojindex 88786f07b..59d418e9a 100644--- a/src/Web/Grand.Web.AdminShared/Grand.Web.AdminShared.csproj+++ b/src/Web/Grand.Web.AdminShared/Grand.Web.AdminShared.csproj@@ -9,6 +9,7 @@<ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" /><ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj" /><ProjectReference Include="..\Grand.Web.Common\Grand.Web.Common.csproj" />+ <ProjectReference Include="..\Grand.SharedUIResources\Grand.SharedUIResources.csproj" /></ItemGroup><ItemGroup><PackageReference Include="elFinder.Net.AspNetCore" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddProductToOrder.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/AddProductToOrder.cshtmlsimilarity index 94%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddProductToOrder.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/AddProductToOrder.cshtmlindex 5edc6226c..1ad923342 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/AddProductToOrder.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/AddProductToOrder.cshtml@@ -1,8 +1,9 @@-@model OrderModel.AddOrderProductModel+@model OrderModel.AddOrderProductModel@inject AdminAreaSettings adminAreaSettings@{//page titleViewBag.Title = string.Format(Loc["Admin.Orders.Products.AddNew.Title1"], Model.OrderNumber);+ var area = ViewContext.RouteData.Values["area"]?.ToString();}<div class="row">@@ -19,7 +20,7 @@</div></div><div class="x_content form">- <vc:admin-widget widget-zone="order_add_products_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AddProducts.Top" model="Model"/><div class="form-horizontal"><div class="form-body"><div class="form-group popup">@@ -67,7 +68,7 @@</div></div></div>- <vc:admin-widget widget-zone="order_add_products_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AddProducts.Bottom" model="Model"/></div><div class="x_content"><strong>@Loc["Admin.Orders.Products.AddNew.Note1"]</strong>@@ -89,7 +90,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("AddProductToOrder", "Order", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("AddProductToOrder", "Order", new { area = area }))",type: "POST",dataType: "json",data: additionalData@@ -168,11 +169,11 @@var selectedItem = grid.dataItem(grid.select());var productId = selectedItem.Id;//load "product details page" block- var productDetailsActionUrl = '@Html.Raw(Url.Action("AddProductToOrderDetails", "Order", new { orderId = Model.OrderId, productId = "productidplaceholder", area = Constants.AreaAdmin }))';+ var productDetailsActionUrl = '@Html.Raw(Url.Action("AddProductToOrderDetails", "Order", new { orderId = Model.OrderId, productId = "productidplaceholder", area = area }))';productDetailsActionUrl = productDetailsActionUrl.replace("productidplaceholder", productId);setLocation(productDetailsActionUrl);}</script><div id="productdetails"></div>-<input asp-for="OrderId" type="hidden"/>\ No newline at end of file+<input asp-for="OrderId" type="hidden"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/AddProductToOrderDetails.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/AddProductToOrderDetails.cshtmlsimilarity index 93%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Order/AddProductToOrderDetails.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/AddProductToOrderDetails.cshtmlindex e39f7868b..0eb4bd467 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/AddProductToOrderDetails.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/AddProductToOrderDetails.cshtml@@ -1,11 +1,12 @@-@model OrderModel.AddOrderProductModel.ProductDetailsModel+@model OrderModel.AddOrderProductModel.ProductDetailsModel@{ViewBag.Title = string.Format(Loc["Admin.Orders.Products.AddNew.Title2"], Model.Name, Model.OrderNumber);+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="Order" asp-action="AddProductToOrderDetails" asp-route-orderId="@Model.OrderId"+<form asp-area="@area" 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"><div asp-validation-summary="All"></div>- <vc:admin-widget widget-zone="order_add_products_details_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AddProductsDetails.Top" model="Model"/><div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -107,5 +108,5 @@</div></div></div>- <vc:admin-widget widget-zone="order_add_products_details_bottom" additional-data="Model"/>-</form>\ No newline at end of file+ <partial name="Partials/WidgetZone.AddProductsDetails.Bottom" model="Model"/>+</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/AddressEdit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/AddressEdit.cshtmlsimilarity index 84%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Order/AddressEdit.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/AddressEdit.cshtmlindex 7516132fe..186c120c8 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/AddressEdit.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/AddressEdit.cshtml@@ -1,9 +1,10 @@-@model OrderAddressModel+@model OrderAddressModel@{//page titleViewBag.Title = Loc["Admin.Orders.Address.EditAddress"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="Order" asp-action="AddressEdit"+<form asp-area="@area" asp-controller="Order" asp-action="AddressEdit"asp-route-addressId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["addressId"])"asp-route-billingAddress="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["BillingAddress"])"asp-route-orderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["orderId"])">@@ -24,7 +25,7 @@<button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"]</button>- <vc:admin-widget widget-zone="order_address_details_buttons" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AddressEditButtons" model="Model"/></div></div><div class="x_content form">@@ -33,4 +34,4 @@</div></div></div>-</form>\ No newline at end of file+</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Edit.cshtmlsimilarity index 93%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Order/Edit.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Edit.cshtmlindex 12951625a..5a58f98a8 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Edit.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Edit.cshtml@@ -1,4 +1,4 @@-@using Grand.Business.Core.Interfaces.Common.Security+@using Grand.Business.Core.Interfaces.Common.Security@using Grand.Domain.Permissions@model OrderModel@inject IPermissionService permissionService@@ -8,8 +8,9 @@//has "Manage Documents" permission?var canManageDocuments = await permissionService.Authorize(StandardPermission.ManageDocuments);var canManageMessageQueue = await permissionService.Authorize(StandardPermission.ManageMessageQueue);+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="Order" asp-action="Edit" method="post" id="order-form">+<form asp-area="@area" asp-controller="Order" asp-action="Edit" method="post" id="order-form"><input type="hidden" asp-for="Id"/><div asp-validation-summary="All"></div><div class="row">@@ -25,7 +26,7 @@</div><div class="actions"><div class="btn-group btn-group-devided util-btn-margin-bottom-5">- <a href="@Url.Action("PdfInvoice", new { orderId = Model.Id, area = Constants.AreaStore })" class="btn purple">+ <a href="@Url.Action("PdfInvoice", new { orderId = Model.Id, area = area })" class="btn purple"><i class="fa fa-file-pdf-o"></i> @Loc["Admin.Orders.PdfInvoice"]</a><span id="order-delete" class="btn red">@@ -44,7 +45,7 @@});});</script>- <vc:admin-widget widget-zone="order_details_buttons" additional-data="Model"/>+ <partial name="Partials/WidgetZone.DetailsButtons" model="Model"/></div></div></div>@@ -122,7 +123,7 @@</content></tabstrip-item>}- <vc:admin-widget widget-zone="order_details_tabs" additional-data="Model"/>+ <partial name="Partials/WidgetZone.DetailsTabs" model="Model"/></items></admin-tabstrip></div>@@ -130,4 +131,4 @@</div></div></form>-<admin-delete-confirmation button-id="order-delete"/>\ No newline at end of file+<admin-delete-confirmation button-id="order-delete"/>diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/CreateOrUpdateAddress.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/CreateOrUpdateAddress.cshtmlnew file mode 100644index 000000000..4fea0e621--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/CreateOrUpdateAddress.cshtml@@ -0,0 +1,5 @@+@model OrderAddressModel+<partial name="Partials/WidgetZone.AddressDetails.Top" model="Model"/>+<div asp-validation-summary="All"></div>+<admin-input asp-for="Address" asp-template="Address"/>+<partial name="Partials/WidgetZone.AddressDetails.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Addresses.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Addresses.cshtmlsimilarity index 97%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Addresses.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Addresses.cshtmlindex ed94e9aac..8707d0dca 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Addresses.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Addresses.cshtml@@ -1,5 +1,8 @@-@model OrderModel-<vc:admin-widget widget-zone="order_details_address_top" additional-data="Model"/>+@model OrderModel+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}+<partial name="Partials/WidgetZone.Addresses.Top" model="Model"/><div class="card col-md-6"><div class="card-body"><h4 class="card-title">@Loc["Admin.Orders.BillingInfo"]</h4>@@ -148,7 +151,7 @@<tr><td colspan="2">- <a href="@Url.Action("AddressEdit", new { addressId = Model.BillingAddress.Id, orderId = Model.Id, BillingAddress = true, area = Constants.AreaAdmin })" class="k-button"><span class="k-icon k-i-edit"></span> @Loc["Admin.Common.Edit"]</a>+ <a href="@Url.Action("AddressEdit", new { addressId = Model.BillingAddress.Id, orderId = Model.Id, BillingAddress = true, area = area })" class="k-button"><span class="k-icon k-i-edit"></span> @Loc["Admin.Common.Edit"]</a></td></tr>@@ -299,7 +302,7 @@<tr><td colspan="2">- <a href="@Url.Action("AddressEdit", new { addressId = Model.ShippingAddress.Id, orderId = Model.Id, area = Constants.AreaAdmin })" class="k-button"><span class="k-icon k-i-edit"></span> @Loc["Admin.Common.Edit"]</a>+ <a href="@Url.Action("AddressEdit", new { addressId = Model.ShippingAddress.Id, orderId = Model.Id, area = area })" class="k-button"><span class="k-icon k-i-edit"></span> @Loc["Admin.Common.Edit"]</a></td></tr>@@ -434,4 +437,4 @@ else</div>}-<vc:admin-widget widget-zone="order_details_address_bottom" additional-data="Model"/>\ No newline at end of file+<partial name="Partials/WidgetZone.Addresses.Bottom" model="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Documents.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Documents.cshtmlsimilarity index 79%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Documents.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Documents.cshtmlindex e8373571a..60f4c269c 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Documents.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Documents.cshtml@@ -1,14 +1,17 @@-@model OrderModel+@model OrderModel@inject AdminAreaSettings adminAreaSettings+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}<div class="panel panel-default">- <vc:admin-widget widget-zone="order_details_documents_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Documents.Top" model="Model"/><div class="panel-body"><div id="order-documents-grid"></div></div><div class="panel-footer">- <button type="button" class="k-button" onclick="location.href='@Url.Action("CreateDocument", "Document", new { ObjectId = Model.Id, Reference = (int)Reference.Order, area = Constants.AreaAdmin })'"><i class="fa fa-plus"></i> @Loc["Admin.Marketing.Document.Add"]</button>+ <button type="button" class="k-button" onclick="location.href='@Url.Action("CreateDocument", "Document", new { ObjectId = Model.Id, Reference = (int)Reference.Order, area = area })'"><i class="fa fa-plus"></i> @Loc["Admin.Marketing.Document.Add"]</button></div>- <vc:admin-widget widget-zone="order_details_documents_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Documents.Bottom" model="Model"/></div><script>@@ -17,7 +20,7 @@ $(document).ready(function () {dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ListDocuments", "Document", new { reference = (int)Reference.Order, ObjectId = Model.Id, StatusId = -1, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("ListDocuments", "Document", new { reference = (int)Reference.Order, ObjectId = Model.Id, StatusId = -1, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -51,12 +54,12 @@ $(document).ready(function () {columns: [{field: "Number",title: "@Loc["Admin.Documents.Document.Fields.Number"]",- template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(Number)#</a>',+ template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = area })/#=Id#">#=kendo.htmlEncode(Number)#</a>',},{field: "Name",title: "@Loc["Admin.Documents.Document.Fields.Name"]",- template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(Name)#</a>',+ template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = area })/#=Id#">#=kendo.htmlEncode(Name)#</a>',}, {field: "Published",title: "@Loc["Admin.Documents.Document.Fields.Published"]",@@ -68,4 +71,4 @@ $(document).ready(function () {}]});});-</script>\ No newline at end of file+</script>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Info.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Info.cshtmlsimilarity index 97%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Info.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Info.cshtmlindex 29d05e7dd..d180b060e 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Info.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Info.cshtml@@ -1,4 +1,4 @@-@using System.Text.Encodings.Web+@using System.Text.Encodings.Web@using Grand.Business.Core.Interfaces.Checkout.Orders@using Grand.Domain.Payments@using Grand.Domain.Tax@@ -29,6 +29,7 @@}orderTagsSB.Append("]");+ var area = ViewContext.RouteData.Values["area"]?.ToString();}<script>@@ -76,7 +77,7 @@</script><div class="form-horizontal">-<vc:admin-widget widget-zone="order_details_info_top" additional-data="Model"/>+<partial name="Partials/WidgetZone.Info.Top" model="Model"/><div class="form-body"><div class="form-group"><admin-label asp-for="OrderNumber" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>@@ -150,7 +151,7 @@}<div>- <a class="btn btn-@labelStatus" href="@Url.Action("Edit", "PaymentTransaction", new { id = Model.PaymentTransactionId, area = Grand.Web.Admin.Extensions.Constants.AreaAdmin })">@Model.PaymentStatus - @Loc["Admin.Common.View"]</a>+ <a class="btn btn-@labelStatus" href="@Url.Action("Edit", "PaymentTransaction", new { id = Model.PaymentTransactionId, area = area })">@Model.PaymentStatus - @Loc["Admin.Common.View"]</a></div></div>@@ -232,7 +233,7 @@<admin-label asp-for="AffiliateId" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label><div class="col-9 col-md-9 col-sm-9"><label class="control-label">- <a href="@Url.Action("Edit", "Affiliate", new { id = Model.AffiliateId, area = Grand.Web.Admin.Extensions.Constants.AreaAdmin })">@Model.AffiliateName - @Loc["Admin.Common.View"]</a>+ <a href="@Url.Action("Edit", "Affiliate", new { id = Model.AffiliateId, area = area })">@Model.AffiliateName - @Loc["Admin.Common.View"]</a></label></div></div>@@ -408,7 +409,7 @@{var discount = Model.UsedDiscounts[i];<label class="control-label">- <a href="@Url.Action("Edit", "Discount", new { id = discount.DiscountId, area = Grand.Web.Admin.Extensions.Constants.AreaAdmin })">@discount.DiscountName</a>+ <a href="@Url.Action("Edit", "Discount", new { id = discount.DiscountId, area = area })">@discount.DiscountName</a>@if (i != Model.UsedDiscounts.Count - 1){<text>,</text>@@ -541,5 +542,5 @@</div></div></div>-<vc:admin-widget widget-zone="order_details_info_bottom" additional-data="Model"/>+<partial name="Partials/WidgetZone.Info.Bottom" model="Model"/></div>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Notes.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Notes.cshtmlsimilarity index 92%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Notes.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Notes.cshtmlindex a04d4b4f8..9c482efbb 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Notes.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Notes.cshtml@@ -1,15 +1,16 @@-@using Grand.Domain.Media+@using Grand.Domain.Media@model OrderModel@{ViewData["DownloadType"] = DownloadType.Order;ViewData["ReferenceId"] = Model.Id;+ var area = ViewContext.RouteData.Values["area"]?.ToString();}<div class="panel panel-default">- <vc:admin-widget widget-zone="order_details_notes_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Notes.Top" model="Model"/><div class="panel-body"><div id="ordernotes-grid"></div></div>- <vc:admin-widget widget-zone="order_details_notes_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Notes.Bottom" model="Model"/></div><script>$(document).ready(function () {@@ -17,13 +18,13 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("OrderNotesSelect", "Order", new { orderId = Model.Id, area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("OrderNotesSelect", "Order", new { orderId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("OrderNoteDelete", "Order", new { orderId = Model.Id, area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("OrderNoteDelete", "Order", new { orderId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -79,7 +80,7 @@field: "DownloadId",title: "@Loc["Admin.Orders.OrderNotes.Fields.Download"]",width: 100,- template: '# if(DownloadId != "") {# <a href="@Url.Action("DownloadFile", "Download", new { area = Constants.AreaStore })/?downloadGuid=#=DownloadGuid#">@Loc["Admin.Orders.OrderNotes.Fields.Download.Link"]</a> #} else {# @Loc["Admin.Orders.OrderNotes.Fields.Download.Link.No"] #} #'+ template: '# if(DownloadId != "") {# <a href="@Url.Action("DownloadFile", "Download", new { area = area })/?downloadGuid=#=DownloadGuid#">@Loc["Admin.Orders.OrderNotes.Fields.Download.Link"]</a> #} else {# @Loc["Admin.Orders.OrderNotes.Fields.Download.Link.No"] #} #'}, {field: "CreatedByCustomer",title: "@Loc["Admin.Orders.OrderNotes.Fields.CreatedByCustomer"]",@@ -188,7 +189,7 @@$.ajax({cache:false,type: "POST",- url: "@(Url.Action("OrderNoteAdd", "Order", new { area = Constants.AreaStore }))",+ url: "@(Url.Action("OrderNoteAdd", "Order", new { area = area }))",data: postData,success: function (data) {var grid = $("#ordernotes-grid").data('kendoGrid');diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Notifications.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Notifications.cshtmlsimilarity index 88%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Notifications.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Notifications.cshtmlindex ca95719d8..ceb49650b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Notifications.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Notifications.cshtml@@ -1,11 +1,14 @@-@model OrderModel+@model OrderModel@inject AdminAreaSettings adminAreaSettings+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}<div class="panel panel-default">- <vc:admin-widget widget-zone="order_details_notifications_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Notifications.Top" model="Model"/><div class="panel-body"><div id="order-notifications-grid"></div></div>- <vc:admin-widget widget-zone="order_details_notifications_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Notifications.Bottom" model="Model"/></div><script>@@ -14,7 +17,7 @@ $(document).ready(function () {dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("QueuedEmailByReference", "QueuedEmail", new { reference = (int)Reference.Order, ObjectId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("QueuedEmailByReference", "QueuedEmail", new { reference = (int)Reference.Order, ObjectId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -69,4 +72,4 @@ $(document).ready(function () {}]});});-</script>\ No newline at end of file+</script>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Products.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Products.cshtmlsimilarity index 95%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Products.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Products.cshtmlindex f0adac689..f5ee393c1 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Products.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Products.cshtml@@ -1,7 +1,10 @@-@using Grand.Domain.Tax+@using Grand.Domain.Tax@model OrderModel+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}-<vc:admin-widget widget-zone="order_details_products_top" additional-data="Model"/>+<partial name="Partials/WidgetZone.Products.Top" model="Model"/><div class="table-responsive order-table"><table class="table table-bordered table-striped table-hover"><tr>@@ -95,7 +98,7 @@<td><div><em>- <a href="@Url.Action("Edit", "Product", new { id = item.ProductId, area = Constants.AreaStore })">@item.ProductName</a>+ <a href="@Url.Action("Edit", "Product", new { id = item.ProductId, area = area })">@item.ProductName</a></em>@if (!string.IsNullOrEmpty(item.AttributeInfo)){@@ -135,7 +138,7 @@@Loc["Admin.Orders.Products.MerchandiseReturns"]<text>:</text>@for (var i = 0; i < item.MerchandiseReturnIds.Count; i++){- <a href="@Url.Action("Edit", "MerchandiseReturn", new { id = item.MerchandiseReturnIds[i], area = Constants.AreaStore })" class="k-button"><span class="k-icon k-i-eye"></span> @Loc["Admin.Orders.MerchandiseReturns.View"]</a>+ <a href="@Url.Action("Edit", "MerchandiseReturn", new { id = item.MerchandiseReturnIds[i], area = area })" class="k-button"><span class="k-icon k-i-eye"></span> @Loc["Admin.Orders.MerchandiseReturns.View"]</a>if (i != item.MerchandiseReturnIds.Count - 1){<text>,</text>@@ -149,7 +152,7 @@@Loc["Admin.Orders.Products.GiftVouchers"]<text>:</text>@for (var i = 0; i < item.PurchasedGiftVoucherIds.Count; i++){- <a href="@Url.Action("Edit", "GiftVoucher", new { id = item.PurchasedGiftVoucherIds[i], area = Constants.AreaStore })" class="k-button"><span class="k-icon k-i-eye"></span> @Loc["Admin.Orders.Products.GiftVoucher.View"]</a>+ <a href="@Url.Action("Edit", "GiftVoucher", new { id = item.PurchasedGiftVoucherIds[i], area = area })" class="k-button"><span class="k-icon k-i-eye"></span> @Loc["Admin.Orders.Products.GiftVoucher.View"]</a>if (i != item.PurchasedGiftVoucherIds.Count - 1){<text>,</text>@@ -185,10 +188,10 @@<br/>@if (item.LicenseDownloadGuid != Guid.Empty){- <a href="@Url.Action("DownloadFile", "Download", new { downloadGuid = item.LicenseDownloadGuid, area = Constants.AreaStore })" class="btn purple">@Loc["Admin.Orders.Products.License.DownloadLicense"]</a>+ <a href="@Url.Action("DownloadFile", "Download", new { downloadGuid = item.LicenseDownloadGuid, area = area })" class="btn purple">@Loc["Admin.Orders.Products.License.DownloadLicense"]</a>}<br/>- <a id="pvlicensefile" name="pvlicensefile" href="@(Url.Action("UploadLicenseFilePopup", "Order", new { id = Model.Id, orderItemId = item.Id, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaStore }))" class="k-button">+ <a id="pvlicensefile" name="pvlicensefile" href="@(Url.Action("UploadLicenseFilePopup", "Order", new { id = Model.Id, orderItemId = item.Id, btnId = "btnRefreshPage", formId = "order-form", area = area }))" class="k-button">@Loc["Admin.Orders.Products.License.UploadFile"]</a></div>@@ -342,7 +345,7 @@</tr></table></div>-<vc:admin-widget widget-zone="order_details_products_bottom" additional-data="Model"/>+<partial name="Partials/WidgetZone.Products.Bottom" model="Model"/>@if (!string.IsNullOrEmpty(Model.CheckoutAttributeInfo)){@@ -351,5 +354,5 @@</div>}<div class="form-actions">- <button type="submit" id="btnAddNewProduct" name="btnAddNewProduct" onclick=" javascript:setLocation('@(Url.Action("AddProductToOrder", "Order", new { orderId = Model.Id, area = Constants.AreaStore }))'); return false; " class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Orders.Products.AddNew"]</button>+ <button type="submit" id="btnAddNewProduct" name="btnAddNewProduct" onclick=" javascript:setLocation('@(Url.Action("AddProductToOrder", "Order", new { orderId = Model.Id, area = area }))'); return false; " class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Orders.Products.AddNew"]</button></div>\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/OrderDetails.Shipment.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Shipment.cshtmlsimilarity index 71%rename from src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/OrderDetails.Shipment.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Shipment.cshtmlindex e38ab5628..185ea0f46 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/OrderDetails.Shipment.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/OrderDetails.Shipment.cshtml@@ -1,28 +1,34 @@-@using Grand.Business.Core.Interfaces.Common.Security+@using Grand.Business.Core.Interfaces.Common.Security@using Grand.Domain.Permissions+@using Grand.Domain.Orders@model OrderModel@inject IPermissionService permissionService;-<vc:vendor-widget widget-zone="vendor_order_details_address_top" additional-data="Model"/>+@inject IAdminDataScope<Order> Scope+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+ var prefix = Scope.ResourceKeyPrefix;+}+<partial name="Partials/WidgetZone.Shipment.AddressTop" model="Model"/>@if (Model.IsShippable){@if (await permissionService.Authorize(PermissionSystemName.Shipments)){<div class="card col-md-12"><div class="card-body">- <h4 class="card-title">@Loc["Vendor.Orders.Shipments"]</h4>+ <h4 class="card-title">@Loc[$"{prefix}.Orders.Shipments"]</h4><div class="card-text"><div class="panel panel-default">- <vc:vendor-widget widget-zone="vendor_order_details_shipping_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Shipment.ShippingTop" model="Model"/><div class="panel-body"><div id="shipments-grid"></div></div><div class="panel-footer">@if (Model.CanAddNewShipments){- <button type="submit" id="btnAddNewShipment" name="btnAddNewShipment" onclick="javascript:setLocation('@(Url.Action("AddShipment", "Shipment", new { orderId = Model.Id, area = Constants.AreaVendor }))'); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Vendor.Orders.Shipments.AddNew"]</button>+ <button type="submit" id="btnAddNewShipment" name="btnAddNewShipment" onclick="javascript:setLocation('@(Url.Action("AddShipment", "Shipment", new { orderId = Model.Id, area = area }))'); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc[$"{prefix}.Orders.Shipments.AddNew"]</button>}</div>- <vc:vendor-widget widget-zone="vendor_order_details_shipping_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Shipment.ShippingBottom" model="Model"/></div></div></div>@@ -35,7 +41,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ShipmentsByOrder", "Shipment", new { orderId = Model.Id, area = Constants.AreaVendor }))",+ url: "@Html.Raw(Url.Action("ShipmentsByOrder", "Shipment", new { orderId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -67,27 +73,27 @@scrollable: false,columns: [{field: "ShipmentNumber",- title: "@Loc["Vendor.Orders.Shipments.ID"]",+ title: "@Loc[$"{prefix}.Orders.Shipments.ID"]",width: 50,- template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = Constants.AreaVendor })/#=Id#">#=ShipmentNumber#</a>'+ template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = area })/#=Id#">#=ShipmentNumber#</a>'}, {field: "TrackingNumber",- title: "@Loc["Vendor.Orders.Shipments.TrackingNumber"]",+ title: "@Loc[$"{prefix}.Orders.Shipments.TrackingNumber"]",width: 100,- template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = Constants.AreaVendor })/#=Id#">#=kendo.htmlEncode(TrackingNumber)#</a>'+ template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = area })/#=Id#">#=kendo.htmlEncode(TrackingNumber)#</a>'}, {field: "TotalWeight",- title: "@Loc["Vendor.Orders.Shipments.TotalWeight"]",+ title: "@Loc[$"{prefix}.Orders.Shipments.TotalWeight"]",width: 100}, {field: "ShippedDate",- title: "@Loc["Vendor.Orders.Shipments.ShippedDate"]",+ title: "@Loc[$"{prefix}.Orders.Shipments.ShippedDate"]",width: 200,type: "date",format: "{0:G}"}, {field: "DeliveryDate",- title: "@Loc["Vendor.Orders.Shipments.DeliveryDate"]",+ title: "@Loc[$"{prefix}.Orders.Shipments.DeliveryDate"]",width: 200,type: "date",format: "{0:G}"@@ -101,7 +107,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ShipmentsItemsByShipmentId", "Shipment", new { area = Constants.AreaVendor }))?shipmentId="+e.data.Id,+ url: "@Html.Raw(Url.Action("ShipmentsItemsByShipmentId", "Shipment", new { area = area }))?shipmentId="+e.data.Id,type: "POST",dataType: "json",data: addAntiForgeryToken@@ -132,23 +138,23 @@columns: [{field: "ProductName",- title: "@Loc["Vendor.Orders.Shipments.Products.ProductName"]",+ title: "@Loc[$"{prefix}.Orders.Shipments.Products.ProductName"]",width: 400},{field: "ShippedFromWarehouse",- title: "@Loc["Vendor.Orders.Shipments.Products.Warehouse"]",+ title: "@Loc[$"{prefix}.Orders.Shipments.Products.Warehouse"]",width: 150},{field: "QuantityInThisShipment",- title: "@Loc["Vendor.Orders.Shipments.Products.QtyShipped"]",+ title: "@Loc[$"{prefix}.Orders.Shipments.Products.QtyShipped"]",width: 150},{field: "ItemWeight",- title: "@Loc["Vendor.Orders.Shipments.Products.ItemWeight"]",+ title: "@Loc[$"{prefix}.Orders.Shipments.Products.ItemWeight"]",width: 150},{field: "ItemDimensions",- title: "@Loc["Vendor.Orders.Shipments.Products.ItemDimensions"]",+ title: "@Loc[$"{prefix}.Orders.Shipments.Products.ItemDimensions"]",width: 150}]@@ -160,8 +166,8 @@else{<div class="card col-md-6">- <div class="note note-info">@Loc["Vendor.Orders.ShippingInfo.NotRequired"]</div>+ <div class="note note-info">@Loc[$"{prefix}.Orders.ShippingInfo.NotRequired"]</div></div>}-<vc:vendor-widget widget-zone="vendor_order_details_address_bottom" additional-data="Model"/>\ No newline at end of file+<partial name="Partials/WidgetZone.Shipment.AddressBottom" model="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/ProductAddAttributes.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/ProductAddAttributes.cshtmlsimilarity index 100%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/ProductAddAttributes.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/ProductAddAttributes.cshtmldiff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/ProductAddGiftVoucherInfo.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/ProductAddGiftVoucherInfo.cshtmlsimilarity index 100%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/ProductAddGiftVoucherInfo.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/Partials/ProductAddGiftVoucherInfo.cshtmldiff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/UploadLicenseFilePopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/UploadLicenseFilePopup.cshtmlsimilarity index 86%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Order/UploadLicenseFilePopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/UploadLicenseFilePopup.cshtmlindex 5ed1dfa16..7dfae290c 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/UploadLicenseFilePopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Order/UploadLicenseFilePopup.cshtml@@ -1,10 +1,11 @@-@model OrderModel.UploadLicenseModel+@model OrderModel.UploadLicenseModel@{Layout = "";//page titleViewBag.Title = Loc["Admin.Orders.Products.License.UploadFile"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="UploadLicenseFilePopup" asp-area="@Constants.AreaStore" asp-controller="Order" asp-action="UploadLicenseFilePopup" method="post">+<form id="UploadLicenseFilePopup" asp-area="@area" asp-controller="Order" asp-action="UploadLicenseFilePopup" method="post"><div class="row"><div class="col-md-12">@@ -22,7 +23,7 @@<input type="submit" name="deletelicense" asp-action="DeleteLicenseFilePopup" value="@Loc["Admin.Common.Delete"]" id="deletelicense" class="btn red"/>}</div>- <vc:admin-widget widget-zone="order_upload_license_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.UploadLicenseButtons" model="Model"/></div></div></div>@@ -61,4 +62,4 @@});});</script>-</form>\ No newline at end of file+</form>diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/_ViewImports.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/_ViewImports.cshtmlindex 99532cee9..6f40614b8 100644--- a/src/Web/Grand.Web.AdminShared/Views/AdminShared/_ViewImports.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/_ViewImports.cshtml@@ -14,6 +14,7 @@@using Grand.Web.Common.Extensions@using Grand.Web.Common.Localization@using Grand.Web.AdminShared.Models.Catalog+@using Grand.Web.AdminShared.Models.Orders@using Grand.Web.AdminShared.Interfaces@inject LocService Locdiff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/AddProductToOrder.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/AddProductToOrder.cshtmldeleted file mode 100644index d454b6b3a..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/AddProductToOrder.cshtml+++ /dev/null@@ -1,178 +0,0 @@-@model OrderModel.AddOrderProductModel-@inject AdminAreaSettings adminAreaSettings-@{- //page title- ViewBag.Title = string.Format(Loc["Admin.Orders.Products.AddNew.Title1"], Model.OrderNumber);-}--<div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <i class="fa fa-cube"></i>- @string.Format(Loc["Admin.Orders.Products.AddNew.Title1"], Model.OrderNumber)- <small>- <i class="fa fa-arrow-circle-left"></i>- @Html.ActionLink(Loc["Admin.Orders.Products.AddNew.BackToOrder"], "Edit", new { id = Model.OrderId })- </small>- </div>- </div>- <div class="x_content form">- <vc:admin-widget widget-zone="order_add_products_top" additional-data="Model"/>- <div class="form-horizontal">- <div class="form-body">- <div class="form-group popup">- <admin-label class="col-sm-2 control-label" asp-for="SearchProductName"/>- <div class="col-8 col-md-4 col-sm-4">- <admin-input asp-for="SearchProductName"/>- </div>- <div class="col-8 col-md-6 col-sm-4 mt-mobile-10">- <div class="btn-group btn-group-devided">- <button class="btn btn-success filter-submit" id="search-products">- <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]- </button>- <button type="button" class="btn btn-default filter-extend-button">- <i class="fa fa-filter"></i>- </button>- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- </div>- </div>- </div>- <div class="form-group extend-collapse">- <admin-label asp-for="SearchCategoryId"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SearchCategoryId"/>- </div>- </div>- <div class="form-group extend-collapse">- <admin-label asp-for="SearchBrandId"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SearchBrandId"/>- </div>- </div>- <div class="form-group extend-collapse">- <admin-label asp-for="SearchCollectionId"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SearchCollectionId"/>- </div>- </div>- <div class="form-group extend-collapse">- <admin-label asp-for="SearchProductTypeId"/>- <div class="col-md-9 col-sm-9">- <admin-select asp-for="SearchProductTypeId" asp-items="Model.AvailableProductTypes"/>- </div>- </div>- </div>- </div>- <vc:admin-widget widget-zone="order_add_products_bottom" additional-data="Model"/>- </div>- <div class="x_content">- <strong>@Loc["Admin.Orders.Products.AddNew.Note1"]</strong>- <div id="products-grid"></div>- </div>- </div>- </div>-</div>-<script>- $(document).ready(function () {-- $('.extend-collapse').hide();- $('.filter-extend-button').click(function () {- $('.extend-collapse').toggle("slow");- $('.filter-text-close').toggle();- });-- $("#products-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("AddProductToOrder", "Order", new { area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: additionalData- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- //selectable- selectable: true,- change: onChange,- columns: [{- field: "Name",- title: "@Loc["Admin.Orders.Products.AddNew.Name"]",- width: 400- },{- field: "Sku",- title: "@Loc["Admin.Orders.Products.AddNew.SKU"]",- width: 100- }]- });- });-</script>-<script>- $(document).ready(function () {- $('#search-products').click(function () {- var grid = $('#products-grid').data('kendoGrid');- grid.dataSource.page(1); //new search. Set page size to 1- //grid.dataSource.read(); we already loaded the grid above using "page" function- return false;- });- });-- $("#@Html.IdFor(model => model.SearchProductName)").keydown(function (event) {- if (event.keyCode == 13) {- $("#search-products").click();- return false;- }- });-- function additionalData() {- var data = {- SearchProductName: $('#@Html.IdFor(model => model.SearchProductName)').val(),- SearchCategoryId: $('#SearchCategoryId').val(),- SearchBrandId: $('#SearchBrandId').val(),- SearchCollectionId: $('#SearchCollectionId').val(),- SearchProductTypeId: $('#SearchProductTypeId').val()- };- addAntiForgeryToken(data);- return data;- }-- function onChange(e) {- var grid = $('#products-grid').data('kendoGrid');- var selectedItem = grid.dataItem(grid.select());- var productId = selectedItem.Id;- //load "product details page" block- var productDetailsActionUrl = '@Html.Raw(Url.Action("AddProductToOrderDetails", "Order", new { orderId = Model.OrderId, productId = "productidplaceholder", area = Constants.AreaStore }))';- productDetailsActionUrl = productDetailsActionUrl.replace("productidplaceholder", productId);- setLocation(productDetailsActionUrl);- }-</script>-<div id="productdetails">-</div>-<input asp-for="OrderId" type="hidden"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/CreateOrUpdateAddress.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/CreateOrUpdateAddress.cshtmldeleted file mode 100644index 02aab8b36..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/CreateOrUpdateAddress.cshtml+++ /dev/null@@ -1,5 +0,0 @@-@model OrderAddressModel-<vc:admin-widget widget-zone="order_address_details_top" additional-data="Model"/>-<div asp-validation-summary="All"></div>-<admin-input asp-for="Address" asp-template="Address"/>-<vc:admin-widget widget-zone="order_address_details_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Addresses.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Addresses.cshtmldeleted file mode 100644index 10359b8b4..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Addresses.cshtml+++ /dev/null@@ -1,437 +0,0 @@-@model OrderModel-<vc:admin-widget widget-zone="order_details_address_top" additional-data="Model"/>-<div class="card col-md-6">- <div class="card-body">- <h4 class="card-title">@Loc["Admin.Orders.BillingInfo"]</h4>- <p class="card-text">- <table class="table table-bordered table-striped table-hover">- @if (Model.BillingAddress.FirstNameEnabled || Model.BillingAddress.LastNameEnabled)- {- <tr>- <td style="width:25%">- @Loc["Admin.Orders.Address.FullName"]:- </td>- <td>- @Model.BillingAddress.FirstName @Model.BillingAddress.LastName- </td>- </tr>- }- @if (Model.BillingAddress.EmailEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Email"]:- </td>- <td>- @Model.BillingAddress.Email- </td>- </tr>- }- @if (Model.BillingAddress.PhoneEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Phone"]:- </td>- <td>- @Model.BillingAddress.PhoneNumber- </td>- </tr>- }- @if (Model.BillingAddress.FaxEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Fax"]:- </td>- <td>- @Model.BillingAddress.FaxNumber- </td>- </tr>- }- @if (Model.BillingAddress.CompanyEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Company"]:- </td>- <td>- @Model.BillingAddress.Company- </td>- </tr>- }- @if (Model.BillingAddress.VatNumberEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.VatNumber"]:- </td>- <td>- @Model.BillingAddress.VatNumber- </td>- </tr>- }- @if (Model.BillingAddress.StreetAddressEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Address1"]:- </td>- <td>- @Model.BillingAddress.Address1- </td>- </tr>- }- @if (Model.BillingAddress.StreetAddress2Enabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Address2"]:- </td>- <td>- @Model.BillingAddress.Address2- </td>- </tr>- }- @if (Model.BillingAddress.CityEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.City"]:- </td>- <td>- @Model.BillingAddress.City- </td>- </tr>- }- @if (Model.BillingAddress.StateProvinceEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.StateProvince"]:- </td>- <td>- @Model.BillingAddress.StateProvinceName- </td>- </tr>- }- @if (Model.BillingAddress.ZipPostalCodeEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.ZipPostalCode"]:- </td>- <td>- @Model.BillingAddress.ZipPostalCode- </td>- </tr>- }- @if (Model.BillingAddress.CountryEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Country"]:- </td>- <td>- @Model.BillingAddress.CountryName- </td>- </tr>- }- @if (!string.IsNullOrEmpty(Model.BillingAddress.FormattedCustomAddressAttributes))- {- <tr class="custom-attributes-view">- <td colspan="2">- @Html.Raw(Model.BillingAddress.FormattedCustomAddressAttributes)- </td>- </tr>- }-- <tr>- <td colspan="2">- <a href="@Url.Action("AddressEdit", new { addressId = Model.BillingAddress.Id, orderId = Model.Id, BillingAddress = true, area = Constants.AreaStore })" class="k-button"><span class="k-icon k-i-edit"></span> @Loc["Admin.Common.Edit"]</a>- </td>- </tr>-- </table>- </p>- </div>-</div>--@if (Model.IsShippable)-{- <div class="card col-md-6">- <div class="card-body">- <h4 class="card-title">@Loc["Admin.Orders.ShippingInfo"]</h4>- <p class="card-text">-- @if (Model.ShippingAddress != null)- {- <table class="table table-bordered table-striped table-hover">- @if (Model.ShippingAddress.FirstNameEnabled || Model.ShippingAddress.LastNameEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.FullName"]:- </td>- <td>- @Model.ShippingAddress.FirstName @Model.ShippingAddress.LastName- </td>- </tr>- }- @if (Model.ShippingAddress.EmailEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Email"]:- </td>- <td>- @Model.ShippingAddress.Email- </td>- </tr>- }- @if (Model.ShippingAddress.PhoneEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Phone"]:- </td>- <td>- @Model.ShippingAddress.PhoneNumber- </td>- </tr>- }- @if (Model.ShippingAddress.FaxEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Fax"]:- </td>- <td>- @Model.ShippingAddress.FaxNumber- </td>- </tr>- }- @if (Model.ShippingAddress.CompanyEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Company"]:- </td>- <td>- @Model.ShippingAddress.Company- </td>- </tr>- }- @if (Model.ShippingAddress.StreetAddressEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Address1"]:- </td>- <td>- @Model.ShippingAddress.Address1- </td>- </tr>- }- @if (Model.ShippingAddress.StreetAddress2Enabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Address2"]:- </td>- <td>- @Model.ShippingAddress.Address2- </td>- </tr>- }- @if (Model.ShippingAddress.CityEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.City"]:- </td>- <td>- @Model.ShippingAddress.City- </td>- </tr>- }- @if (Model.ShippingAddress.StateProvinceEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.StateProvince"]:- </td>- <td>- @Model.ShippingAddress.StateProvinceName- </td>- </tr>- }- @if (Model.ShippingAddress.ZipPostalCodeEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.ZipPostalCode"]:- </td>- <td>- @Model.ShippingAddress.ZipPostalCode- </td>- </tr>- }- @if (Model.ShippingAddress.CountryEnabled)- {- <tr>- <td>- @Loc["Admin.Orders.Address.Country"]:- </td>- <td>- @Model.ShippingAddress.CountryName- </td>- </tr>- }- @if (!string.IsNullOrEmpty(Model.ShippingAddress.FormattedCustomAddressAttributes))- {- <tr class="custom-attributes-view">- <td colspan="2">- @Html.Raw(Model.ShippingAddress.FormattedCustomAddressAttributes)- </td>- </tr>- }-- <tr>- <td colspan="2">- <a href="@Url.Action("AddressEdit", new { addressId = Model.ShippingAddress.Id, orderId = Model.Id, area = Constants.AreaStore })" class="k-button"><span class="k-icon k-i-edit"></span> @Loc["Admin.Common.Edit"]</a>- </td>- </tr>-- </table>- <div style="padding-top: 15px;">- <img alt="google maps" src="@Url.Content($"{Grand.SharedUIResources.Constants.WwwRoot}/administration/build/images/google-maps.gif")"/>- <a href="@Html.Raw(Model.ShippingAddressGoogleMapsUrl)" target="_blank">@Loc["Admin.Orders.Fields.ShippingAddress.ViewOnGoogleMaps"]</a>- </div>- }- @if (Model.PickupAddress != null)- {- <div class="form-group">- <admin-label asp-for="PickupAddress"/>- <div class="col-md-9 col-sm-9">- <table class="table table-bordered table-striped table-hover">- @if (!string.IsNullOrEmpty(Model.PickupAddress.Address1))- {- <tr>- <td>- @Loc["Admin.Orders.Address.Address1"]:- </td>- <td>- @Model.PickupAddress.Address1- </td>- </tr>- }- @if (!string.IsNullOrEmpty(Model.PickupAddress.City))- {- <tr>- <td>- @Loc["Admin.Orders.Address.City"]:- </td>- <td>- @Model.PickupAddress.City- </td>- </tr>- }- @if (!string.IsNullOrEmpty(Model.PickupAddress.ZipPostalCode))- {- <tr>- <td>- @Loc["Admin.Orders.Address.ZipPostalCode"]:- </td>- <td>- @Model.PickupAddress.ZipPostalCode- </td>- </tr>- }- @if (!string.IsNullOrEmpty(Model.PickupAddress.CountryName))- {- <tr>- <td>- @Loc["Admin.Orders.Address.Country"]:- </td>- <td>- @Model.PickupAddress.CountryName- </td>- </tr>- }- </table>- </div>- </div>- }-- @if (Model.IsShippable)- {- <div class="form-horizontal">- <div class="form-body">-- <div class="form-group">- <admin-label asp-for="ShippingMethod"/>- <div class="col-md-9 col-sm-9">- <label class="control-label" id="lblShippingMethod">@Model.ShippingMethod</label>-- <script>- $(document).ready(function () {- toggleEditShippingMethod(false);- });--- function toggleEditShippingMethod(editmode) {- if (editmode) {- $('#lblShippingMethod').hide();- $('#divShippingMethod').show();- $('#btnEditShippingMethod').hide();- $('#btnSaveShippingMethod').show();- $('#btnCancelShippingMethod').show();- } else {- $('#lblShippingMethod').show();- $('#divShippingMethod').hide();- $('#btnEditShippingMethod').show();- $('#btnSaveShippingMethod').hide();- $('#btnCancelShippingMethod').hide();- }- }-- </script>- <div id="divShippingMethod" style="display: inline-block;">- <admin-input asp-for="ShippingMethod"/>- </div>- <button type="submit" id="btnEditShippingMethod" onclick=" toggleEditShippingMethod(true);return false; " class="k-button"><span class="k-icon k-i-edit"></span> @Loc["Admin.Common.Edit"]</button>- <input type="submit" value="@Loc["Admin.Common.Save"]" id="btnSaveShippingMethod" asp-action="EditShippingMethod" name="save-shipping-method" class="k-button" onclick=" return confirm('@Loc["Admin.Common.AreYouSure"]'); "/>- <input type="submit" value="@Loc["Admin.Common.Cancel"]" onclick=" toggleEditShippingMethod(false);return false; " id="btnCancelShippingMethod" class="k-button"/>-- @if (!string.IsNullOrEmpty(Model.ShippingAdditionDescription))- {- <br/>- <label>@Html.Raw(Model.ShippingAdditionDescription)</label>- }- </div>- </div>-- <div class="form-group">- <admin-label asp-for="ShippingStatus"/>- <div class="col-md-9 col-sm-9">- <label class="control-label">@Model.ShippingStatus</label>- </div>- </div>-- </div>- </div>- }-- </p>- </div>- </div>-}-else-{- <div class="card col-md-6">- <div class="note note-info">@Loc["Admin.Orders.ShippingInfo.NotRequired"]</div>- </div>-}--<vc:admin-widget widget-zone="order_details_address_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Documents.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Documents.cshtmldeleted file mode 100644index 2a754f08e..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Documents.cshtml+++ /dev/null@@ -1,71 +0,0 @@-@model OrderModel-@inject AdminAreaSettings adminAreaSettings-<div class="panel panel-default">- <vc:admin-widget widget-zone="order_details_documents_top" additional-data="Model"/>- <div class="panel-body">- <div id="order-documents-grid"></div>- </div>- <div class="panel-footer">- <button type="button" class="k-button" onclick="location.href='@Url.Action("CreateDocument", "Document", new { ObjectId = Model.Id, Reference = (int)Reference.Order, area = Constants.AreaStore })'"><i class="fa fa-plus"></i> @Loc["Admin.Marketing.Document.Add"]</button>- </div>- <vc:admin-widget widget-zone="order_details_documents_bottom" additional-data="Model"/>-</div>--<script>-$(document).ready(function () {- $("#order-documents-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ListDocuments", "Document", new { reference = (int)Reference.Order, ObjectId = Model.Id, StatusId = -1, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- autoBind: false,- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: true,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Number",- title: "@Loc["Admin.Documents.Document.Fields.Number"]",- template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(Number)#</a>',- },- {- field: "Name",- title: "@Loc["Admin.Documents.Document.Fields.Name"]",- template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(Name)#</a>',- }, {- field: "Published",- title: "@Loc["Admin.Documents.Document.Fields.Published"]",- width: 100,- minScreenWidth: 500,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'- }]- });-});-</script>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Info.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Info.cshtmldeleted file mode 100644index 9192a5900..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Info.cshtml+++ /dev/null@@ -1,545 +0,0 @@-@using System.Text.Encodings.Web-@using Grand.Business.Core.Interfaces.Checkout.Orders-@using Grand.Domain.Payments-@using Grand.Domain.Tax-@using Constants = Grand.SharedUIResources.Constants-@model OrderModel-@inject IOrderTagService orderTagService---<link rel="stylesheet" type="text/css" asp-src="@(Constants.WwwRoot)/administration/tagEditor/jquery.tag-editor.css"/>-<script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/tagEditor/jquery.tag-editor.min.js"></script>-<script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/tagEditor/jquery.caret.min.js"></script>--@{- //tags- var orderTags = await orderTagService.GetAllOrderTags();- var orderTagsSB = new StringBuilder();- orderTagsSB.Append("var initialOrderTags = [");- for (var i = 0; i < orderTags.Count; i++)- {- var tag = orderTags[i];- orderTagsSB.Append("'");- orderTagsSB.Append(JavaScriptEncoder.Default.Encode(tag.Name));- orderTagsSB.Append("'");- if (i != orderTags.Count - 1)- {- orderTagsSB.Append(",");- }- }-- orderTagsSB.Append("]");-}--<script>- $(document).ready(function() {- toggleChangeOrderStatus(false);- toggleOrderTotals(false);-- //tags- @Html.Raw(orderTagsSB.ToString())- $("#@Html.IdFor(model => model.OrderTags)").tagEditor({- autocomplete: {- delay: 0,- position: { collision: 'flip' },- source: initialOrderTags- },- delimiter: ',',- placeholder: 'Enter tags...'- });- });-- function toggleChangeOrderStatus(editmode) {- if (editmode) {- $('#pnlChangeOrderStatus').show();- $('#btnChangeOrderStatus').hide();- } else {- $('#pnlChangeOrderStatus').hide();- $('#btnChangeOrderStatus').show();- }- }-- function toggleOrderTotals(editmode) {- if (editmode) {- $('#trEditOrderTotals').show();- $('#btnEditOrderTotals').hide();- $('#btnSaveOrderTotals').show();- $('#btnCancelOrderTotals').show();- } else {- $('#trEditOrderTotals').hide();- $('#btnEditOrderTotals').show();- $('#btnSaveOrderTotals').hide();- $('#btnCancelOrderTotals').hide();- }- }-- </script>--<div class="form-horizontal">-<vc:admin-widget widget-zone="order_details_info_top" additional-data="Model"/>-<div class="form-body">-<div class="form-group">- <admin-label asp-for="OrderNumber" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.OrderNumber</label>- </div>-</div>--<div class="form-group order-status-block @Model.OrderStatus">- <admin-label asp-for="OrderStatus" asp-display-hint="false" class="control-label col-12 col-md-3 col-sm-3 pt-2"></admin-label>- <div class="col-12 col-md-9 col-sm-9 orderEditBtn">- <div class="d-inline-flex w-100 align-items-center mb-3">- <div class="alert mb-0">- @Model.OrderStatus- </div> - @if (Model.CanCancelOrder)- {- <input type="submit" name="cancelorder" asp-action="CancelOrder" value="@Loc["Admin.Orders.Fields.OrderStatus.Cancel"]" id="cancelorder" class="btn red" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]');"/>- }- <input type="submit" name="btnChangeOrderStatus" value="@Loc["Admin.Orders.Fields.OrderStatus.Change"]" onclick="toggleChangeOrderStatus(true);return false;" id="btnChangeOrderStatus" class="btn green"/>- </div>- <div id="pnlChangeOrderStatus">- <div class="note note-info">@Loc["Admin.Orders.Fields.OrderStatus.Change.ForAdvancedUsers"]</div>- <admin-select asp-for="OrderStatusId" asp-items="Model.OrderStatuses"/>- <div class="form-actions btn-group btn-group-devided mt-3">- <input type="submit" name="btnSaveOrderStatus" asp-action="ChangeOrderStatus" value="@Loc["Admin.Common.Save"]" id="btnSaveOrderStatus" class="k-button" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]');"/>- <input type="submit" name="btnCancelOrderStatus" value="@Loc["Admin.Common.Cancel"]" onclick="toggleChangeOrderStatus(false);return false;" id="btnCancelOrderStatus" class="k-button"/>- </div>- </div>- </div>-</div>--<div class="form-group">- <admin-label asp-for="ShippingStatus" asp-display-hint="false" class="control-label col-12 col-md-3 col-sm-3"></admin-label>- <div class="col-12 col-md-9 col-sm-9">- <label class="control-label">- @Model.ShippingStatus- </label>- </div>-</div>--<div class="form-group">- <admin-label asp-for="PaymentStatus" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- @{- var labelStatus = "";- switch (Model.PaymentStatusEnum)- {- case PaymentStatus.Paid:- labelStatus = "success";- break;- case PaymentStatus.PartiallyPaid:- labelStatus = "info";- break;- case PaymentStatus.Pending:- labelStatus = "default";- break;- case PaymentStatus.Authorized:- labelStatus = "info";- break;- case PaymentStatus.PartiallyRefunded:- labelStatus = "info";- break;- case PaymentStatus.Refunded:- labelStatus = "warning";- break;- case PaymentStatus.Voided:- labelStatus = "danger";- break;- }- }- <div>-- <a class="btn btn-@labelStatus" href="@Url.Action("Edit", "PaymentTransaction", new { id = Model.PaymentTransactionId, area = Grand.Web.Store.Extensions.Constants.AreaStore })">@Model.PaymentStatus - @Loc["Admin.Common.View"]</a>-- </div>- </div>-</div>--<div class="form-group" id="trEditOrderTags">- <admin-label asp-for="OrderTags"/>- <div class="col-md-9 col-sm-9">- <span asp-validation-for="OrderTags"></span>- <div class="input-group flex-nowrap w-100">- <admin-input asp-for="OrderTags"/>- <input type="submit" name="btnSaveOrderTags" asp-action="SaveOrderTags" value="@Loc["Admin.Orders.Fields.SaveOrderTags"]" id="btnSaveOrderTags" class="k-button" onclick=" return confirm('@Loc["Admin.Common.AreYouSure"]'); "/>- </div>- </div>-</div>--@if (!string.IsNullOrEmpty(Model.Code))-{- <div class="form-group">- <admin-label asp-for="Code" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.Code</label>- </div>- </div>-}-<div class="form-group">- <admin-label asp-for="CurrencyCode" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">- @Model.CurrencyCode- @if (Model.CurrencyRate != 1)- {- <text>(@Model.CurrencyRate)</text>- }- </label>- </div>-</div>--<div class="form-group">- <admin-label asp-for="OrderGuid" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.OrderGuid</label>- </div>-</div>--<div class="form-group">- <admin-label asp-for="StoreName" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.StoreName</label>- </div>-</div>--<div class="form-group">- <admin-label asp-for="CustomerId" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">- @Html.ActionLink(Model.CustomerInfo, "Edit", "Customer", new { id = Model.CustomerId }, new { })- </label>- </div>-</div>-<div class="form-group">- <admin-label asp-for="CustomerIp" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.CustomerIp</label>- </div>-</div>-@if (!string.IsNullOrEmpty(Model.VatNumber))-{- <div class="form-group">- <admin-label asp-for="VatNumber" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.VatNumber</label>- </div>- </div>-}-@if (!string.IsNullOrEmpty(Model.AffiliateId))-{- <div class="form-group">- <admin-label asp-for="AffiliateId" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">- <a href="@Url.Action("Edit", "Affiliate", new { id = Model.AffiliateId, area = Grand.Web.Store.Extensions.Constants.AreaStore })">@Model.AffiliateName - @Loc["Admin.Common.View"]</a>- </label>- </div>- </div>-}-@if (!string.IsNullOrEmpty(Model.SalesEmployeeId))-{- <div class="form-group">- <admin-label asp-for="SalesEmployeeId" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.SalesEmployeeName</label>- </div>- </div>-}-@if (Model.TaxDisplayType == TaxDisplayType.IncludingTax)-{- <div class="form-group">- <admin-label asp-for="OrderSubtotalInclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.OrderSubtotalInclTax</label>- </div>- </div>-}-@if (Model.TaxDisplayType == TaxDisplayType.ExcludingTax)-{- <div class="form-group">- <admin-label asp-for="OrderSubtotalExclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.OrderSubtotalExclTax</label>- </div>- </div>-}-@if (Model.TaxDisplayType == TaxDisplayType.IncludingTax- && !string.IsNullOrEmpty(Model.OrderSubTotalDiscountInclTax))-{- <div class="form-group">- <admin-label asp-for="OrderSubTotalDiscountInclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.OrderSubTotalDiscountInclTax</label>- </div>- </div>-}-@if (Model.TaxDisplayType == TaxDisplayType.ExcludingTax- && !string.IsNullOrEmpty(Model.OrderSubTotalDiscountExclTax))-{- <div class="form-group">- <admin-label asp-for="OrderSubTotalDiscountExclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.OrderSubTotalDiscountExclTax</label>- </div>- </div>-}-@if (Model.TaxDisplayType == TaxDisplayType.IncludingTax)-{- <div class="form-group">- <admin-label asp-for="OrderShippingInclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.OrderShippingInclTax</label>- </div>- </div>-}-@if (Model.TaxDisplayType == TaxDisplayType.ExcludingTax)-{- <div class="form-group">- <admin-label asp-for="OrderShippingExclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.OrderShippingExclTax</label>- </div>- </div>-}-@if (Model.TaxDisplayType == TaxDisplayType.IncludingTax- && !string.IsNullOrEmpty(Model.PaymentMethodAdditionalFeeInclTax))-{- <div class="form-group">- <admin-label asp-for="PaymentMethodAdditionalFeeInclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.PaymentMethodAdditionalFeeInclTax</label>- </div>- </div>-}-@if (Model.TaxDisplayType == TaxDisplayType.ExcludingTax- && !string.IsNullOrEmpty(Model.PaymentMethodAdditionalFeeExclTax))-{- <div class="form-group">- <admin-label asp-for="PaymentMethodAdditionalFeeExclTax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.PaymentMethodAdditionalFeeExclTax</label>- </div>- </div>-}-@if (Model.DisplayTaxRates)-{- foreach (var tr in Model.TaxRates)- {- <div class="form-group">- <admin-label asp-for="Tax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@tr.Rate% - @tr.Value</label>- </div>- </div>- }-}-@if (Model.DisplayTax)-{- <div class="form-group">- <admin-label asp-for="Tax" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.Tax</label>- </div>- </div>-}-@if (!string.IsNullOrEmpty(Model.OrderTotalDiscount))-{- <div class="form-group">- <admin-label asp-for="OrderTotalDiscount" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.OrderTotalDiscount</label>- </div>- </div>-}-@foreach (var gc in Model.GiftVouchers)-{- <div class="form-group">- <admin-label asp-for="GiftVouchers[0].CouponCode" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">(@(gc.CouponCode))</label>- <label class="control-label">@gc.Amount</label>- </div>- </div>-}-@if (Model.RedeemedLoyaltyPoints > 0)-{- <div class="form-group">- <admin-label asp-for="RedeemedLoyaltyPoints" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">- @Model.RedeemedLoyaltyPoints @Loc["Admin.Orders.Fields.RedeemedLoyaltyPoints.Points"]- <text>/</text>- @Model.RedeemedLoyaltyPointsAmount- </label>- </div>- </div>-}-<div class="form-group">- <admin-label asp-for="OrderTotal" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.OrderTotal</label>- </div>-</div>-@if (!string.IsNullOrEmpty(Model.RefundedAmount))-{- <div class="form-group">- <admin-label asp-for="RefundedAmount" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.RefundedAmount</label>- </div>- </div>-}-@if (!string.IsNullOrEmpty(Model.SuggestedRefundedAmount))-{- <div class="form-group">- <admin-label asp-for="SuggestedRefundedAmount" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.SuggestedRefundedAmount</label>- </div>- </div>-}-@if (Model.UsedDiscounts.Count > 0)-{- <div class="form-group">- <admin-label asp-for="UsedDiscounts" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- @for (var i = 0; i < Model.UsedDiscounts.Count; i++)- {- var discount = Model.UsedDiscounts[i];- <label class="control-label">- <a href="@Url.Action("Edit", "Discount", new { id = discount.DiscountId, area = Grand.Web.Store.Extensions.Constants.AreaStore })">@discount.DiscountName</a>- @if (i != Model.UsedDiscounts.Count - 1)- {- <text>,</text>- }- </label>- }- </div>- </div>-}-<div class="form-group">- <admin-label asp-for="Profit" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.Profit</label>- </div>-</div>--<div class="form-group" id="trEditOrderTotals">- <label class="control-label col-md-3"></label>- <div class="col-12 col-md-12 col-sm-12">- <div class="form-horizontal portlet light bg-inverse form-fit">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="OrderSubtotalInclTaxValue" asp-display-hint="false" class="control-label col-12 col-md-3 col-sm-3"></admin-label>- <div class="col-8 col-md-4 col-sm-6">- <label class="control-label"> @Loc["Admin.Orders.Fields.Edit.InclTax"] </label>- <admin-input asp-for="OrderSubtotalInclTaxValue"/>- </div>- <div class="col-8 col-md-4 col-sm-6">- <label class="control-label">@Loc["Admin.Orders.Fields.Edit.ExclTax"] </label>- <admin-input asp-for="OrderSubtotalExclTaxValue"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="OrderSubTotalDiscountInclTaxValue" asp-display-hint="false" class="control-label col-12 col-md-3 col-sm-3"></admin-label>- <div class="col-8 col-md-4 col-sm-6">- <label class="control-label">@Loc["Admin.Orders.Fields.Edit.InclTax"] </label>- <admin-input asp-for="OrderSubTotalDiscountInclTaxValue"/>- </div>- <div class="col-8 col-md-4 col-sm-6">- <label class="control-label">@Loc["Admin.Orders.Fields.Edit.ExclTax"] </label>- <admin-input asp-for="OrderSubTotalDiscountExclTaxValue"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="OrderShippingInclTaxValue" asp-display-hint="false" class="control-label col-12 col-md-3 col-sm-3"></admin-label>- <div class="col-8 col-md-4 col-sm-6">- <label class="control-label">@Loc["Admin.Orders.Fields.Edit.InclTax"] </label>- <admin-input asp-for="OrderShippingInclTaxValue"/>- </div>- <div class="col-8 col-md-4 col-sm-6">- <label class="control-label">@Loc["Admin.Orders.Fields.Edit.ExclTax"]</label>- <admin-input asp-for="OrderShippingExclTaxValue"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="PaymentMethodAdditionalFeeInclTaxValue" asp-display-hint="false" class="control-label col-12 col-md-3 col-sm-3"></admin-label>- <div class="col-8 col-md-4 col-sm-6">- <label class="control-label"> @Loc["Admin.Orders.Fields.Edit.InclTax"] </label>- <admin-input asp-for="PaymentMethodAdditionalFeeInclTaxValue"/>- </div>- <div class="col-8 col-md-4 col-sm-6">- <label class="control-label"> @Loc["Admin.Orders.Fields.Edit.ExclTax"] </label>- <admin-input asp-for="PaymentMethodAdditionalFeeExclTaxValue"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="TaxValue" asp-display-hint="false" class="control-label col-12 col-md-3 col-sm-3"></admin-label>- <div class="col-md-8">- <admin-input asp-for="TaxValue"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="OrderTotalDiscountValue" asp-display-hint="false" class="control-label col-12 col-md-3 col-sm-3"></admin-label>- <div class="col-md-8">- <admin-input asp-for="OrderTotalDiscountValue"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="CurrencyRate" asp-display-hint="false" class="control-label col-12 col-md-3 col-sm-3"></admin-label>- <div class="col-md-8">- <admin-input asp-for="CurrencyRate"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="OrderTotalValue" asp-display-hint="false" class="control-label col-12 col-md-3 col-sm-3"></admin-label>- <div class="col-md-8">- <admin-input asp-for="OrderTotalValue"/>- </div>- </div>- </div>- </div>- </div>-</div>-<div class="form-group">- <label class="control-label col-md-3"></label>- <div class="col-md-9 actions btn-group btn-group-devided">- <button type="submit" id="btnEditOrderTotals" onclick=" toggleOrderTotals(true);return false; " name="btnEditOrderTotals" class="k-button"><span class="k-icon k-i-edit"></span> @Loc["Admin.Orders.Fields.EditOrderTotals"]</button>- <input type="submit" name="btnSaveOrderTotals" asp-action="EditOrderTotals" value="@Loc["Admin.Orders.Fields.SaveOrderTotals"]" id="btnSaveOrderTotals" class="k-button" onclick=" return confirm('@Loc["Admin.Common.AreYouSure"]'); "/>- <input type="submit" name="btnCancelOrderTotals" value="@Loc["Admin.Orders.Fields.CancelOrderTotals"]" onclick=" toggleOrderTotals(false);return false; " id="btnCancelOrderTotals" class="k-button"/>- </div>-</div>-<div class="form-group">- <admin-label asp-for="PaymentMethod" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label">@Model.PaymentMethod</label>- </div>-</div>--@if (Model.CustomValues is { Count: > 0 })-{- <div class="form-group">- <admin-label asp-for="CustomValues" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <table>- @foreach (var item in Model.CustomValues)- {- <tr>- <td>@item.Key:</td>- <td>@(item.Value != null ? item.Value.ToString() : "")</td>- </tr>- }- </table>- </div>- </div>-}-<div class="form-group">- <admin-label asp-for="CreatedOn" asp-display-hint="false" class="control-label col-3 col-md-3 col-sm-3"></admin-label>- <div class="col-9 col-md-9 col-sm-9">- <label class="control-label"> @Html.DisplayFor(model => model.CreatedOn)</label>- </div>-</div>-</div>-<vc:admin-widget widget-zone="order_details_info_bottom" additional-data="Model"/>-</div>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Notifications.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Notifications.cshtmldeleted file mode 100644index 26fd22f38..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Notifications.cshtml+++ /dev/null@@ -1,72 +0,0 @@-@model OrderModel-@inject AdminAreaSettings adminAreaSettings-<div class="panel panel-default">- <vc:admin-widget widget-zone="order_details_notifications_top" additional-data="Model"/>- <div class="panel-body">- <div id="order-notifications-grid"></div>- </div>- <vc:admin-widget widget-zone="order_details_notifications_bottom" additional-data="Model"/>-</div>--<script>-$(document).ready(function () {- $("#order-notifications-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("QueuedEmailByReference", "QueuedEmail", new { reference = (int)Reference.Order, ObjectId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- autoBind: false,- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: true,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Subject",- title: "@Loc["Admin.System.QueuedEmails.Fields.Subject"]",- width: 300,- template: '<a class="k-link" href="@Url.Action("Edit", "QueuedEmail")/#=Id#">#=kendo.htmlEncode(Subject)#</a>',- }, {- field: "To",- title: "@Loc["Admin.System.QueuedEmails.Fields.To"]",- width: 100- }, {- field: "CreatedOn",- title: "@Loc["Admin.System.QueuedEmails.Fields.CreatedOn"]",- width: 100,- type: "date",- format: "{0:G}"- }, {- field: "SentOn",- title: "@Loc["Admin.System.QueuedEmails.Fields.SentOn"]",- width: 100,- type: "date",- format: "{0:G}"- }]- });-});-</script>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Shipment.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Shipment.cshtmldeleted file mode 100644index 1bac31908..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/OrderDetails.Shipment.cshtml+++ /dev/null@@ -1,167 +0,0 @@-@using Grand.Business.Core.Interfaces.Common.Security-@using Grand.Domain.Permissions-@model OrderModel-@inject IPermissionService permissionService;-<vc:admin-widget widget-zone="order_details_address_top" additional-data="Model"/>-@if (Model.IsShippable)-{- @if (await permissionService.Authorize(PermissionSystemName.Shipments))- {- <div class="card col-md-12">- <div class="card-body">- <h4 class="card-title">@Loc["Admin.Orders.Shipments"]</h4>- <div class="card-text">- <div class="panel panel-default">- <vc:admin-widget widget-zone="order_details_shipping_top" additional-data="Model"/>- <div class="panel-body">- <div id="shipments-grid"></div>- </div>- <div class="panel-footer">- @if (Model.CanAddNewShipments)- {- <button type="submit" id="btnAddNewShipment" name="btnAddNewShipment" onclick="javascript:setLocation('@(Url.Action("AddShipment", "Shipment", new { orderId = Model.Id, area = Constants.AreaStore }))'); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Orders.Shipments.AddNew"]</button>- }- </div>- <vc:admin-widget widget-zone="order_details_shipping_bottom" additional-data="Model"/>- </div>- </div>- </div>- </div>--- <script>- $(document).ready(function () {- $("#shipments-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ShipmentsByOrder", "Shipment", new { orderId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- autoBind: false,- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- //details grid- detailInit: detailInit,- scrollable: false,- columns: [{- field: "ShipmentNumber",- title: "@Loc["Admin.Orders.Shipments.ID"]",- width: 50,- template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = Constants.AreaStore })/#=Id#">#=ShipmentNumber#</a>'- }, {- field: "TrackingNumber",- title: "@Loc["Admin.Orders.Shipments.TrackingNumber"]",- width: 100,- template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(TrackingNumber)#</a>'- }, {- field: "TotalWeight",- title: "@Loc["Admin.Orders.Shipments.TotalWeight"]",- width: 100- }, {- field: "ShippedDate",- title: "@Loc["Admin.Orders.Shipments.ShippedDate"]",- width: 200,- type: "date",- format: "{0:G}"- }, {- field: "DeliveryDate",- title: "@Loc["Admin.Orders.Shipments.DeliveryDate"]",- width: 200,- type: "date",- format: "{0:G}"- }]- });- });-- //details grid- function detailInit(e) {- $("<div/>").appendTo(e.detailCell).kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ShipmentsItemsByShipmentId", "Shipment", new { area = Constants.AreaStore }))?shipmentId="+e.data.Id,- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- scrollable: false,- sortable: true,- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- columns: [- {- field: "ProductName",- title: "@Loc["Admin.Orders.Shipments.Products.ProductName"]",- width: 400- },{- field: "ShippedFromWarehouse",- title: "@Loc["Admin.Orders.Shipments.Products.Warehouse"]",- width: 150- },{- field: "QuantityInThisShipment",- title: "@Loc["Admin.Orders.Shipments.Products.QtyShipped"]",- width: 150- },{- field: "ItemWeight",- title: "@Loc["Admin.Orders.Shipments.Products.ItemWeight"]",- width: 150- },{- field: "ItemDimensions",- title: "@Loc["Admin.Orders.Shipments.Products.ItemDimensions"]",- width: 150- }- ]- });- }- </script>- }-}-else-{- <div class="card col-md-6">- <div class="note note-info">@Loc["Admin.Orders.ShippingInfo.NotRequired"]</div>- </div>-}--<vc:admin-widget widget-zone="order_details_address_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/ProductAddAttributes.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/ProductAddAttributes.cshtmldeleted file mode 100644index 31b110e06..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/ProductAddAttributes.cshtml+++ /dev/null@@ -1,96 +0,0 @@-@model IList<OrderModel.AddOrderProductModel.ProductAttributeModel>-@if (Model.Count > 0)-{- foreach (var attribute in Model)- {- <div class="form-group">- @{- var controlId = $"attributes[{attribute.Id}]";- var textPrompt = !string.IsNullOrEmpty(attribute.TextPrompt) ? attribute.TextPrompt : attribute.Name;- }- <label class="control-label col-md-3">- @textPrompt- @if (attribute.IsRequired)- {- <span class="required">*</span>- }- </label>- <div class="col-md-9 col-sm-9">- @switch (attribute.AttributeControlType)- {- case AttributeControlType.DropdownList:- {- <select class="form-control" name="@(controlId)" id="@(controlId)">- @if (!attribute.IsRequired)- {- <option value="">---</option>- }- @foreach (var attributeValue in attribute.Values)- {- <option selected="@attributeValue.IsPreSelected" value="@attributeValue.Id">- @attributeValue.Name- </option>- }- </select>- }- break;- case AttributeControlType.RadioList:- case AttributeControlType.ColorSquares:- case AttributeControlType.ImageSquares:- {- <div class="radio-list">- @foreach (var attributeValue in attribute.Values)- {- <div>- <input id="@(controlId)" type="radio" name="@(controlId)" value="@attributeValue.Id" checked="@attributeValue.IsPreSelected"/>- <label for="@(controlId)">@attributeValue.Name</label>- </div>- }- </div>- }- break;- case AttributeControlType.Checkboxes:- case AttributeControlType.ReadonlyCheckboxes:- {- <div class="checkbox-list">- @foreach (var attributeValue in attribute.Values)- {- <div>- <input id="@(controlId)" type="checkbox" name="@(controlId)" value="@attributeValue.Id" checked="@attributeValue.IsPreSelected" @(attribute.AttributeControlType == AttributeControlType.ReadonlyCheckboxes ? Html.Raw(" disabled=\"disabled\"") : null)/>- <label for="@(controlId)">@attributeValue.Name</label>- </div>- }- </div>- }- break;- case AttributeControlType.TextBox:- {- <input name="@(controlId)" type="text" id="@(controlId)" class="form-control"/>- }- break;- case AttributeControlType.MultilineTextbox:- {- <textarea cols="20" id="@(controlId)" name="@(controlId)" rows="2" class="form-control"></textarea>- }- break;- case AttributeControlType.Datepicker:- {- <date-picker-dropdown control-day="@(controlId + "_day")"- control-month="@(controlId + "_month")"- control-year="@(controlId + "_year")"- begin-year="@(DateTime.Now.Year)"- end-year="@(DateTime.Now.Year + 1)"- PartialViewName="Partials/DateDropDowns"- class="col-12 input-group"/>- }- break;- case AttributeControlType.FileUpload:- {- <input type="file" id="@(controlId)" name="@(controlId)" class="form-control"/>- }- break;- }- </div>- </div>- }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/ProductAddGiftVoucherInfo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/ProductAddGiftVoucherInfo.cshtmldeleted file mode 100644index db636bd0e..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/ProductAddGiftVoucherInfo.cshtml+++ /dev/null@@ -1,42 +0,0 @@-@model OrderModel.AddOrderProductModel.GiftVoucherModel-@if (Model.IsGiftVoucher)-{- <div class="form-group">- <div class="form-group">- <admin-label asp-for="RecipientName"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="RecipientName"/>- </div>- </div>- <div class="form-group">- @if (Model.GiftVoucherType == GiftVoucherType.Virtual)- {- <admin-label asp-for="RecipientEmail"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="RecipientEmail"/>- </div>- }- </div>- <div class="form-group">- <admin-label asp-for="SenderName"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SenderName"/>- </div>- </div>- <div class="form-group">- @if (Model.GiftVoucherType == GiftVoucherType.Virtual)- {- <admin-label asp-for="SenderEmail"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SenderEmail"/>- </div>- }- </div>- <div class="form-group">- <admin-label asp-for="Message"/>- <div class="col-md-9 col-sm-9">- <admin-textarea asp-for="Message"></admin-textarea>- </div>- </div>- </div>-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProducts.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProducts.Bottom.cshtmlnew file mode 100644index 000000000..4d5f76158--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProducts.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel.AddOrderProductModel+<vc:store-widget widget-zone="order_add_products_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProducts.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProducts.Top.cshtmlnew file mode 100644index 000000000..82e5ac317--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProducts.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel.AddOrderProductModel+<vc:store-widget widget-zone="order_add_products_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProductsDetails.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProductsDetails.Bottom.cshtmlnew file mode 100644index 000000000..24dd6ce66--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProductsDetails.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel.AddOrderProductModel.ProductDetailsModel+<vc:store-widget widget-zone="order_add_products_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProductsDetails.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProductsDetails.Top.cshtmlnew file mode 100644index 000000000..a586feffa--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddProductsDetails.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel.AddOrderProductModel.ProductDetailsModel+<vc:store-widget widget-zone="order_add_products_details_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddressDetails.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddressDetails.Bottom.cshtmlnew file mode 100644index 000000000..bd14f09f3--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddressDetails.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderAddressModel+<vc:store-widget widget-zone="order_address_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddressDetails.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddressDetails.Top.cshtmlnew file mode 100644index 000000000..5f80fa923--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddressDetails.Top.cshtml@@ -0,0 +1,2 @@+@model OrderAddressModel+<vc:store-widget widget-zone="order_address_details_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddressEditButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddressEditButtons.cshtmlnew file mode 100644index 000000000..eb624696d--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.AddressEditButtons.cshtml@@ -0,0 +1,2 @@+@model OrderAddressModel+<vc:store-widget widget-zone="order_address_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Addresses.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Addresses.Bottom.cshtmlnew file mode 100644index 000000000..08e8abd76--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Addresses.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_address_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Addresses.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Addresses.Top.cshtmlnew file mode 100644index 000000000..53f2aed1b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Addresses.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_address_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..df116bb01--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.DetailsTabs.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.DetailsTabs.cshtmlnew file mode 100644index 000000000..df659cf79--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.DetailsTabs.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Documents.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Documents.Bottom.cshtmlnew file mode 100644index 000000000..3e02ab54f--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Documents.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_documents_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Documents.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Documents.Top.cshtmlnew file mode 100644index 000000000..8c4e3158e--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Documents.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_documents_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..9eb9e8b7e--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..fdadd967d--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notes.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notes.Bottom.cshtmlnew file mode 100644index 000000000..3ced33843--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notes.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_notes_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notes.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notes.Top.cshtmlnew file mode 100644index 000000000..35ef6eca5--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notes.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_notes_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notifications.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notifications.Bottom.cshtmlnew file mode 100644index 000000000..15d6dd706--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notifications.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_notifications_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notifications.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notifications.Top.cshtmlnew file mode 100644index 000000000..3ad6c8a1e--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Notifications.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_notifications_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Products.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Products.Bottom.cshtmlnew file mode 100644index 000000000..cb94524e8--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Products.Bottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_products_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Products.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Products.Top.cshtmlnew file mode 100644index 000000000..add5b98ac--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Products.Top.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_products_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.AddressBottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.AddressBottom.cshtmlnew file mode 100644index 000000000..08e8abd76--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.AddressBottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_address_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.AddressTop.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.AddressTop.cshtmlnew file mode 100644index 000000000..53f2aed1b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.AddressTop.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_address_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.ShippingBottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.ShippingBottom.cshtmlnew file mode 100644index 000000000..33abf95d6--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.ShippingBottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_shipping_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.ShippingTop.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.ShippingTop.cshtmlnew file mode 100644index 000000000..7bc4ef2ac--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.Shipment.ShippingTop.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:store-widget widget-zone="order_details_shipping_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.UploadLicenseButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.UploadLicenseButtons.cshtmlnew file mode 100644index 000000000..45dff1d9a--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Order/Partials/WidgetZone.UploadLicenseButtons.cshtml@@ -0,0 +1,2 @@+@model OrderModel.UploadLicenseModel+<vc:store-widget widget-zone="order_upload_license_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.AddressBottom.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.AddressBottom.cshtmlnew file mode 100644index 000000000..94a9838b8--- /dev/null+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.AddressBottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:vendor-widget widget-zone="vendor_order_details_address_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.AddressTop.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.AddressTop.cshtmlnew file mode 100644index 000000000..3f0c2f351--- /dev/null+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.AddressTop.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:vendor-widget widget-zone="vendor_order_details_address_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.ShippingBottom.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.ShippingBottom.cshtmlnew file mode 100644index 000000000..f867c800b--- /dev/null+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.ShippingBottom.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:vendor-widget widget-zone="vendor_order_details_shipping_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.ShippingTop.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.ShippingTop.cshtmlnew file mode 100644index 000000000..f819a23dd--- /dev/null+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/WidgetZone.Shipment.ShippingTop.cshtml@@ -0,0 +1,2 @@+@model OrderModel+<vc:vendor-widget widget-zone="vendor_order_details_shipping_top" additional-data="Model"/>