Skip to content

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.

refactor(arch001): migrate PaymentTransaction views to Grand.Web.AdminShared, extract per-host WidgetZone satellites

KrzysztofPajak0fa7b2930aff
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml
deleted file mode 100644
index dddb2cc72..000000000
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml
+++ /dev/null
@@ -1,79 +0,0 @@
-@{
- Layout = "";
- //page title
- ViewBag.Title = Loc["Admin.PaymentTransaction.Fields.PartialPaid"];
-}
-@model PaymentTransactionModel
-<form id="PartiallyPaidPopup" asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyPaidPopup" method="post"
- asp-route-OrderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])"
- asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
- asp-route-online="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["online"])"
- asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
-
- <input asp-for="Id" type="hidden"/>
- <input asp-for="MaxAmountToPaid" type="hidden"/>
- <input asp-for="CurrencyCode" type="hidden"/>
-
- <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-tag"></i>
- @Loc["Admin.PaymentTransaction.Fields.PartialPaid"]
- </div>
- </div>
- <vc:admin-widget widget-zone="payment_transaction_partially_paid_buttons" additional-data="Model"/>
- <div class="x_content form">
- <div class="form-horizontal">
- <div class="form-body">
- <div class="form-group">
- <admin-label asp-for="AmountToPaid"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="AmountToPaid"/> &nbsp;
- <span style="white-space: nowrap">
- @string.Format(Loc["Admin.PaymentTransaction.Fields.PartialPaid.AmountToPaid.Max"], Model.MaxAmountToPaid.ToString("N2"), Model.CurrencyCode)
- </span>
- </div>
- </div>
- </div>
- <div class="form-actions">
- <input type="submit" name="partialpaidpaymenttransaction" value="@Loc["Admin.PaymentTransaction.Fields.Paid"]" id="partialpaidpaymenttransaction" class="btn default"/>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <div asp-validation-summary="All"></div>
- @if (ViewBag.RefreshPage == true)
- {
- <script>
- try {
- window.location.href = window.location.href;
- }
- catch (e) { }
- </script>
- }
- <script>
- $("#PartiallyPaidPopup").submit(function (e) {
- e.preventDefault();
- var form = $(this);
- var url = form.attr('action');
- $.ajax({
- type: "POST",
- url: url,
- data: form.serialize(),
- success: function (data) {
- $.magnificPopup.open({
- items: {
- src: data,
- type: 'inline'
- }
- });
- }
- });
- });
- </script>
-</form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml
deleted file mode 100644
index 7ea695379..000000000
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml
+++ /dev/null
@@ -1,80 +0,0 @@
-@{
- Layout = "";
- //page title
- ViewBag.Title = Loc["Admin.PaymentTransaction.Fields.PartialRefund"];
-}
-@model PaymentTransactionModel
-<form id="PartiallyRefundPopup" asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyRefundPopup" method="post"
- asp-route-OrderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])"
- asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
- asp-route-online="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["online"])"
- asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">
-
- <input asp-for="Id" type="hidden"/>
- <input asp-for="MaxAmountToRefund" type="hidden"/>
- <input asp-for="CurrencyCode" type="hidden"/>
-
- <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-tag"></i>
- @Loc["Admin.PaymentTransaction.Fields.PartialRefund"]
- </div>
- </div>
- <vc:admin-widget widget-zone="payment_transaction_partially_refund_buttons" additional-data="Model"/>
- <div class="x_content form">
- <div class="form-horizontal">
- <div class="form-body">
- <div class="form-group">
- <admin-label asp-for="AmountToRefund"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="AmountToRefund"/> &nbsp;
- <span style="white-space: nowrap">
- @string.Format(Loc["Admin.PaymentTransaction.Fields.PartialRefund.AmountToRefund.Max"], Model.MaxAmountToRefund.ToString("G29"), Model.CurrencyCode)
- </span>
- </div>
- </div>
- </div>
- <div class="form-actions">
- <input type="submit" name="partialrefundpaymenttransaction" asp-action="PartiallyRefundPopup" value="@Loc["Admin.PaymentTransaction.Fields.Refund"]" id="partialrefundpaymenttransaction" class="btn default"/>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <div asp-validation-summary="All"></div>
- @if (ViewBag.RefreshPage == true)
- {
- <script>
- try {
- window.location.href = window.location.href;
- }
- catch (e) { }
- </script>
- }
- <script>
- var mfp = $.magnificPopup.instance;
- $("#PartiallyRefundPopup").submit(function (e) {
- e.preventDefault();
- var form = $(this);
- var url = form.attr('action');
- $.ajax({
- type: "POST",
- url: url,
- data: form.serialize(),
- success: function (data) {
- $.magnificPopup.open({
- items: {
- src: data,
- type: 'inline'
- }
- });
- }
- });
- });
- </script>
-</form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.DetailsButtons.cshtml
new file mode 100644
index 000000000..ca1e9bf82
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.DetailsButtons.cshtml
@@ -0,0 +1,2 @@
+@model PaymentTransactionModel
+<vc:admin-widget widget-zone="payment_transaction_details_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.DetailsTop.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.DetailsTop.cshtml
new file mode 100644
index 000000000..27eec2737
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.DetailsTop.cshtml
@@ -0,0 +1,2 @@
+@model PaymentTransactionModel
+<vc:admin-widget widget-zone="payment_transaction_details_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.ListButtons.cshtml
new file mode 100644
index 000000000..257ca20a3
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.ListButtons.cshtml
@@ -0,0 +1,2 @@
+@model PaymentTransactionListModel
+<vc:admin-widget widget-zone="payment_transaction_list_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.PartiallyPaidButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.PartiallyPaidButtons.cshtml
new file mode 100644
index 000000000..c4fb60d35
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.PartiallyPaidButtons.cshtml
@@ -0,0 +1,2 @@
+@model PaymentTransactionModel
+<vc:admin-widget widget-zone="payment_transaction_partially_paid_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.PartiallyRefundButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.PartiallyRefundButtons.cshtml
new file mode 100644
index 000000000..e30d49474
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/WidgetZone.PartiallyRefundButtons.cshtml
@@ -0,0 +1,2 @@
+@model PaymentTransactionModel
+<vc:admin-widget widget-zone="payment_transaction_partially_refund_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/Edit.cshtml
similarity index 95%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Edit.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/Edit.cshtml
index 1b31a8f57..fa0341c2b 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Edit.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/Edit.cshtml
@@ -1,9 +1,10 @@
-@model PaymentTransactionModel
+@model PaymentTransactionModel
@{
//page title
ViewBag.Title = Loc["Admin.Orders.PaymentTransaction.Details"];
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
}
-<form asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="Edit" method="post">
+<form asp-area="@area" asp-controller="PaymentTransaction" asp-action="Edit" method="post">
<div class="row">
<div class="col-md-12">
@@ -34,7 +35,7 @@
@if (Model.CanPartiallyPaidOffline)
{
<a id="partiallypaidpaymenttransactionoffline" name="partiallypaidpaymenttransactionoffline"
- href="@(Url.Action("PartiallyPaidPopup", "PaymentTransaction", new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))"
+ href="@(Url.Action("PartiallyPaidPopup", "PaymentTransaction", new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = area }))"
class="k-button">
@Loc["Admin.PaymentTransaction.Fields.PartialPaidOffline"]
</a>
@@ -56,7 +57,7 @@
{
<a id="partiallyrefundpaymenttransaction" name="partiallyrefundpaymenttransaction"
value="@Loc["Admin.PaymentTransaction.Fields.PartialRefund"]"
- href="@(Url.Action("PartiallyRefundPopup", "PaymentTransaction", new { id = Model.Id, online = true, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))"
+ href="@(Url.Action("PartiallyRefundPopup", "PaymentTransaction", new { id = Model.Id, online = true, btnId = "btnRefreshPage", formId = "order-form", area = area }))"
class="k-button">
@Loc["Admin.PaymentTransaction.Fields.PartialRefund"]
</a>
@@ -65,7 +66,7 @@
@if (Model.CanPartiallyRefundOffline)
{
<a id="partiallyrefundpaymenttransactionoffline" name="partiallyrefundpaymenttransactionoffline"
- href="@(Url.Action("PartiallyRefundPopup", "PaymentTransaction", new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))"
+ href="@(Url.Action("PartiallyRefundPopup", "PaymentTransaction", new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = area }))"
class="k-button">
@Loc["Admin.PaymentTransaction.Fields.PartialRefundOffline"]
</a>
@@ -88,7 +89,7 @@
<span id="paymenttransaction-delete" class="btn red">
<i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]
</span>
- <vc:admin-widget widget-zone="payment_transaction_details_buttons" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.DetailsButtons" model="Model"/>
</div>
</div>
</div>
@@ -142,4 +143,4 @@
});
</script>
</form>
-<admin-delete-confirmation button-id="paymenttransaction-delete"/>
\ No newline at end of file
+<admin-delete-confirmation button-id="paymenttransaction-delete"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/List.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/List.cshtml
similarity index 94%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/List.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/List.cshtml
index 428c987a1..ecc23b35f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/List.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/List.cshtml
@@ -1,10 +1,11 @@
-@model PaymentTransactionListModel
+@model PaymentTransactionListModel
@inject AdminAreaSettings adminAreaSettings
@{
//page title
ViewBag.Title = Loc["Admin.Orders.PaymentTransaction"];
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
}
-<form asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="List" method="post">
+<form asp-area="@area" asp-controller="PaymentTransaction" asp-action="List" method="post">
<div class="row">
<div class="col-md-12">
@@ -14,7 +15,7 @@
<i class="fa fa-truck"></i>
@Loc["Admin.Orders.PaymentTransaction"]
</div>
- <vc:admin-widget widget-zone="payment_transaction_list_buttons" additional-data="null"/>
+ <partial name="Partials/WidgetZone.ListButtons" model="Model"/>
</div>
<div class="x_content form">
<div class="form-horizontal">
@@ -92,7 +93,7 @@
dataSource: {
transport: {
read: {
- url: "@Html.Raw(Url.Action("List", "PaymentTransaction", new { area = Constants.AreaAdmin }))",
+ url: "@Html.Raw(Url.Action("List", "PaymentTransaction", new { area = area }))",
type: "POST",
dataType: "json",
data: additionalData
@@ -142,12 +143,12 @@
field: "CustomerId",
title: "@Loc["Admin.Orders.PaymentTransaction.Fields.Customer"]",
width: 200,
- template: '<a class="k-link" href="@Url.Action("Edit", "Customer", new { area = Constants.AreaAdmin })/#=CustomerId#">#:kendo.htmlEncode(CustomerEmail)#</a>'
+ template: '<a class="k-link" href="@Url.Action("Edit", "Customer", new { area = area })/#=CustomerId#">#:kendo.htmlEncode(CustomerEmail)#</a>'
}, {
field: "OrderNumber",
title: "@Loc["Admin.Orders.PaymentTransaction.Fields.OrderNumber"]",
width: 80,
- template: '<a class="k-link" href="@Url.Action("Edit", "Order", new { area = Constants.AreaAdmin })/#=OrderId#">#:OrderNumber#</a>'
+ template: '<a class="k-link" href="@Url.Action("Edit", "Order", new { area = area })/#=OrderId#">#:OrderNumber#</a>'
}, {
field: "Status",
title: "@Loc["Admin.Orders.PaymentTransaction.Fields.Status"]",
@@ -199,4 +200,4 @@
}
});
});
-</script>
\ No newline at end of file
+</script>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/PartiallyPaidPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/PartiallyPaidPopup.cshtml
similarity index 91%
rename from src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/PartiallyPaidPopup.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/PartiallyPaidPopup.cshtml
index c1bab3fb9..b421c509d 100644
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/PartiallyPaidPopup.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/PartiallyPaidPopup.cshtml
@@ -1,10 +1,11 @@
-@{
+@{
Layout = "";
//page title
ViewBag.Title = Loc["Admin.PaymentTransaction.Fields.PartialPaid"];
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
}
@model PaymentTransactionModel
-<form id="PartiallyPaidPopup" asp-area="@Constants.AreaStore" asp-controller="PaymentTransaction" asp-action="PartiallyPaidPopup" method="post"
+<form id="PartiallyPaidPopup" asp-area="@area" asp-controller="PaymentTransaction" asp-action="PartiallyPaidPopup" method="post"
asp-route-OrderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])"
asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
asp-route-online="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["online"])"
@@ -23,7 +24,7 @@
@Loc["Admin.PaymentTransaction.Fields.PartialPaid"]
</div>
</div>
- <vc:admin-widget widget-zone="payment_transaction_partially_paid_buttons" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.PartiallyPaidButtons" model="Model"/>
<div class="x_content form">
<div class="form-horizontal">
<div class="form-body">
@@ -76,4 +77,4 @@
});
});
</script>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/PartiallyRefundPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/PartiallyRefundPopup.cshtml
similarity index 91%
rename from src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/PartiallyRefundPopup.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/PartiallyRefundPopup.cshtml
index 34188d004..b909ac7ed 100644
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/PartiallyRefundPopup.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/PartiallyRefundPopup.cshtml
@@ -1,10 +1,11 @@
-@{
+@{
Layout = "";
//page title
ViewBag.Title = Loc["Admin.PaymentTransaction.Fields.PartialRefund"];
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
}
@model PaymentTransactionModel
-<form id="PartiallyRefundPopup" asp-area="@Constants.AreaStore" asp-controller="PaymentTransaction" asp-action="PartiallyRefundPopup" method="post"
+<form id="PartiallyRefundPopup" asp-area="@area" asp-controller="PaymentTransaction" asp-action="PartiallyRefundPopup" method="post"
asp-route-OrderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])"
asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"
asp-route-online="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["online"])"
@@ -23,7 +24,7 @@
@Loc["Admin.PaymentTransaction.Fields.PartialRefund"]
</div>
</div>
- <vc:admin-widget widget-zone="payment_transaction_partially_refund_buttons" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.PartiallyRefundButtons" model="Model"/>
<div class="x_content form">
<div class="form-horizontal">
<div class="form-body">
@@ -77,4 +78,4 @@
});
});
</script>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/Update.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/Partials/Update.cshtml
similarity index 97%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/Update.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/Partials/Update.cshtml
index 47718e874..e1b96823d 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Partials/Update.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/PaymentTransaction/Partials/Update.cshtml
@@ -1,11 +1,11 @@
-@model PaymentTransactionModel
+@model PaymentTransactionModel
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden"/>
<div class="form-horizontal">
- <vc:admin-widget widget-zone="payment_transaction_details_top" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.DetailsTop" model="Model"/>
<div class="form-body">
<div class="form-group">
<admin-label asp-for="PaymentMethodSystemName"/>
@@ -132,4 +132,4 @@
</div>
}
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Edit.cshtml
deleted file mode 100644
index bbb1f63db..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Edit.cshtml
+++ /dev/null
@@ -1,145 +0,0 @@
-@model PaymentTransactionModel
-@{
- //page title
- ViewBag.Title = Loc["Admin.Orders.PaymentTransaction.Details"];
-}
-<form asp-area="@Constants.AreaStore" asp-controller="PaymentTransaction" asp-action="Edit" 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-truck"></i>
- @Loc["Admin.Orders.PaymentTransaction.Details"]
- <small>
- <i class="fa fa-arrow-circle-left"></i> @Html.ActionLink(Loc["Admin.Orders.PaymentTransaction.BackToList"], "List")
- </small>
- </div>
- <div class="actions">
- <div class="btn-group btn-group-devided">
- @if (Model.CanCapture)
- {
- <input type="submit" name="capturepaymenttransaction" asp-action="CapturePaymentTransaction" value="@Loc["Admin.PaymentTransaction.Fields.Capture"]"
- id="capturepaymenttransaction" class="k-button" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]'); "/>
- <text>&nbsp;</text>
- }
- @if (Model.CanMarkAsPaid)
- {
- <button type="submit" id="markpaymenttransactionaspaid" name="markpaymenttransactionaspaid" asp-action="MarkPaymentTransactionAsPaid"
- onclick="return confirm('@Loc["Admin.Common.AreYouSure"]'); " class="k-button">
- <i class="fa fa-money" aria-hidden="true"></i>&nbsp;@Loc["Admin.PaymentTransaction.Fields.MarkAsPaid"]
- </button>
- }
- @if (Model.CanPartiallyPaidOffline)
- {
- <a id="partiallypaidpaymenttransactionoffline" name="partiallypaidpaymenttransactionoffline"
- href="@(Url.Action("PartiallyPaidPopup", "PaymentTransaction", new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaStore }))"
- class="k-button">
- @Loc["Admin.PaymentTransaction.Fields.PartialPaidOffline"]
- </a>
- <text>&nbsp;</text>
- }
- @if (Model.CanRefund)
- {
- <input type="submit" name="refundpaymenttransaction" asp-action="RefundPaymentTransaction" value="@Loc["Admin.PaymentTransaction.Fields.Refund"]" id="refundpaymenttransaction"
- class="k-button" onclick=" return confirm('@Loc["Admin.Common.AreYouSure"]'); "/>
- <text>&nbsp;</text>
- }
- @if (Model.CanRefundOffline)
- {
- <input type="submit" name="refundpaymenttransactionoffline" asp-action="RefundPaymentTransactionOffline" value="@Loc["Admin.PaymentTransaction.Fields.RefundOffline"]"
- id="refundpaymenttransactionoffline" class="k-button" onclick=" return confirm('@Loc["Admin.Common.AreYouSure"]'); "/>
- <text>&nbsp;</text>
- }
- @if (Model.CanPartiallyRefund)
- {
- <a id="partiallyrefundpaymenttransaction" name="partiallyrefundpaymenttransaction"
- value="@Loc["Admin.PaymentTransaction.Fields.PartialRefund"]"
- href="@(Url.Action("PartiallyRefundPopup", "PaymentTransaction", new { id = Model.Id, online = true, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaStore }))"
- class="k-button">
- @Loc["Admin.PaymentTransaction.Fields.PartialRefund"]
- </a>
- <text>&nbsp;</text>
- }
- @if (Model.CanPartiallyRefundOffline)
- {
- <a id="partiallyrefundpaymenttransactionoffline" name="partiallyrefundpaymenttransactionoffline"
- href="@(Url.Action("PartiallyRefundPopup", "PaymentTransaction", new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaStore }))"
- class="k-button">
- @Loc["Admin.PaymentTransaction.Fields.PartialRefundOffline"]
- </a>
- <text>&nbsp;</text>
- }
- @if (Model.CanVoid)
- {
- <input type="submit" name="voidpaymenttransaction" asp-action="VoidPaymentTransaction"
- value="@Loc["Admin.Orders.Fields.Void"]" id="voidpaymenttransaction" class="k-button"
- onclick="return confirm('@Loc["Admin.Common.AreYouSure"]'); "/>
- <text>&nbsp;</text>
- }
- @if (Model.CanVoidOffline)
- {
- <input type="submit" name="voidpaymenttransactionoffline" asp-action="VoidPaymentTransactionOffline"
- value="@Loc["Admin.PaymentTransaction.Fields.VoidOffline"]" id="voidpaymenttransactionoffline" class="k-button"
- onclick="return confirm('@Loc["Admin.Common.AreYouSure"]'); "/>
- <text>&nbsp;</text>
- }
- <span id="paymenttransaction-delete" class="btn red">
- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]
- </span>
- <vc:admin-widget widget-zone="payment_transaction_details_buttons" additional-data="Model"/>
- </div>
- </div>
- </div>
- <div class="x_content form">
- <partial name="Partials/Update" model="Model"/>
- </div>
- </div>
- </div>
- </div>
- <script>
- $(document).ready(function () {
- $('#partiallypaidpaymenttransactionoffline').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');
- }
- }
- });
- $('#partiallyrefundpaymenttransaction').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');
- }
- }
- });
- $('#partiallyrefundpaymenttransactionoffline').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>
-</form>
-<admin-delete-confirmation button-id="paymenttransaction-delete"/>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/List.cshtml
deleted file mode 100644
index 069bb29b3..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/List.cshtml
+++ /dev/null
@@ -1,202 +0,0 @@
-@model PaymentTransactionListModel
-@inject AdminAreaSettings adminAreaSettings
-@{
- //page title
- ViewBag.Title = Loc["Admin.Orders.PaymentTransaction"];
-}
-<form asp-area="@Constants.AreaStore" asp-controller="PaymentTransaction" asp-action="List" method="post">
-
- <div class="row">
- <div class="col-md-12">
- <div class="x_panel light form-fit popup-window">
- <div class="x_title">
- <div class="caption level-caption">
- <i class="fa fa-truck"></i>
- @Loc["Admin.Orders.PaymentTransaction"]
- </div>
- <vc:admin-widget widget-zone="payment_transaction_list_buttons" additional-data="null"/>
- </div>
- <div class="x_content form">
- <div class="form-horizontal">
- <div class="form-body">
- <div class="main-header col-12 px-0">
- <div class="row align-items-end">
- <div class="col-md-4 col-ms-12 col-12">
- <div class="form-group mb-0">
- <admin-label asp-for="SearchCustomerEmail" class="control-label"/>
- <admin-input asp-for="SearchCustomerEmail"/>
- </div>
- </div>
- <div class="col-md-4 col-ms-12 col-12">
- <div class="form-group mb-0">
- <admin-label asp-for="OrderNumber" class="control-label"/>
- <div class="input-group mb-0" style="text-align:left">
- <admin-input asp-for="OrderNumber"/>
- <span class="input-group-append">
- <input type="submit" id="go-to-ordernumber" asp-action="GoToOrderNumber" name="go-to-ordernumber" class="btn default" value="@Loc["Admin.Common.Go"]"/>
- </span>
- </div>
- </div>
- </div>
- <div class="col-md-4 col-sm-12 col-12">
- <div class="form-actions">
- <div class="btn-group">
- <button class="btn btn-success filter-submit" id="search-paymenttransaction">
- <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]
- </button>
- <button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse">
- <i class="fa fa-filter"></i>&nbsp; @Loc["Admin.Common.Filters"]
- </button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="collapse" id="filterCollapse">
- <div class="drop-filters-container w-100">
- <div class="form-group">
- <admin-label asp-for="StartDate" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="StartDate"/>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="EndDate" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="EndDate"/>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="SearchTransactionStatus" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="SearchTransactionStatus" asp-items="Model.PaymentTransactionStatus"/>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="x_content form">
- <div class="x_content">
- <div id="paymenttransactions-grid"></div>
- </div>
- </div>
- </div>
- </div>
- </div>
-</form>
-<script>
- $(document).ready(function() {
- $("#paymenttransactions-grid").kendoGrid({
- dataSource: {
- transport: {
- read: {
- url: "@Html.Raw(Url.Action("List", "PaymentTransaction", 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,
- columns: [
- {
- field: "PaymentMethodSystemName",
- title: "@Loc["Admin.Orders.PaymentTransaction.Fields.PaymentMethodSystemName"]",
- width: 80,
- template: '<a class="k-link" href="Edit/#=Id#">#=PaymentMethodSystemName#</a>'
- }, {
- field: "TransactionAmount",
- title: "@Loc["Admin.Orders.PaymentTransaction.Fields.TransactionAmount"]",
- width: 80,
- template: '<a class="k-link" href="Edit/#=Id#">#=kendo.toString(TransactionAmount, "n2")# #=CurrencyCode#</a>'
- }, {
- field: "PaidAmount",
- title: "@Loc["Admin.Orders.PaymentTransaction.Fields.PaidAmount"]",
- width: 100,
- template: '<a class="k-link" href="Edit/#=Id#">#=kendo.toString(PaidAmount, "n2")# #=CurrencyCode#</a>'
- }, {
- field: "CustomerId",
- title: "@Loc["Admin.Orders.PaymentTransaction.Fields.Customer"]",
- width: 200,
- template: '<a class="k-link" href="@Url.Action("Edit", "Customer", new { area = Constants.AreaStore })/#=CustomerId#">#:kendo.htmlEncode(CustomerEmail)#</a>'
- }, {
- field: "OrderNumber",
- title: "@Loc["Admin.Orders.PaymentTransaction.Fields.OrderNumber"]",
- width: 80,
- template: '<a class="k-link" href="@Url.Action("Edit", "Order", new { area = Constants.AreaStore })/#=OrderId#">#:OrderNumber#</a>'
- }, {
- field: "Status",
- title: "@Loc["Admin.Orders.PaymentTransaction.Fields.Status"]",
- width: 130,
- template: '<a class="k-link" href="Edit/#=Id#">#=Status#</a>'
- }, {
- field: "CreatedOn",
- title: "@Loc["Admin.Orders.PaymentTransaction.Fields.CreatedOn"]",
- width: 100,
- type: "date",
- format: "{0:G}"
- }
- ]
- });
- });
-</script>
-
-<script>
- function additionalData() {
- var data = {
- SearchTransactionStatus: $('#@Html.IdFor(model => model.SearchTransactionStatus)').val(),
- SearchCustomerEmail: $('#@Html.IdFor(model => model.SearchCustomerEmail)').val(),
- OrderNumber: $('#@Html.IdFor(model => model.OrderNumber)').val(),
- StartDate: $('#@Html.IdFor(model => model.StartDate)').val(),
- EndDate: $('#@Html.IdFor(model => model.EndDate)').val()
- };
- addAntiForgeryToken(data);
- return data;
- }
- $(document).ready(function () {
- $('#search-paymenttransaction').click(function () {
- //search
- var grid = $('#paymenttransactions-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.SearchCustomerEmail)").keydown(function (event) {
- if (event.keyCode == 13) {
- $("#search-paymenttransaction").click();
- return false;
- }
- });
- $("#@Html.IdFor(model => model.OrderNumber)").keydown(function (event) {
- if (event.keyCode == 13) {
- $("#go-to-ordernumber").click();
- return false;
- }
- });
- });
-</script>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/Update.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/Update.cshtml
deleted file mode 100644
index 47718e874..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/Update.cshtml
+++ /dev/null
@@ -1,135 +0,0 @@
-@model PaymentTransactionModel
-
-<div asp-validation-summary="All"></div>
-<input asp-for="Id" type="hidden"/>
-
-
-<div class="form-horizontal">
- <vc:admin-widget widget-zone="payment_transaction_details_top" additional-data="Model"/>
- <div class="form-body">
- <div class="form-group">
- <admin-label asp-for="PaymentMethodSystemName"/>
- <div class="col-md-9 col-sm-9">
- <label class="control-label">@Model.PaymentMethodSystemName</label>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="Status"/>
- <div class="col-md-9 col-sm-9">
- <label class="control-label">@Model.Status</label>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="TransactionAmount"/>
- <div class="col-md-9 col-sm-9">
- <label class="control-label">@Model.TransactionAmount [@Model.CurrencyCode]</label>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="PaidAmount"/>
- <div class="col-md-9 col-sm-9">
- <label class="control-label">@Model.PaidAmount [@Model.CurrencyCode]</label>
- </div>
- </div>
- @if (Model.RefundedAmount > 0)
- {
- <div class="form-group">
- <admin-label asp-for="RefundedAmount"/>
- <div class="col-md-9 col-sm-9">
- <label class="control-label">@Model.RefundedAmount [@Model.CurrencyCode]</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.CustomerEmail, "Edit", "Customer", new { id = Model.CustomerId }, new { })
- </label>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="OrderId" 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.OrderNumber.ToString(), "Edit", "Order", new { id = Model.OrderId }, new { })
- </label>
- </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 class="form-group">
- <admin-label asp-for="IPAddress" 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.IPAddress</label>
- </div>
- </div>
- @if (!string.IsNullOrEmpty(Model.AdditionalInfo))
- {
- <div class="form-group">
- <admin-label asp-for="AdditionalInfo" 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.AdditionalInfo</label>
- </div>
- </div>
- }
- @if (!string.IsNullOrEmpty(Model.Description))
- {
- <div class="form-group">
- <admin-label asp-for="Description" 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.Description</label>
- </div>
- </div>
- }
- @if (!string.IsNullOrEmpty(Model.CaptureTransactionId))
- {
- <div class="form-group">
- <admin-label asp-for="CaptureTransactionId" 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.CaptureTransactionId</label>
- </div>
- </div>
- }
- @if (!string.IsNullOrEmpty(Model.CaptureTransactionResult))
- {
- <div class="form-group">
- <admin-label asp-for="CaptureTransactionResult" 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.CaptureTransactionResult</label>
- </div>
- </div>
- }
- @if (!string.IsNullOrEmpty(Model.AuthorizationTransactionId))
- {
- <div class="form-group">
- <admin-label asp-for="AuthorizationTransactionId" 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.AuthorizationTransactionId</label>
- </div>
- </div>
- }
- @if (!string.IsNullOrEmpty(Model.AuthorizationTransactionCode))
- {
- <div class="form-group">
- <admin-label asp-for="AuthorizationTransactionCode" 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.AuthorizationTransactionCode</label>
- </div>
- </div>
- }
- @if (!string.IsNullOrEmpty(Model.AuthorizationTransactionResult))
- {
- <div class="form-group">
- <admin-label asp-for="AuthorizationTransactionResult" 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.AuthorizationTransactionResult</label>
- </div>
- </div>
- }
- </div>
-</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.DetailsButtons.cshtml
new file mode 100644
index 000000000..c512d49ae
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.DetailsButtons.cshtml
@@ -0,0 +1,2 @@
+@model PaymentTransactionModel
+<vc:store-widget widget-zone="payment_transaction_details_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.DetailsTop.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.DetailsTop.cshtml
new file mode 100644
index 000000000..5f9095607
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.DetailsTop.cshtml
@@ -0,0 +1,2 @@
+@model PaymentTransactionModel
+<vc:store-widget widget-zone="payment_transaction_details_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.ListButtons.cshtml
new file mode 100644
index 000000000..be8ad217a
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.ListButtons.cshtml
@@ -0,0 +1,2 @@
+@model PaymentTransactionListModel
+<vc:store-widget widget-zone="payment_transaction_list_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.PartiallyPaidButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.PartiallyPaidButtons.cshtml
new file mode 100644
index 000000000..f7413df81
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.PartiallyPaidButtons.cshtml
@@ -0,0 +1,2 @@
+@model PaymentTransactionModel
+<vc:store-widget widget-zone="payment_transaction_partially_paid_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.PartiallyRefundButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.PartiallyRefundButtons.cshtml
new file mode 100644
index 000000000..a6d12018b
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/PaymentTransaction/Partials/WidgetZone.PartiallyRefundButtons.cshtml
@@ -0,0 +1,2 @@
+@model PaymentTransactionModel
+<vc:store-widget widget-zone="payment_transaction_partially_refund_buttons" additional-data="Model"/>