From de359ec45d0cdea831885ecd871350dcb5812daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 09:20:24 +0200
Subject: [PATCH 01/32] PredefinedProductAttributeValue - magnific popup layout

---
 ...nedProductAttributeValueCreatePopup.cshtml | 35 ++++++++++++++++-
 ...finedProductAttributeValueEditPopup.cshtml | 39 +++++++++++++++++--
 ..._CreateOrUpdate.TabPredefinedValues.cshtml | 32 ++++++++++++++-
 .../Controllers/ProductAttributeController.cs |  4 +-
 4 files changed, 100 insertions(+), 10 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml
index 9b6a5d767..9fb42ffcb 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml
@@ -1,12 +1,12 @@
 @model PredefinedProductAttributeValueModel
 @{    
     // layout
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
 
     //page title
     ViewBag.Title = Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueCreatePopup" method="post"
+<form id="PredefinedProductAttributeValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueCreatePopup" method="post"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]"> 
     
@@ -29,4 +29,35 @@
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#PredefinedProductAttributeValueCreatePopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml
index 56ca89633..0b91051bb 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml
@@ -1,14 +1,14 @@
 @model PredefinedProductAttributeValueModel
 @{    
     // layout
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.EditValueDetails"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueEditPopup" method="post"
+<form id="PredefinedProductAttributeValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueEditPopup" method="post"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -23,9 +23,40 @@
                     </div>
                 </div>
                 <div class="x_content form">
-                   <partial name="_CreateOrUpdatePredefinedProductAttributeValue" model="Model" />
+                    <partial name="_CreateOrUpdatePredefinedProductAttributeValue" model="Model" />
                 </div>
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#PredefinedProductAttributeValueEditPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.TabPredefinedValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.TabPredefinedValues.cshtml
index 7541fafde..a3bf954ef 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.TabPredefinedValues.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.TabPredefinedValues.cshtml
@@ -8,14 +8,42 @@
                 <div id="productattributevalues-grid"></div>
             </div>
             <div class="panel-footer">
-                <button type="submit" id="btnAddNewValue" onclick=" javascript:OpenWindow('@(Url.Action("PredefinedProductAttributeValueCreatePopup", "ProductAttribute", new {productAttributeId = Model.Id, btnId = "btnRefresh", formId = "productattribute-form", area = Constants.AreaAdmin }))', 800, 550, true); return false; " class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.AddNew"]</button>
+                <a id="btnAddNewValue" href="@(Url.Action("PredefinedProductAttributeValueCreatePopup", "ProductAttribute", new {productAttributeId = Model.Id, btnId = "btnRefresh", formId = "productattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.AddNew"]</a>
                 <input type="submit" id="btnRefresh" style="display:none" />
             </div>
             <vc:admin-widget widget-zone="product_attribute_details_predefined_values_bottom" additional-data="Model" />
         </div>
         <script>
             $(document).ready(function() {
+                $(document).ready(function () {
+                    $('#btnAddNewValue').magnificPopup({
+                        type: 'ajax',
+                        settings: { cache: false, async: false },
+                        callbacks: {
+                            parseAjax: function (mfpResponse) {
+                                mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                            },
+                            ajaxContentAdded: function () {
+                                $('.mfp-wrap').removeAttr('tabindex');
+                            }
+                        }
+                    });
+                });
                 $("#productattributevalues-grid").kendoGrid({
+                    dataBound: function () {
+                        $('.editvalue').magnificPopup({
+                            type: 'ajax',
+                            settings: { cache: false, async: false },
+                            callbacks: {
+                                parseAjax: function (mfpResponse) {
+                                    mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                },
+                                ajaxContentAdded: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    },
                     dataSource: {
                         transport: {
                             read: {
@@ -68,7 +96,7 @@
                             field: "Name",
                             title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.Name"]",
                             width: 200,
-                            template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("PredefinedProductAttributeValueEditPopup", "ProductAttribute", new { area = Constants.AreaAdmin })/#=Id#?productAttributeId=@Model.Id&btnId=btnRefresh&formId=productattribute-form', 800, 500, true); return false;\">#=kendo.htmlEncode(Name)#</a>"
+                            template: "<a class='k-link editvalue' href=\"@Url.Action("PredefinedProductAttributeValueEditPopup", "ProductAttribute", new { area = Constants.AreaAdmin })/#=Id#?productAttributeId=@Model.Id&btnId=btnRefresh&formId=productattribute-form\">#=kendo.htmlEncode(Name)#</a>"
                         }, {
                             field: "PriceAdjustmentStr",
                             title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.PriceAdjustment"]",
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs
index d6e372de4..5c4b983e6 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs
@@ -287,7 +287,7 @@ public async Task<IActionResult> PredefinedProductAttributeValueCreatePopup(Pred
                 await _productAttributeService.UpdateProductAttribute(productAttribute);
 
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
             //If we got this far, something failed, redisplay form
             return View(model);
@@ -325,7 +325,7 @@ public async Task<IActionResult> PredefinedProductAttributeValueEditPopup(Predef
                 await _productAttributeService.UpdateProductAttribute(productAttribute);
 
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
             //If we got this far, something failed, redisplay form
             return View(model);

From 02dffdb6e06769ac9f8cd0faf46ce6c2935707d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 09:48:29 +0200
Subject: [PATCH 02/32] SpecificationAttribute popup - magnific popup layout

---
 .../OptionCreatePopup.cshtml                  | 41 +++++++++++--
 .../OptionEditPopup.cshtml                    | 37 +++++++++++-
 .../_CreateOrUpdate.TabOptions.cshtml         | 60 ++++++++++++++-----
 .../_CreateOrUpdateOption.cshtml              | 11 +---
 .../SpecificationAttributeController.cs       |  4 +-
 5 files changed, 120 insertions(+), 33 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml
index 9297983d4..be8fb6320 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml
@@ -1,17 +1,17 @@
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
 }
 @model SpecificationAttributeOptionModel
 @{    
     //page title
     ViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="SpecificationAttribute" asp-action="OptionCreatePopup" 
-    method="post" id="specificationattribute-form"
+<form asp-area="@Constants.AreaAdmin" asp-controller="SpecificationAttribute" asp-action="OptionCreatePopup"
+      method="post" id="specificationattribute-form"
       asp-route-Id="@Context.Request.Query["Id"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -26,9 +26,40 @@
                     </div>
                 </div>
                 <div class="x_content form">
-                   <partial name="_CreateOrUpdateOption" model="Model" />
+                    <partial name="_CreateOrUpdateOption" model="Model" />
                 </div>
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#specificationattribute-form").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml
index b53842cf8..6227012e5 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml
@@ -1,5 +1,5 @@
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
 }
 @model SpecificationAttributeOptionModel
 @{    
@@ -10,7 +10,7 @@
       asp-route-SpecificationAttributeId="@Context.Request.Query["SpecificationAttributeId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -25,9 +25,40 @@
                     </div>
                 </div>
                 <div class="x_content form">
-                   <partial name="_CreateOrUpdateOption" model="Model" />
+                    <partial name="_CreateOrUpdateOption" model="Model" />
                 </div>
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#specificationattribute-form").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.TabOptions.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.TabOptions.cshtml
index 1e5c54658..21ef3734c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.TabOptions.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.TabOptions.cshtml
@@ -1,23 +1,53 @@
 @model SpecificationAttributeModel
+
+<link rel="stylesheet" type="text/css" asp-src="/_content/Grand.Web.Admin/administration/farbtastic/farbtastic.css" />
+<script asp-location="Footer" asp-src="/_content/Grand.Web.Admin/administration/farbtastic/farbtastic.js"></script>
+
 @{
     if (!String.IsNullOrEmpty(Model.Id))
     {
 
-<div class="panel panel-default">
-    <vc:admin-widget widget-zone="specification_attribute_details_options_top" additional-data="null" />
-    <div class="panel-body">
-        <div id="specificationattributeoptions-grid"></div>
-    </div>
-    <div class="panel-footer">
-        <button type="submit" id="btnAddNewOption" onclick="javascript:OpenWindow('@(Url.Action("OptionCreatePopup", "SpecificationAttribute", new { specificationAttributeId = Model.Id, btnId = "btnRefresh", formId = "specificationattribute-form", area = Constants.AreaAdmin }))', 800, 350, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"]</button>
-        <input type="submit" id="btnRefresh" style="display: none" />
-    </div>
-    <vc:admin-widget widget-zone="specification_attribute_details_options_bottom" additional-data="Model" />
-</div>
+        <div class="panel panel-default">
+            <vc:admin-widget widget-zone="specification_attribute_details_options_top" additional-data="null" />
+            <div class="panel-body">
+                <div id="specificationattributeoptions-grid"></div>
+            </div>
+            <div class="panel-footer">
+                <a id="btnAddNewOption" href="@(Url.Action("OptionCreatePopup", "SpecificationAttribute", new { specificationAttributeId = Model.Id, btnId = "btnRefresh", formId = "specificationattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"]</a>
+                <input type="submit" id="btnRefresh" style="display: none" />
+            </div>
+            <vc:admin-widget widget-zone="specification_attribute_details_options_bottom" additional-data="Model" />
+        </div>
 
-<script>
+        <script>
             $(document).ready(function () {
+                $('#btnAddNewOption').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#specificationattributeoptions-grid").kendoGrid({
+                    dataBound: function () {
+                        $('.editoption').magnificPopup({
+                            type: 'ajax',
+                            settings: { cache: false, async: false },
+                            callbacks: {
+                                parseAjax: function (mfpResponse) {
+                                    mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                },
+                                ajaxContentAdded: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    },
                     dataSource: {
                         transport: {
                             read: {
@@ -64,7 +94,7 @@
                     columns: [{
                         field: "Name",
                         title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.Name"]",
-                        template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("OptionEditPopup", "SpecificationAttribute", new { area = Constants.AreaAdmin })/#=Id#?btnId=btnRefresh&formId=specificationattribute-form', 800, 450, true); return false;\">#=kendo.htmlEncode(Name)#</a>"
+                        template: "<a class='k-link editoption' href=\"@Url.Action("OptionEditPopup", "SpecificationAttribute", new { area = Constants.AreaAdmin })/#=Id#?btnId=btnRefresh&formId=specificationattribute-form\">#=kendo.htmlEncode(Name)#</a>"
                     }, {
                         field: "DisplayOrder",
                         title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.DisplayOrder"]",
@@ -80,7 +110,7 @@
                     }]
                 });
             });
-</script>
+        </script>
         <script>
             $(document).ready(function () {
                 $('#btnRefresh').click(function () {
@@ -100,5 +130,5 @@
             @Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.SaveBeforeEdit"]
         </div>
     }
-    
+
 }
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdateOption.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdateOption.cshtml
index 0ea0d74fb..f7b057fec 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdateOption.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdateOption.cshtml
@@ -1,9 +1,6 @@
 @model SpecificationAttributeOptionModel
 @using Microsoft.AspNetCore.Mvc.Razor;
 
-<link rel="stylesheet" type="text/css" asp-src="/_content/Grand.Web.Admin/administration/farbtastic/farbtastic.css" />
-<script asp-location="Footer" asp-src="/_content/Grand.Web.Admin/administration/farbtastic/farbtastic.js"></script>
-
 <div asp-validation-summary="All"></div>
 <input asp-for="Id" type="hidden" />
 <input asp-for="SpecificationAttributeId" type="hidden" />
@@ -24,10 +21,10 @@
 }
 
 <script>
-$(document).ready(function() {
+
     $("#@Html.IdFor(model => model.EnableColorSquaresRgb)").click(toggleEnableColorSquaresRgb);
     toggleEnableColorSquaresRgb();
-});
+
 
 function toggleEnableColorSquaresRgb() {
     if ($('#@Html.IdFor(model => model.EnableColorSquaresRgb)').is(':checked')) {
@@ -89,9 +86,7 @@ function toggleEnableColorSquaresRgb() {
                 <admin-input asp-for="ColorSquaresRgb" />
                 <div id="color-picker"></div>
                 <script>
-                    $(document).ready(function(){
-                        $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');
-                    });
+                    $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');
                 </script>
                 <span asp-validation-for="ColorSquaresRgb"></span>
             </div>
diff --git a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs
index 08e922a97..808812ea1 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs
@@ -258,7 +258,7 @@ public async Task<IActionResult> OptionCreatePopup(SpecificationAttributeOptionM
                 await _specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);
 
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
 
             //If we got this far, something failed, redisplay form
@@ -307,7 +307,7 @@ public async Task<IActionResult> OptionEditPopup(SpecificationAttributeOptionMod
                 await _specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);
 
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
 
             //If we got this far, something failed, redisplay form

From f62105c2dc5a194031c4dcf994784c2bae713a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 09:57:26 +0200
Subject: [PATCH 03/32] Show product preview - new window changed to new tab

---
 src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Edit.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Edit.cshtml
index 082b2a05e..94f2eb2c1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Edit.cshtml
@@ -16,7 +16,7 @@
                     </div>
                     <div class="actions">
                         <div class="btn-group btn-group-devided util-btn-margin-bottom-5">
-                            <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("Product", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">
+                            <button type="button" onclick="window.open('@Url.RouteUrl("Product", new {SeName = Model.SeName})','_blank');" class="btn purple">
                                 <i class="fa fa-eye"></i>
                                 @Loc["Admin.Common.Preview"]
                             </button>

From 79933dd90db2f5741d73869f06e4cafa6ac82683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 10:11:28 +0200
Subject: [PATCH 04/32] CustomerAttribute popup - magnific popup layout

---
 .../CustomerAttribute/ValueCreatePopup.cshtml | 39 +++++++++++++++++--
 .../CustomerAttribute/ValueEditPopup.cshtml   | 39 +++++++++++++++++--
 .../_CreateOrUpdate.TabValues.cshtml          | 32 +++++++++++++--
 .../CustomerAttributeController.cs            |  4 +-
 4 files changed, 101 insertions(+), 13 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml
index da4eebbfa..08e036de5 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml
@@ -1,15 +1,15 @@
 @model CustomerAttributeValueModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Customers.CustomerAttributes.Values.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueCreatePopup"
+<form id="ValueCreatePopup" manifest="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueCreatePopup"
       asp-route-customerAttributeId="@Context.Request.Query["customerAttributeId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
 
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -24,9 +24,40 @@
                     </div>
                 </div>
                 <div class="x_content form">
-                   <partial name="_CreateOrUpdateValue" model="Model" />
+                    <partial name="_CreateOrUpdateValue" model="Model" />
                 </div>
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#ValueCreatePopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml
index 50ae81858..22dcfc1bd 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml
@@ -1,5 +1,5 @@
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
 }
 
 @model CustomerAttributeValueModel
@@ -8,11 +8,11 @@
     //page title
     ViewBag.Title = Loc["Admin.Customers.CustomerAttributes.Values.EditValueDetails"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueEditPopup"
+<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueEditPopup"
       asp-route-customerAttributeId="@Context.Request.Query["customerAttributeId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -27,9 +27,40 @@
                     </div>
                 </div>
                 <div class="x_content form">
-                   <partial name="_CreateOrUpdateValue" model="Model" />
+                    <partial name="_CreateOrUpdateValue" model="Model" />
                 </div>
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#ValueEditPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdate.TabValues.cshtml
index e6790ba08..671513c23 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdate.TabValues.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdate.TabValues.cshtml
@@ -9,15 +9,41 @@
                 <div id="customerattributevalues-grid"></div>
             </div>
             <div class="panel-footer">
-                <button type="submit" id="btnAddNewValue" onclick="javascript:OpenWindow('@(Url.Action("ValueCreatePopup", "CustomerAttribute", new { customerAttributeId = Model.Id, btnId = "btnRefresh", formId = "customerattribute-form", area = Constants.AreaAdmin }))', 800, 350, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.CustomerAttributes.Values.AddNew"]</button>
+                <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "CustomerAttribute", new { customerAttributeId = Model.Id, btnId = "btnRefresh", formId = "customerattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.CustomerAttributes.Values.AddNew"]</a>
                 <input type="submit" id="btnRefresh" style="display: none" />
             </div>
         </div>
 
 
         <script>
-        $(document).ready(function () {
+            $(document).ready(function () {
+                $('#btnAddNewValue').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
             $("#customerattributevalues-grid").kendoGrid({
+                dataBound: function () {
+                    $('.editvalue').magnificPopup({
+                        type: 'ajax',
+                        settings: { cache: false, async: false },
+                        callbacks: {
+                            parseAjax: function (mfpResponse) {
+                                mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                            },
+                            ajaxContentAdded: function () {
+                                $('.mfp-wrap').removeAttr('tabindex');
+                            }
+                        }
+                    });
+                },
                 dataSource: {
                     transport: {
                         read: {
@@ -64,7 +90,7 @@
                 columns: [{
                     field: "Name",
                     title: "@Loc["Admin.Customers.CustomerAttributes.Values.Fields.Name"]",
-                    template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("ValueEditPopup", "CustomerAttribute", new { area = Constants.AreaAdmin })/#=Id#?customerAttributeId=@(Model.Id)&btnId=btnRefresh&formId=customerattribute-form', 800, 350, true); return false;\">#=kendo.htmlEncode(Name)#</a>",
+                    template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "CustomerAttribute", new { area = Constants.AreaAdmin })/#=Id#?customerAttributeId=@(Model.Id)&btnId=btnRefresh&formId=customerattribute-form\">#=kendo.htmlEncode(Name)#</a>",
                 }, {
                     field: "IsPreSelected",
                     title: "@Loc["Admin.Customers.CustomerAttributes.Values.Fields.IsPreSelected"]",
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs
index 7875d466e..9029dd6c4 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs
@@ -184,7 +184,7 @@ public async Task<IActionResult> ValueCreatePopup(CustomerAttributeValueModel mo
             {
                 await _customerAttributeViewModelService.InsertCustomerAttributeValueModel(model);
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
 
             //If we got this far, something failed, redisplay form
@@ -226,7 +226,7 @@ public async Task<IActionResult> ValueEditPopup(CustomerAttributeValueModel mode
                 await _customerAttributeViewModelService.UpdateCustomerAttributeValueModel(model, cav);
 
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
 
             //If we got this far, something failed, redisplay form

From 46d14adf6292dc36193c96db546ee458166e399e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 10:19:24 +0200
Subject: [PATCH 05/32] AddressAttribute popup - magnific popup layout

---
 .../AddressAttribute/ValueCreatePopup.cshtml  | 37 +++++++++++++++--
 .../AddressAttribute/ValueEditPopup.cshtml    | 41 ++++++++++++++++---
 .../_CreateOrUpdate.TabValues.cshtml          | 30 +++++++++++++-
 .../Controllers/AddressAttributeController.cs |  4 +-
 4 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml
index 305b3eb12..8f41d1273 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml
@@ -1,13 +1,13 @@
 @model AddressAttributeValueModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     ViewBag.Title = Loc["Admin.Address.AddressAttributes.Values.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="ValueCreatePopup"
+<form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="ValueCreatePopup"
       asp-route-addressAttributeId="@Context.Request.Query["addressAttributeId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -27,4 +27,35 @@
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#ValueCreatePopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueEditPopup.cshtml
index 08fd6e701..7a1e237d7 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueEditPopup.cshtml
@@ -1,13 +1,13 @@
 @model AddressAttributeValueModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     ViewBag.Title = Loc["Admin.Address.AddressAttributes.Values.EditValueDetails"];
 }
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="ValueEditPopup"
-    asp-route-btnId="@Context.Request.Query["btnId"]"
-    asp-route-formId="@Context.Request.Query["formId"]">
-    
+<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="ValueEditPopup"
+      asp-route-btnId="@Context.Request.Query["btnId"]"
+      asp-route-formId="@Context.Request.Query["formId"]">
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -27,4 +27,35 @@
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#ValueEditPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdate.TabValues.cshtml
index e6a2337d5..e889374dc 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdate.TabValues.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdate.TabValues.cshtml
@@ -9,13 +9,39 @@
                 <vc:admin-widget widget-zone="address_attribute_details_values_bottom" additional-data="Model" />
             </div>
             <div class="panel-footer">
-                <button type="submit" id="btnAddNewValue" onclick="javascript:OpenWindow('@(Url.Action("ValueCreatePopup", "AddressAttribute", new { addressAttributeId = Model.Id, btnId = "btnRefresh", formId = "addressattribute-form", area = Constants.AreaAdmin }))', 800, 350, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Address.AddressAttributes.Values.AddNew"]</button>
+                <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "AddressAttribute", new { addressAttributeId = Model.Id, btnId = "btnRefresh", formId = "addressattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Address.AddressAttributes.Values.AddNew"]</a>
                 <input type="submit" id="btnRefresh" style="display: none" />
             </div>
         </div>
         <script>
             $(document).ready(function () {
+                $('#btnAddNewValue').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#addressattributevalues-grid").kendoGrid({
+                    dataBound: function () {
+                        $('.editvalue').magnificPopup({
+                            type: 'ajax',
+                            settings: { cache: false, async: false },
+                            callbacks: {
+                                parseAjax: function (mfpResponse) {
+                                    mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                },
+                                ajaxContentAdded: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    },
                     dataSource: {
                         transport: {
                             read: {
@@ -62,7 +88,7 @@
                     columns: [{
                         field: "Name",
                         title: "@Loc["Admin.Address.AddressAttributes.Values.Fields.Name"]",
-                        template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("ValueEditPopup", "AddressAttribute", new { area = Constants.AreaAdmin })/#=Id#?addressAttributeId=@(Model.Id)&btnId=btnRefresh&formId=addressattribute-form', 800, 350, true); return false;\">#=Name#</a>",
+                        template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "AddressAttribute", new { area = Constants.AreaAdmin })/#=Id#?addressAttributeId=@(Model.Id)&btnId=btnRefresh&formId=addressattribute-form\">#=Name#</a>",
                     }, {
                         field: "IsPreSelected",
                         title: "@Loc["Admin.Address.AddressAttributes.Values.Fields.IsPreSelected"]",
diff --git a/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs
index 056e9afdb..9745c0da9 100644
--- a/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs
@@ -191,7 +191,7 @@ public async Task<IActionResult> ValueCreatePopup(AddressAttributeValueModel mod
             {
                 await _addressAttributeViewModelService.InsertAddressAttributeValueModel(model);
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
             //If we got this far, something failed, redisplay form
             return View(model);
@@ -236,7 +236,7 @@ public async Task<IActionResult> ValueEditPopup(AddressAttributeValueModel model
             {
                 await _addressAttributeViewModelService.UpdateAddressAttributeValueModel(model, cav);
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
 
             //If we got this far, something failed, redisplay form

From 186132ddf72ebfa5bc466eb2b2127519105dd758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 10:41:12 +0200
Subject: [PATCH 06/32] CustomerReminder product popup - magnific popup layout

---
 .../CustomerReminder/ProductAddPopup.cshtml   | 41 +++++++++++++++----
 .../CustomerReminder/_ConditionProduct.cshtml | 14 ++++++-
 .../Controllers/CustomerReminderController.cs |  2 +-
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtml
index 76c839166..5117eb7a6 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtml
@@ -1,12 +1,12 @@
 @model CustomerReminderModel.ConditionModel.AddProductToConditionModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Customers.CustomerReminder.Condition.Products.AddNew"];
 }
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="ProductAddPopup" method="post" 
+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="ProductAddPopup" method="post" 
       asp-route-CustomerReminderId="@Context.Request.Query["CustomerReminderId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -109,7 +109,35 @@
     </div>
 
     <script>
-    $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#ProductAddPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefreshProducts').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
 
         $('.extend-collapse').hide();
         $('.filter-extend-button').click(function () {
@@ -170,11 +198,8 @@
                 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>
 
-    <script>
-        $(document).ready(function() {
+        
             $('#search-products').click(function() {
                 var grid = $('#products-grid').data('kendoGrid');
                 grid.dataSource.page(1);
@@ -197,7 +222,7 @@
             $('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
+        
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionProduct.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionProduct.cshtml
index 40651293f..160fe5dab 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionProduct.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionProduct.cshtml
@@ -12,13 +12,25 @@
             <div id="products-grid"></div>
         </div>
         <div class="panel-footer">
-            <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshProducts", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin }))    ', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.CustomerReminder.Condition.Products.AddNew"]</button>
+            <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshProducts", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.CustomerReminder.Condition.Products.AddNew"]</a>
             <input type="submit" id="btnRefreshProducts" style="display: none" />
         </div>
     </div>
 
     <script>
             $(document).ready(function () {
+                $('#btnAddNewProduct').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#products-grid").kendoGrid({
                     dataSource: {
                         transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
index 0c73e4777..9ea9119ee 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
@@ -481,7 +481,7 @@ public async Task<IActionResult> ProductAddPopup(CustomerReminderModel.Condition
                 await _customerReminderViewModelService.InsertProductToConditionModel(model);
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
 

From 30f3e8e74dfa7b682dedfb6bed414fba2a45c0e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 10:49:49 +0200
Subject: [PATCH 07/32] CustomerReminder category popup - magnific popup layout

---
 .../CustomerReminder/CategoryAddPopup.cshtml  | 37 +++++++++++++++----
 .../_ConditionCategory.cshtml                 | 14 ++++++-
 .../Controllers/CustomerReminderController.cs |  2 +-
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtml
index 3451abb3c..5c72cd328 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtml
@@ -6,7 +6,7 @@
     ViewBag.Title = Loc["Admin.Customers.CustomerReminder.Condition.Category.AddNew"];
 }
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="CategoryAddPopup" method="post"
+<form id="CategoryAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="CategoryAddPopup" method="post"
       asp-route-CustomerReminderId="@Context.Request.Query["CustomerReminderId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -65,7 +65,35 @@
     }
 
     <script>
-                $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#CategoryAddPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefreshCategories').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
                     $("#categories-grid").kendoGrid({
                         dataSource: {
                             transport: {
@@ -119,11 +147,7 @@
                             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>
 
-    <script>
-                    $(document).ready(function() {
                         $('#search-categories').click(function() {
                             var grid = $('#categories-grid').data('kendoGrid');
                             grid.dataSource.page(1);
@@ -146,7 +170,6 @@
                         $('#categories-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                             updateMasterCheckbox();
                         });
-                    });
 
                     function additionalData() {
                         var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCategory.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCategory.cshtml
index cc6e87d30..22902ebfa 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCategory.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCategory.cshtml
@@ -12,13 +12,25 @@
                 <div id="categories-grid"></div>
             </div>
             <div class="panel-footer">
-                <input type="submit" id="btnAddNewCategory" value="@Loc["Admin.Customers.CustomerReminder.Condition.Category.AddNew"]" onclick="javascript:OpenWindow('@(Url.Action("CategoryAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshCategories", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="btn default" />
+                <a id="btnAddNewCategory" href="@(Url.Action("CategoryAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshCategories", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin }))" class="btn default">@Loc["Admin.Customers.CustomerReminder.Condition.Category.AddNew"]</a>
                 <input type="submit" id="btnRefreshCategories" style="display: none" />
             </div>
         </div>
 
                 <script>
                         $(document).ready(function () {
+                            $('#btnAddNewCategory').magnificPopup({
+                                type: 'ajax',
+                                settings: { cache: false, async: false },
+                                callbacks: {
+                                    parseAjax: function (mfpResponse) {
+                                        mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                    },
+                                    ajaxContentAdded: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
                             $("#categories-grid").kendoGrid({
                                 dataSource: {
                                     transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
index 9ea9119ee..565bdca62 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
@@ -374,7 +374,7 @@ public async Task<IActionResult> CategoryAddPopup(CustomerReminderModel.Conditio
                 await _customerReminderViewModelService.InsertCategoryConditionModel(model);
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         #endregion

From e6725f76ea8277615f3432a6dbf73c3bf5477c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 10:58:55 +0200
Subject: [PATCH 08/32] CustomerReminder collection popup - magnific popup
 layout

---
 .../CollectionAddPopup.cshtml                 | 41 +++++++++++++++----
 .../_ConditionCollection.cshtml               | 14 ++++++-
 .../Controllers/CustomerReminderController.cs |  2 +-
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtml
index 49580d8b6..f4c3bd46f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtml
@@ -2,11 +2,11 @@
 @inject AdminAreaSettings adminAreaSettings
 
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Customers.CustomerReminder.Condition.Collections.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="CollectionAddPopup" method="post"
+<form id="CollectionAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="CollectionAddPopup" method="post"
       asp-route-CustomerReminderId="@Context.Request.Query["CustomerReminderId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -66,7 +66,36 @@
         </script>
     }
     <script>
-    $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#CollectionAddPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefreshCollections').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+
         $("#collections-grid").kendoGrid({
             dataSource: {
                 transport: {
@@ -120,11 +149,7 @@
                 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>
 
-    <script>
-        $(document).ready(function() {
             $('#search-collections').click(function() {
                 var grid = $('#collections-grid').data('kendoGrid');
                 grid.dataSource.page(1);
@@ -147,7 +172,7 @@
             $('#collections-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
+      
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCollection.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCollection.cshtml
index 7287d97cf..c4fac31d3 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCollection.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCollection.cshtml
@@ -13,13 +13,25 @@
                 <div id="collections-grid"></div>
             </div>
             <div class="panel-footer">
-                <input type="submit" id="btnAddNewCollection" value="@Loc["Admin.Customers.CustomerReminder.Condition.Collections.AddNew"]" onclick="javascript:OpenWindow('@(Url.Action("CollectionAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshCollections", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="btn default" />
+                <a id="btnAddNewCollection" href="@(Url.Action("CollectionAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshCollections", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin }))" class="btn default">@Loc["Admin.Customers.CustomerReminder.Condition.Collections.AddNew"]</a>
                 <input type="submit" id="btnRefreshCollections" style="display: none" />
             </div>
         </div>
 
         <script>
             $(document).ready(function () {
+                $('#btnAddNewCollection').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#collections-grid").kendoGrid({
                     dataSource: {
                         transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
index 565bdca62..80e1c5f5c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
@@ -431,7 +431,7 @@ public async Task<IActionResult> CollectionAddPopup(CustomerReminderModel.Condit
                 await _customerReminderViewModelService.InsertCollectionConditionModel(model);
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
         #endregion
 

From 16ee858134b332eb98c9e625ec9a9adbe3cb8b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 11:12:47 +0200
Subject: [PATCH 09/32] ContactAttribute value popup - magnific popup layout

---
 .../ContactAttribute/ValueCreatePopup.cshtml  | 35 ++++++++++++++++-
 .../ContactAttribute/ValueEditPopup.cshtml    | 39 +++++++++++++++++--
 .../_CreateOrUpdate.TabValues.cshtml          | 30 +++++++++++++-
 .../Controllers/ContactAttributeController.cs |  4 +-
 4 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml
index 33cf91699..6ea07ed02 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml
@@ -1,5 +1,5 @@
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
 }
 
 @model ContactAttributeValueModel
@@ -8,7 +8,7 @@
     //page title
     ViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueCreatePopup"
+<form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueCreatePopup"
       asp-route-contactAttributeId="@Context.Request.Query["contactAttributeId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -32,4 +32,35 @@
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#ValueCreatePopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml
index 96df6439a..1e2761f34 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml
@@ -1,14 +1,14 @@
 @model ContactAttributeValueModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes.Values.EditValueDetails"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueEditPopup"
+<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueEditPopup"
       asp-route-contactAttributeId="@Context.Request.Query["contactAttributeId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -23,9 +23,40 @@
                     </div>
                 </div>
                 <div class="x_content form">
-                   <partial name="_CreateOrUpdateValue" model="Model" />
+                    <partial name="_CreateOrUpdateValue" model="Model" />
                 </div>
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#ValueEditPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdate.TabValues.cshtml
index b232e40e6..9ab88033a 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdate.TabValues.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdate.TabValues.cshtml
@@ -9,14 +9,40 @@
                 <div id="contactattributevalues-grid"></div>
             </div>
             <div class="panel-footer">
-                <button type="submit" id="btnAddNewValue" onclick="javascript:OpenWindow('@(Url.Action("ValueCreatePopup", "ContactAttribute", new { contactAttributeId = Model.Id, btnId = "btnRefresh", formId = "contactattribute-form", area = Constants.AreaAdmin }))', 800, 350, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"]</button>
+                <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "ContactAttribute", new { contactAttributeId = Model.Id, btnId = "btnRefresh", formId = "contactattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"]</a>
                 <input type="submit" id="btnRefresh" style="display: none" />
             </div>
         </div>
 
         <script>
             $(document).ready(function () {
+                $('#btnAddNewValue').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#contactattributevalues-grid").kendoGrid({
+                    dataBound: function () {
+                        $('.editvalue').magnificPopup({
+                            type: 'ajax',
+                            settings: { cache: false, async: false },
+                            callbacks: {
+                                parseAjax: function (mfpResponse) {
+                                    mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                },
+                                ajaxContentAdded: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    },
                     dataSource: {
                         transport: {
                             read: {
@@ -63,7 +89,7 @@
                     columns: [{
                         field: "Name",
                         title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.Name"]",
-                        template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("ValueEditPopup", "ContactAttribute", new { area = Constants.AreaAdmin })/#=Id#?contactAttributeId=@Model.Id&btnId=btnRefresh&formId=contactattribute-form', 800, 350, true); return false;\">#=kendo.htmlEncode(Name)#</a>"
+                        template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "ContactAttribute", new { area = Constants.AreaAdmin })/#=Id#?contactAttributeId=@Model.Id&btnId=btnRefresh&formId=contactattribute-form\">#=kendo.htmlEncode(Name)#</a>"
                     }, {
                         field: "IsPreSelected",
                         title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.IsPreSelected"]",
diff --git a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
index 59409a574..fa5187c36 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
@@ -230,7 +230,7 @@ public async Task<IActionResult> ValueCreatePopup(ContactAttributeValueModel mod
                 await _contactAttributeViewModelService.InsertContactAttributeValueModel(contactAttribute, model);
 
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
 
             //If we got this far, something failed, redisplay form
@@ -279,7 +279,7 @@ public async Task<IActionResult> ValueEditPopup(ContactAttributeValueModel model
             {
                 await _contactAttributeViewModelService.UpdateContactAttributeValueModel(contactAttribute, cav, model);
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
 
             //If we got this far, something failed, redisplay form

From ad085fdbb913aa0744578c2ba04b25ec62f22a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 11:24:25 +0200
Subject: [PATCH 10/32] InteractiveForm attribute popup - magnific popup layout

---
 .../InteractiveForm/ValueCreatePopup.cshtml   | 42 ++++++++++--
 .../InteractiveForm/ValueEditPopup.cshtml     | 65 ++++++++++++++-----
 .../_CreateOrUpdateAttribute.TabValues.cshtml | 30 ++++++++-
 .../Controllers/InteractiveFormController.cs  |  4 +-
 4 files changed, 114 insertions(+), 27 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueCreatePopup.cshtml
index c029e1a2a..ab096e062 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueCreatePopup.cshtml
@@ -1,16 +1,15 @@
 @model InteractiveFormAttributeValueModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["admin.marketing.InteractiveForms.Attribute.Values.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="InteractiveForm" asp-action="ValueCreatePopup"
+<form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="InteractiveForm" asp-action="ValueCreatePopup"
       asp-route-form="@Context.Request.Query["form"]"
       asp-route-aId="@Context.Request.Query["aId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]"
-      >
-    
+      asp-route-formId="@Context.Request.Query["formId"]">
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -24,9 +23,40 @@
                     </div>
                 </div>
                 <div class="x_content form">
-                   <partial name="_CreateOrUpdateAttributeValue" model="Model" />
+                    <partial name="_CreateOrUpdateAttributeValue" model="Model" />
                 </div>
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#ValueCreatePopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefreshValues').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueEditPopup.cshtml
index 347eec310..fa7a9ee51 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueEditPopup.cshtml
@@ -1,32 +1,63 @@
 @model InteractiveFormAttributeValueModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["admin.marketing.InteractiveForms.Attribute.Values.EditValue"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="InteractiveForm" asp-action="ValueEditPopup"
+<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="InteractiveForm" asp-action="ValueEditPopup"
       asp-route-form="@Context.Request.Query["form"]"
       asp-route-aId="@Context.Request.Query["aId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
-        
-        <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-list-alt"></i>
-                            @Loc["admin.marketing.InteractiveForms.Attribute.Values.EditValue"]
-                        </div>
-                        <div class="actions">
-                            <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>
-                        </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="fa fa-list-alt"></i>
+                        @Loc["admin.marketing.InteractiveForms.Attribute.Values.EditValue"]
                     </div>
-                    <div class="x_content form">
-                       <partial name="_CreateOrUpdateAttributeValue" model="Model" />
+                    <div class="actions">
+                        <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>
                     </div>
                 </div>
+                <div class="x_content form">
+                    <partial name="_CreateOrUpdateAttributeValue" model="Model" />
+                </div>
             </div>
         </div>
+    </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#ValueEditPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefreshValues').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttribute.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttribute.TabValues.cshtml
index 4edfbcf21..44cb7d56c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttribute.TabValues.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttribute.TabValues.cshtml
@@ -8,14 +8,40 @@
                 <div id="attributeValues-grid"></div>
             </div>
             <div class="panel-footer">
-                <button type="submit" id="btnAddNewValues" onclick="javascript:OpenWindow('@(Url.Action("ValueCreatePopup", "InteractiveForm", new { form = Model.FormId, aId = Model.Id, formId = "attribute-form", btnId = "btnRefreshValues", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.InteractiveForms.Attribute.Values.AddNew"]</button>
+                <a id="btnAddNewValues" href="@(Url.Action("ValueCreatePopup", "InteractiveForm", new { form = Model.FormId, aId = Model.Id, formId = "attribute-form", btnId = "btnRefreshValues", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.InteractiveForms.Attribute.Values.AddNew"]</a>
                 <input type="submit" id="btnRefreshValues" style="display: none" />
             </div>
         </div>
 
         <script>
             $(document).ready(function () {
+                $('#btnAddNewValues').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#attributeValues-grid").kendoGrid({
+                    dataBound: function () {
+                        $('.editvalue').magnificPopup({
+                            type: 'ajax',
+                            settings: { cache: false, async: false },
+                            callbacks: {
+                                parseAjax: function (mfpResponse) {
+                                    mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                },
+                                ajaxContentAdded: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    },
                     dataSource: {
                         transport: {
                             read: {
@@ -62,7 +88,7 @@
                     columns: [{
                         field: "Name",
                         title: "@Loc["admin.marketing.InteractiveForms.Attribute.Values.Fields.Name"]",
-                        template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("ValueEditPopup", "InteractiveForm", new { area = Constants.AreaAdmin })/#=Id#?form=@Model.FormId&aId=@Model.Id&btnId=btnRefreshValues&formId=attribute-form', 800, 350, true); return false;\">#=kendo.htmlEncode(Name)#</a>",
+                        template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "InteractiveForm", new { area = Constants.AreaAdmin })/#=Id#?form=@Model.FormId&aId=@Model.Id&btnId=btnRefreshValues&formId=attribute-form\">#=kendo.htmlEncode(Name)#</a>",
                     },
                     {
                         field: "IsPreSelected",
diff --git a/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs b/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs
index 7e167692c..1c6bcb3dc 100644
--- a/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs
@@ -395,7 +395,7 @@ public async Task<IActionResult> ValueCreatePopup(string btnId, string formId, s
                 ViewBag.RefreshPage = true;
                 ViewBag.btnId = btnId;
                 ViewBag.formId = formId;
-                return View(model);
+                return Content("");
             }
 
             return View(model);
@@ -452,7 +452,7 @@ public async Task<IActionResult> ValueEditPopup(string btnId, string formId, str
                 ViewBag.RefreshPage = true;
                 ViewBag.btnId = btnId;
                 ViewBag.formId = formId;
-                return View(model);
+                return Content("");
             }
 
             return View(model);

From 2952dc8fd6871c5ec6246cf8cc92ae6e7abc2390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 11:35:24 +0200
Subject: [PATCH 11/32] Knowledgebase related article popup - magnific popup
 layout

---
 .../Views/Knowledgebase/ArticlesPopup.cshtml  | 38 +++++++++++++++----
 .../_CreateOrUpdateArticle.TabRelated.cshtml  | 14 ++++++-
 .../Controllers/KnowledgebaseController.cs    |  2 +-
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml
index 9b8b8a330..a7148f34d 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml
@@ -4,7 +4,7 @@
     ViewBag.Title = Loc["Admin.Content.Knowledgebase.KnowledgebaseArticle.Related.AddNew"];
     Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="Knowledgebase" asp-action="ArticlesPopup" method="post"
+<form id="ArticlesPopup" asp-area="@Constants.AreaAdmin" asp-controller="Knowledgebase" asp-action="ArticlesPopup" method="post"
       asp-route-KnowledgebaseId="@Context.Request.Query["KnowledgebaseId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -60,7 +60,36 @@
     }
 
     <script>
-        $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#ArticlesPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefreshRelatedArticles').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+
             $("#articles-grid").kendoGrid({
                 dataSource: {
                     transport: {
@@ -114,11 +143,7 @@
                     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>
 
-    <script>
-        $(document).ready(function () {
             $('#search-articles').click(function () {
                 var grid = $('#articles-grid').data('kendoGrid');
                 grid.dataSource.page(1); //new search. Set page size to 1
@@ -143,7 +168,6 @@
             $('#articles-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/_CreateOrUpdateArticle.TabRelated.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/_CreateOrUpdateArticle.TabRelated.cshtml
index 97c5d672d..1dbe5f987 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/_CreateOrUpdateArticle.TabRelated.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/_CreateOrUpdateArticle.TabRelated.cshtml
@@ -7,13 +7,25 @@
             <div id="relatedarticles-grid"></div>
         </div>
         <div class="panel-footer">
-            <button type="submit" id="btnAddNewRelatedArticle" onclick="javascript:OpenWindow('@(Url.Action("ArticlesPopup", "Knowledgebase", new { articleId = Model.Id, btnId = "btnRefreshRelatedArticles", formId = "article-form", area = Constants.AreaAdmin  }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Content.Knowledgebase.KnowledgebaseArticle.Related.AddNew"]</button>
+            <a id="btnAddNewRelatedArticle" href="@(Url.Action("ArticlesPopup", "Knowledgebase", new { articleId = Model.Id, btnId = "btnRefreshRelatedArticles", formId = "article-form", area = Constants.AreaAdmin  }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Content.Knowledgebase.KnowledgebaseArticle.Related.AddNew"]</a>
             <input type="submit" id="btnRefreshRelatedArticles" style="display: none" />
         </div>
     </div>
 
     <script>
         $(document).ready(function () {
+            $('#btnAddNewRelatedArticle').magnificPopup({
+                type: 'ajax',
+                settings: { cache: false, async: false },
+                callbacks: {
+                    parseAjax: function (mfpResponse) {
+                        mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                    },
+                    ajaxContentAdded: function () {
+                        $('.mfp-wrap').removeAttr('tabindex');
+                    }
+                }
+            });
             $("#relatedarticles-grid").kendoGrid({
                 dataSource: {
                     transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs b/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs
index 3c057c726..3ee5398ae 100644
--- a/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs
@@ -335,7 +335,7 @@ public async Task<IActionResult> ArticlesPopup(KnowledgebaseArticleModel.AddRela
                 await _knowledgebaseViewModelService.InsertKnowledgebaseRelatedArticle(model);
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         [PermissionAuthorizeAction(PermissionActionName.Delete)]

From 51f00d3c496cca2f507c7720216b848a81880c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 11:46:13 +0200
Subject: [PATCH 12/32] Blog post and product popup - magnific popup layout

---
 .../Admin/Views/Blog/BlogPostAddPopup.cshtml  | 40 +++++++++++++++----
 .../Admin/Views/Blog/ProductAddPopup.cshtml   | 40 +++++++++++++++----
 .../Blog/_CreateOrUpdate.TabProducts.cshtml   | 14 ++++++-
 .../Blog/_CreateOrUpdateCategory.Posts.cshtml | 14 ++++++-
 .../Controllers/BlogController.cs             |  4 +-
 5 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml
index 21cdb503e..823b89b68 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml
@@ -2,11 +2,11 @@
 @inject AdminAreaSettings adminAreaSettings
 
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Content.Blog.BlogCategory.AddNewPost"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="Blog" asp-action="BlogPostAddPopup" method="post"
+<form id="BlogPostAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Blog" asp-action="BlogPostAddPopup" method="post"
       asp-route-CategoryId="@Context.Request.Query["CategoryId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -64,7 +64,35 @@
 </form>
 
 <script>
-    $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#BlogPostAddPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefreshPosts').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
 
         $("#blogposts-grid").kendoGrid({
             dataSource: {
@@ -112,10 +140,7 @@
                 title: "@Loc["Admin.Content.Blog.BlogCategory.Fields.Post"]"
             }]
         });
-    });
-</script>
-<script>
-        $(document).ready(function() {
+
             $('#search-posts').click(function() {
                 var grid = $('#blogposts-grid').data('kendoGrid');
                 grid.dataSource.page(1); //new search. Set page size to 1
@@ -140,7 +165,6 @@
             $('#blogposts-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml
index 2791624ed..e78f6b1fe 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml
@@ -1,12 +1,12 @@
 @model BlogProductModel.AddProductModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Content.Blog.BlogPosts.Products.AddNew"];
 }
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="Blog" asp-action="ProductAddPopup" method="post"
+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Blog" asp-action="ProductAddPopup" method="post"
       asp-route-BlogPostId="@Context.Request.Query["BlogPostId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -106,7 +106,35 @@
 
 
     <script>
-    $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#ProductAddPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefreshProducts').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
 
         $('.extend-collapse').hide();
         $('.filter-extend-button').click(function () {
@@ -168,10 +196,7 @@
                     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>
-    <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
@@ -196,7 +221,6 @@
             $('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabProducts.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabProducts.cshtml
index 2f642d7f4..cfc90ce0c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabProducts.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabProducts.cshtml
@@ -8,13 +8,25 @@
             <div id="product-grid"></div>
         </div>
         <div class="panel-footer">
-            <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "Blog", new { blogPostId = Model.Id, btnId = "btnRefreshProducts", formId = "blog-edit", area = Constants.AreaAdmin }))', 1000, 1000, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Content.Blog.BlogPosts.Products.AddNew"]</button>
+            <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "Blog", new { blogPostId = Model.Id, btnId = "btnRefreshProducts", formId = "blog-edit", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Content.Blog.BlogPosts.Products.AddNew"]</a>
             <input type="button" id="btnRefreshProducts" style="display: none" />
         </div>
         <vc:admin-widget widget-zone="blog_details_product_bottom" additional-data="Model" />
     </div>
     <script>
         $(document).ready(function () {
+            $('#btnAddNewProduct').magnificPopup({
+                type: 'ajax',
+                settings: { cache: false, async: false },
+                callbacks: {
+                    parseAjax: function (mfpResponse) {
+                        mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                    },
+                    ajaxContentAdded: function () {
+                        $('.mfp-wrap').removeAttr('tabindex');
+                    }
+                }
+            });
             $("#product-grid").kendoGrid({
                 dataSource: {
                     transport: {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdateCategory.Posts.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdateCategory.Posts.cshtml
index 14bbf314d..f6b70368f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdateCategory.Posts.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdateCategory.Posts.cshtml
@@ -8,12 +8,24 @@
             <div id="posts-grid"></div>
         </div>
         <div class="panel-footer">
-            <button type="submit" id="btnAddNewPost" onclick="javascript:OpenWindow('@(Url.Action("BlogPostAddPopup", "Blog", new { categoryId = Model.Id, btnId = "btnRefreshPosts", formId = "category-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Content.Blog.BlogCategory.AddNewPost"]</button>
+            <a id="btnAddNewPost" href="@(Url.Action("BlogPostAddPopup", "Blog", new { categoryId = Model.Id, btnId = "btnRefreshPosts", formId = "category-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Content.Blog.BlogCategory.AddNewPost"]</a>
             <input type="submit" id="btnRefreshPosts" style="display: none" />
         </div>
     </div>
     <script>
         $(document).ready(function () {
+            $('#btnAddNewPost').magnificPopup({
+                type: 'ajax',
+                settings: { cache: false, async: false },
+                callbacks: {
+                    parseAjax: function (mfpResponse) {
+                        mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                    },
+                    ajaxContentAdded: function () {
+                        $('.mfp-wrap').removeAttr('tabindex');
+                    }
+                }
+            });
             $("#posts-grid").kendoGrid({
                 dataSource: {
                     transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
index 3df7bd842..0d026f921 100644
--- a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
@@ -542,7 +542,7 @@ public async Task<IActionResult> BlogPostAddPopup(AddBlogPostCategoryModel model
                     }
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         #endregion
@@ -642,7 +642,7 @@ public async Task<IActionResult> ProductAddPopup(string blogPostId, BlogProductM
             }
 
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         [PermissionAuthorizeAction(PermissionActionName.Edit)]

From c4bb3aea65c0251e788d30f9d3344e5e06f7057c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 12:23:31 +0200
Subject: [PATCH 13/32] AssociatedProductToCoursePopup - magnific popup layout

---
 .../AssociateProductToCoursePopup.cshtml      | 44 +++++++++++++------
 .../Course/_CreateOrUpdate.TabInfo.cshtml     | 19 ++++++--
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml
index 8f739089e..5ee756ccc 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml
@@ -1,7 +1,7 @@
 @model CourseModel.AssociateProductToCourseModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Courses.Course.Fields.PurchasedWithProduct.Choose"];
 }
@@ -92,12 +92,12 @@
     {
         <script>
             try {
-                    window.opener.document.getElementById('@(Context.Request.Query["productIdInput"])').value = '@(ViewBag.productId)';
-                    window.opener.document.getElementById('@(Context.Request.Query["productNameInput"])').innerHTML = '@(ViewBag.productName)';
-                    window.opener.document.getElementById('@(Context.Request.Query["btnId"])').click();
+                    document.getElementById('@(Context.Request.Query["productIdInput"])').value = '@(ViewBag.productId)';
+                    document.getElementById('@(Context.Request.Query["productNameInput"])').innerHTML = '@(ViewBag.productName)';
+                    document.getElementById('@(Context.Request.Query["btnId"])').click();
             }
             catch (e){}
-            window.close();
+            $.magnificPopup.instance.close();
         </script>
     }
 
@@ -106,7 +106,30 @@
     <div id="products-grid"></div>
 
     <script>
-        $(document).ready(function () {
+            var mfp = $.magnificPopup.instance;
+            $("#associateproduct").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'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });                 
+                    }
+                });
+            });
 
             $('.extend-collapse').hide();
             $('.filter-extend-button').click(function () {
@@ -165,19 +188,14 @@
                     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>
-
 
-    <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) {
@@ -199,7 +217,7 @@
             addAntiForgeryToken(data);
             return data;
         }
-        
+
         function selectAssociatedProduct(productid) {
             $("#@Html.IdFor(model => model.AssociatedToProductId)").val(productid);
             $('#associateproduct').submit();
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.TabInfo.cshtml
index 551c2d0e6..32eac58d7 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.TabInfo.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.TabInfo.cshtml
@@ -124,19 +124,30 @@
         <div class="form-group">
             <div class="col-md-3 col-sm-3"></div>
             <div class="col-md-9 col-sm-9">
-                <button type="button"
-                        onclick="javascript:OpenWindow('@(Url.Action("AssociateProductToCoursePopup", "Course",
+                <a id="btnAssociateProductToCoursePopup" href="@(Url.Action("AssociateProductToCoursePopup", "Course",
                                 new { productIdInput = Html.IdFor(model => model.ProductId),
                                     productNameInput = "purchased-with-product-name",
-                                    btnId = "btnRefreshPurchasedWithProduct", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button">
+                                    btnId = "btnRefreshPurchasedWithProduct", area = Constants.AreaAdmin }))" class="k-button">
                     @Loc["Admin.Courses.Course.Fields.PurchasedWithProduct.Choose"]
-                </button>
+                </a>
                 <button type="button" id="purchased-with-product-name-remove" class="k-button">
                     @Loc["Admin.Courses.Course.Fields.PurchasedWithProduct.Remove"]
                 </button>
                 <input type="button" id="btnRefreshPurchasedWithProduct" style="display: none" />
                 <script>
                             $(document).ready(function () {
+                                $('#btnAssociateProductToCoursePopup').magnificPopup({
+                                    type: 'ajax',
+                                    settings: { cache: false, async: false },
+                                    callbacks: {
+                                        parseAjax: function (mfpResponse) {
+                                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                        },
+                                        ajaxContentAdded: function () {
+                                            $('.mfp-wrap').removeAttr('tabindex');
+                                        }
+                                    }
+                                });
                                 $('#purchased-with-product-name-remove').click(function () {
                                     $('#purchased-with-product-name').text('');
                                     $("#@Html.IdFor(model => model.ProductId)").val('');

From 714bae32e5056806ffba7fd9bbce88c63209199e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 12:32:49 +0200
Subject: [PATCH 14/32] State popup - magnific popup layout

---
 .../Views/Country/StateCreatePopup.cshtml     | 35 +++++++++++++++++--
 .../Admin/Views/Country/StateEditPopup.cshtml | 35 +++++++++++++++++--
 .../Country/_CreateOrUpdate.TabStates.cshtml  | 30 ++++++++++++++--
 .../Controllers/CountryController.cs          |  4 +--
 4 files changed, 96 insertions(+), 8 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtml
index 2d92db2a4..a1f11d8b1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtml
@@ -1,11 +1,11 @@
 @model StateProvinceModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Configuration.Countries.States.AddNew"];
 }
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="Country" asp-action="StateCreatePopup"
+<form id="StateCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="Country" asp-action="StateCreatePopup"
       asp-route-countryId="@Context.Request.Query["countryId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -29,4 +29,35 @@
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#StateCreatePopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtml
index 85bfb87df..9e6b58289 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtml
@@ -1,9 +1,9 @@
 @model StateProvinceModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     ViewBag.Title = Loc["Admin.Configuration.Countries.States.EditStateDetails"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="Country" asp-action="StateEditPopup"
+<form id="StateEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="Country" asp-action="StateEditPopup"
       asp-route-countryId="@Context.Request.Query["countryId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -27,4 +27,35 @@
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#StateEditPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdate.TabStates.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdate.TabStates.cshtml
index 3e7dd8e2b..401d236ed 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdate.TabStates.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdate.TabStates.cshtml
@@ -8,14 +8,40 @@
                 <div id="states-grid"></div>
             </div>
             <div class="panel-footer">
-                <button type="submit" id="btnAddNewState" onclick="javascript:OpenWindow('@(Url.Action("StateCreatePopup", "Country", new { countryId = Model.Id, btnId = "btnRefresh", formId = "country-form", area = Constants.AreaAdmin }))', 800, 500, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Configuration.Countries.States.AddNew"]</button>
+                <a id="btnAddNewState" href="@(Url.Action("StateCreatePopup", "Country", new { countryId = Model.Id, btnId = "btnRefresh", formId = "country-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Configuration.Countries.States.AddNew"]</a>
                 <input type="submit" id="btnRefresh" style="display: none" />
             </div>
         </div>
 
         <script>
             $(document).ready(function () {
+                $('#btnAddNewState').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#states-grid").kendoGrid({
+                    dataBound: function () {
+                        $('.editstate').magnificPopup({
+                            type: 'ajax',
+                            settings: { cache: false, async: false },
+                            callbacks: {
+                                parseAjax: function (mfpResponse) {
+                                    mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                },
+                                ajaxContentAdded: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    },
                     dataSource: {
                         transport: {
                             read: {
@@ -63,7 +89,7 @@
                         field: "Name",
                         title: "@Loc["Admin.Configuration.Countries.States.Fields.Name"]",
                         width: 300,
-                        template: "<a class=\"k-link\" onclick=\"javascript:OpenWindow('@Url.Action("StateEditPopup", "Country", new { area = Constants.AreaAdmin })/#=Id#?countryId=@(Model.Id)&btnId=btnRefresh&formId=country-form', 800, 500, true); return false;\">#=Name#</a>",
+                        template: "<a class=\"k-link editstate\" href=\"@Url.Action("StateEditPopup", "Country", new { area = Constants.AreaAdmin })/#=Id#?countryId=@(Model.Id)&btnId=btnRefresh&formId=country-form\">#=Name#</a>",
                     }, {
                         field: "Abbreviation",
                         title: "@Loc["Admin.Configuration.Countries.States.Fields.Abbreviation"]",
diff --git a/src/Web/Grand.Web.Admin/Controllers/CountryController.cs b/src/Web/Grand.Web.Admin/Controllers/CountryController.cs
index 22f3fef6a..a2acc4d03 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CountryController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CountryController.cs
@@ -266,7 +266,7 @@ public async Task<IActionResult> StateCreatePopup(StateProvinceModel model)
             {
                 await _countryViewModelService.InsertStateProvinceModel(model);
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
 
             //If we got this far, something failed, redisplay form
@@ -317,7 +317,7 @@ public async Task<IActionResult> StateEditPopup(StateProvinceModel model)
             {
                 await _countryViewModelService.UpdateStateProvinceModel(sp, model);
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
 
             //If we got this far, something failed, redisplay form

From 292f02d18b1b9f6d5c5e8665e10792488c28c32c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 13:26:11 +0200
Subject: [PATCH 15/32] PaymentTransaction popup - magnific popup layout

---
 .../Views/PaymentTransaction/Edit.cshtml      | 72 +++++++++++++++----
 .../PartiallyPaidPopup.cshtml                 | 27 +++++--
 .../PartiallyRefundPopup.cshtml               | 28 ++++++--
 3 files changed, 105 insertions(+), 22 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Edit.cshtml
index cdcd8ede3..7b4c84584 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Edit.cshtml
@@ -31,11 +31,12 @@
                             }
                             @if (Model.CanPartiallyPaidOffline)
                             {
-                                <input type="submit" id="partiallypaidpaymenttransactionoffline" name="partiallypaidpaymenttransactionoffline"
-                                       value="@Loc["Admin.PaymentTransaction.Fields.PartialPaidOffline"]"
-                                       onclick="javascript:OpenWindow('@(Url.Action("PartiallyPaidPopup", "PaymentTransaction",
-                                       new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))', 500, 300, true); return false; "
-                                       class="k-button" />
+                                <a id="partiallypaidpaymenttransactionoffline" name="partiallypaidpaymenttransactionoffline"
+                                       href="@(Url.Action("PartiallyPaidPopup", "PaymentTransaction",
+                                       new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))"
+                                       class="k-button">
+                                    @Loc["Admin.PaymentTransaction.Fields.PartialPaidOffline"]
+                                </a>
                                 <text>&nbsp;</text>
                             }
                             @if (Model.CanRefund)
@@ -52,20 +53,23 @@
                             }
                             @if (Model.CanPartiallyRefund)
                             {
-                                <input type="submit" id="partiallyrefundpaymenttransaction" name="partiallyrefundpaymenttransaction"
+                                <a id="partiallyrefundpaymenttransaction" name="partiallyrefundpaymenttransaction"
                                        value="@Loc["Admin.PaymentTransaction.Fields.PartialRefund"]"
-                                       onclick="javascript:OpenWindow('@(Url.Action("PartiallyRefundPopup", "PaymentTransaction",
-                                       new { id = Model.Id, online = true, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))', 500, 300, true); return false; "
-                                       class="k-button" />
+                                       href="@(Url.Action("PartiallyRefundPopup", "PaymentTransaction",
+                                       new { id = Model.Id, online = true, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))"
+                                       class="k-button">
+                                    @Loc["Admin.PaymentTransaction.Fields.PartialRefund"]
+                                </a>
                                 <text>&nbsp;</text>
                             }
                             @if (Model.CanPartiallyRefundOffline)
                             {
-                                <input type="submit" id="partiallyrefundpaymenttransactionoffline" name="partiallyrefundpaymenttransactionoffline"
-                                       value="@Loc["Admin.PaymentTransaction.Fields.PartialRefundOffline"]"
-                                       onclick="javascript:OpenWindow('@(Url.Action("PartiallyRefundPopup", "PaymentTransaction",
-                                       new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))', 500, 300, true); return false; "
-                                       class="k-button" />
+                                <a id="partiallyrefundpaymenttransactionoffline" name="partiallyrefundpaymenttransactionoffline"
+                                       href="@(Url.Action("PartiallyRefundPopup", "PaymentTransaction",
+                                       new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))"
+                                       class="k-button">
+                                    @Loc["Admin.PaymentTransaction.Fields.PartialRefundOffline"]
+                                </a>
                                 <text>&nbsp;</text>
                             }
                             @if (Model.CanVoid)
@@ -93,5 +97,45 @@
             </div>
         </div>
     </div>
+    <script>
+        $(document).ready(function () {
+            $('#partiallypaidpaymenttransactionoffline').magnificPopup({
+                type: 'ajax',
+                settings: { cache: false, async: false },
+                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 },
+                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 },
+                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"/>
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
index 87a983ca0..effdde4f8 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml
@@ -1,10 +1,10 @@
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.PaymentTransaction.Fields.PartialPaid"];
 }
 @model PaymentTransactionModel
-<form asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyPaidPopup" method="post"
+<form id="PartiallyPaidPopup" asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyPaidPopup" method="post"
       asp-route-OrderId="@Context.Request.Query["Id"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-online="@Context.Request.Query["online"]"
@@ -50,10 +50,29 @@
     {
         <script>
             try {
-                window.opener.location.href = window.opener.location.href;
+                window.location.href = window.location.href;
             }
             catch (e) { }
-            window.close();
         </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
index 9543d83fc..7902a68b1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml
@@ -1,10 +1,10 @@
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.PaymentTransaction.Fields.PartialRefund"];
 }
 @model PaymentTransactionModel
-<form asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyRefundPopup" method="post"
+<form id="PartiallyRefundPopup" asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyRefundPopup" method="post"
       asp-route-OrderId="@Context.Request.Query["Id"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-online="@Context.Request.Query["online"]"
@@ -50,10 +50,30 @@
     {
         <script>
             try {
-                window.opener.location.href = window.opener.location.href;
+                window.location.href = window.location.href;
             }
             catch (e) { }
-            window.close();
         </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

From 85e5bce336c6adde2b6531c43e7635981a2ce452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 14:08:46 +0200
Subject: [PATCH 16/32] UploadLicenseFilePopup - magnific popup layout

---
 .../Views/Order/UploadLicenseFilePopup.cshtml | 28 ++++++++++++++++---
 .../Views/Order/_OrderDetails.Products.cshtml | 22 +++++++++++++--
 2 files changed, 44 insertions(+), 6 deletions(-)

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.cshtml
index 52cc4b355..bce51458b 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/UploadLicenseFilePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/UploadLicenseFilePopup.cshtml
@@ -1,10 +1,10 @@
 @model OrderModel.UploadLicenseModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Orders.Products.License.UploadFile"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="UploadLicenseFilePopup" method="post">
+<form id="UploadLicenseFilePopup" asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="UploadLicenseFilePopup" method="post">
     
     <div class="row">
         <div class="col-md-12">
@@ -31,14 +31,34 @@
     {
         <script>
             try {
-                window.opener.location.href = window.opener.location.href;
+                window.location.href = window.location.href;
             }
             catch (e){}
-            window.close();
         </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>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml
index b44b2eb16..89ae1f6af 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml
@@ -187,8 +187,27 @@
                                                             <a href="@Url.Action("DownloadFile", "Download", new { downloadGuid = item.LicenseDownloadGuid, area = Constants.AreaAdmin })" class="btn purple">@Loc["Admin.Orders.Products.License.DownloadLicense"]</a>
                                                         }
                                                         <br />
-                                                        <input type="submit" id="pvlicensefile" name="pvlicensefile" value="@Loc["Admin.Orders.Products.License.UploadFile"]" onclick="javascript:OpenWindow('@(Url.Action("UploadLicenseFilePopup", "Order", new { id = Model.Id, orderItemId = item.Id, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))', 550, 300, true); return false;" 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 = 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 },
+                                                                callbacks: {
+                                                                    parseAjax: function (mfpResponse) {
+                                                                        mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                                                    },
+                                                                    ajaxContentAdded: function () {
+                                                                        $('.mfp-wrap').removeAttr('tabindex');
+                                                                    }
+                                                                }
+                                                            });
+                                                        });
+                                                    </script>
+
                                                 }
                                             </p>
                                         }
@@ -330,4 +349,3 @@
     </div>
 }
 
-

From 6a52573a8da3af7e2b75654ea4c59d8bc03ba217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 14:49:46 +0200
Subject: [PATCH 17/32] Discount assigned popup - magnific popup layout

---
 .../Admin/Views/Discount/BrandAddPopup.cshtml | 37 +++++++++++---
 .../Views/Discount/CategoryAddPopup.cshtml    | 40 ++++++++++++---
 .../Views/Discount/CollectionAddPopup.cshtml  | 39 ++++++++++++---
 .../Views/Discount/ProductAddPopup.cshtml     | 50 ++++++++++++-------
 .../Views/Discount/VendorAddPopup.cshtml      | 40 +++++++++++----
 .../_CreateOrUpdate.TabAppliedToBrands.cshtml | 14 +++++-
 ...eateOrUpdate.TabAppliedToCategories.cshtml | 14 +++++-
 ...ateOrUpdate.TabAppliedToCollections.cshtml | 14 +++++-
 ...CreateOrUpdate.TabAppliedToProducts.cshtml | 14 +++++-
 ..._CreateOrUpdate.TabAppliedToVendors.cshtml | 16 +++++-
 .../Controllers/DiscountController.cs         | 10 ++--
 11 files changed, 228 insertions(+), 60 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml
index 4ebb00eb4..9e36af7b2 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml
@@ -6,7 +6,7 @@
     ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToBrands.AddNew"];
 }
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="BrandAddPopup" method="post"
+<form id="BrandAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="BrandAddPopup" method="post"
       asp-route-DiscountId="@Context.Request.Query["DiscountId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -58,7 +58,35 @@
         </script>
     }
     <script>
-        $(document).ready(function () {
+            var mfp = $.magnificPopup.instance;
+            $("#BrandAddPopup").submit(function (e) {
+                e.preventDefault();
+                var form = $(this);
+                var url = form.attr('action');
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: form.serialize(),
+                    success: function (data) {
+                        if (data == "") {
+                            mfp.close();
+                            $('#btnRefreshBrands').click();
+                        } else {
+                            $.magnificPopup.open({
+                                items: {
+                                    src: data,
+                                    type: 'inline'
+                                },
+                                callbacks: {
+                                    open: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+            });
             $("#brands-grid").kendoGrid({
                 dataSource: {
                     transport: {
@@ -106,11 +134,7 @@
                 }
                 ]
             });
-        });
-    </script>
 
-    <script>
-        $(document).ready(function() {
             $('#search-brands').click(function() {
                 var grid = $('#brands-grid').data('kendoGrid');
                 grid.dataSource.page(1); //new search. Set page size to 1
@@ -135,7 +159,6 @@
             $('#brands-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml
index 495e903b8..1243816b0 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml
@@ -1,12 +1,12 @@
 @model DiscountModel.AddCategoryToDiscountModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"];
 }
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CategoryAddPopup" method="post"
+<form id="CategoryAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CategoryAddPopup" method="post"
       asp-route-DiscountId="@Context.Request.Query["DiscountId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -64,7 +64,35 @@
 
 
     <script>
-    $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#CategoryAddPopup").submit(function (e) {
+                e.preventDefault();
+                var form = $(this);
+                var url = form.attr('action');
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: form.serialize(),
+                    success: function (data) {
+                        if (data == "") {
+                            mfp.close();
+                            $('#btnRefreshCategories').click();
+                        } else {
+                            $.magnificPopup.open({
+                                items: {
+                                    src: data,
+                                    type: 'inline'
+                                },
+                                callbacks: {
+                                    open: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+        });
         $("#categories-grid").kendoGrid({
             dataSource: {
                 transport: {
@@ -118,10 +146,7 @@
                 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>
-    <script>
-                    $(document).ready(function() {
+
                         $('#search-categories').click(function() {
                             var grid = $('#categories-grid').data('kendoGrid');
                             grid.dataSource.page(1); //new search. Set page size to 1
@@ -146,7 +171,6 @@
                         $('#categories-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                             updateMasterCheckbox();
                         });
-                    });
 
                     function additionalData() {
                         var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml
index 35986639c..0f97a7a8b 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml
@@ -2,13 +2,13 @@
 @inject AdminAreaSettings adminAreaSettings
 
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
 
     //page title
     ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"];
 }
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CollectionAddPopup" method="post"
+<form id="CollectionAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CollectionAddPopup" method="post"
       asp-route-DiscountId="@Context.Request.Query["DiscountId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -63,7 +63,35 @@
         </script>
     }
     <script>
-    $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#CollectionAddPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefreshCollections').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
         $("#collections-grid").kendoGrid({
             dataSource: {
                 transport: {
@@ -117,10 +145,6 @@
                 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>
-    <script>
-        $(document).ready(function() {
             $('#search-collections').click(function() {
                 var grid = $('#collections-grid').data('kendoGrid');
                 grid.dataSource.page(1); //new search. Set page size to 1
@@ -143,7 +167,6 @@
             $('#collections-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtml
index e0e1100ca..4a2f6635c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtml
@@ -1,26 +1,17 @@
 @model DiscountModel.AddProductToDiscountModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"];
 }
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="ProductAddPopup" method="post"
+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="ProductAddPopup" method="post"
       asp-route-DiscountId="@Context.Request.Query["DiscountId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
 
     
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit popup-window">
@@ -106,7 +97,35 @@
 
     <div id="products-grid"></div>
     <script>
-        $(document).ready(function () {
+            var mfp = $.magnificPopup.instance;
+            $("#ProductAddPopup").submit(function (e) {
+                e.preventDefault();
+                var form = $(this);
+                var url = form.attr('action');
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: form.serialize(),
+                    success: function (data) {
+                        if (data == "") {
+                            mfp.close();
+                            $('#btnRefreshProducts').click();
+                        } else {
+                            $.magnificPopup.open({
+                                items: {
+                                    src: data,
+                                    type: 'inline'
+                                },
+                                callbacks: {
+                                    open: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+            });
 
             $('.extend-collapse').hide();
             $('.filter-extend-button').click(function () {
@@ -167,10 +186,7 @@
                     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>
-    <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
@@ -195,7 +211,7 @@
             $('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
+     
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml
index 2d5e2d2a1..909148414 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml
@@ -1,12 +1,12 @@
 @model DiscountModel.AddVendorToDiscountModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToVendors.AddNew"];
 }
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="VendorAddPopup" method="post"
+<form id="VendorAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="VendorAddPopup" method="post"
       asp-route-DiscountId="@Context.Request.Query["DiscountId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -64,7 +64,35 @@
         </script>
     }
     <script>
-        $(document).ready(function () {
+            var mfp = $.magnificPopup.instance;
+            $("#VendorAddPopup").submit(function (e) {
+                e.preventDefault();
+                var form = $(this);
+                var url = form.attr('action');
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: form.serialize(),
+                    success: function (data) {
+                        if (data == "") {
+                            mfp.close();
+                            $('#btnRefreshVendors').click();
+                        } else {
+                            $.magnificPopup.open({
+                                items: {
+                                    src: data,
+                                    type: 'inline'
+                                },
+                                callbacks: {
+                                    open: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+            });
             $("#vendors-grid").kendoGrid({
                 dataSource: {
                     transport: {
@@ -116,11 +144,6 @@
                 }
                 ]
             });
-        });
-    </script>
-
-    <script>
-        $(document).ready(function() {
             $('#search-vendors').click(function() {
                 var grid = $('#vendors-grid').data('kendoGrid');
                 grid.dataSource.page(1); //new search. Set page size to 1
@@ -152,7 +175,6 @@
             $('#vendors-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToBrands.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToBrands.cshtml
index 63940abb6..1aaaa9ee8 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToBrands.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToBrands.cshtml
@@ -8,7 +8,7 @@
                 <div id="brands-grid"></div>
             </div>
             <div class="panel-footer">
-                <button type="submit" id="btnAddNewBrand" onclick="javascript:OpenWindow('@(Url.Action("BrandAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshBrands", formId = "discount-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Marketing.Discounts.AppliedToBrands.AddNew"]</button>
+                <a id="btnAddNewBrand" href="@(Url.Action("BrandAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshBrands", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Marketing.Discounts.AppliedToBrands.AddNew"]</a>
                 <input type="button" id="btnRefreshBrands" style="display: none" />
             </div>
             <vc:admin-widget widget-zone="discount_details_applied_to_brands_bottom" additional-data="Model" />
@@ -16,6 +16,18 @@
 
         <script>
             $(document).ready(function () {
+                $('#btnAddNewBrand').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#brands-grid").kendoGrid({
                     dataSource: {
                         transport: {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCategories.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCategories.cshtml
index 363f19980..3d13947f0 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCategories.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCategories.cshtml
@@ -9,13 +9,25 @@
         <div id="categories-grid"></div>
     </div>
     <div class="panel-footer">
-        <button type="submit" id="btnAddNewCategory" onclick="javascript:OpenWindow('@(Url.Action("CategoryAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCategories", formId = "discount-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"]</button>
+        <a id="btnAddNewCategory" href="@(Url.Action("CategoryAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCategories", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"]</a>
         <input type="submit" id="btnRefreshCategories" style="display: none" />
     </div>
     <vc:admin-widget widget-zone="discount_details_applied_to_categories_bottom" additional-data="Model" />
 </div>
         <script>
             $(document).ready(function () {
+                $('#btnAddNewCategory').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#categories-grid").kendoGrid({
                     dataSource: {
                         transport: {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCollections.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCollections.cshtml
index 51db10fdf..511df4956 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCollections.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCollections.cshtml
@@ -9,13 +9,25 @@
         <div id="collections-grid"></div>
     </div>
     <div class="panel-footer">
-        <button type="submit" id="btnAddNewCollection" onclick="javascript:OpenWindow('@(Url.Action("CollectionAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCollections", formId = "discount-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"]</button>
+        <a id="btnAddNewCollection" href="@(Url.Action("CollectionAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCollections", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"]</a>
         <input type="submit" id="btnRefreshCollections" style="display: none" />
     </div>
     <vc:admin-widget widget-zone="discount_details_applied_to_collections_bottom" additional-data="Model" />
 </div>
         <script>
             $(document).ready(function () {
+                $('#btnAddNewCollection').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#collections-grid").kendoGrid({
                     dataSource: {
                         transport: {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToProducts.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToProducts.cshtml
index 309f8ea48..02d1d7bb5 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToProducts.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToProducts.cshtml
@@ -11,7 +11,7 @@
         <div id="products-grid"></div>
     </div>
     <div class="panel-footer">
-        <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshProducts", formId = "discount-form", area = Constants.AreaAdmin }))', 1000, 1000, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"]</button>
+        <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshProducts", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"]</a>
         <input type="submit" id="btnRefreshProducts" style="display: none" />
     </div>
     <vc:admin-widget widget-zone="discount_details_applied_to_products_bottom" additional-data="Model" />
@@ -19,6 +19,18 @@
 
         <script>
             $(document).ready(function () {
+                $('#btnAddNewProduct').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#products-grid").kendoGrid({
                     dataSource: {
                         transport: {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToVendors.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToVendors.cshtml
index 109c7ecfa..bb8923d0c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToVendors.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToVendors.cshtml
@@ -8,14 +8,26 @@
         <div id="vendors-grid"></div>
     </div>
     <div class="panel-footer">
-        <button type="submit" id="btnAddNewVendor" onclick="javascript:OpenWindow('@(Url.Action("VendorAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshVendors", formId = "discount-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.Discounts.AppliedToVendors.AddNew"]</button>
+        <a id="btnAddNewVendor" href="@(Url.Action("VendorAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshVendors", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["admin.marketing.Discounts.AppliedToVendors.AddNew"]</a>
         <input type="button" id="btnRefreshVendors" style="display: none" />
     </div>
     <vc:admin-widget widget-zone="discount_details_applied_to_vendors_bottom" additional-data="Model" />
 </div>
 
 <script>
-            $(document).ready(function () {
+    $(document).ready(function () {
+                $('#btnAddNewVendor').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#vendors-grid").kendoGrid({
                     dataSource: {
                         transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
index 8196d3ee7..cfe7357d6 100644
--- a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
@@ -430,7 +430,7 @@ public async Task<IActionResult> ProductAddPopup(DiscountModel.AddProductToDisco
             }
 
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         #endregion
@@ -525,7 +525,7 @@ public async Task<IActionResult> CategoryAddPopup(DiscountModel.AddCategoryToDis
                 await _discountViewModelService.InsertCategoryToDiscountModel(model);
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         #endregion
@@ -607,7 +607,7 @@ public async Task<IActionResult> BrandAddPopup(DiscountModel.AddBrandToDiscountM
                 await _discountViewModelService.InsertBrandToDiscountModel(model);
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         #endregion
@@ -690,7 +690,7 @@ public async Task<IActionResult> CollectionAddPopup(DiscountModel.AddCollectionT
                 await _discountViewModelService.InsertCollectionToDiscountModel(model);
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         #endregion
@@ -779,7 +779,7 @@ public async Task<IActionResult> VendorAddPopup(DiscountModel.AddVendorToDiscoun
                 await _discountViewModelService.InsertVendorToDiscountModel(model);
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         #endregion

From 1c07621852699d72a001f846a5b5763246dd8bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 14:56:02 +0200
Subject: [PATCH 18/32] CustomerTag popup - magnific popup layout

---
 .../Views/CustomerTag/ProductAddPopup.cshtml  | 51 +++++++++++--------
 .../_CreateOrUpdate.TabProducts.cshtml        | 14 ++++-
 .../Controllers/CustomerTagController.cs      |  2 +-
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtml
index 824474999..0fa20103a 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtml
@@ -1,12 +1,12 @@
 @model CustomerTagProductModel.AddProductModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Customers.CustomerTags.Products.AddNew"];
 }
 @inject AdminAreaSettings adminAreaSettings
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerTag" asp-action="ProductAddPopup" method="post"
+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerTag" asp-action="ProductAddPopup" method="post"
       asp-route-CustomerTagId="@Context.Request.Query["CustomerTagId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -94,19 +94,36 @@
             </div>
         </div>
     </div>
-
-
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
     <script>
-        $(document).ready(function () {
+            var mfp = $.magnificPopup.instance;
+            $("#ProductAddPopup").submit(function (e) {
+                e.preventDefault();
+                var form = $(this);
+                var url = form.attr('action');
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: form.serialize(),
+                    success: function (data) {
+                        if (data == "") {
+                            mfp.close();
+                            $('#btnRefreshProducts').click();
+                        } else {
+                            $.magnificPopup.open({
+                                items: {
+                                    src: data,
+                                    type: 'inline'
+                                },
+                                callbacks: {
+                                    open: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+            });
 
             $('.extend-collapse').hide();
             $('.filter-extend-button').click(function () {
@@ -168,12 +185,7 @@
                     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>
 
-
-    <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
@@ -198,7 +210,6 @@
             $('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/_CreateOrUpdate.TabProducts.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/_CreateOrUpdate.TabProducts.cshtml
index b9dd31802..0a7ec6c38 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/_CreateOrUpdate.TabProducts.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/_CreateOrUpdate.TabProducts.cshtml
@@ -17,12 +17,24 @@
                 <div id="products-grid"></div>
             </div>
             <div class="panel-footer">
-                <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "CustomerTag", new { customerTagId = Model.Id, btnId = "btnRefreshProducts", formId = "customertag-form", area = Constants.AreaAdmin }))    ', 1000, 1000, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.CustomerTags.Products.Fields.AddNew"]</button>
+                <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "CustomerTag", new { customerTagId = Model.Id, btnId = "btnRefreshProducts", formId = "customertag-form", area = Constants.AreaAdmin }))    " class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.CustomerTags.Products.Fields.AddNew"]</a>
                 <input type="submit" id="btnRefreshProducts" style="display: none" />
             </div>
         </div>
         <script>
                 $(document).ready(function () {
+                    $('#btnAddNewProduct').magnificPopup({
+                        type: 'ajax',
+                        settings: { cache: false, async: false },
+                        callbacks: {
+                            parseAjax: function (mfpResponse) {
+                                mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                            },
+                            ajaxContentAdded: function () {
+                                $('.mfp-wrap').removeAttr('tabindex');
+                            }
+                        }
+                    });
                     $("#products-grid").kendoGrid({
                         dataSource: {
                             transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs
index 35f3dd4c5..4b41a8f96 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs
@@ -275,7 +275,7 @@ public async Task<IActionResult> ProductAddPopup(CustomerTagProductModel.AddProd
 
             //a vendor should have access only to his products
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
         #endregion
     }

From 5513b1dc74be0b8d8442145a4f175e55c6187907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 15:03:26 +0200
Subject: [PATCH 19/32] CustomerGroup RecommendedProducts popup - magnific
 popup layout

---
 .../CustomerGroup/ProductAddPopup.cshtml      | 46 ++++++++++++-------
 .../_CreateOrUpdate.TabProducts.cshtml        | 14 +++++-
 .../Controllers/CustomerGroupController.cs    |  2 +-
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml
index cdb3d4678..1003d62f3 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml
@@ -5,7 +5,7 @@
     //page title
     ViewBag.Title = Loc["Admin.Customers.CustomerGroups.Products.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerGroup" asp-action="ProductAddPopup" method="post"
+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerGroup" asp-action="ProductAddPopup" method="post"
       asp-route-CustomerGroupId="@Context.Request.Query["CustomerGroupId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -92,16 +92,36 @@
             </div>
         </div>
     </div>
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
     <script>
-        $(document).ready(function () {
+            var mfp = $.magnificPopup.instance;
+            $("#ProductAddPopup").submit(function (e) {
+                e.preventDefault();
+                var form = $(this);
+                var url = form.attr('action');
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: form.serialize(),
+                    success: function (data) {
+                        if (data == "") {
+                            mfp.close();
+                            $('#btnRefreshProducts').click();
+                        } else {
+                            $.magnificPopup.open({
+                                items: {
+                                    src: data,
+                                    type: 'inline'
+                                },
+                                callbacks: {
+                                    open: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+            });
 
             $('.extend-collapse').hide();
             $('.filter-extend-button').click(function () {
@@ -163,12 +183,7 @@
                     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>
 
-
-    <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
@@ -193,7 +208,6 @@
             $('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabProducts.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabProducts.cshtml
index 9d55d169f..a6fc31506 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabProducts.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabProducts.cshtml
@@ -17,13 +17,25 @@
             <div id="products-grid"></div>
         </div>
         <div class="panel-footer">
-            <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "CustomerGroup", new { customerGroupId = Model.Id, btnId = "btnRefreshProducts", formId = "customergroup-form", area = Constants.AreaAdmin  }))    ', 1000, 1000, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.CustomerGroups.Products.Fields.AddNew"]</button>
+            <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "CustomerGroup", new { customerGroupId = Model.Id, btnId = "btnRefreshProducts", formId = "customergroup-form", area = Constants.AreaAdmin  }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.CustomerGroups.Products.Fields.AddNew"]</a>
             <input type="submit" id="btnRefreshProducts" style="display: none" />
         </div>
     </div>
 
         <script>
                 $(document).ready(function () {
+                    $('#btnAddNewProduct').magnificPopup({
+                        type: 'ajax',
+                        settings: { cache: false, async: false },
+                        callbacks: {
+                            parseAjax: function (mfpResponse) {
+                                mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                            },
+                            ajaxContentAdded: function () {
+                                $('.mfp-wrap').removeAttr('tabindex');
+                            }
+                        }
+                    });
                     $("#products-grid").kendoGrid({
                         dataSource: {
                             transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs
index 952c95bd8..600a5c013 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs
@@ -249,7 +249,7 @@ public async Task<IActionResult> ProductAddPopup(CustomerGroupProductModel.AddPr
 
             //a vendor should have access only to his products
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
         #endregion
 

From c0ddc59ebc191f2c44a1291a9b83308ca046c11e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 15:13:44 +0200
Subject: [PATCH 20/32] CustomerAction product popup - magnific popup layout

---
 .../CustomerAction/ProductAddPopup.cshtml     | 39 +++++++++++++++----
 .../CustomerAction/_ConditionProduct.cshtml   | 14 ++++++-
 .../Controllers/CustomerActionController.cs   |  2 +-
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtml
index 4944328ca..f383e1324 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtml
@@ -1,12 +1,12 @@
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Customers.CustomerActionCondition.Products.AddNew"];
 }
 @model CustomerActionConditionModel.AddProductToConditionModel
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="ProductAddPopup" method="post" 
+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="ProductAddPopup" method="post" 
       asp-route-CustomerActionId="@Context.Request.Query["CustomerActionId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -107,7 +107,35 @@
         </script>
     }
     <script>
-        $(document).ready(function () {
+            var mfp = $.magnificPopup.instance;
+            $("#ProductAddPopup").submit(function (e) {
+                e.preventDefault();
+                var form = $(this);
+                var url = form.attr('action');
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: form.serialize(),
+                    success: function (data) {
+                        if (data == "") {
+                            mfp.close();
+                            $('#btnRefreshProducts').click();
+                        } else {
+                            $.magnificPopup.open({
+                                items: {
+                                    src: data,
+                                    type: 'inline'
+                                },
+                                callbacks: {
+                                    open: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+            });
 
             $('.extend-collapse').hide();
             $('.filter-text-open').hide();
@@ -170,11 +198,7 @@
                     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>
 
-    <script>
-        $(document).ready(function() {
             $('#search-products').click(function() {
                 var grid = $('#products-grid').data('kendoGrid');
                 grid.dataSource.page(1);
@@ -197,7 +221,6 @@
             $('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionProduct.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionProduct.cshtml
index afc3e25eb..79e3ef652 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionProduct.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionProduct.cshtml
@@ -15,12 +15,24 @@
             <div id="products-grid"></div>
         </div>
         <div class="panel-footer">
-            <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshProducts",  formId = "customer-action-condition-form", area = Constants.AreaAdmin }))    ', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.CustomerActionCondition.Products.AddNew"]</button>
+            <a type="submit" id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshProducts",  formId = "customer-action-condition-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.CustomerActionCondition.Products.AddNew"]</a>
             <input type="submit" id="btnRefreshProducts" style="display: none" />
         </div>
     </div>
     <script>
         $(document).ready(function () {
+            $('#btnAddNewProduct').magnificPopup({
+                type: 'ajax',
+                settings: { cache: false, async: false },
+                callbacks: {
+                    parseAjax: function (mfpResponse) {
+                        mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                    },
+                    ajaxContentAdded: function () {
+                        $('.mfp-wrap').removeAttr('tabindex');
+                    }
+                }
+            });
             $("#products-grid").kendoGrid({
                 dataSource: {
                     transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
index 8b8a8c68f..cf68bf578 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
@@ -373,7 +373,7 @@ public async Task<IActionResult> ProductAddPopup(CustomerActionConditionModel.Ad
                 await _customerActionViewModelService.InsertProductToConditionModel(model);
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
         #endregion
 

From 38431239839de4d4752203c015b8f65d94f47d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 15:25:13 +0200
Subject: [PATCH 21/32] CustomerAction collection popup - magnific popup layout

---
 .../CustomerAction/CollectionAddPopup.cshtml  | 42 +++++++++++++++----
 .../_ConditionCollection.cshtml               | 16 ++++++-
 .../Controllers/CustomerActionController.cs   |  2 +-
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtml
index 8d0c81581..a4455f2f4 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtml
@@ -1,11 +1,11 @@
 @model CustomerActionConditionModel.AddCollectionConditionModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Customers.CustomerActionCondition.Collections.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="CollectionAddPopup" method="post"
+<form id="CollectionAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="CollectionAddPopup" method="post"
       asp-route-CustomerActionId="@Context.Request.Query["CustomerActionId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -47,12 +47,12 @@
                             </div>
                             <div id="collections-grid"></div>
                         </div>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
 
-
     @if (ViewBag.RefreshPage == true)
     {
     <script>
@@ -62,7 +62,36 @@
     </script>
     }
     <script>
-    $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#CollectionAddPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefreshCollections').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+
         $("#collections-grid").kendoGrid({
             dataSource: {
                 transport: {
@@ -116,11 +145,7 @@
                 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>
 
-    <script>
-        $(document).ready(function() {
             $('#search-collections').click(function() {
                 var grid = $('#collections-grid').data('kendoGrid');
                 grid.dataSource.page(1); //new search. Set page size to 1
@@ -145,7 +170,6 @@
             $('#collections-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCollection.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCollection.cshtml
index fda1bbd76..27cc6f699 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCollection.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCollection.cshtml
@@ -13,12 +13,24 @@
                 <div id="collections-grid"></div>
             </div>
             <div class="panel-footer">
-                <input type="submit" id="btnAddNewCollection" value="@Loc["Admin.Customers.CustomerActionCondition.Collections.AddNew"]" onclick="javascript:OpenWindow('@(Url.Action("CollectionAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshCollections", formId = "customer-action-condition-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="btn default" />
+                <a id="btnAddNewCollection" href="@(Url.Action("CollectionAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshCollections", formId = "customer-action-condition-form", area = Constants.AreaAdmin }))" class="btn default">@Loc["Admin.Customers.CustomerActionCondition.Collections.AddNew"]</a>
                 <input type="submit" id="btnRefreshCollections" style="display: none" />
             </div>
         </div>
     <script>
-            $(document).ready(function () {
+        $(document).ready(function () {
+                $('#btnAddNewCollection').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#collections-grid").kendoGrid({
                     dataSource: {
                         transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
index cf68bf578..63e911fb6 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
@@ -495,7 +495,7 @@ public async Task<IActionResult> CollectionAddPopup(CustomerActionConditionModel
                 await _customerActionViewModelService.InsertCollectionConditionModel(model);
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         #endregion

From bc1753e4535efaf202316a52174f7c41257ced0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 15:32:11 +0200
Subject: [PATCH 22/32] CustomerAction category popup - magnific popup layout

---
 .../CustomerAction/CategoryAddPopup.cshtml    | 52 ++++++++++++-------
 .../CustomerAction/_ConditionCategory.cshtml  | 16 +++++-
 .../Controllers/CustomerActionController.cs   |  2 +-
 3 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CategoryAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CategoryAddPopup.cshtml
index 215641af2..8ca4f32cf 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CategoryAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CategoryAddPopup.cshtml
@@ -1,11 +1,11 @@
 @model CustomerActionConditionModel.AddCategoryConditionModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Customers.CustomerActionCondition.Category.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="CategoryAddPopup" method="post"
+<form id="CategoryAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="CategoryAddPopup" method="post"
       asp-route-CustomerActionId="@Context.Request.Query["CustomerActionId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -52,19 +52,36 @@
             </div>
         </div>
     </div>
-
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-             catch (e){}
-            window.close();
-        </script>
-    }
-
     <script>
-    $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#CategoryAddPopup").submit(function (e) {
+                e.preventDefault();
+                var form = $(this);
+                var url = form.attr('action');
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: form.serialize(),
+                    success: function (data) {
+                        if (data == "") {
+                            mfp.close();
+                            $('#btnRefreshCategories').click();
+                        } else {
+                            $.magnificPopup.open({
+                                items: {
+                                    src: data,
+                                    type: 'inline'
+                                },
+                                callbacks: {
+                                    open: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+        });
         $("#categories-grid").kendoGrid({
             dataSource: {
                 transport: {
@@ -118,11 +135,6 @@
                 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>
-
-    <script>
-        $(document).ready(function() {
             $('#search-categories').click(function() {
                 var grid = $('#categories-grid').data('kendoGrid');
                 grid.dataSource.page(1); //new search. Set page size to 1
@@ -147,7 +159,7 @@
             $('#categories-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
+  
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCategory.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCategory.cshtml
index d0a9f10a7..8256c771e 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCategory.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCategory.cshtml
@@ -12,13 +12,25 @@
                 <div id="categories-grid"></div>
             </div>
             <div class="panel-footer">
-                <input type="submit" id="btnAddNewCategory" value="@Loc["Admin.Customers.CustomerActionCondition.Category.AddNew"]" onclick="javascript:OpenWindow('@(Url.Action("CategoryAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshCategories", formId = "customer-action-condition-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="btn default" />
+                <a id="btnAddNewCategory" href="@(Url.Action("CategoryAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshCategories", formId = "customer-action-condition-form", area = Constants.AreaAdmin }))" class="btn default">@Loc["Admin.Customers.CustomerActionCondition.Category.AddNew"]</a>
                 <input type="submit" id="btnRefreshCategories" style="display: none" />
             </div>
         </div>
 
     <script>
-            $(document).ready(function () {
+        $(document).ready(function () {
+                 $('#btnAddNewCategory').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#categories-grid").kendoGrid({
                     dataSource: {
                         transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
index 63e911fb6..5dffbf522 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
@@ -437,7 +437,7 @@ public async Task<IActionResult> CategoryAddPopup(CustomerActionConditionModel.A
                 await _customerActionViewModelService.InsertCategoryConditionModel(model);
             }
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         #endregion

From 3d906cdf06ce94289aef6482f5a24bf60ce029c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 15:42:10 +0200
Subject: [PATCH 23/32] Customer product and price popup - magnific popup
 layout

---
 .../Views/Customer/ProductAddPopup.cshtml     | 43 +++++++++++++++----
 .../_CreateOrUpdate.TabProduct.cshtml         | 16 ++++++-
 .../_CreateOrUpdate.TabProductPrice.cshtml    | 14 +++++-
 .../Controllers/CustomerController.cs         |  2 +-
 4 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml
index 04628f7c3..397ac7d1f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml
@@ -1,12 +1,12 @@
 @model CustomerModel.AddProductModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Customers.Products.AddNew"];
 }
 
-<form asp-area="@Constants.AreaAdmin" asp-controller="Customer" asp-action="ProductAddPopup" method="post"
+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Customer" asp-action="ProductAddPopup" method="post"
       asp-route-CustomerId="@Context.Request.Query["CustomerId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]"
@@ -107,7 +107,36 @@
 
 
     <script>
-    $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#ProductAddPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefreshPersonalizedProducts').click();
+                        $('#btnRefreshProducts').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
 
         $('.extend-collapse').hide();
         $('.filter-extend-button').click(function () {
@@ -168,11 +197,7 @@
                 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>
-
-    <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
@@ -197,7 +222,7 @@
             $('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
                 updateMasterCheckbox();
             });
-        });
+
 
         function additionalData() {
             var data = {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProduct.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProduct.cshtml
index dad5e725c..6a52eccae 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProduct.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProduct.cshtml
@@ -8,13 +8,25 @@
         <div id="personalizedproduct-grid"></div>
     </div>
     <div class="panel-footer">
-        <button type="submit" id="btnAddNewPersonalizedProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "Customer", new { customerId = Model.Id, btnId = "btnRefreshPersonalizedProducts", formId = "customer-form", personalized = "true", area = Constants.AreaAdmin }))', 1000, 1000, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.Customers.PersonalizedProduct.AddNew"]</button>
+        <a id="btnAddNewPersonalizedProduct" href="@(Url.Action("ProductAddPopup", "Customer", new { customerId = Model.Id, btnId = "btnRefreshPersonalizedProducts", formId = "customer-form", personalized = "true", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.Customers.PersonalizedProduct.AddNew"]</a>
         <input type="submit" id="btnRefreshPersonalizedProducts" style="display: none" />
     </div>
     <vc:admin-widget widget-zone="customer_details_product_bottom" additional-data="Model" />
 </div>
 <script>
-        $(document).ready(function () {
+    $(document).ready(function () {
+             $('#btnAddNewPersonalizedProduct').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+             });
             $("#personalizedproduct-grid").kendoGrid({
                 dataSource: {
                     transport: {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProductPrice.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProductPrice.cshtml
index 984104c13..19805096c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProductPrice.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProductPrice.cshtml
@@ -8,7 +8,7 @@
             <div id="productprice-grid"></div>
         </div>
         <div class="panel-footer">
-            <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "Customer", new { customerId = Model.Id, btnId = "btnRefreshProducts", formId = "customer-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.Customers.ProductPrice.AddNew"]</button>
+            <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "Customer", new { customerId = Model.Id, btnId = "btnRefreshProducts", formId = "customer-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Customers.Customers.ProductPrice.AddNew"]</a>
             <input type="submit" id="btnRefreshProducts" style="display: none" />
         </div>
         <vc:admin-widget widget-zone="customer_details_product_price_bottom" additional-data="Model" />
@@ -19,6 +19,18 @@
 
     <script>
         $(document).ready(function () {
+            $('#btnAddNewProduct').magnificPopup({
+                type: 'ajax',
+                settings: { cache: false, async: false },
+                callbacks: {
+                    parseAjax: function (mfpResponse) {
+                        mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                    },
+                    ajaxContentAdded: function () {
+                        $('.mfp-wrap').removeAttr('tabindex');
+                    }
+                }
+            });
             $("#productprice-grid").kendoGrid({
                 dataSource: {
                     transport: {
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
index 9a7e119e7..3d9e11db6 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
@@ -989,7 +989,7 @@ public async Task<IActionResult> ProductAddPopup(string customerId, bool persona
             }
 
             ViewBag.RefreshPage = true;
-            return View(model);
+            return Content("");
         }
 
         [PermissionAuthorizeAction(PermissionActionName.Edit)]

From 9f010d03adcf6eca9b22d31e0034431b622ed7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 27 Sep 2021 15:52:02 +0200
Subject: [PATCH 24/32] CheckoutAttributes popup - magnific popup layout

---
 .../CheckoutAttribute/ValueCreatePopup.cshtml | 35 ++++++++++++++++-
 .../CheckoutAttribute/ValueEditPopup.cshtml   | 39 +++++++++++++++++--
 .../_CreateOrUpdate.TabValues.cshtml          | 30 +++++++++++++-
 .../CheckoutAttributeController.cs            |  4 +-
 4 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml
index 77322dbc5..bd55fba6e 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml
@@ -1,5 +1,5 @@
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
 }
 
 @model CheckoutAttributeValueModel
@@ -8,7 +8,7 @@
     //page title
     ViewBag.Title = Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueCreatePopup"
+<form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueCreatePopup"
       asp-route-checkoutAttributeId="@Context.Request.Query["checkoutAttributeId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
@@ -32,4 +32,35 @@
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+            $("#ValueCreatePopup").submit(function (e) {
+                e.preventDefault();
+                var form = $(this);
+                var url = form.attr('action');
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: form.serialize(),
+                    success: function (data) {
+                        if (data == "") {
+                            mfp.close();
+                            $('#btnRefresh').click();
+                        } else {
+                            $.magnificPopup.open({
+                                items: {
+                                    src: data,
+                                    type: 'inline'
+                                },
+                                callbacks: {
+                                    open: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+            });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml
index a8d0bbf25..708bdcfd1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml
@@ -1,14 +1,14 @@
 @model CheckoutAttributeValueModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Orders.CheckoutAttributes.Values.EditValueDetails"];
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueEditPopup"
+<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueEditPopup"
       asp-route-checkoutAttributeId="@Context.Request.Query["checkoutAttributeId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -23,9 +23,40 @@
                     </div>
                 </div>
                 <div class="x_content form">
-                   <partial name="_CreateOrUpdateValue" model="Model" />
+                    <partial name="_CreateOrUpdateValue" model="Model" />
                 </div>
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+            $("#ValueEditPopup").submit(function (e) {
+                e.preventDefault();
+                var form = $(this);
+                var url = form.attr('action');
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: form.serialize(),
+                    success: function (data) {
+                        if (data == "") {
+                            mfp.close();
+                            $('#btnRefresh').click();
+                        } else {
+                            $.magnificPopup.open({
+                                items: {
+                                    src: data,
+                                    type: 'inline'
+                                },
+                                callbacks: {
+                                    open: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+            });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdate.TabValues.cshtml
index 4dc583e7a..fce8c9fb4 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdate.TabValues.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdate.TabValues.cshtml
@@ -9,14 +9,40 @@
                 <div id="checkoutattributevalues-grid"></div>
             </div>
             <div class="panel-footer">
-                <button type="submit" id="btnAddNewValue" onclick="javascript:OpenWindow('@(Url.Action("ValueCreatePopup", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, btnId = "btnRefresh", formId = "checkoutattribute-form", area = Constants.AreaAdmin }))', 800, 350, true); return false;" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"]</button>
+                <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, btnId = "btnRefresh", formId = "checkoutattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"]</a>
                 <input type="submit" id="btnRefresh" style="display: none" />
             </div>
         </div>
 
         <script>
             $(document).ready(function () {
+                $('#btnAddNewValue').magnificPopup({
+                    type: 'ajax',
+                    settings: { cache: false, async: false },
+                    callbacks: {
+                        parseAjax: function (mfpResponse) {
+                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                        },
+                        ajaxContentAdded: function () {
+                            $('.mfp-wrap').removeAttr('tabindex');
+                        }
+                    }
+                });
                 $("#checkoutattributevalues-grid").kendoGrid({
+                    dataBound: function () {
+                        $('.editvalue').magnificPopup({
+                            type: 'ajax',
+                            settings: { cache: false, async: false },
+                            callbacks: {
+                                parseAjax: function (mfpResponse) {
+                                    mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                },
+                                ajaxContentAdded: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    },
                     dataSource: {
                         transport: {
                             read: {
@@ -63,7 +89,7 @@
                     columns: [{
                         field: "Name",
                         title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.Name"]",
-                        template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("ValueEditPopup", "CheckoutAttribute", new { area = Constants.AreaAdmin })/#=Id#?checkoutAttributeId=@Model.Id&btnId=btnRefresh&formId=checkoutattribute-form', 800, 350, true); return false;\">#=kendo.htmlEncode(Name)#</a>"
+                        template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "CheckoutAttribute", new { area = Constants.AreaAdmin })/#=Id#?checkoutAttributeId=@Model.Id&btnId=btnRefresh&formId=checkoutattribute-form\">#=kendo.htmlEncode(Name)#</a>"
                     }, {
                         field: "PriceAdjustment",
                         title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.PriceAdjustment"]",
diff --git a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
index 2b5ac187b..a6c469f44 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
@@ -235,7 +235,7 @@ public async Task<IActionResult> ValueCreatePopup(CheckoutAttributeValueModel mo
             {
                 var cav = await _checkoutAttributeViewModelService.InsertCheckoutAttributeValueModel(checkoutAttribute, model);
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
 
             //If we got this far, something failed, redisplay form
@@ -288,7 +288,7 @@ public async Task<IActionResult> ValueEditPopup(CheckoutAttributeValueModel mode
             {
                 await _checkoutAttributeViewModelService.UpdateCheckoutAttributeValueModel(checkoutAttribute, cav, model);
                 ViewBag.RefreshPage = true;
-                return View(model);
+                return Content("");
             }
 
             //If we got this far, something failed, redisplay form

From 3a0f5f8d69a813d90d7544815988112c7ac58bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Tue, 28 Sep 2021 09:27:19 +0200
Subject: [PATCH 25/32] magnific popup layouts - removed unnecessary scripts

---
 .../Admin/Views/Blog/BlogPostAddPopup.cshtml  | 19 ++++------------
 .../Admin/Views/Blog/ProductAddPopup.cshtml   | 11 ----------
 .../Views/Category/ProductAddPopup.cshtml     | 22 +++++--------------
 .../Views/Collection/ProductAddPopup.cshtml   | 13 +----------
 .../AssociateProductToCoursePopup.cshtml      |  1 -
 .../Views/Customer/ProductAddPopup.cshtml     | 11 ----------
 .../CustomerAction/CollectionAddPopup.cshtml  |  8 -------
 .../CustomerAction/ProductAddPopup.cshtml     | 11 +---------
 .../CustomerGroup/ProductAddPopup.cshtml      |  2 +-
 .../CustomerReminder/CategoryAddPopup.cshtml  | 13 +----------
 .../CollectionAddPopup.cshtml                 | 13 +----------
 .../CustomerReminder/ProductAddPopup.cshtml   | 11 ----------
 .../Admin/Views/Discount/BrandAddPopup.cshtml |  9 --------
 .../Views/Discount/CategoryAddPopup.cshtml    | 14 +-----------
 .../Views/Discount/CollectionAddPopup.cshtml  |  9 --------
 .../Views/Discount/VendorAddPopup.cshtml      | 10 ---------
 .../Views/Knowledgebase/ArticlesPopup.cshtml  | 12 +---------
 .../Product/AssociatedProductAddPopup.cshtml  | 14 +-----------
 .../Product/AttributeCombinationPopup.cshtml  |  8 -------
 .../Product/BundleProductAddPopup.cshtml      |  9 --------
 .../Product/CrossSellProductAddPopup.cshtml   |  8 -------
 .../ProductAttributeConditionPopup.cshtml     |  4 ++--
 .../ProductAttributeMappingPopup.cshtml       |  9 --------
 ...roductAttributeValidationRulesPopup.cshtml | 11 ----------
 .../Views/Product/ProductPicturePopup.cshtml  |  8 -------
 .../Product/RecommendedProductAddPopup.cshtml |  9 --------
 .../Product/RelatedProductAddPopup.cshtml     |  8 -------
 .../Admin/Views/Shared/PicturePopup.cshtml    |  6 -----
 28 files changed, 20 insertions(+), 263 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml
index 823b89b68..901f9248c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml
@@ -10,7 +10,7 @@
       asp-route-CategoryId="@Context.Request.Query["CategoryId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -52,18 +52,7 @@
             </div>
         </div>
     </div>
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-                try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-                catch (e){}
-                window.close();
-        </script>
-    }
-</form>
-
-<script>
+    <script>
         var mfp = $.magnificPopup.instance;
         $("#BlogPostAddPopup").submit(function (e) {
             e.preventDefault();
@@ -181,5 +170,5 @@
             $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);
         }
 
-</script>
-
+    </script>
+</form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml
index e78f6b1fe..19d6fa537 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml
@@ -94,17 +94,6 @@
         </div>
     </div>
 
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-                try {opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-                catch (e){}
-                window.close();
-        </script>
-    }
-
-
     <script>
         var mfp = $.magnificPopup.instance;
         $("#ProductAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtml
index 3826077b0..18cbde1d8 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtml
@@ -6,11 +6,11 @@
     //page title
     ViewBag.Title = Loc["Admin.Catalog.Categories.Products.AddNew"];
 }
-<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Category" asp-action="ProductAddPopup" method="post" 
+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Category" asp-action="ProductAddPopup" method="post"
       asp-route-CategoryId="@Context.Request.Query["CategoryId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit popup-window">
@@ -93,18 +93,7 @@
             </div>
         </div>
     </div>
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
-</form>
-
-<script>
+    <script>
         var mfp = $.magnificPopup.instance;
         $("#ProductAddPopup").submit(function (e) {
             e.preventDefault();
@@ -134,7 +123,7 @@
                 }
             });
         });
-        
+
         $('.extend-collapse').hide();
         $('.filter-extend-button').click(function () {
             $('.extend-collapse').toggle("slow");
@@ -240,5 +229,6 @@
             $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);
         }
 
-</script>
+    </script>
+</form>
 
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtml
index 041a6179c..1f076eb35 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtml
@@ -9,8 +9,7 @@
 <form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Collection" asp-action="ProductAddPopup" method="post"
       asp-route-CollectionId="@Context.Request.Query["CollectionId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
-    
+      asp-route-formId="@Context.Request.Query["formId"]">   
 
     <div class="row">
         <div class="col-md-12">
@@ -95,16 +94,6 @@
         </div>
     </div>
 
-
-
-    @if (ViewBag.RefreshPage == true)
-    {
-    <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-    </script>
-    }
     <script>
             var mfp = $.magnificPopup.instance;
             $("#ProductAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml
index 5ee756ccc..32717bf36 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml
@@ -14,7 +14,6 @@
       id="associateproduct"
       >
     
-
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml
index 397ac7d1f..fc31d98a0 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml
@@ -95,17 +95,6 @@
         </div>
     </div>
 
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-                try {opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-                catch (e){}
-                window.close();
-        </script>
-    }
-
-
     <script>
         var mfp = $.magnificPopup.instance;
         $("#ProductAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtml
index a4455f2f4..b5432c162 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtml
@@ -53,14 +53,6 @@
         </div>
     </div>
 
-    @if (ViewBag.RefreshPage == true)
-    {
-    <script>
-        try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-        catch (e){}
-        window.close();
-    </script>
-    }
     <script>
         var mfp = $.magnificPopup.instance;
         $("#CollectionAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtml
index f383e1324..a050db667 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtml
@@ -13,8 +13,7 @@
 
     <input asp-for="CustomerActionId" type="hidden" />
     <input asp-for="CustomerActionConditionId" type="hidden" />
-
-    
+   
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit popup-window">
@@ -98,14 +97,6 @@
         </div>
     </div>
 
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
     <script>
             var mfp = $.magnificPopup.instance;
             $("#ProductAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml
index 1003d62f3..be16c74d5 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml
@@ -1,7 +1,7 @@
 @model CustomerGroupProductModel.AddProductModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Customers.CustomerGroups.Products.AddNew"];
 }
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtml
index 5c72cd328..de607155e 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtml
@@ -1,7 +1,7 @@
 @model CustomerReminderModel.ConditionModel.AddCategoryConditionModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Customers.CustomerReminder.Condition.Category.AddNew"];
 }
@@ -14,8 +14,6 @@
     <input asp-for="CustomerReminderId" type="hidden" />
     <input asp-for="ConditionId" type="hidden" />
 
-    
-
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -55,15 +53,6 @@
             </div>
         </div>
     </div>
-    @if (ViewBag.RefreshPage == true)
-    {
-    <script>
-           try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-             catch (e){}
-            window.close();
-    </script>
-    }
-
     <script>
         var mfp = $.magnificPopup.instance;
         $("#CategoryAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtml
index f4c3bd46f..96e273743 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtml
@@ -10,11 +10,10 @@
       asp-route-CustomerReminderId="@Context.Request.Query["CustomerReminderId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    <input asp-for="CustomerReminderId" type="hidden" />
 
+    <input asp-for="CustomerReminderId" type="hidden" />
     <input asp-for="ConditionId" type="hidden" />
     
-
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -55,16 +54,6 @@
         </div>
     </div>
 
-
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
     <script>
         var mfp = $.magnificPopup.instance;
         $("#CollectionAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtml
index 5117eb7a6..d6e849515 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtml
@@ -14,17 +14,6 @@
     <input asp-for="CustomerReminderId" type="hidden" />
     <input asp-for="ConditionId" type="hidden" />
 
-    
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
-
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit popup-window">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml
index 9e36af7b2..61ef7423e 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml
@@ -48,15 +48,6 @@
         </div>
     </div>
 
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
     <script>
             var mfp = $.magnificPopup.instance;
             $("#BrandAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml
index 1243816b0..76d3cba1d 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml
@@ -9,18 +9,7 @@
 <form id="CategoryAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CategoryAddPopup" method="post"
       asp-route-DiscountId="@Context.Request.Query["DiscountId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
-      asp-route-formId="@Context.Request.Query["formId"]">
-    
-
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
+      asp-route-formId="@Context.Request.Query["formId"]">   
 
     <div class="row">
         <div class="col-md-12">
@@ -62,7 +51,6 @@
         </div>
     </div>
 
-
     <script>
         var mfp = $.magnificPopup.instance;
         $("#CategoryAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml
index 0f97a7a8b..36632e226 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml
@@ -53,15 +53,6 @@
             </div>
         </div>
     </div>
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
     <script>
         var mfp = $.magnificPopup.instance;
         $("#CollectionAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml
index 909148414..286377dff 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml
@@ -53,16 +53,6 @@
             </div>
         </div>
     </div>
-
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
     <script>
             var mfp = $.magnificPopup.instance;
             $("#VendorAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml
index a7148f34d..7bdb69ef2 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml
@@ -2,7 +2,7 @@
 @inject AdminAreaSettings adminAreaSettings
 @{
     ViewBag.Title = Loc["Admin.Content.Knowledgebase.KnowledgebaseArticle.Related.AddNew"];
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
 }
 <form id="ArticlesPopup" asp-area="@Constants.AreaAdmin" asp-controller="Knowledgebase" asp-action="ArticlesPopup" method="post"
       asp-route-KnowledgebaseId="@Context.Request.Query["KnowledgebaseId"]"
@@ -49,16 +49,6 @@
             </div>
         </div>
     </div>
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-                    try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-                    catch (e){}
-                    window.close();
-        </script>
-    }
-
     <script>
         var mfp = $.magnificPopup.instance;
         $("#ArticlesPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml
index d1979e64e..353248d82 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml
@@ -1,7 +1,7 @@
 @model ProductModel.AddAssociatedProductModel
 @inject AdminAreaSettings adminAreaSettings
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Catalog.Products.AssociatedProducts.AddNew"];
 }
@@ -94,19 +94,7 @@
             </div>
         </div>
     </div>
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
-
-
     <script>
-
             var mfp = $.magnificPopup.instance;
             $("#AssociatedProductAddPopup").submit(function (e) {
                 e.preventDefault();
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml
index 964400612..a124e1a5c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml
@@ -254,14 +254,6 @@
             </div>
         </div>
     </div>
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-        try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-        catch (e){}
-        window.close();
-        </script>
-    }
     <script>
         var mfp = $.magnificPopup.instance;
         $("#AttributeCombinationPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtml
index 7145cfeee..c8528553f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtml
@@ -87,15 +87,6 @@
             </div>
         </div>
     </div>
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
     <script>
             var mfp = $.magnificPopup.instance;
             $("#BundleProductAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtml
index 92950d09a..564a32148 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtml
@@ -93,14 +93,6 @@
             </div>
         </div>
     </div>
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-        try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
 
     <script>
             var mfp = $.magnificPopup.instance;
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtml
index 25885dc11..a64a2a925 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtml
@@ -54,11 +54,11 @@
                                                 <div class="col-md-9 col-sm-9">
                                                     <admin-select asp-for="SelectedProductAttributeId" asp-items="@(attributesList)" />
                                                     <script>
-                                                        $(document).ready(function() {
+                                                        
                                                             $("#@Html.IdFor(model => model.SelectedProductAttributeId)").change(toggleProductAttributes);
 
                                                             toggleProductAttributes();
-                                                        });
+                                                        
 
                                                         function toggleProductAttributes() {
                                                             var selectedProductAttributeId = $("#@Html.IdFor(model => model.SelectedProductAttributeId)").val();
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml
index 88fa88529..af50a1a6c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml
@@ -108,15 +108,6 @@
             </div>
         </div>
     </div>
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            alert('test');
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
     <script>
         var mfp = $.magnificPopup.instance;
         $("#ProductAttributeMappingPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtml
index e7452b983..6d1892a48 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtml
@@ -72,17 +72,6 @@
             </div>
         </div>
     </div>
-
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-        try {
-            window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();
-        } catch (e) {
-        }
-        window.close();
-        </script>
-    }
     @if (!Model.ValidationRulesAllowed)
     {
         <div class="note note-danger">This attribute type cannot have validation rules</div>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
index 0321f5659..b558f618a 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
@@ -89,14 +89,6 @@
             </div>
         </div>
     </div>
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
     <script>
         var mfp = $.magnificPopup.instance;
         $("#ProductPicturePopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtml
index 0c2f7f4aa..3bf94bedf 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtml
@@ -91,15 +91,6 @@
             </div>
         </div>
     </div>
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-        try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-        </script>
-    }
-
 <script>
         var mfp = $.magnificPopup.instance;
         $("#RecommendedProductAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml
index 224a247ef..87d196ff3 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml
@@ -93,14 +93,6 @@
             </div>
         </div>
     </div>
-    @if (ViewBag.RefreshPage == true)
-    {
-    <script>
-            try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}
-            catch (e){}
-            window.close();
-    </script>
-    }
     <script>
         var mfp = $.magnificPopup.instance;
         $("#RelatedProductAddPopup").submit(function (e) {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtml
index 1fed45c86..4411ca023 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtml
@@ -74,12 +74,6 @@
             </div>
         </div>
     </div>
-    @if (ViewBag.RefreshPage == true)
-    {
-        <script>
-            window.close();
-        </script>
-    }
     <script>
         var mfp = $.magnificPopup.instance;
         $("#PicturePopup").submit(function (e) {

From 22f01f7166a302ac22c24f0479aefb8dbf264213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Tue, 28 Sep 2021 14:23:42 +0200
Subject: [PATCH 26/32] Blog Picture modal - magnific popup layout

---
 .../Areas/Admin/Views/Blog/Edit.cshtml        |  2 +-
 .../Views/Blog/_CreateOrUpdate.TabInfo.cshtml | 19 ++++++++++++++++++-
 .../Controllers/BlogController.cs             |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Edit.cshtml
index 0ecddfc07..9bfb529da 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Edit.cshtml
@@ -17,7 +17,7 @@
                     </div>
                     <div class="actions">
                         <div class="btn-group btn-group-devided">
-                            <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("BlogPost", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">
+                            <button type="button" onclick="window.open('@Url.RouteUrl("BlogPost", new {SeName = Model.SeName})','_blank');" class="btn purple">
                                 <i class="fa fa-eye"></i>
                                 @Loc["Admin.Common.Preview"]
                             </button>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabInfo.cshtml
index 45117edfc..a64349bad 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabInfo.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabInfo.cshtml
@@ -102,8 +102,25 @@
             @if (!string.IsNullOrEmpty(Model.PictureId))
             {
                 <label class="control-label">
-                    <a class='k-link' href='javascript:OpenWindow("@Url.Action("PicturePopup", "Blog", new { area = Constants.AreaAdmin })/?blogpostId=@(Model.Id)", 800, 600, true);'>@Loc["Admin.Common.Picture.Attributes"]</a>
+                    <a class='k-link picturelink' href='@Url.Action("PicturePopup", "Blog", new { area = Constants.AreaAdmin })/?blogpostId=@(Model.Id)'>@Loc["Admin.Common.Picture.Attributes"]</a>
                 </label>
+                <script>
+                    $(document).ready(function () {
+                        $('.picturelink').magnificPopup({
+                            type: 'ajax',
+                            settings: { cache: false, async: false },
+                            callbacks:
+                            {
+                                parseAjax: function (mfpResponse) {
+                                    mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                },
+                                ajaxContentAdded: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    });
+                </script>
             }
         </div>
     </div>
diff --git a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
index 0d026f921..bfdb502d7 100644
--- a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
@@ -269,7 +269,7 @@ public async Task<IActionResult> PicturePopup(PictureModel model)
                 await _pictureViewModelService.UpdatePicture(model);
 
                 ViewBag.RefreshPage = true;
-                return View("PicturePopup", model);
+                return Content("");
             }
 
             Error(ModelState);

From d0931021e24ea6360994c515c96d1322d3b5d41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Tue, 28 Sep 2021 14:24:49 +0200
Subject: [PATCH 27/32] Preview in new tab

---
 src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/Edit.cshtml     | 2 +-
 src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/Edit.cshtml  | 2 +-
 .../Grand.Web.Admin/Areas/Admin/Views/Collection/Edit.cshtml    | 2 +-
 .../Areas/Admin/Views/Knowledgebase/EditArticle.cshtml          | 2 +-
 .../Areas/Admin/Views/Knowledgebase/EditCategory.cshtml         | 2 +-
 src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtml      | 2 +-
 src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtml      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/Edit.cshtml
index ca760e7f9..9c59e8ead 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/Edit.cshtml
@@ -16,7 +16,7 @@
                     </div>
                     <div class="actions">
                         <div class="btn-group btn-group-devided util-btn-margin-bottom-5">
-                            <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("Brand", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">
+                            <button type="button" onclick="window.open('@Url.RouteUrl("Brand", new {SeName = Model.SeName})','_blank');" class="btn purple">
                                 <i class="fa fa-eye"></i>
                                 @Loc["Admin.Common.Preview"]
                             </button>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/Edit.cshtml
index 05f9e920c..c5300163e 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/Edit.cshtml
@@ -16,7 +16,7 @@
                     </div>
                     <div class="actions">
                         <div class="btn-group btn-group-devided util-btn-margin-bottom-5">
-                            <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("Category", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">
+                            <button type="button" onclick="window.open('@Url.RouteUrl("Category", new {SeName = Model.SeName})','_blank');" class="btn purple">
                                 <i class="fa fa-eye"></i>
                                 @Loc["Admin.Common.Preview"]
                             </button>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/Edit.cshtml
index 2f1e8bd75..699946bac 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/Edit.cshtml
@@ -16,7 +16,7 @@
                     </div>
                     <div class="actions">
                         <div class="btn-group btn-group-devided util-btn-margin-bottom-5">
-                            <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("Collection", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">
+                            <button type="button" onclick="window.open('@Url.RouteUrl("Collection", new {SeName = Model.SeName})','_blank');" class="btn purple">
                                 <i class="fa fa-eye"></i>
                                 @Loc["Admin.Common.Preview"]
                             </button>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditArticle.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditArticle.cshtml
index e653be61e..c4192a019 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditArticle.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditArticle.cshtml
@@ -16,7 +16,7 @@
                     </div>
                     <div class="actions">
                         <div class="btn-group btn-group-devided">
-                            <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("KnowledgebaseArticle", new { SeName = Model.SeName })', 800, 600, true); return false;" class="btn purple">
+                            <button type="button" onclick="window.open('@Url.RouteUrl("KnowledgebaseArticle", new {SeName = Model.SeName})','_blank');" class="btn purple">
                                 <i class="fa fa-eye"></i>
                                 @Loc["Admin.Common.Preview"]
                             </button>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditCategory.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditCategory.cshtml
index 214731ba3..305bd081d 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditCategory.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditCategory.cshtml
@@ -16,7 +16,7 @@
                     </div>
                     <div class="actions">
                         <div class="btn-group btn-group-devided">
-                            <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("KnowledgebaseCategory", new { SeName = Model.SeName })', 800, 600, true); return false;" class="btn purple">
+                            <button type="button" onclick="window.open('@Url.RouteUrl("KnowledgebaseCategory", new {SeName = Model.SeName})','_blank');" class="btn purple">
                                 <i class="fa fa-eye"></i>
                                 @Loc["Admin.Common.Preview"]
                             </button>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtml
index b3673554d..d84b719cf 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtml
@@ -16,7 +16,7 @@
                     </div>
                     <div class="actions">
                         <div class="btn-group btn-group-devided">
-                            <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("NewsItem", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">
+                            <button type="button" onclick="window.open('@Url.RouteUrl("NewsItem", new {SeName = Model.SeName})','_blank');" class="btn purple">
                                 <i class="fa fa-eye"></i>
                                 @Loc["Admin.Common.Preview"]
                             </button>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtml
index fdf6db33e..9bbb7ca1e 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtml
@@ -16,7 +16,7 @@
                     </div>
                     <div class="actions">
                         <div class="btn-group btn-group-devided">
-                            <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("Page", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">
+                            <button type="button" onclick="window.open('@Url.RouteUrl("Page", new {SeName = Model.SeName})','_blank');" class="btn purple">
                                 <i class="fa fa-eye"></i>
                                 @Loc["Admin.Common.Preview"]
                             </button>

From bf4bff10bf617f9f55ea17241a5db5abc3f3c237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Tue, 28 Sep 2021 14:25:13 +0200
Subject: [PATCH 28/32] Permission modal - magnific popup layout

---
 .../_CreateOrUpdate.TabAcl.cshtml             | 16 +++++++++++-
 .../Areas/Admin/Views/Permission/Index.cshtml | 20 ++++++++++++--
 .../Views/Permission/PermissionsAction.cshtml | 26 +++++++++++++------
 3 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabAcl.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabAcl.cshtml
index cb5f4a572..10b21f02b 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabAcl.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabAcl.cshtml
@@ -17,6 +17,20 @@
     <script>
                 $(document).ready(function () {
                     $("#acl-grid").kendoGrid({
+                        dataBound: function () {
+                            $('.permissionlink').magnificPopup({
+                                type: 'ajax',
+                                settings: { cache: false, async: false },
+                                callbacks: {
+                                    parseAjax: function (mfpResponse) {
+                                        mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                    },
+                                    ajaxContentAdded: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        },
                         dataSource: {
                             transport: {
                                 read: {
@@ -86,7 +100,7 @@
                             width: 10,
                             headerAttributes: { style: "text-align:center" },
                             attributes: { style: "text-align:center" },
-                            template: '# if(Actions.length > 0) {# <a class="k-link" onclick="javascript:OpenWindow(\'@Url.Action("PermissionsAction", "Permission", new { area = Constants.AreaAdmin })/?systemname=#=SystemName#&customeGroupId=@Model.Id\', 600, 400, true); return false;"><i class="icon-settings"></i></a> #} #'
+                            template: '# if(Actions.length > 0) {# <a class="k-link permissionlink" href="\@Url.Action("PermissionsAction", "Permission", new { area = Constants.AreaAdmin })/?systemname=#=SystemName#&customeGroupId=@Model.Id\"><i class="icon-settings"></i></a> #} #'
 
                         },
                         {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml
index 831cc9b24..b5d025a4b 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml
@@ -114,8 +114,24 @@
                                                                                     <label class='mt-checkbox mt-checkbox-outline control control-checkbox @if (!item.Actions) { <text>no-action</text> }'><input class="allow_@(cr.Id)" type="checkbox" value="@(item.SystemName)" name="allow_@(cr.Id)" @(allowed ? " checked=checked" : null) /> <div class="control__indicator"></div></label>
                                                                                     @if (item.Actions)
                                                                                     {
-                                                                                        <a class='k-link'
-                                                                                           onclick="javascript:OpenWindow('@Url.Action("PermissionsAction", "Permission", new { area = Constants.AreaAdmin })/?systemname=@(item.SystemName)&customeGroupId=@cr.Id', 600, 400, true); return false;"><i class="icon-settings"></i></a>
+                                                                                        <a class='k-link permissionlink'
+                                                                                           href="@Url.Action("PermissionsAction", "Permission", new { area = Constants.AreaAdmin })/?systemname=@(item.SystemName)&customeGroupId=@cr.Id"><i class="icon-settings"></i></a>
+                                                                                        <script>
+                                                                                            $(document).ready(function () {
+                                                                                                $('.permissionlink').magnificPopup({
+                                                                                                    type: 'ajax',
+                                                                                                    settings: { cache: false, async: false },
+                                                                                                    callbacks: {
+                                                                                                        parseAjax: function (mfpResponse) {
+                                                                                                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                                                                                        },
+                                                                                                        ajaxContentAdded: function () {
+                                                                                                            $('.mfp-wrap').removeAttr('tabindex');
+                                                                                                        }
+                                                                                                    }
+                                                                                                });
+                                                                                            });
+                                                                                        </script>
                                                                                     }
                                                                                 </li>
                                                                             }
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/PermissionsAction.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/PermissionsAction.cshtml
index e95e1c1f8..70adb4644 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/PermissionsAction.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/PermissionsAction.cshtml
@@ -1,16 +1,10 @@
 @model PermissionActionModel
 @{
-    Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;
+    Layout = "";
     //page title
     ViewBag.Title = Loc["Admin.Configuration.Permissions"];
 }
-@if (ViewBag.ClosePage == true)
-{
-    <script>
-        window.close();
-    </script>
-}
-<form asp-area="@Constants.AreaAdmin" asp-controller="Permission" asp-action="PermissionsAction" method="post">
+<form id="PermissionsAction" asp-area="@Constants.AreaAdmin" asp-controller="Permission" asp-action="PermissionsAction" method="post">
     <input asp-for="SystemName" type="hidden" />
     <input asp-for="CustomerGroupId" type="hidden" />
     <div class="row">
@@ -48,4 +42,20 @@
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#PermissionsAction").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    mfp.close();
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file

From c69c5ed0ee0633bd12f6ecb845aa3748565f5e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Tue, 28 Sep 2021 15:26:04 +0200
Subject: [PATCH 29/32] ShippingPoint popup - magnific popup layout

---
 .../Controllers/ShippingPointController.cs    |  3 ++
 .../Views/ShippingPoint/Configure.cshtml      | 34 +++++++++++++--
 .../Admin/Views/ShippingPoint/Create.cshtml   | 37 ++++++++++++++--
 .../Admin/Views/ShippingPoint/Edit.cshtml     | 43 ++++++++++++++++---
 4 files changed, 105 insertions(+), 12 deletions(-)

diff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs
index 614b99dd7..1937998f3 100644
--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs
@@ -109,6 +109,7 @@ public async Task<IActionResult> Create(ShippingPointModel model)
                 await _shippingPointService.InsertStoreShippingPoint(shippingPoint);
 
                 ViewBag.RefreshPage = true;
+                return Content("");
             }
 
             await PrepareShippingPointModel(model);
@@ -132,6 +133,8 @@ public async Task<IActionResult> Edit(ShippingPointModel model)
                 var shippingPoint = await _shippingPointService.GetStoreShippingPointById(model.Id);
                 shippingPoint = model.ToEntity();
                 await _shippingPointService.UpdateStoreShippingPoint(shippingPoint);
+
+                return Content("");
             }
             ViewBag.RefreshPage = true;
 
diff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Configure.cshtml b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Configure.cshtml
index 24bf801e8..a23639831 100644
--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Configure.cshtml
+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Configure.cshtml
@@ -9,8 +9,34 @@
             <div class="panel-body">
                 <div id="shipping-points-grid"></div>
                 <script>
-                    $(document).ready(function() {
+                    $(document).ready(function () {
+                        $('#btnAddNewOption').magnificPopup({
+                            type: 'ajax',
+                            settings: { cache: false, async: false },
+                            callbacks: {
+                                parseAjax: function (mfpResponse) {
+                                    mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                },
+                                ajaxContentAdded: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
                         $("#shipping-points-grid").kendoGrid({
+                            dataBound: function () {
+                                $('.editpopup').magnificPopup({
+                                    type: 'ajax',
+                                    settings: { cache: false, async: false },
+                                    callbacks: {
+                                        parseAjax: function (mfpResponse) {
+                                            mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                                        },
+                                        ajaxContentAdded: function () {
+                                            $('.mfp-wrap').removeAttr('tabindex');
+                                        }
+                                    }
+                                });
+                            },
                             dataSource: {
                                 type: "json",
                                 transport: {
@@ -79,7 +105,7 @@
                                 field: "Id",
                                 title: "@Loc["Admin.Common.Edit"]",
                                 width: 100,
-                                template: "<input type='submit' value='@Loc["Admin.Common.Edit"]' onclick=\"javascript:OpenWindow('@Url.Action("Edit", "ShippingPoint")?id=#=Id#&btnId=btnRefresh&formId=shipping-instore-form', 800, 800, true); return false;\" class='k-button k-button-icontext' />"
+                                template: "<a href=\"@Url.Action("Edit", "ShippingPoint")?id=#=Id#&btnId=btnRefresh&formId=shipping-instore-form\" class='k-button editpopup k-button-icontext'>@Loc["Admin.Common.Edit"]</a>"
                             }, {
                                 command: { name: "destroy", text: "@Loc["Admin.Common.Delete"]" },
                                 title: "@Loc["Admin.Common.Delete"]",
@@ -90,7 +116,9 @@
                 </script>
             </div>
             <div class="panel-footer">
-                <input type="submit" id="btnAddNewOption" class="btn btn-primary" value="@Loc["Admin.Common.AddNew"]" onclick="javascript:OpenWindow('@(Url.Action("Create", "ShippingPoint") + "?btnId=btnRefresh&formId=shipping-instore-form")', 800, 800, true); return false;" />
+                <a id="btnAddNewOption" class="btn btn-primary" href="@(Url.Action("Create", "ShippingPoint") + "?btnId=btnRefresh&formId=shipping-instore-form")">
+                    @Loc["Admin.Common.AddNew"]
+                </a>
                 <input type="submit" id="btnRefresh" class="btn btn-default" style="display: none" />
             </div>
 
diff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtml b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtml
index c06f454a1..715e348e4 100644
--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtml
+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtml
@@ -1,13 +1,13 @@
 @{
-    Layout = "_AdminPopupLayout";
+    Layout = "";
 }
 @model Shipping.ShippingPoint.Models.ShippingPointModel
 
-<form asp-controller="ShippingPoint" asp-action="Create" method="post"
+<form id="CreatePopup" asp-controller="ShippingPoint" asp-action="Create" method="post"
       asp-route-ShippingPointId="@Context.Request.Query["ShippingPointId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -29,4 +29,35 @@
             <partial name="_CreateOrUpdate" model="Model" />
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#CreatePopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtml b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtml
index f8ed522c6..ddb335bf6 100644
--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtml
+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtml
@@ -1,13 +1,13 @@
 @{
-    Layout = "_AdminPopupLayout";
+    Layout = "";
 }
 @model Shipping.ShippingPoint.Models.ShippingPointModel
 
-<form asp-controller="ShippingPoint" asp-action="Edit" method="post"
-        asp-route-ShippingPointId="@Context.Request.Query["ShippingPointId"]"
-        asp-route-btnId="@Context.Request.Query["btnId"]"
-        asp-route-formId="@Context.Request.Query["formId"]">
-    
+<form id="EditPopup" asp-controller="ShippingPoint" asp-action="Edit" method="post"
+      asp-route-ShippingPointId="@Context.Request.Query["ShippingPointId"]"
+      asp-route-btnId="@Context.Request.Query["btnId"]"
+      asp-route-formId="@Context.Request.Query["formId"]">
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -29,4 +29,35 @@
             <partial name="_CreateOrUpdate" model="Model" />
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#EditPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file

From 45b40336c226351bb40ef16aaa72413a345619e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Tue, 28 Sep 2021 15:27:54 +0200
Subject: [PATCH 30/32] DiscountRulesStandard popup - magnific popup layout

---
 .../Views/HasAllProducts/Configure.cshtml     | 16 +++++-
 .../HasAllProducts/ProductAddPopup.cshtml     | 52 ++++++++++++++-----
 .../Views/HasOneProduct/Configure.cshtml      | 20 +++++--
 .../HasOneProduct/ProductAddPopup.cshtml      | 50 +++++++++++++-----
 4 files changed, 107 insertions(+), 31 deletions(-)

diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml
index 37f4b283f..47a664374 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml
@@ -45,7 +45,9 @@
         <span class="control-label" style="text-align:left" id="discountrequirement-product-names@(Model.RequirementId)"></span>
         <div class="group-btn btn-group-devided margin-top-10">
             <input type="button" id="saveHasAllProductsrequirement@(Model.RequirementId)" class="btn default" value="@Loc["Admin.Common.Save"]" />
-            <input type="submit" id="btnAddNewDiscountRequirementProduct@(Model.RequirementId)" value="@Loc["Plugins.DiscountRules.HasAllProducts.Fields.Products.AddNew"]" onclick="javascript:OpenWindow('@(Url.RouteUrl("Plugin.DiscountRules.HasAllProducts.ProductAddPopup", new { btnId = "btnRefreshDiscountRequirementProducts" + Model.RequirementId, productIdsInput = Html.IdFor(model => model.Products) }))', 800, 800, true); return false;" class="btn default" />
+            <a id="btnAddNewDiscountRequirementProduct@(Model.RequirementId)" href="@(Url.RouteUrl("Plugin.DiscountRules.HasAllProducts.ProductAddPopup", new { btnId = "btnRefreshDiscountRequirementProducts" + Model.RequirementId, productIdsInput = Html.IdFor(model => model.Products) }))" class="btn default">
+                @Loc["Plugins.DiscountRules.HasAllProducts.Fields.Products.AddNew"]
+            </a>
         </div>
         <div id="pnl-save-requirement-result@(Model.RequirementId)" style="display:none;">@Loc["admin.marketing.Discounts.Requirements.Saved"]</div>
 
@@ -54,6 +56,18 @@
         <input type="submit" id="btnRefreshDiscountRequirementProducts@(Model.RequirementId)" style="display: none" />
         <script>
                 $(document).ready(function () {
+                    $('#btnAddNewDiscountRequirementProduct@(Model.RequirementId)').magnificPopup({
+                        type: 'ajax',
+                        settings: { cache: false, async: false },
+                        callbacks: {
+                            parseAjax: function (mfpResponse) {
+                                mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                            },
+                            ajaxContentAdded: function () {
+                                $('.mfp-wrap').removeAttr('tabindex');
+                            }
+                        }
+                    });
                     $('#btnRefreshDiscountRequirementProducts@(Model.RequirementId)').click(function () {
                         //refresh product list
                         loadDiscountRequirementProductFriendlyNames@(Model.RequirementId)();
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml
index f20783e88..cbcdab3ce 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml
@@ -1,5 +1,5 @@
 @{
-    Layout = "~/Areas/Admin/Views/Shared/_AdminPopupLayout.cshtml";
+    Layout = "";
 }
 @model DiscountRules.HasAllProducts.Models.RequirementModel.AddProductModel
 @using Grand.Domain.Common;
@@ -8,8 +8,8 @@
     //page title
     ViewBag.Title = Loc["Plugins.DiscountRules.HasAllProducts.Fields.Products.Choose"];
 }
-<form asp-controller="HasAllProducts" asp-action="ProductAddPopup" method="post">
-    
+<form id="ProductAddPopup" asp-controller="HasAllProducts" asp-action="ProductAddPopup" method="post">
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -75,7 +75,35 @@
     </div>
     <div id="products-grid"></div>
     <script>
-        $(document).ready(function () {
+            var mfp = $.magnificPopup.instance;
+            $("#ProductAddPopup").submit(function (e) {
+                e.preventDefault();
+                var form = $(this);
+                var url = form.attr('action');
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: form.serialize(),
+                    success: function (data) {
+                        if (data == "") {
+                            mfp.close();
+                            $('#btnRefresh').click();
+                        } else {
+                            $.magnificPopup.open({
+                                items: {
+                                    src: data,
+                                    type: 'inline'
+                                },
+                                callbacks: {
+                                    open: function () {
+                                        $('.mfp-wrap').removeAttr('tabindex');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+            });
             $("#products-grid").kendoGrid({
                 dataSource: {
                     type: "json",
@@ -128,17 +156,13 @@
                     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>
-    <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) {
@@ -162,16 +186,16 @@
 
         function selectRequiredProduct(productid) {
             try {
-                var currentValue = window.opener.document.getElementById('@(ViewBag.productIdsInput)').value;
+                var currentValue = document.getElementById('@(ViewBag.productIdsInput)').value;
                 if (currentValue) {
                     //add comma
-                    window.opener.document.getElementById('@(ViewBag.productIdsInput)').value += ', ';
+                    document.getElementById('@(ViewBag.productIdsInput)').value += ', ';
                 }
-                window.opener.document.getElementById('@(ViewBag.productIdsInput)').value += productid;
-                window.opener.document.getElementById('@(ViewBag.btnId)').click();
+                document.getElementById('@(ViewBag.productIdsInput)').value += productid;
+                document.getElementById('@(ViewBag.btnId)').click();
             }
             catch (e){}
-            window.close();
+            $.magnificPopup.instance.close();
         }
     </script>
 </form>
\ No newline at end of file
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml
index 9b5f57405..c4952c947 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml
@@ -45,7 +45,9 @@
         <label class="control-label" style="text-align:left" id="discountrequirement-product-names@(Model.RequirementId)"></label>
         <div class="group-btn btn-group-devided margin-top-10">
             <input type="button" id="saveHasOneProductrequirement@(Model.RequirementId)" class="btn default" value="@Loc["Admin.Common.Save"]" />
-            <input type="submit" id="btnAddNewDiscountRequirementProduct@(Model.RequirementId)" value="@Loc["Plugins.DiscountRules.HasOneProduct.Fields.Products.AddNew"]" onclick="javascript:OpenWindow('@(Url.RouteUrl("Plugin.DiscountRules.HasOneProduct.ProductAddPopup", new { btnId = "btnRefreshDiscountRequirementProducts" + Model.RequirementId, productIdsInput = Html.IdFor(model => model.Products) }))', 800, 800, true); return false;" class="btn default" />
+            <a id="btnAddNewDiscountRequirementProduct@(Model.RequirementId)" href="@(Url.RouteUrl("Plugin.DiscountRules.HasOneProduct.ProductAddPopup", new { btnId = "btnRefreshDiscountRequirementProducts" + Model.RequirementId, productIdsInput = Html.IdFor(model => model.Products) }))" class="btn default">
+                @Loc["Plugins.DiscountRules.HasOneProduct.Fields.Products.AddNew"]
+            </a>
         </div>
 
         <div id="pnl-save-requirement-result@(Model.RequirementId)" style="display:none;">@Loc["admin.marketing.Discounts.Requirements.Saved"]</div>
@@ -56,6 +58,18 @@
 
     <script>
         $(document).ready(function () {
+            $('#btnAddNewDiscountRequirementProduct@(Model.RequirementId)').magnificPopup({
+                        type: 'ajax',
+                        settings: { cache: false, async: false },
+                        callbacks: {
+                            parseAjax: function (mfpResponse) {
+                                mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                            },
+                            ajaxContentAdded: function () {
+                                $('.mfp-wrap').removeAttr('tabindex');
+                            }
+                        }
+                    });
             $('#btnRefreshDiscountRequirementProducts@(Model.RequirementId)').click(function () {
                 //refresh product list
                 loadDiscountRequirementProductFriendlyNames@(Model.RequirementId)();
@@ -63,9 +77,9 @@
                 //return false to don't reload a page
                 return false;
             });
-        
+
             loadDiscountRequirementProductFriendlyNames@(Model.RequirementId)();
-        
+
             $('#@Html.IdFor(model => model.Products)')
                 .data('timeout', null)
                 .keyup(function () {
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml
index c0c3c9351..0c7224dbd 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml
@@ -1,5 +1,5 @@
 @{
-    Layout = "~/Areas/Admin/Views/Shared/_AdminPopupLayout.cshtml";
+    Layout = "";
 }
 @model DiscountRules.HasOneProduct.Models.RequirementModel.AddProductModel
 @using Grand.Domain.Common;
@@ -8,7 +8,7 @@
     //page title
     ViewBag.Title = Loc["Plugins.DiscountRules.HasOneProduct.Fields.Products.Choose"];
 }
-<form asp-controller="HasOneProduct" asp-action="ProductAddPopup" method="post">
+<form id="ProductAddPopup" asp-controller="HasOneProduct" asp-action="ProductAddPopup" method="post">
     
     <div class="row">
         <div class="col-md-12">
@@ -75,7 +75,35 @@
     </div>
     <div id="products-grid"></div>
     <script>
-        $(document).ready(function () {
+        var mfp = $.magnificPopup.instance;
+        $("#ProductAddPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    if (data == "") {
+                        mfp.close();
+                        $('#btnRefresh').click();
+                    } else {
+                        $.magnificPopup.open({
+                            items: {
+                                src: data,
+                                type: 'inline'
+                            },
+                            callbacks: {
+                                open: function () {
+                                    $('.mfp-wrap').removeAttr('tabindex');
+                                }
+                            }
+                        });
+                    }
+                }
+            });
+        });
             $("#products-grid").kendoGrid({
                 dataSource: {
                     transport: {
@@ -127,17 +155,13 @@
                     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>
-    <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) {
@@ -161,16 +185,16 @@
 
         function selectRequiredProduct(productid) {
             try {
-                var currentValue = window.opener.document.getElementById('@(ViewBag.productIdsInput)').value;
+                var currentValue = document.getElementById('@(ViewBag.productIdsInput)').value;
                 if (currentValue) {
                     //add comma
-                    window.opener.document.getElementById('@(ViewBag.productIdsInput)').value += ', ';
+                    document.getElementById('@(ViewBag.productIdsInput)').value += ', ';
                 }
-                window.opener.document.getElementById('@(ViewBag.productIdsInput)').value += productid;
-                window.opener.document.getElementById('@(ViewBag.btnId)').click();
+                document.getElementById('@(ViewBag.productIdsInput)').value += productid;
+                document.getElementById('@(ViewBag.btnId)').click();
             }
             catch (e){}
-            window.close();
+            $.magnificPopup.instance.close();
         }
     </script>
 </form>
\ No newline at end of file

From af031d445cfd5bbd0cd084ef4908973a792d4aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Tue, 28 Sep 2021 15:28:37 +0200
Subject: [PATCH 31/32] ShippingByWeight popup - magnific popup layout

---
 .../Views/ShippingByWeight/AddPopup.cshtml    | 21 ++++++++++--
 .../Views/ShippingByWeight/Configure.cshtml   | 32 +++++++++++++++++--
 .../Views/ShippingByWeight/EditPopup.cshtml   | 21 ++++++++++--
 3 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml
index 57c8f052f..8a30c7db6 100644
--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml
+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml
@@ -1,9 +1,9 @@
 @{
-    Layout = "_AdminPopupLayout";
+    Layout = "";
 }
 @model ShippingByWeightModel
 @using Shipping.ByWeight.Models;
-<form asp-controller="ShippingByWeight" asp-action="AddPopup" method="post"
+<form id="AddPopup" asp-controller="ShippingByWeight" asp-action="AddPopup" method="post"
       asp-route-ShippingByWeightId="@Context.Request.Query["ShippingByWeightId"]"
     asp-route-btnId="@Context.Request.Query["btnId"]"
     asp-route-formId="@Context.Request.Query["formId"]">
@@ -29,4 +29,21 @@
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#AddPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    mfp.close();
+                    $('#btnRefresh').click();
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file
diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/Configure.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/Configure.cshtml
index 1c10b623b..cccd8b27f 100644
--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/Configure.cshtml
+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/Configure.cshtml
@@ -22,13 +22,41 @@
             <div id="shipping-byweight-grid"></div>
         </div>
         <div class="panel-footer">
-            <input type="submit" id="btnAddNewOption" value="@Loc["Plugins.Shipping.ByWeight.AddRecord"]" onclick="javascript:OpenWindow('@(addNewUrl)', 800, 550, true); return false;" class="btn default" />
+            <a id="btnAddNewOption" href="@(addNewUrl)" class="btn default">
+                @Loc["Plugins.Shipping.ByWeight.AddRecord"]
+            </a>
             <input type="submit" id="btnRefresh" style="display: none" />
         </div>
     </div>
     <script>
         $(document).ready(function () {
+            $('#btnAddNewOption').magnificPopup({
+                type: 'ajax',
+                settings: { cache: false, async: false },
+                callbacks: {
+                    parseAjax: function (mfpResponse) {
+                        mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                    },
+                    ajaxContentAdded: function () {
+                        $('.mfp-wrap').removeAttr('tabindex');
+                    }
+                }
+            });
             $("#shipping-byweight-grid").kendoGrid({
+                dataBound: function() {
+                    $('.editpopup').magnificPopup({
+                        type: 'ajax',
+                        settings: { cache: false, async: false },
+                        callbacks: {
+                            parseAjax: function (mfpResponse) {
+                                mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+                            },
+                            ajaxContentAdded: function () {
+                                $('.mfp-wrap').removeAttr('tabindex');
+                            }
+                        }
+                    });
+                },
                 dataSource: {
                     transport: {
                         read: {
@@ -109,7 +137,7 @@
                     field: "Id",
                     title: "@Loc["Admin.Common.Edit"]",
                     width: 100,
-                    template: "<input type='submit' value='@Loc["Admin.Common.Edit"]' onclick=\"javascript:OpenWindow('@Url.Action("EditPopup","ShippingByWeight")?id=#=Id#&btnId=btnRefresh&formId=shipping-byweight-form', 800, 400, true); return false;\" class='k-button k-button-icontext' />"
+                    template: "<a href=\"@Url.Action("EditPopup","ShippingByWeight")?id=#=Id#&btnId=btnRefresh&formId=shipping-byweight-form\" class='k-button editpopup k-button-icontext'>@Loc["Admin.Common.Edit"]</a>"
                 },  {
                     command: { name: "destroy", text: "@Loc["Admin.Common.Delete"]" },
                     title: "@Loc["Admin.Common.Delete"]",
diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml
index 95bf7c932..5adcb1c43 100644
--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml
+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml
@@ -3,11 +3,11 @@
 }
 @model ShippingByWeightModel
 @using Shipping.ByWeight.Models;
-<form asp-controller="ShippingByWeight" asp-action="EditPopup" method="post"
+<form id="EditPopup" asp-controller="ShippingByWeight" asp-action="EditPopup" method="post"
       asp-route-ShippingByWeightId="@Context.Request.Query["ShippingByWeightId"]"
       asp-route-btnId="@Context.Request.Query["btnId"]"
       asp-route-formId="@Context.Request.Query["formId"]">
-    
+
     <div class="row">
         <div class="col-md-12">
             <div class="x_panel light form-fit">
@@ -28,4 +28,21 @@
             </div>
         </div>
     </div>
+    <script>
+        var mfp = $.magnificPopup.instance;
+        $("#EditPopup").submit(function (e) {
+            e.preventDefault();
+            var form = $(this);
+            var url = form.attr('action');
+            $.ajax({
+                type: "POST",
+                url: url,
+                data: form.serialize(),
+                success: function (data) {
+                    mfp.close();
+                    $('#btnRefresh').click();
+                }
+            });
+        });
+    </script>
 </form>
\ No newline at end of file

From 23849ad43970472e58e8823dca6fa089d8c1c274 Mon Sep 17 00:00:00 2001
From: KrzysztofPajak <krzysiek@grandnode.com>
Date: Tue, 28 Sep 2021 18:12:08 +0200
Subject: [PATCH 32/32] Remove unused javascript functions

---
 ...CreateOrUpdate.ProductAttributes.TabAttributes.cshtml | 9 ---------
 .../wwwroot/administration/admin.common.js               | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtml
index e10060446..6f5a0bcfe 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtml
@@ -166,15 +166,6 @@
                 ]
             });
         });
-    //details grid
-    function toolbar_click_newProductAttributeValue(id) {
-        javascript: OpenWindow('@Url.Action("ProductAttributeValueCreatePopup", "Product", new { area = Constants.AreaAdmin })/' + '?productAttributeMappingId=' + id + '&productId=@Model.Id&formId=product-form&btnId=btnRefreshProductAttributesValues', 800, 550, true);
-        return false;
-    }
-    function toolbar_click_editProductAttributeValue(id, pam) {
-        javascript: OpenWindow('@Url.Action("ProductAttributeValueEditPopup", "Product", new { area = Constants.AreaAdmin })/' + id + '?productId=@(Model.Id)&productAttributeMappingId=' + pam + '&btnId=btnRefreshProductAttributesValues&formId=product-form', 800, 500, true);
-        return false;
-    }
     function detailInit(e) {
             $("<div data-name='productattributevalue' data-id='" + e.data.id+"' />").appendTo(e.detailCell).kendoGrid({
                 dataSource: {
diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.js b/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.js
index b7c0cc0a4..1401bdba2 100644
--- a/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.js
+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.js
@@ -2,15 +2,6 @@ function setLocation(url) {
     window.location.href = url;
 }
 
-function OpenWindow(query, w, h, scroll) {
-    var l = (screen.width - w) / 2;
-    var t = (screen.height - h) / 2;
-
-    winprops = 'resizable=1, height=' + h + ',width=' + w + ',top=' + t + ',left=' + l + 'w';
-    if (scroll) winprops += ',scrollbars=1';
-    var f = window.open(query, "_blank", winprops);
-}
-
 function showThrobber(message) {
     $('.throbber-header').html(message);
     window.setTimeout(function () {