Skip to content

Commit 2d5437c

Browse files
Michael-HerzogMichael-Herzog
committed
Closes smartstore#459 New field to determine tag for topic widget
1 parent 7439990 commit 2d5437c

17 files changed

Lines changed: 161 additions & 80 deletions

File tree

‎changelog.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Release Notes
1+
# Release Notes
22

33
## SmartStore.NET 2.2
44

@@ -9,6 +9,7 @@
99
* Quantity unit management
1010
* Option to determine the maximum amount of filter items
1111
* Option to determine whether all filter groups should be displayed expanded
12+
* #459 New field to determine tag for page titles on widget level
1213

1314
### Improvements
1415
* Feed plugins: product query now paged to reduce memory payload
@@ -26,6 +27,7 @@
2627
* Tax rates persisted on order item level to avoid rounding issues (required for Debitoor, Accarda and Payone)
2728
* Print order as pdf redirected to login although the admin already was logged in
2829
* #621 PDF Order: does not take overridden attribute combination price into account (in order line)
30+
* Hide additional shipping surcharge when display prices permission is not granted
2931

3032

3133
## SmartStore.NET 2.1.1

‎src/Libraries/SmartStore.Core/Domain/Topics/Topic.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ public partial class Topic : BaseEntity, ILocalizedEntity, IStoreMappingSupporte
9191
/// </summary>
9292
public int Priority { get; set; }
9393

94+
/// <summary>
95+
/// Gets or sets the title tag
96+
/// </summary>
97+
public string TitleTag { get; set; }
98+
9499
/// <summary>
95100
/// Helper function which gets the comma-separated <c>WidgetZone</c> property as list of strings
96101
/// </summary>

‎src/Libraries/SmartStore.Data/Migrations/201501291549546_OrderItemTaxRate.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ public override void Up()
1111
AddColumn("dbo.Order", "OrderShippingTaxRate", c => c.Decimal(nullable: false, precision: 18, scale: 4));
1212
AddColumn("dbo.Order", "PaymentMethodAdditionalFeeTaxRate", c => c.Decimal(nullable: false, precision: 18, scale: 4));
1313
AddColumn("dbo.OrderItem", "TaxRate", c => c.Decimal(nullable: false, precision: 18, scale: 4));
14+
AddColumn("dbo.Topic", "TitleTag", c => c.String(nullable: true));
1415
}
1516

1617
public override void Down()
1718
{
1819
DropColumn("dbo.OrderItem", "TaxRate");
1920
DropColumn("dbo.Order", "PaymentMethodAdditionalFeeTaxRate");
2021
DropColumn("dbo.Order", "OrderShippingTaxRate");
22+
DropColumn("dbo.Topic", "TitleTag");
2123
}
2224

2325
public bool RollbackOnFailure
@@ -52,6 +54,13 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
5254
builder.AddOrUpdate("Admin.Common.Export.Wait",
5355
"Please wait while the export is being executed",
5456
"Bitte haben Sie einen Augenblick Geduld, während der Export durchgeführt wird");
57+
58+
builder.AddOrUpdate("Admin.ContentManagement.Topics.Fields.TitleTag",
59+
"Title tag",
60+
"Titel-Tag",
61+
"Determines the title tag of the topic",
62+
"Legt das Tag fest, welches für die Überschrift des Topics ausgegeben wird");
63+
5564
}
5665
}
5766
}

‎src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.cs‎

Lines changed: 109 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -6361,18 +6361,108 @@ public IList<Manufacturer> Manufacturers()
63616361
PageSize = 12,
63626362
AllowCustomersToSelectPageSize = true,
63636363
PageSizeOptions = "12,18,36,72,150",
6364-
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0000746_apple_125.jpeg"), "image/pjpeg", GetSeName("Apple")),
6364+
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0000746_apple_125.png"), "image/png", GetSeName("Apple")),
63656365
Published = true,
6366-
DisplayOrder = 2,
6366+
DisplayOrder = 1,
63676367
CreatedOnUtc = DateTime.UtcNow,
63686368
UpdatedOnUtc = DateTime.UtcNow
63696369
};
63706370

63716371
#endregion Apple
63726372

