Skip to content

Commit 907fcdd

Browse files
muratcakirmuratcakir
committed
Merge branch '2.x' into sass
# Conflicts: # src/Presentation/SmartStore.Web/Administration/Views/Import/_ColumnMappings.cshtml
2 parents b275999 + 0f839d0 commit 907fcdd

121 files changed

Lines changed: 3939 additions & 2527 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.

‎build.bat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ FOR %%b in (
55

66
"%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
77
"%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
8-
"%ProgramFiles%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
8+
"%ProgramFiles%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
9+
10+
"%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
11+
"%ProgramFiles(x86)%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"
12+
"%ProgramFiles%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"
913
) do (
1014
if exist %%b (
1115
call %%b x86

‎changelog.md‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,27 @@
33
## SmartStore.NET 2.5.1
44

55
### Highlights
6-
* #637 Integrate PayPal PLUS Provider
6+
* #637 Integrated PayPal PLUS payment Provider
7+
* Major improvements in Importer: better field mapping, higher performance, bug fixes etc.
78

89
### New Features
10+
* #637 Integrated PayPal PLUS payment Provider
11+
* #961 Fix "Open Redirection Vulnerability"
912
* #571 Option to display another checkbox on confirm page to let the customer accept that his email address can be handed over to a third party
1013
* #870 Implement address import for customers (both billing & shipping address)
1114
* #886 Add setting to hide manufacturer images on product detail page and to hide default image for manufacturers
1215
* Import localized SEO names for product and categories
16+
* #477 Implement option to specify the number of exported and imported pictures
1317

1418
### Improvements
19+
* Major improvements in Importer: better field mapping, higher performance, bug fixes etc.
1520
* (Dev) Publishing SmartStore.Web from within Visual Studio now deploys the project correctly. No need to execute ClickToBuild.cmd anymore. Just publish directly to any target, including Azure.
1621
* Localization & SEO: language switcher now takes language specific SEO slugs into account when building links
1722
* Exports the product detail link including the attribute query string when exporting attribute combinations
1823
* #918 Compare products: Display base price information
1924
* Export email attachments needs to be stored in database because the temp file may not exist anymore when sending the email
25+
* #913 Use HTML5 Input types (tel, email)
26+
* Added paging to frontend order list
2027

2128
### Bugfixes
2229
* Fixed ajax cache issue when saving payment or shipping restrictions. Internet Explorer showed the old data state (before storage).
@@ -29,6 +36,14 @@
2936
* BizImporter: fixed redirection bug when default file extension in .biz wasn't .html
3037
* Fixed: Export deployment emails were always send manually
3138
* Manually notifying gift card recipient threw an exception
39+
* Loading shipping by weight grid failed under SQL CE
40+
* #949 Import: ProcessSlugs does not process explicitly specified "SeName", if product name did not change in an update scenario
41+
* Customer import: Creates customer role duplicates for inserted customers
42+
* GMC feed does not generate the sale price if the sale price is set for a future date
43+
* Mobile devices: Fixed "Uncaught Error: Syntax error, unrecognized expression: :nth-child"
44+
* Download nor sample download were removable when editing product
45+
* Copied product must not share sample download of source product. Could produce "The DELETE statement conflicted with the REFERENCE constraint 'FK_dbo.Product_dbo.Download_SampleDownloadId'".
46+
* #921 Specification attribute options with single quotation marks are causing a Javascript error
3247

3348

3449
## SmartStore.NET 2.5

‎src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ public string Sku
191191
/// Gets or sets the manufacturer part number
192192
/// </summary>
193193
[DataMember]
194+
[Index]
194195
public string ManufacturerPartNumber
195196
{
196197
[DebuggerStepThrough]
@@ -208,6 +209,7 @@ public string ManufacturerPartNumber
208209
/// Gets or sets the Global Trade Item Number (GTIN). These identifiers include UPC (in North America), EAN (in Europe), JAN (in Japan), and ISBN (for books).
209210
/// </summary>
210211
[DataMember]
212+
[Index]
211213
public string Gtin
212214
{
213215
[DebuggerStepThrough]

‎src/Libraries/SmartStore.Core/Domain/DataExchange/ImportProfile.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ public ImportEntityType EntityType
8585
/// </summary>
8686
public string FileTypeConfiguration { get; set; }
8787

88+
/// <summary>
89+
/// XML with extra data
90+
/// </summary>
91+
public string ExtraData { get; set; }
92+
8893
/// <summary>
8994
/// Mapping of import columns
9095
/// </summary>

‎src/Libraries/SmartStore.Core/Domain/Media/MediaSettings.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public MediaSettings()
1818
CartThumbPictureSize = 80;
1919
CartThumbBundleItemPictureSize = 32;
2020
MiniCartThumbPictureSize = 32;
21-
AutoCompleteSearchThumbPictureSize = 20;
21+
VariantValueThumbPictureSize = 20;
2222
MaximumImageSize = 1280;
2323
DefaultPictureZoomEnabled = true;
2424
PictureZoomType = "window";
@@ -38,7 +38,7 @@ public MediaSettings()
3838
public int CartThumbPictureSize { get; set; }
3939
public int CartThumbBundleItemPictureSize { get; set; }
4040
public int MiniCartThumbPictureSize { get; set; }
41-
public int AutoCompleteSearchThumbPictureSize { get; set; }
41+
public int VariantValueThumbPictureSize { get; set; }
4242

4343
public bool DefaultPictureZoomEnabled { get; set; }
4444
public string PictureZoomType { get; set; }

‎src/Libraries/SmartStore.Core/Domain/Orders/OrderSettings.cs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System.Collections.Generic;
2-
using SmartStore.Core.Configuration;
1+
using SmartStore.Core.Configuration;
32
using SmartStore.Core.Domain.Localization;
43

54
namespace SmartStore.Core.Domain.Orders
@@ -16,6 +15,7 @@ public OrderSettings()
1615
ReturnRequestReasons = "Received Wrong Product,Wrong Product Ordered,There Was A Problem With The Product";
1716
NumberOfDaysReturnRequestAvailable = 365;
1817
MinimumOrderPlacementInterval = 30;
18+
OrderListPageSize = 10;
1919
}
2020

2121
/// <summary>
@@ -87,5 +87,10 @@ public OrderSettings()
8787
/// Gets or sets a value indicating whether to display all orders of all stores to a customer
8888
/// </summary>
8989
public bool DisplayOrdersOfAllStores { get; set; }
90+
91+
/// <summary>
92+
/// Page size of the order list
93+
/// </summary>
94+
public int OrderListPageSize { get; set; }
9095
}
9196
}

‎src/Libraries/SmartStore.Core/Extensions/MiscExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static void Dump(this Exception exception)
2424
public static string ToAllMessages(this Exception exception)
2525
{
2626
var sb = new StringBuilder();
27-
27+
2828
while (exception != null)
2929
{
3030
if (!sb.ToString().EmptyNull().Contains(exception.Message))

‎src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ContainerManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public object ResolveUnregistered(Type type, ILifetimeScope scope = null)
9595
}
9696
}
9797

98-
throw new SmartException("No contructor was found that had all the dependencies satisfied.");
98+
throw new SmartException("No constructor for {0} was found that had all the dependencies satisfied.".FormatInvariant(type.Name.NaIfEmpty()));
9999
}
100100

