Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Minor fix - discount by vendor (hide brands tab)

KrzysztofPajak9c6d8d251197
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 bb8923d0c..370424fb9 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
@@ -2,19 +2,19 @@
@{
if (!String.IsNullOrEmpty(Model.Id))
{
-<div class="panel panel-default">
- <vc:admin-widget widget-zone="discount_details_applied_to_vendors_top" additional-data="Model" />
- <div class="panel-body">
- <div id="vendors-grid"></div>
- </div>
- <div class="panel-footer">
- <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>
+ <div class="panel panel-default">
+ <vc:admin-widget widget-zone="discount_details_applied_to_vendors_top" additional-data="Model" />
+ <div class="panel-body">
+ <div id="vendors-grid"></div>
+ </div>
+ <div class="panel-footer">
+ <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>
+ <script>
$(document).ready(function () {
$('#btnAddNewVendor').magnificPopup({
type: 'ajax',
@@ -89,7 +89,7 @@
}]
});
});
-</script>
+ </script>
<script>
$(document).ready(function () {
$('#btnRefreshVendors').click(function () {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabInfo.cshtml
index ab4ab505e..5b37d956a 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabInfo.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabInfo.cshtml
@@ -73,6 +73,7 @@
$('#tab-applied-to-collections').hide();
$('#tab-applied-to-products').hide();
$('#pnlMaximumDiscountedQuantity').show();
+ $('#tab-applied-to-brands').hide();
$('#tab-applied-to-vendors').show();
}
else if(selectedDiscountTypeId == @(((int)DiscountType.AssignedToAllProducts).ToString())){