Skip to content

Commit aa1bc43

Browse files
muratcakirmuratcakir
committed
Merge branch '2.x' into feature/providers
Conflicts: README.md changelog.md src/Libraries/SmartStore.Data/SmartStore.Data.csproj src/Libraries/SmartStore.Services/Discounts/DiscountService.cs src/Libraries/SmartStore.Services/Payments/PaymentService.cs src/Libraries/SmartStore.Services/SmartStore.Services.csproj src/Plugins/Api.WebApi/Description.txt src/Plugins/DiscountRules.HadSpentAmount/HadSpentAmountDiscountRequirementRule.cs src/Plugins/DiscountRules.HadSpentAmount/Localization/resources.de-de.xml src/Plugins/Feed.Froogle/Description.txt src/Plugins/Feed.Froogle/Models/FeedFroogleModel.cs src/Plugins/Feed.Froogle/Services/GoogleFeedService.cs src/Plugins/Payments.PayPalStandard/Description.txt src/Plugins/Shipping.ByTotal/Description.txt src/Plugins/Shipping.ByTotal/Views/ShippingByTotal/Configure.cshtml src/Plugins/Shipping.ByWeight/Description.txt src/Presentation/SmartStore.Web/Administration/Content/admin.less src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj src/Presentation/SmartStore.Web/Administration/Views/ActivityLog/ListTypes.cshtml src/Presentation/SmartStore.Web/Administration/Views/Campaign/List.cshtml src/Presentation/SmartStore.Web/Administration/Views/Category/Edit.cshtml src/Presentation/SmartStore.Web/Administration/Views/Currency/List.cshtml src/Presentation/SmartStore.Web/Administration/Views/ExternalAuthentication/Methods.cshtml src/Presentation/SmartStore.Web/Administration/Views/Measure/Dimensions.cshtml src/Presentation/SmartStore.Web/Administration/Views/Measure/Weights.cshtml src/Presentation/SmartStore.Web/Administration/Views/NewsLetterSubscription/List.cshtml src/Presentation/SmartStore.Web/Administration/Views/Order/AddProductToOrderDetails.cshtml src/Presentation/SmartStore.Web/Administration/Views/Order/Edit.cshtml src/Presentation/SmartStore.Web/Administration/Views/Product/BulkEdit.cshtml src/Presentation/SmartStore.Web/Administration/Views/Product/List.cshtml src/Presentation/SmartStore.Web/Administration/Views/Product/_CreateOrUpdate.Attributes.cshtml src/Presentation/SmartStore.Web/Administration/Views/Product/_CreateOrUpdate.Price.cshtml src/Presentation/SmartStore.Web/Administration/Views/ReturnRequest/Edit.cshtml src/Presentation/SmartStore.Web/Administration/Views/Shipping/Providers.cshtml src/Presentation/SmartStore.Web/Administration/Views/Widget/List.cshtml src/Presentation/SmartStore.Web/Content/theme.common.less src/Presentation/SmartStore.Web/Controllers/CatalogController.cs src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs src/Presentation/SmartStore.Web/Scripts/smartstore.jquery.utils.js src/Presentation/SmartStore.Web/SmartStore.Web.csproj src/Presentation/SmartStore.Web/Themes/Alpha/Content/site.less src/Presentation/SmartStore.Web/Views/Order/Details.cshtml src/Presentation/SmartStore.Web/Views/Product/AskQuestion.cshtml src/Presentation/SmartStore.Web/Views/Product/EmailAFriend.cshtml
2 parents a8185f6 + adb7a1e commit aa1bc43

320 files changed

Lines changed: 11825 additions & 4708 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.

‎changelog.md‎

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

33
##SmartStore.NET 2.1#
44

@@ -16,6 +16,17 @@
1616
* (Developer) Simple widgets: the model of the parent action view context now gets passed to a widget.
1717
* (Developer) New IoC method ContainerManager.InjectProperties()
1818
* #393 Web API: Implement OData actions for simpler working with product attributes
19+
* #431 Web API: Add support for localized properties
20+
* ShippingByWeight: new settings to configure a small quantity surcharge
21+
* #216 Better return request support
22+
* #90 Directly set order status to completed
23+
* #413 Orders: Add a PDF export\download of selected orders
24+
* #69 Award reward points for product reviews
25+
* #164 Add multistore support for polls
26+
* #170 Multistore support for Newsletters
27+
* #266 Update Pending Order in Admin Panel
28+
* #331 Show CommentBox in checkout (optional)
29+
* Option to turn off the filter for products in categories
1930