6373-
#region Samsung
6374-
6375-
var manufacturerSamsung = new Manufacturer
6373+
#region Android
6374+
6375+
var manufacturerAndroid = new Manufacturer
6376+
{
6377+
Name = "Android",
6378+
ManufacturerTemplateId = manufacturerTemplateInGridAndLines.Id,
6379+
PageSize = 12,
6380+
AllowCustomersToSelectPageSize = true,
6381+
PageSizeOptions = "12,18,36,72,150",
6382+
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "manufacturer-android.png"), "image/png", GetSeName("Android")),
6383+
Published = true,
6384+
DisplayOrder = 2,
6385+
CreatedOnUtc = DateTime.UtcNow,
6386+
UpdatedOnUtc = DateTime.UtcNow
6387+
};
6388+
6389+
#endregion Android
6390+
6391+
#region LG
6392+
6393+
var manufacturerLG = new Manufacturer
6394+
{
6395+
Name = "LG",
6396+
ManufacturerTemplateId = manufacturerTemplateInGridAndLines.Id,
6397+
PageSize = 12,
6398+
AllowCustomersToSelectPageSize = true,
6399+
PageSizeOptions = "12,18,36,72,150",
6400+
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "manufacturer-lg.png"), "image/png", GetSeName("LG")),
6401+
Published = true,
6402+
DisplayOrder = 3,
6403+
CreatedOnUtc = DateTime.UtcNow,
6404+
UpdatedOnUtc = DateTime.UtcNow
6405+
};
6406+
6407+
#endregion LG
6408+
6409+
#region Dell
6410+
6411+
var manufacturerDell = new Manufacturer
6412+
{
6413+
Name = "Dell",
6414+
ManufacturerTemplateId = manufacturerTemplateInGridAndLines.Id,
6415+
PageSize = 12,
6416+
AllowCustomersToSelectPageSize = true,
6417+
PageSizeOptions = "12,18,36,72,150",
6418+
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "Dell_Logo.png"), "image/pjpeg", GetSeName("Dell")),
6419+
Published = true,
6420+
DisplayOrder = 4,
6421+
CreatedOnUtc = DateTime.UtcNow,
6422+
UpdatedOnUtc = DateTime.UtcNow
6423+
};
6424+
6425+
#endregion Dell
6426+
6427+
#region HP
6428+
6429+
var manufacturerHP = new Manufacturer
6430+
{
6431+
Name = "HP",
6432+
ManufacturerTemplateId = manufacturerTemplateInGridAndLines.Id,
6433+
PageSize = 12,
6434+
AllowCustomersToSelectPageSize = true,
6435+
PageSizeOptions = "12,18,36,72,150",
6436+
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "HP_Logo_2012.svg.png"), "image/png", GetSeName("HP")),
6437+
Published = true,
6438+
DisplayOrder = 5,
6439+
CreatedOnUtc = DateTime.UtcNow,
6440+
UpdatedOnUtc = DateTime.UtcNow
6441+
};
6442+
6443+
#endregion HP
6444+
6445+
#region Microsoft
6446+
6447+
var manufacturerMicrosoft = new Manufacturer
6448+
{
6449+
Name = "Microsoft",
6450+
ManufacturerTemplateId = manufacturerTemplateInGridAndLines.Id,
6451+
PageSize = 12,
6452+
AllowCustomersToSelectPageSize = true,
6453+
PageSizeOptions = "12,18,36,72,150",
6454+
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "manufacturer-microsoft.png"), "image/png", GetSeName("Microsoft")),
6455+
Published = true,
6456+
DisplayOrder = 6,
6457+
CreatedOnUtc = DateTime.UtcNow,
6458+
UpdatedOnUtc = DateTime.UtcNow
6459+
};
6460+
6461+
#endregion Microsoft
6462+
6463+
#region Samsung
6464+
6465+
var manufacturerSamsung = new Manufacturer
63766466
{
63776467
Name = "Samsung",
63786468
ManufacturerTemplateId = manufacturerTemplateInGridAndLines.Id,
@@ -6381,49 +6471,13 @@ public IList<Manufacturer> Manufacturers()
63816471
PageSizeOptions = "12,18,36,72,150",
63826472
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0000904_samsung_125.jpeg"), "image/pjpeg", GetSeName("Samsung")),
63836473
Published = true,
6384-
DisplayOrder = 2,
6474+
DisplayOrder = 7,
63856475
CreatedOnUtc = DateTime.UtcNow,
63866476
UpdatedOnUtc = DateTime.UtcNow
63876477
};
63886478

63896479
#endregion Samsung
63906480

