Skip to content

Commit 0919054

Browse files
exileDevRomanovM
authored andcommitted
nopSolutions#7340 News moved to plugin
1 parent ed707e2 commit 0919054

157 files changed

Lines changed: 4319 additions & 3391 deletions

File tree

Some content is hidden

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

src/Libraries/Nop.Core/Domain/Common/SitemapSettings.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ public partial class SitemapSettings : ISettings
3232
/// </summary>
3333
public bool SitemapIncludeManufacturers { get; set; }
3434

35-
/// <summary>
36-
/// Gets or sets a value indicating whether to include news to sitemap
37-
/// </summary>
38-
public bool SitemapIncludeNews { get; set; }
39-
4035
/// <summary>
4136
/// Gets or sets a value indicating whether to include products to sitemap
4237
/// </summary>

src/Libraries/Nop.Core/Domain/Common/SitemapXmlSettings.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ public SitemapXmlSettings()
3737
/// </summary>
3838
public bool SitemapXmlIncludeManufacturers { get; set; }
3939

40-
/// <summary>
41-
/// Gets or sets a value indicating whether to include news to sitemap.xml
42-
/// </summary>
43-
public bool SitemapXmlIncludeNews { get; set; }
44-
4540
/// <summary>
4641
/// Gets or sets a value indicating whether to include products to sitemap.xml
4742
/// </summary>

src/Libraries/Nop.Core/Domain/Messages/MessageTemplateSystemNames.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,6 @@ public static partial class MessageTemplateSystemNames
286286
/// </summary>
287287
public const string BLOG_COMMENT_STORE_OWNER_NOTIFICATION = "Blog.BlogComment";
288288

289-
/// <summary>
290-
/// Represents system name of notification store owner about new news comment
291-
/// </summary>
292-
public const string NEWS_COMMENT_STORE_OWNER_NOTIFICATION = "News.NewsComment";
293-
294289
/// <summary>
295290
/// Represents system name of notification customer about product receipt
296291
/// </summary>

src/Libraries/Nop.Core/Domain/News/NewsCommentApprovedEvent.cs

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

src/Libraries/Nop.Core/Domain/Security/CaptchaSettings.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,10 @@ public partial class CaptchaSettings : ISettings
4747
/// </summary>
4848
public bool ShowOnBlogCommentPage { get; set; }
4949

50-
/// <summary>
51-
/// A value indicating whether CAPTCHA should be displayed on the "comment news" page
52-
/// </summary>
53-
public bool ShowOnNewsCommentPage { get; set; }
54-
5550
/// <summary>
5651
/// A value indicating whether CAPTCHA should be displayed on the "News letter" page
5752
/// </summary>
58-
public bool ShowOnNewsletterPage { get; set; }
53+
public bool ShowOnNewsletterPage { get; set; }
5954

6055
/// <summary>
6156
/// A value indicating whether CAPTCHA should be displayed on the product reviews page

src/Libraries/Nop.Core/Http/NopRouteNames.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ public static partial class General
6565
/// </summary>
6666
public const string BLOG = "Blog";
6767

68-
/// <summary>
69-
/// Gets the news route name
70-
/// </summary>
71-
public const string NEWS = "NewsArchive";
72-
7368
/// <summary>
7469
/// Gets the forums route name
7570
/// </summary>
@@ -291,11 +286,6 @@ public static partial class Standard
291286
/// </summary>
292287
public const string BLOG_RSS = "BlogRSS";
293288

294-
/// <summary>
295-
/// Gets the news RSS route name
296-
/// </summary>
297-
public const string NEWS_RSS = "NewsRSS";
298-
299289
/// <summary>
300290
/// Gets the customer return request route name
301291
/// </summary>

src/Libraries/Nop.Data/Mapping/BaseNameCompatibility.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Nop.Core.Domain.Customers;
44
using Nop.Core.Domain.Discounts;
55
using Nop.Core.Domain.Forums;
6-
using Nop.Core.Domain.News;
76
using Nop.Core.Domain.Orders;
87
using Nop.Core.Domain.Security;
98
using Nop.Core.Domain.Shipping;
@@ -38,8 +37,7 @@ public partial class BaseNameCompatibility : INameCompatibility
3837
{ typeof(ForumPostVote), "Forums_PostVote" },
3938
{ typeof(ForumSubscription), "Forums_Subscription" },
4039
{ typeof(ForumTopic), "Forums_Topic" },
41-
{ typeof(PrivateMessage), "Forums_PrivateMessage" },
42-
{ typeof(NewsItem), "News" }
40+
{ typeof(PrivateMessage), "Forums_PrivateMessage" }
4341
};
4442