2031
###Improvements###
2132
* New backend design and cleaner frontend theme
@@ -52,7 +63,13 @@
5263
- Html.Add[Script|CssFile]Parts() now can handle already bundled resources correctly (no attempt is made to bundle them, the bundle's virtual url is returned instead)
5364
- Made extra bundles for frequently used resources (like sequence js, fileupload, image gallery etc.). This way they always come compressed.
5465
* #384 Web API: Inserting sluged recources like products require an URL record
55-
* Promotion feed plugins: Asynchronous feed creation
66+
* #382 Promotion feed plugins: Asynchronous feed creation, more options and improvements
67+
* #433 GMC feed: Option to filter config records that have not been edited
68+
* #362 Display 'from {0}' for products with variant attributes
69+
* #239 Categories: Ask merchant if he want a cascading or a non cascading deletion
70+
* HTML text collapser: Make it usable for all long texts
71+
* #375 Implement SKU search for 'related products picker'
72+
* #391 Admin: allow searching/filtering for specification attributes
5673
* Removed _OpenID_ plugin from core
5774

5875
###Bugfixes###
@@ -70,6 +87,15 @@
7087
* Shipping.ByTotal: Fixed matching of rates by choosing the more specific over the common rate
7188
* A grouped product only shows up to 12 associated products
7289
* #405 Billiger feed: Wrong base price exported
90+
* #437 Mobile devices: Cannot add a product to the cart when it is grouped
91+
* PayPal Standard: Costs for checkout attributes were double charged
92+
* Paging of return request grid did not work
93+
* #428 Multiline checkout attributes aren't rendered correctly
94+
* #434 Shipping.ByTotal: Make grid pageable
95+
* #419 email account password hidden
96+
* #424 Localize return reasons & return actions
97+
* #479 Product filter: Wrong count of manufacturers if products of sub-categories are included
98+
7399

74100
##SmartStore.NET 2.0.2#
75101

‎src/Libraries/SmartStore.Core/Data/DataSettings.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,18 @@ public string ProviderInvariantName
122122
}
123123
}
124124

125+
public string ProviderFriendlyName
126+
{
127+
get
128+
{
129+
if (this.DataProvider.HasValue() && this.DataProvider.IsCaseInsensitiveEqual("sqlserver"))
130+
return "SQL Server";
131+
132+
// SqlCe should always be the default provider
133+
return "SQL Server Compact (SQL CE)";
134+
}
135+
}
136+
125137
public bool IsSqlServer
126138
{
127139
get

‎src/Libraries/SmartStore.Core/Data/IDbContext.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,21 @@ IList<TEntity> ExecuteStoredProcedureList<TEntity>(string commandText, params ob
9595
/// </summary>
9696
/// <returns>The count of detached entities</returns>
9797
int DetachAll();
98+
99+
/// <summary>
100+
/// Change the state of an entity object
101+
/// </summary>
102+
/// <typeparam name="TEntity">Type of entity</typeparam>
103+
/// <param name="entity">The entity instance</param>
104+
/// <param name="newState">The new state</param>
105+
void ChangeState<TEntity>(TEntity entity, System.Data.Entity.EntityState newState);
106+
107+
/// <summary>
108+
/// Changes the object state to unchanged
109+
/// </summary>
110+
/// <typeparam name="TEntity">Type of entity</typeparam>
111+
/// <param name="entity">The entity instance</param>
112+
/// <returns>true on success, false on failure</returns>
113+
bool SetToUnchanged<TEntity>(TEntity entity);
98114
}
99115
}

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public CatalogSettings()
2424
RecentlyAddedProductsNumber = 10;
2525
RecentlyAddedProductsEnabled = true;
2626
CompareProductsEnabled = true;
27+
FilterEnabled = true;
2728
ProductSearchAutoCompleteEnabled = true;
2829
ProductSearchAutoCompleteNumberOfProducts = 10;
2930
ProductSearchTermMinimumLength = 3;
@@ -47,6 +48,7 @@ public CatalogSettings()
4748
ShowVariantCombinationPriceAdjustment = true;
4849
ShowLinkedAttributeValueImage = true;
4950
EnableDynamicPriceUpdate = true;
51+
HtmlTextCollapsedHeight = 260;
5052
}
5153

5254
/// <summary>
@@ -138,6 +140,11 @@ public CatalogSettings()
138140
/// Gets or sets a value indicating whether category breadcrumb is enabled
139141
/// </summary>
140142
public bool CategoryBreadcrumbEnabled { get; set; }
143+
144+
/// <summary>
145+
/// Gets or sets a value indicating whether filter is enabled
146+
/// </summary>
147+
public bool FilterEnabled { get; set; }
141148

142149
/// <summary>
143150
/// Gets or sets a value indicating whether a 'Share button' is enabled
@@ -388,5 +395,15 @@ public CatalogSettings()
388395
/// Gets or sets the value indicating how many manufacturers to display in manufacturers block
389396
/// </summary>
390397
public int ManufacturersBlockItemsToDisplay { get; set; }
398+
399+
/// <summary>
400+
/// Gets or sets a value indicating if html long text should be collapsed
401+
/// </summary>
402+
public bool EnableHtmlTextCollapser { get; set; }
403+
404+
/// <summary>
405+
/// Gets or sets the height of collapsed text
406+
/// </summary>
407+
public int HtmlTextCollapsedHeight { get; set; }
391408
}
392409
}

