Skip to content

Commit e00d4d8

Browse files
muratcakirmuratcakir
committed
Renamed plugin Froogle > SmartStore.GoogleMerchantCenter
1 parent b190dad commit e00d4d8

51 files changed

Lines changed: 200 additions & 164 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,8 @@ private void MigrateInitial()
245245
{ "DiscountRequirement.HasPaymentMethod", "SmartStore.DiscountRules.HasPaymentMethod" },
246246
{ "DiscountRequirement.HasShippingOption", "SmartStore.DiscountRules.HasShippingOption" },
247247
{ "DiscountRequirement.PurchasedAllProducts", "SmartStore.DiscountRules.PurchasedProducts" },
248-
{ "DiscountRequirement.PurchasedOneProduct", "SmartStore.DiscountRules.PurchasedProducts" },
248+
{ "DiscountRequirement.PurchasedOneProduct", "SmartStore.DiscountRules.PurchasedProducts" },
249+
{ "PromotionFeed.Froogle", "SmartStore.GoogleMerchantCenter" },
249250
};
250251

251252
foreach (var name in installedPlugins)

‎src/Libraries/SmartStore.Data/Migrations/201406262150229_Providers.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
7171
builder.AddOrUpdate("Admin.PromotionFeeds", "Promotion feeds", "Promotion Feeds");
7272

7373
// some admin menu renaming / new entries
74+
builder.AddOrUpdate("Admin.Promotions").Value("de", "Marketing");
7475
builder.AddOrUpdate("Admin.Configuration.Tax.Providers.Fields.MarkAsPrimaryProvider").Value("de", "Als Standard festlegen");
7576
builder.AddOrUpdate("Admin.Common.Activate").Value("de", "Aktivieren");
7677
builder.AddOrUpdate("Admin.Configuration.ActivityLog.ActivityLog").Value("de", "Aktivitätslog");

‎src/Plugins/Feed.Froogle/Data/Migrations/Configuration.cs‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/Plugins/Feed.Froogle/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/Plugins/SmartStore.GoogleMerchantCenter/AdminMenu.cs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Web.Routing;
6+
using System.Web.Mvc;
7+
using SmartStore.Web.Framework.UI;
8+
using SmartStore.Collections;
9+
10+
namespace SmartStore.GoogleMerchantCenter
11+
{
12+
public class AdminMenu : IMenuProvider
13+
{
14+
public void BuildMenu(TreeNode<MenuItem> pluginsNode)
15+
{
16+
var root = pluginsNode.Root.SelectNode(x => x.Value.Id == "promotion-feeds");
17+
if (root == null)
18+
return;
19+
20+
var menuItem = new MenuItem().ToBuilder()
21+
.Text("Google Merchant Center")
22+
.ResKey("Plugins.FriendlyName.SmartStore.GoogleMerchantCenter")
23+
.Action("ConfigurePlugin", "Plugin", new { systemName = "SmartStore.GoogleMerchantCenter", area = "Admin" })
24+
.ToItem();
25+
26+
root.Append(menuItem);
27+
}
28+
29+
}
30+
}

src/Plugins/Feed.Froogle/Content/Web.config renamed to src/Plugins/SmartStore.GoogleMerchantCenter/Content/Web.config

File renamed without changes.

src/Plugins/Feed.Froogle/Content/icon.png renamed to src/Plugins/SmartStore.GoogleMerchantCenter/Content/icon.png

File renamed without changes.

src/Plugins/Feed.Froogle/Content/images/mc_logo.png renamed to src/Plugins/SmartStore.GoogleMerchantCenter/Content/images/mc_logo.png

File renamed without changes.

src/Plugins/Feed.Froogle/Content/smartstore.feed.froogle.css renamed to src/Plugins/SmartStore.GoogleMerchantCenter/Content/smartstore.feed.froogle.css

File renamed without changes.

src/Plugins/Feed.Froogle/Controllers/FeedFroogleController.cs renamed to src/Plugins/SmartStore.GoogleMerchantCenter/Controllers/FeedFroogleController.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
using System.Globalization;
55
using System.Web.Mvc;
66
using SmartStore.Core.Localization;
7-
using SmartStore.Plugin.Feed.Froogle.Models;
8-
using SmartStore.Plugin.Feed.Froogle.Services;
7+
using SmartStore.GoogleMerchantCenter.Models;
8+
using SmartStore.GoogleMerchantCenter.Services;
99
using SmartStore.Services.Configuration;
1010
using SmartStore.Services.Security;
1111
using SmartStore.Web.Framework.Controllers;
1212
using SmartStore.Web.Framework.Mvc;
1313
using SmartStore.Web.Framework.UI;
1414
using Telerik.Web.Mvc;
1515

16-
namespace SmartStore.Plugin.Feed.Froogle.Controllers
16+
namespace SmartStore.GoogleMerchantCenter.Controllers
1717
{
1818
public class FeedFroogleController : PluginControllerBase
1919
{
@@ -40,7 +40,7 @@ public FeedFroogleController(
4040

4141
private ActionResult RedirectToConfig()
4242
{
43-
return RedirectToAction("ConfigureMiscPlugin", "Plugin", new { systemName = _googleService.Helper.SystemName, area = "Admin" });
43+
return RedirectToAction("ConfigurePlugin", "Plugin", new { systemName = _googleService.Helper.SystemName, area = "Admin" });
4444
}
4545

4646
[AdminAuthorize]

0 commit comments

Comments
 (0)