@@ -761,8 +761,8 @@ public virtual void AddOrderTokens(IList<Token> tokens, Order order, int languag
761761 var paymentMethodName = paymentMethod != null ? GetLocalizedValue ( paymentMethod . Metadata , "FriendlyName" , x => x . FriendlyName ) : order . PaymentMethodSystemName ;
762762 tokens . Add ( new Token ( "Order.PaymentMethod" , paymentMethodName ) ) ;
763763 tokens . Add ( new Token ( "Order.VatNumber" , order . VatNumber ) ) ;
764-
765764 tokens . Add ( new Token ( "Order.Product(s)" , ProductListToHtmlTable ( order , languageId ) , true ) ) ;
765+ tokens . Add ( new Token ( "Order.CustomerComment" , order . CustomerOrderComment , true ) ) ;
766766
767767 var language = _languageService . GetLanguageById ( languageId ) ;
768768 if ( language != null && ! String . IsNullOrEmpty ( language . LanguageCulture ) )
@@ -778,8 +778,6 @@ public virtual void AddOrderTokens(IList<Token> tokens, Order order, int languag
778778 //TODO add a method for getting URL (use routing because it handles all SEO friendly URLs)
779779 tokens . Add ( new Token ( "Order.OrderURLForCustomer" , string . Format ( "{0}order/details/{1}" , _webHelper . GetStoreLocation ( false ) , order . Id ) , true ) ) ;
780780
781-
782- //Codehint: sm-add
783781 tokens . Add ( new Token ( "Order.Disclaimer" , TopicToHtml ( "Disclaimer" , languageId ) , true ) ) ;
784782 tokens . Add ( new Token ( "Order.ConditionsOfUse" , TopicToHtml ( "ConditionsOfUse" , languageId ) , true ) ) ;
785783
@@ -1059,6 +1057,7 @@ public virtual string[] GetListOfAllowedTokens()
10591057 "%Order.ShippingCountry%" ,
10601058 "%Order.PaymentMethod%" ,
10611059 "%Order.VatNumber%" ,
1060+ "%Order.CustomerComment%" ,
10621061 "%Order.Product(s)%" ,
10631062 "%Order.CreatedOn%" ,
10641063 "%Order.OrderURLForCustomer%" ,
@@ -1112,7 +1111,6 @@ public virtual string[] GetListOfAllowedTokens()
11121111 "%PrivateMessage.Subject%" ,
11131112 "%PrivateMessage.Text%" ,
11141113 "%BackInStockSubscription.ProductName%" ,
1115- //codehint: sm-add
11161114 "%Order.Disclaimer%" ,
11171115 "%Order.ConditionsOfUse%" ,
11181116 "%Company.CompanyName%" ,
0 commit comments