‎src/Libraries/SmartStore.Core/Domain/Customers/CustomerNameFormat.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ public enum CustomerNameFormat : int
1616
/// <summary>
1717
/// Show full names
1818
/// </summary>
19-
ShowFullNames = 3
19+
ShowFullNames = 3,
20+
/// <summary>
21+
/// Show first name
22+
/// </summary>
23+
ShowFirstName = 4,
24+
/// <summary>
25+
/// Show shorted name and city
26+
/// </summary>
27+
ShowNameAndCity = 5
2028
}
2129
}

‎src/Libraries/SmartStore.Core/Domain/Customers/CustomerSettings.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public CustomerSettings()
1414
UserRegistrationType = UserRegistrationType.Standard;
1515
AvatarMaximumSizeBytes = 20000;
1616
DefaultAvatarEnabled = true;
17-
CustomerNameFormat = CustomerNameFormat.ShowUsernames;
17+
CustomerNameFormat = CustomerNameFormat.ShowFirstName;
18+
CustomerNameFormatMaxLength = 64;
1819
GenderEnabled = true;
1920
DateOfBirthEnabled = true;
2021
CompanyEnabled = true;
@@ -113,6 +114,11 @@ public CustomerSettings()
113114
/// </summary>
114115
public CustomerNameFormat CustomerNameFormat { get; set; }
115116

117+
/// <summary>
118+
/// Gets or sets a value indicating the maximum length of a formatted customer name
119+
/// </summary>
120+
public int CustomerNameFormatMaxLength { get; set; }
121+
116122
/// <summary>
117123
/// Gets or sets a value indicating whether 'Newsletter' form field is enabled
118124
/// </summary>

‎src/Libraries/SmartStore.Core/Domain/Customers/RewardPointsSettings.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ public RewardPointsSettings()
2929
/// </summary>
3030
public int PointsForRegistration { get; set; }
3131

32+
/// <summary>
33+
/// Gets or sets a number of points awarded for a product review
34+
/// </summary>
35+
public int PointsForProductReview { get; set; }
36+
3237
/// <summary>
3338
/// Gets or sets a number of points awarded for purchases (amount in primary store currency)
3439
/// </summary>

‎src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,47 @@
1+
using System.Runtime.Serialization;
2+
13
namespace SmartStore.Core.Domain.Localization
24
{
35
/// <summary>
46
/// Represents a localized property
57
/// </summary>
8+
[DataContract]
69
public partial class LocalizedProperty : BaseEntity
710
{
811
/// <summary>
912
/// Gets or sets the entity identifier
1013
/// </summary>
11-
public int EntityId { get; set; }
14+
[DataMember]
15+
public int EntityId { get; set; }
1216

1317
/// <summary>
1418
/// Gets or sets the language identifier
1519
/// </summary>
16-
public int LanguageId { get; set; }
20+
[DataMember]
21+
public int LanguageId { get; set; }
1722

1823
/// <summary>
1924
/// Gets or sets the locale key group
2025
/// </summary>
21-
public string LocaleKeyGroup { get; set; }
26+
[DataMember]
27+
public string LocaleKeyGroup { get; set; }
2228

2329
/// <summary>
2430
/// Gets or sets the locale key
2531
/// </summary>
26-
public string LocaleKey { get; set; }
32+
[DataMember]
33+
public string LocaleKey { get; set; }
2734

2835
/// <summary>
2936
/// Gets or sets the locale value
3037
/// </summary>
31-
public string LocaleValue { get; set; }
38+
[DataMember]
39+
public string LocaleValue { get; set; }
3240

3341
/// <summary>
3442
/// Gets the language
3543
/// </summary>
36-
public virtual Language Language { get; set; }
44+
[DataMember]
45+
public virtual Language Language { get; set; }
3746
}
3847
}

‎src/Libraries/SmartStore.Core/Domain/Messages/Campaign.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using System;
2+
using SmartStore.Core.Domain.Stores;
23

34
namespace SmartStore.Core.Domain.Messages
45
{
56
/// <summary>
67
/// Represents a campaign
78
/// </summary>
8-
public partial class Campaign : BaseEntity
9+
public partial class Campaign : BaseEntity, IStoreMappingSupported
910
{
1011
/// <summary>
1112
/// Gets or sets the name
@@ -26,5 +27,10 @@ public partial class Campaign : BaseEntity
2627
/// Gets or sets the date and time of instance creation
2728
/// </summary>
2829
public DateTime CreatedOnUtc { get; set; }
30+
31+
/// <summary>
32+
/// Gets or sets a value indicating whether the entity is limited/restricted to certain stores
33+
/// </summary>
34+
public bool LimitedToStores { get; set; }
2935
}
3036
}

‎src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,10 @@ public partial class NewsLetterSubscription : BaseEntity
2626
/// Gets or sets the date and time when subscription was created
2727
/// </summary>
2828
public DateTime CreatedOnUtc { get; set; }
29+
30+
/// <summary>
31+
/// Gets or sets the store identifier
32+
/// </summary>
33+
public int StoreId { get; set; }
2934
}
3035
}

0 commit comments

Comments
 (0)