4543
public Dictionary<(Type, string), string> ColumnName => new()

src/Libraries/Nop.Data/Migrations/Installation/SchemaMigration.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using Nop.Core.Domain.Media;
1616
using Nop.Core.Domain.Menus;
1717
using Nop.Core.Domain.Messages;
18-
using Nop.Core.Domain.News;
1918
using Nop.Core.Domain.Orders;
2019
using Nop.Core.Domain.Polls;
2120
using Nop.Core.Domain.ScheduleTasks;
@@ -154,8 +153,6 @@ public override void Up()
154153
Create.TableFor<NewsLetterSubscriptionType>();
155154
Create.TableFor<NewsLetterSubscription>();
156155
Create.TableFor<QueuedEmail>();
157-
Create.TableFor<NewsItem>();
158-
Create.TableFor<NewsComment>();
159156
Create.TableFor<Poll>();
160157
Create.TableFor<PollAnswer>();
161158
Create.TableFor<PollVotingRecord>();

src/Libraries/Nop.Data/Migrations/UpgradeTo460/MySqlDateTimeWithPrecisionMigration.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using Nop.Core.Domain.Gdpr;
1010
using Nop.Core.Domain.Logging;
1111
using Nop.Core.Domain.Messages;
12-
using Nop.Core.Domain.News;
1312
using Nop.Core.Domain.Orders;
1413
using Nop.Core.Domain.Polls;
1514
using Nop.Core.Domain.ScheduleTasks;
@@ -171,20 +170,6 @@ public override void Up()
171170
.AlterColumn(NameCompatibilityManager.GetColumnName(typeof(MigrationVersionInfo), nameof(MigrationVersionInfo.AppliedOn)))
172171
.AsCustom("datetime(6)")
173172
.Nullable();
174-
Alter.Table(NameCompatibilityManager.GetTableName(typeof(NewsItem)))
175-
.AlterColumn(NameCompatibilityManager.GetColumnName(typeof(NewsItem), nameof(NewsItem.CreatedOnUtc)))
176-
.AsCustom("datetime(6)");
177-
Alter.Table(NameCompatibilityManager.GetTableName(typeof(NewsItem)))
178-
.AlterColumn(NameCompatibilityManager.GetColumnName(typeof(NewsItem), nameof(NewsItem.EndDateUtc)))
179-
.AsCustom("datetime(6)")
180-
.Nullable();
181-
Alter.Table(NameCompatibilityManager.GetTableName(typeof(NewsItem)))
182-
.AlterColumn(NameCompatibilityManager.GetColumnName(typeof(NewsItem), nameof(NewsItem.StartDateUtc)))
183-
.AsCustom("datetime(6)")
184-
.Nullable();
185-
Alter.Table(NameCompatibilityManager.GetTableName(typeof(NewsComment)))
186-
.AlterColumn(NameCompatibilityManager.GetColumnName(typeof(NewsComment), nameof(NewsComment.CreatedOnUtc)))
187-
.AsCustom("datetime(6)");
188173
Alter.Table(NameCompatibilityManager.GetTableName(typeof(NewsLetterSubscription)))
189174
.AlterColumn(NameCompatibilityManager.GetColumnName(typeof(NewsLetterSubscription), nameof(NewsLetterSubscription.CreatedOnUtc)))
190175
.AsCustom("datetime(6)");

src/Libraries/Nop.Data/Migrations/UpgradeTo470/AddIndexesMigration.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using Nop.Core.Domain.Customers;
55
using Nop.Core.Domain.Forums;
66
using Nop.Core.Domain.Logging;
7-
using Nop.Core.Domain.News;
87
using Nop.Core.Domain.Orders;
98
using Nop.Core.Domain.Polls;
109
using Nop.Data.Mapping;
@@ -120,11 +119,6 @@ public override void Up()
120119
.OnColumn(nameof(RewardPointsHistory.CustomerId)).Ascending()
121120
.WithOptions().NonClustered();
122121

123-
if (!Schema.Table(nameof(NewsComment)).Index("IX_NewsComment_CustomerId").Exists())
124-
IfDatabase(databaseType).Create.Index("IX_NewsComment_CustomerId").OnTable(nameof(NewsComment))
125-
.OnColumn(nameof(NewsComment.CustomerId)).Ascending()
126-
.WithOptions().NonClustered();
127-
128122
if (!Schema.Table(NameCompatibilityManager.GetTableName(typeof(CustomerAddressMapping)))
129123
.Index("IX_CustomerAddressMapping_CustomerId").Exists())
130124
IfDatabase(databaseType).Create.Index("IX_CustomerAddressMapping_CustomerId")

0 commit comments

Comments
 (0)