Upgrate from original repo

.gitignore

@@ -278,6 +278,7 @@ $RECYCLE.BIN/
 /src/Plugins/*-sym
 /src/Tests/*-sym
 /src/Presentation/SmartStore.Web/Themes/*-sym
+/src/Presentation/SmartStore.Web/Themes/HP
 
 
 ###########
@@ -319,3 +320,4 @@ Kopie von*
 
 src/SmartStoreNET.Packager.sln
 Log.txt
+src/Presentation/SmartStore.Web/Themes/FlexMuseo/

CREDITS.txt

@@ -1,11 +1,8 @@
 SmartStore.NET
-Copyright 1999-2014 SmartStore AG
+Copyright 1999-2018 SmartStore AG
 http://www.smartstore.com | https://github.com/smartstoreag/SmartStoreNET
 
 
-SmartStore.NET is a fork of the ASP.NET open source e-commerce solution 
-nopCommerce (http://www.nopcommerce.com).
-
 SmartStore.NET includes works distributed under the licenses listed below. 
 Please refer to the specific resources for more detailed information about the authors, 
 copyright notices, and licenses.
@@ -14,7 +11,7 @@ copyright notices, and licenses.
 51Degrees
 ---------------------------------------------
 WebSite:      http://51degrees.mobi/
-Copyright:    Copyright 2010 - 2013 51Degrees.mobi Limited
+Copyright:    Copyright 2010 - 2018 51Degrees.mobi Limited
 License:      Mozilla Public License 2.0 (MPL-2.0)
 
 
@@ -28,39 +25,38 @@ License:      BSD License
 
 ASP.NET MVC
 ---------------------------------------------
-Website:      http://aspnet.codeplex.com/wikipage?title=MVC&referringTitle=Home
+Website:      https://github.com/aspnet/AspNetWebStack
 Copyright:    Copyright (c) 2008-2011 Microsoft Corporation
 License:      MICROSOFT ASP.NET MODEL VIEW CONTROLLER 3 EULA
               http://go.microsoft.com/fwlink/?LinkID=207621
 
 
 Autofac
 ---------------------------------------------
-Website:      http://code.google.com/p/autofac/
-Copyright:    Copyright (c) 2007-2014 Autofac Contributors
-              http://code.google.com/p/autofac/wiki/Contributing
+Website:      https://autofac.org/
+Copyright:    Copyright (c) 2007-2018 Autofac Contributors
 License:      MIT
 
 
 AutoMapper
 ---------------------------------------------
 WebSite:      http://www.automapper.org
-Copyright:    Copyright � 2008-2013 Jimmy Bogard and other contributors
+Copyright:    Copyright � 2008-2018 Jimmy Bogard and other contributors
 License:      MIT
 
 
 Bundle Transformer 
 ---------------------------------------------
-Website:      https://bundletransformer.codeplex.com
+Website:      https://github.com/Taritsyn/BundleTransformer
 Copyright:    Copyright Andrey Taritsyn 2014
 License:      Apache License 2.0 (Apache)
 
 
-CKEditor
+summernote
 ---------------------------------------------
-WebSite:      http://ckeditor.com/
-Copyright:    &copy 2014 CKSource - Frederico Knabben
-License:      GNU Library General Public License (LGPL)
+WebSite:      https://summernote.org/
+Copyright:    Copyright (c) 2015~ Summernote Team (https://github.com/orgs/summernote/people)
+License:      MIT
 
 
 DotNetOpenAuth
@@ -72,28 +68,28 @@ License:      MS-PL
 
 DotNetZip
 ---------------------------------------------
-Website:      http://dotnetzip.codeplex.com/
+Website:      https://archive.codeplex.com/?p=dotnetzip
 Copyright:    
 License:      MS-PL
 
 
 Entity Framework
 ---------------------------------------------
-Website:      https://entityframework.codeplex.com
-Copyright:    Copyright (c) 2012-2014 Microsoft Corporation
+Website:      https://github.com/aspnet/EntityFramework6
+Copyright:    Copyright (c) 2012-2018 Microsoft Corporation
 License:      Apache License 2.0 (Apache)
 
 
 EPPlus
 ---------------------------------------------
-Website:      https://epplus.codeplex.com/
+Website:      https://github.com/JanKallman/EPPlus
 Copyright:    Copyright (C) 2011  Jan K�llman
 License:      GNU Library General Public License (LGPL)
 
 
 Fluent Validation
 ---------------------------------------------
-Website:      https://fluentvalidation.codeplex.com/
+Website:      https://github.com/JeremySkinner/FluentValidation
 License:      Apache License 2.0 (Apache)
 
 
@@ -104,11 +100,11 @@ Copyright:    Copyright (C) 2014  Glimpse contributors (http://getglimpse.com/Co
 License:      Apache License 2.0 (Apache)
 
 
-ImageResizer.NET
+ImageProcessor
 ---------------------------------------------
-Website:      https://imageresizing.net/
-Copyright:    Copyright (c) 2012 Imazen
-License:      Freedom License
+Website:      http://imageprocessor.org/
+Copyright:    Copyright (c) 2018 James Jackson-South
+License:      Apache License 2.0 (Apache)
 
 
 JavaScriptEngineSwitcher
@@ -132,16 +128,9 @@ Copyright:    Copyright (c) 2007-2009 Ariel Flesler
 License:      MIT
 
 
-jQuery UI (Core)
----------------------------------------------
-Website:      http://docs.jquery.com/UI
-Copyright:    Copyright (c) 2010 lib/jquery.ui/AUTHORS.txt (http://jqueryui.com/about)
-License:      MIT
-
-
-JSON.NET
+Json.NET
 ---------------------------------------------
-Website:      http://james.newtonking.com/
+Website:      https://www.newtonsoft.com/json
 Copyright:    Copyright (c) 2007 James Newton-King
 License:      MIT
 
@@ -181,30 +170,30 @@ License:      MIT
 
 NuGet
 ---------------------------------------------
-Website:      http://nuget.codeplex.com
-Copyright:    Copyright 2010-2011 Outercurve Foundation
+Website:      https://github.com/nuget/home
+Copyright:    Copyright 2010-2018 Outercurve Foundation
 License:      Apache Software Foundation License 2.0
 
 
 nUnit
 ---------------------------------------------
-Website:      http://www.nunit.org/index.php
+Website:       http://nunit.org/
 Copyright:    Copyright (c) 2002-2007 NUnit.org
-              Portions Copyright (c) 2002-2008 Charlie Poole or Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright (c) 2000-2002 Philip A. Craig
+              Portions Copyright (c) 2002-2018 Charlie Poole or Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright (c) 2000-2002 Philip A. Craig
 License:      Derived from zlib: http://nunit.org/index.php?p=license&r=2.4
 
 
 PhotoSwipe
 ---------------------------------------------
 Website:      http://photoswipe.com/
-Copyright:    Copyright (c) 2014-2016 Dmitry Semenov, http://dimsemenov.com
+Copyright:    Copyright (c) 2014-2018 Dmitry Semenov, http://dimsemenov.com
 License:      MIT
 
 
 slick carousel
 ---------------------------------------------
 Website:      http://kenwheeler.github.io/slick/
-Copyright:    Copyright (c) 2014 Ken Wheeler
+Copyright:    Copyright (c) 2018 Ken Wheeler
 License:      MIT
 
 
@@ -216,7 +205,7 @@ License:      GPL v3.0
 
 Twitter Bootstrap
 ---------------------------------------------
-Website:      http://twitter.github.io/bootstrap/
+Website:      https://getbootstrap.com/
 License:      Apache License v2.0
 
 

SmartStoreNET.Tasks.Targets

@@ -104,7 +104,7 @@
 		  <LibSass-Native-Binaries-x64 Include="$(SrcFolder)\packages\LibSassHost.Native.win-x64.1.0.3\runtimes\win7-x64\native\**\*"/>
       <VC14-Native-Binaries-x86 Include="$(LibFolder)\msvcp140\x86\**\*"/>
       <VC14-Native-Binaries-x64 Include="$(LibFolder)\msvcp140\x64\**\*"/>
-      <RoslynFiles Include="$(SrcFolder)\packages\Microsoft.Net.Compilers.1.3.2\tools\**\*"/>
+      <RoslynFiles Include="$(SrcFolder)\packages\Microsoft.Net.Compilers.2.4.0\tools\**\*"/>
 		</ItemGroup>
 
 		<!-- delete the build folder -->

build.bat

@@ -1,42 +1,37 @@
+for /f "usebackq tokens=1* delims=: " %%i in (`lib\vswhere\vswhere -latest -requires Microsoft.Component.MSBuild`) do (
+	if /i "%%i"=="installationPath" set InstallDir=%%j
+)
+
 FOR %%b in (
-		"%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
-		"%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
-		"%ProgramFiles%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" 
-
-		"%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
-		"%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
-		"%ProgramFiles%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
-
-		"%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
-		"%ProgramFiles(x86)%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"
-		"%ProgramFiles%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" 
-	) do (
-	if exist %%b ( 
-		call %%b x86
-		goto findmsbuild
-	)
+       "%InstallDir%\Common7\Tools\VsMSBuildCmd.bat"
+       "%VS140COMNTOOLS%\Common7\Tools\vsvars32.bat"
+    ) do (
+    if exist %%b ( 
+       call %%b
+       goto findmsbuild
+    )
 )
-  
+
 echo "Unable to detect suitable environment. Build may not succeed."
 
 :findmsbuild
 
 SETLOCAL ENABLEDELAYEDEXPANSION
 
-FOR %%p in (
-	   "%ProgramFiles(x86)%\MSBuild\14.0\Bin"
-	   "%ProgramFiles%\MSBuild\14.0\Bin"
-    ) do (
-	if exist %%p (
-		if not defined MsBuildPath (
-			SET "MsBuildPath=%%~p"
-			goto build	
-		)
-	)
+if exist "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
+	if not defined MsBuildPath (	
+		SET "MsBuildPath=%InstallDir%\MSBuild\15.0\Bin\MsBuild.exe"
+		goto build	
+	)	
 )
 
-echo "Unable to detect suitable MsBuild version (14.0). Build may not succeed."
+
+echo "Unable to detect suitable MsBuild version (15.0). Build may not succeed."
 
 :build
+cd /d %~dp0
+
+echo "Restoring NuGet packages"
+lib\nuget\nuget.exe restore "src\SmartStoreNET.Full-sym.sln"
 
-call "!MsBuildPath!\msbuild.exe" SmartStoreNET.proj /p:DebugSymbols=false /p:DebugType=None /P:SlnName=SmartStoreNET /maxcpucount %*
+call "!MsBuildPath!" SmartStoreNET.proj /p:SlnName=SmartStoreNET /m /p:DebugSymbols=false /p:DebugType=None /maxcpucount %*

changelog.md

@@ -1,21 +1,84 @@
-# Release Notes
+# Release Notes
 
 ## SmartStore.NET 3.1.0
-### Bugfixes
-* #1268 Data importer always inserts new pictures and does not detect equal pictures while importing
-* OutputCache computes ambigous cache keys for blog pages
-* #1142 Customer import creates role multiple times
-* #1244 Variant query model binder cannot handle types text and datepicker
+### Breaking changes
+* Message template customizations are lost due to the new template engine. You have to customize the templates again. No automatic migration, sorry :-(
+* Amazon Pay: The plugin has been changed to new *Login and pay with Amazon* services. A registration at Amazon and new access data are necessary for its use. The old access data can no longer be used.
+* (Dev) Calls to cache methods `Keys()` and `RemoveByPattern()` require glob chars to be present now (supported glob-styles see [https://redis.io/commands/keys](https://redis.io/commands/keys)). Previously these methods appended `*` to the passed pattern, which made pattern matching rather unflexible.
+* (Dev) Hook framework now passes `IHookedEntity` interface instead of `HookedEntity` class
+* (Dev) Completely removed all `EntityInserted<T>`, `EntityUpdated<T>` and `EntityDeleted<T>` legacy events. We were using DbSaveHooks anyway, which provides a much more powerful and way faster pub-sub mechanism for database operations.
+
+### Highlights
+* New [Liquid](https://github.com/Shopify/liquid/wiki/Liquid-for-Designers) based template engine
+* Multi-configurable rounding of order total ("cash rounding"). Can be adjusted and activated separately for each currency and payment method.
+* (Perf) Picture service: new processing and caching strategy! Thumbnails are not created synchronously during the main request anymore, instead a new middleware route defers processing until an image is actually requested by any client.
+* MegaMenu shrinker and *Brands* virtual menu item
+* Address formatting templates by country
+* Connection to translate.smartstore.com. For available languages, localized resources can be downloaded and installed directly.
+* **Amazon Pay**:
+	* Supports merchants registered in the USA and Japan
+	* External authentication via *Login with Amazon* button in shop frontend
+	* Several improvements through the new *Login and pay with Amazon* services
 
-### Improvements
-* #1141 Clearer backend order list. Added more infos like payment method.
-* #1248 New payment integration guidelines for Sofort\Klarna
-* TwitterAuth: better error handling and enhanced admin instruction
-* 
 ### New Features
+* 1203 MegaMenu shrinker and *Brands* virtual menu item
+* [Summernote](https://summernote.org/) is now the primary HTML editor
 * #431 Added option to randomize the display order for slides on each request
 * #1258 Add option to filter shipping and payment methods by a specific customer role
 * #1247 Allow to import non system customer roles in customer import
+* #1117 Added an option to display a dropdown menu for manufacturers 
+* #1203 Added an option to define a maximum number of elements in the main menu for the first hierarchy of the catalog navigation
+* GMC: column chooser for edit grid
+* #1100 Customer can register in frontend via "Login with Amazon" button
+* **Web API**:
+	* #1292 Added endpoint to get order in PDF format
+	* Added endpoint to complete an order
+	* #1364 Added endpoints for MeasureWeight and MeasureDimension
+* Added options to include option names of specification and product attributes in the search index
+* #441 added option to specify that additional shipping surcharges are considered only once.
+* #1295 Sales tracking (tracking pixel) for Billiger.de
+* XML and CSV export of shopping cart and wishlist items
+* #1363 Make storing of IP addresses optional
+* #729 Option for automatic order amount capturing when the shipping status changed to "shipped"
+* (Dev) ILocalizationFileResolver: responsible for finding localization files for client scripts
+* #998 GMC: Find a way to map attribute combination values to feed export values
+
+### Improvements
+* Target .NET Framework changed: 4.5.2 > 4.6.1.
+* Lower memory consumption
+* #649 Media FileSystem provider: segmenting files in subfolders to increase IO perf with huge amount of files
+* #1141 Clearer backend order list. Added more infos like payment method.
+* #1248 New payment integration guidelines for Sofort\Klarna
+* TwitterAuth: better error handling and enhanced admin instruction
+* #1181 Debitoor: Add option to display shipping address on invoices
+* Moved RoundPricesDuringCalculation setting to currency entity
+* #1100 Use new "Login with Amazon" services to initialize an Amazon payment
+* #1285 Copy product: Add option to add more than one copy
+* (Perf) Many improvements in hooking framework
+* #1294 Swiss PostFinance: External payment page too small on mobile devices. Added setting for mobile device template URL, pre-configured with PostFinance template.
+* #1143 Make shipping methods suitable for multi-stores
+* #1320 Image import: Find out the content type of image URLs by response header rather than file extension (which is sometimes missing)
+* #1219 Recently viewed products list should respect setting to hide manufacturer names
+
+### Bugfixes
+* #1268 Data importer always inserts new pictures and does not detect equal pictures while importing
+* OutputCache computes ambiguous cache keys for blog pages
+* #1142 Customer import creates role multiple times
+* #1244 Variant query model binder cannot handle types text and datepicker
+* #1273 Attribute formatter should consider setting CatalogSettings.ShowVariantCombinationPriceAdjustment
+* Product entity picker should use the wildcard search to find products
+* Hook framework should run hooks with `ImportantAttribute` when hooking was disabled per scope
+* #1297 Web API: Parsing the timestamp may fail due to the different accuracy of the milliseconds
+* Debitoor: VAT amount could be transmitted as miscellaneous for deliveries abroad.
+* Prices with discounts limited to categories and customer groups were shown to all users in product lists
+* #1330 MegaSearch: Missing variant facets if the variant value is not unique
+* Back-in-stock subscription form was already submitted when opening the popup dialog
+* Associated products of a grouped product were displayed in the wrong order
+* Payment-Filter: Fixed "The cast to value type 'System.Decimal' failed because the materialized value is null"
+* The tax value per tax rate was not updated when adding\removing a product to\from the order.
+* The option to send manually was ignored when sending e-mails
+* #528 LimitedToStores is required on payment provider rather than plugin level
+* #1318 Disabled preselected attribute combination permanently hides the shopping cart button, even if another combination is selected.
 
 
 ## SmartStore.NET 3.0.3
@@ -36,7 +99,9 @@
 * Fixed shipping computation method ignoring deactivated PricesIncludeTax setting
 * **Debitoor**: Fixed missing tax rates on Debitoor invoice for net prices
 * #1224 Notifier wasn't working in plugin controllers
-* #1205 Server cannot append header after HTTP headers have been sent
+* #1205 Server cannot append header after 
+* 
+*  headers have been sent
 * #1154 Left offcanvas navigation does not open when in checkout progress
 * #1212 Export: FTP publishing should consider directory structure
 * #1253 Product PDF exporter only exports one picture and ignores the picture number profile setting

src/Libraries/SmartStore.Core/BaseEntity.cs

@@ -30,11 +30,12 @@ public Type GetUnproxiedType()
 				// it's a proxied type
 				t = t.BaseType;
 			}
+
 			return t;
         }
 
 		/// <summary>
-		/// Transient objects are not associated with an item already in storage.  For instance,
+		/// Transient objects are not associated with an item already in storage. For instance,
 		/// a Product entity is transient if its Id is 0.
 		/// </summary>
 		public virtual bool IsTransientRecord()