6391-
#region LG
6392-
6393-
var manufacturerLG = new Manufacturer
6394-
{
6395-
Name = "LG",
6396-
ManufacturerTemplateId = manufacturerTemplateInGridAndLines.Id,
6397-
PageSize = 12,
6398-
AllowCustomersToSelectPageSize = true,
6399-
PageSizeOptions = "12,18,36,72,150",
6400-
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0000900_lg.jpeg"), "image/pjpeg", GetSeName("LG")),
6401-
Published = true,
6402-
DisplayOrder = 2,
6403-
CreatedOnUtc = DateTime.UtcNow,
6404-
UpdatedOnUtc = DateTime.UtcNow
6405-
};
6406-
6407-
#endregion LG
6408-
6409-
#region HP
6410-
6411-
var manufacturerHP = new Manufacturer
6412-
{
6413-
Name = "HP",
6414-
ManufacturerTemplateId = manufacturerTemplateInGridAndLines.Id,
6415-
PageSize = 12,
6416-
AllowCustomersToSelectPageSize = true,
6417-
PageSizeOptions = "12,18,36,72,150",
6418-
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "HP_Logo_2012.svg.png"), "image/png", GetSeName("HP")),
6419-
Published = true,
6420-
DisplayOrder = 2,
6421-
CreatedOnUtc = DateTime.UtcNow,
6422-
UpdatedOnUtc = DateTime.UtcNow
6423-
};
6424-
6425-
#endregion HP
6426-
64276481
#region Acer
64286482

64296483
var manufacturerAcer = new Manufacturer
@@ -6435,14 +6489,13 @@ public IList<Manufacturer> Manufacturers()
64356489
PageSizeOptions = "12,18,36,72,150",
64366490
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "acer-logo.jpg"), "image/pjpeg", GetSeName("Acer")),
64376491
Published = true,
6438-
DisplayOrder = 2,
6492+
DisplayOrder = 8,
64396493
CreatedOnUtc = DateTime.UtcNow,
64406494
UpdatedOnUtc = DateTime.UtcNow
64416495
};
64426496

64436497
#endregion Acer
64446498

6445-
64466499
#region TrekStor
64476500

64486501
var manufacturerTrekStor = new Manufacturer
@@ -6454,7 +6507,7 @@ public IList<Manufacturer> Manufacturers()
64546507
PageSizeOptions = "12,18,36,72,150",
64556508
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0000993_trekstor.jpeg"), "image/pjpeg", GetSeName("TrekStor")),
64566509
Published = true,
6457-
DisplayOrder = 2,
6510+
DisplayOrder = 9,
64586511
CreatedOnUtc = DateTime.UtcNow,
64596512
UpdatedOnUtc = DateTime.UtcNow
64606513
};
@@ -6472,31 +6525,13 @@ public IList<Manufacturer> Manufacturers()
64726525
PageSizeOptions = "12,18,36,72,150",
64736526
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0000994_western-digital.jpeg"), "image/pjpeg", GetSeName("Western Digital")),
64746527
Published = true,
6475-
DisplayOrder = 2,
6528+
DisplayOrder = 10,
64766529
CreatedOnUtc = DateTime.UtcNow,
64776530
UpdatedOnUtc = DateTime.UtcNow
64786531
};
64796532

64806533
#endregion Western Digital
64816534

6482-
#region Dell
6483-
6484-
var manufacturerDell = new Manufacturer
6485-
{
6486-
Name = "Dell",
6487-
ManufacturerTemplateId = manufacturerTemplateInGridAndLines.Id,
6488-
PageSize = 12,
6489-
AllowCustomersToSelectPageSize = true,
6490-
PageSizeOptions = "12,18,36,72,150",
6491-
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "Dell_Logo.png"), "image/pjpeg", GetSeName("Dell")),
6492-
Published = true,
6493-
DisplayOrder = 2,
6494-
CreatedOnUtc = DateTime.UtcNow,
6495-
UpdatedOnUtc = DateTime.UtcNow
6496-
};
6497-
6498-
#endregion Dell
6499-
65006535
#region MSI
65016536