101101
private bool TryResolveAll(Type[] types, out object[] instances, ILifetimeScope scope = null)

‎src/Libraries/SmartStore.Core/SmartStoreVersion.cs‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ public static class SmartStoreVersion
2323
new Version("2.5")
2424
};
2525

26-
private const string HELP_BASEURL = "http://docs.smartstore.com/display/SMNET25/";
26+
//private const string HELP_BASEURL = "http://docs.smartstore.com/display/SMNET25/";
27+
private const string HELP_BASEURL = "http://docs.smartstore.com/display/";
2728

28-
static SmartStoreVersion()
29+
static SmartStoreVersion()
2930
{
3031
s_breakingChangesHistory.Reverse();
3132

@@ -67,9 +68,18 @@ public static Version Version
6768
}
6869
}
6970

70-
public static string GenerateHelpUrl(string path)
71+
public static string GenerateHelpUrl(string languageCode, string path)
7172
{
72-
return HELP_BASEURL + path.Trim().TrimStart('/', '\\');
73+
return String.Concat(
74+
HELP_BASEURL,
75+
GetUserGuideSpaceKey(languageCode),
76+
"/",
77+
path.EmptyNull().Trim().TrimStart('/', '\\'));
78+
}
79+
80+
public static string GetUserGuideSpaceKey(string languageCode)
81+
{
82+
return "SMNET25";
7383
}
7484

7585
/// <summary>

‎src/Libraries/SmartStore.Data/Mapping/DataExchange/ImportProfileMap.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public ImportProfileMap()
1414
this.Property(x => x.FolderName).IsRequired().HasMaxLength(100);
1515
this.Property(x => x.KeyFieldNames).HasMaxLength(1000);
1616
this.Property(x => x.FileTypeConfiguration).IsMaxLength();
17+
this.Property(x => x.ExtraData).IsMaxLength();
1718
this.Property(x => x.ColumnMapping).IsMaxLength();
1819
this.Property(x => x.ResultInfo).IsMaxLength();
1920

0 commit comments

Comments
 (0)