Move menu items to Administration

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Menus/OrdersMenuContributor.cs

@@ -37,7 +37,7 @@ namespace EasyAbp.EShop.Orders.Web.Menus
             
             if (!orderManagementMenuItem.Items.IsNullOrEmpty())
             {
-                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == OrdersMenus.ModuleGroupPrefix,
+                var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == OrdersMenus.ModuleGroupPrefix,
                     () => new ApplicationMenuItem(OrdersMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag"));
                 
                 eShopMenuItem.Items.Add(orderManagementMenuItem);

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Menus/PaymentsMenuContributor.cs

@@ -43,7 +43,7 @@ namespace EasyAbp.EShop.Payments.Web.Menus
 
             if (!paymentManagementMenuItem.Items.IsNullOrEmpty())
             {
-                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == PaymentsMenus.ModuleGroupPrefix,
+                var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == PaymentsMenus.ModuleGroupPrefix,
                     () => new ApplicationMenuItem(PaymentsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag"));
                 
                 eShopMenuItem.Items.Add(paymentManagementMenuItem);

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Menus/ProductsMenuContributor.cs

@@ -40,7 +40,7 @@ namespace EasyAbp.EShop.Products.Web.Menus
 
             if (!productManagementMenuItem.Items.IsNullOrEmpty())
             {
-                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == ProductsMenus.ModuleGroupPrefix,
+                var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == ProductsMenus.ModuleGroupPrefix,
                     () => new ApplicationMenuItem(ProductsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag"));
                 
                 eShopMenuItem.Items.Add(productManagementMenuItem);

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Menus/StoresMenuContributor.cs

@@ -50,7 +50,7 @@ namespace EasyAbp.EShop.Stores.Web.Menus
             
             if (!storeManagementMenuItem.Items.IsNullOrEmpty())
             {
-                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == StoresMenus.ModuleGroupPrefix,
+                var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == StoresMenus.ModuleGroupPrefix,
                     () => new ApplicationMenuItem(StoresMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag"));
                 
                 eShopMenuItem.Items.Add(storeManagementMenuItem);

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Menus/BasketsMenuContributor.cs

@@ -19,19 +19,21 @@ namespace EasyAbp.EShop.Plugins.Baskets.Web.Menus
         {
             var l = context.GetLocalizer<BasketsResource>(); //Add main menu items.
 
-            var basketManagementMenuItem = new ApplicationMenuItem(BasketsMenus.Prefix, l["Menu:BasketManagement"]);
+            // var basketManagementMenuItem = new ApplicationMenuItem(BasketsMenus.Prefix, l["Menu:BasketManagement"]);
 
-            basketManagementMenuItem.AddItem(
+            context.Menu.AddItem(
-                new ApplicationMenuItem(BasketsMenus.BasketItem, l["Menu:BasketItem"], $"/EShop/Plugins/Baskets/BasketItems/BasketItem?basketName={BasketsConsts.DefaultBasketName}&userId=")
+                new ApplicationMenuItem(BasketsMenus.BasketItem, l["Menu:BasketItem"],
+                    $"/EShop/Plugins/Baskets/BasketItems/BasketItem?basketName={BasketsConsts.DefaultBasketName}&userId=",
+                    icon: "fa fa-shopping-cart")
             );
-            
+
-            if (!basketManagementMenuItem.Items.IsNullOrEmpty())
+            // if (!basketManagementMenuItem.Items.IsNullOrEmpty())
-            {
+            // {
-                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == BasketsMenus.ModuleGroupPrefix,
+            //     var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == BasketsMenus.ModuleGroupPrefix,
-                    () => new ApplicationMenuItem(BasketsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag"));
+            //         () => new ApplicationMenuItem(BasketsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag"));
-                
+            //     
-                eShopMenuItem.Items.Add(basketManagementMenuItem);
+            //     eShopMenuItem.Items.Add(basketManagementMenuItem);
-            }
+            // }
         }
     }
-}
+}

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Web/Menus/BookingMenuContributor.cs

@@ -51,8 +51,8 @@ public class BookingMenuContributor : IMenuContributor
 
         if (!bookingMenuItem.Items.IsNullOrEmpty())
         {
-            var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == BookingMenus.ModuleGroupPrefix,
+            var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == BookingMenus.ModuleGroupPrefix,
-                () => new ApplicationMenuItem(BookingMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"]));
+                () => new ApplicationMenuItem(BookingMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag"));
                 
             eShopMenuItem.Items.Add(bookingMenuItem);
         }

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Web/Menus/CouponsMenuContributor.cs

@@ -38,7 +38,7 @@ namespace EasyAbp.EShop.Plugins.Coupons.Web.Menus
             
             if (!couponManagementMenuItem.Items.IsNullOrEmpty())
             {
-                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == CouponsMenus.ModuleGroupPrefix,
+                var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == CouponsMenus.ModuleGroupPrefix,
                     () => new ApplicationMenuItem(CouponsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag"));
                 
                 eShopMenuItem.Items.Add(couponManagementMenuItem);

plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenuContributor.cs

@@ -46,7 +46,7 @@ public class FlashSalesMenuContributor : IMenuContributor
 
         if (!flashSalesManagementMenuItem.Items.IsNullOrEmpty())
         {
-            var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == FlashSalesMenus.ModuleGroupPrefix,
+            var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == FlashSalesMenus.ModuleGroupPrefix,
                 () => new ApplicationMenuItem(FlashSalesMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag"));
 
             eShopMenuItem.Items.Add(flashSalesManagementMenuItem);

plugins/Promotions/src/EasyAbp.EShop.Plugins.Promotions.Web/Menus/PromotionsMenuContributor.cs

@@ -38,9 +38,8 @@ public class PromotionsMenuContributor : IMenuContributor
 
         if (!promotionMenuItem.Items.IsNullOrEmpty())
         {
-            var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == PromotionsMenus.ModuleGroupPrefix,
+            var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == PromotionsMenus.ModuleGroupPrefix,
-                () => new ApplicationMenuItem(PromotionsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"],
+                () => new ApplicationMenuItem(PromotionsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag"));
-                    icon: "fa fa-badge-percent"));
 
             eShopMenuItem.Items.Add(promotionMenuItem);
         }