65026537
var manufacturerMSI = new Manufacturer
@@ -6508,7 +6543,7 @@ public IList<Manufacturer> Manufacturers()
65086543
PageSizeOptions = "12,18,36,72,150",
65096544
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "msi_logo1.jpg"), "image/pjpeg", GetSeName("MSI")),
65106545
Published = true,
6511-
DisplayOrder = 2,
6546+
DisplayOrder = 11,
65126547
CreatedOnUtc = DateTime.UtcNow,
65136548
UpdatedOnUtc = DateTime.UtcNow
65146549
};
@@ -6526,7 +6561,7 @@ public IList<Manufacturer> Manufacturers()
65266561
PageSizeOptions = "12,18,36,72,150",
65276562
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0001085_canon.jpeg"), "image/pjpeg", GetSeName("Canon")),
65286563
Published = true,
6529-
DisplayOrder = 2,
6564+
DisplayOrder = 12,
65306565
CreatedOnUtc = DateTime.UtcNow,
65316566
UpdatedOnUtc = DateTime.UtcNow
65326567
};
@@ -6544,7 +6579,7 @@ public IList<Manufacturer> Manufacturers()
65446579
PageSizeOptions = "12,18,36,72,150",
65456580
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0001086_casio.jpeg"), "image/pjpeg", GetSeName("Casio")),
65466581
Published = true,
6547-
DisplayOrder = 2,
6582+
DisplayOrder = 13,
65486583
CreatedOnUtc = DateTime.UtcNow,
65496584
UpdatedOnUtc = DateTime.UtcNow
65506585
};
@@ -6562,7 +6597,7 @@ public IList<Manufacturer> Manufacturers()
65626597
PageSizeOptions = "12,18,36,72,150",
65636598
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0001087_panasonic.jpeg"), "image/pjpeg", GetSeName("Panasonic")),
65646599
Published = true,
6565-
DisplayOrder = 2,
6600+
DisplayOrder = 14,
65666601
CreatedOnUtc = DateTime.UtcNow,
65676602
UpdatedOnUtc = DateTime.UtcNow
65686603
};
@@ -6580,7 +6615,7 @@ public IList<Manufacturer> Manufacturers()
65806615
PageSizeOptions = "12,18,36,72,150",
65816616
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0000898_blackberry.jpeg"), "image/pjpeg", GetSeName("BlackBerry")),
65826617
Published = true,
6583-
DisplayOrder = 2,
6618+
DisplayOrder = 15,
65846619
CreatedOnUtc = DateTime.UtcNow,
65856620
UpdatedOnUtc = DateTime.UtcNow
65866621
};
@@ -6598,7 +6633,7 @@ public IList<Manufacturer> Manufacturers()
65986633
PageSizeOptions = "12,18,36,72,150",
65996634
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0000899_htc.png"), "image/pjpeg", GetSeName("HTC")),
66006635
Published = true,
6601-
DisplayOrder = 2,
6636+
DisplayOrder = 16,
66026637
CreatedOnUtc = DateTime.UtcNow,
66036638
UpdatedOnUtc = DateTime.UtcNow
66046639
};
@@ -6616,7 +6651,7 @@ public IList<Manufacturer> Manufacturers()
66166651
PageSizeOptions = "12,18,36,72,150",
66176652
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0001591_festina.jpeg"), "image/pjpeg", GetSeName("Festina")),
66186653
Published = true,
6619-
DisplayOrder = 2,
6654+
DisplayOrder = 17,
66206655
CreatedOnUtc = DateTime.UtcNow,
66216656
UpdatedOnUtc = DateTime.UtcNow
66226657
};
@@ -6634,7 +6669,7 @@ public IList<Manufacturer> Manufacturers()
66346669
PageSizeOptions = "12,18,36,72,150",
66356670
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "0001328_certina_125.jpeg"), "image/pjpeg", GetSeName("Certina")),
66366671
Published = true,
6637-
DisplayOrder = 2,
6672+
DisplayOrder = 18,
66386673
CreatedOnUtc = DateTime.UtcNow,
66396674
UpdatedOnUtc = DateTime.UtcNow
66406675
};
@@ -6652,7 +6687,7 @@ public IList<Manufacturer> Manufacturers()
66526687
PageSizeOptions = "12,18,36,72,150",
66536688
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "sony-logo.jpg"), "image/pjpeg", GetSeName("Sony")),
66546689
Published = true,
6655-
DisplayOrder = 2,
6690+
DisplayOrder = 19,
66566691
CreatedOnUtc = DateTime.UtcNow,
66576692
UpdatedOnUtc = DateTime.UtcNow
66586693
};
@@ -6670,7 +6705,7 @@ public IList<Manufacturer> Manufacturers()
66706705
PageSizeOptions = "12,18,36,72,150",
66716706
Picture = CreatePicture(File.ReadAllBytes(sampleImagesPath + "ubisoft-logo.jpg"), "image/pjpeg", GetSeName("Ubisoft")),
66726707
Published = true,
6673-
DisplayOrder = 2,
6708+
DisplayOrder = 20,
66746709
CreatedOnUtc = DateTime.UtcNow,
66756710
UpdatedOnUtc = DateTime.UtcNow
66766711
};

0 commit comments

Comments
 (0)