Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Fix - Wishlist email a friend message

KrzysztofPajake40a57b00c97
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShoppingCartTokensCommand.cs b/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShoppingCartTokensCommand.cs
index a5000ab54..e7f8bb331 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShoppingCartTokensCommand.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShoppingCartTokensCommand.cs
@@ -1,8 +1,9 @@
-using Grand.Domain.Customers;
+using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-using Grand.Business.Messages.DotLiquidDrops;
using MediatR;
+
namespace Grand.Business.Messages.Commands.Models
{
public class GetShoppingCartTokensCommand : IRequest<LiquidShoppingCart>
@@ -10,7 +11,5 @@ namespace Grand.Business.Messages.Commands.Models
public Customer Customer { get; set; }
public Store Store { get; set; }
public Language Language { get; set; }
- public string PersonalMessage { get; set; } = "";
- public string CustomerEmail { get; set; } = "";
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs
index b7948a3a3..6dd1a43a7 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs
@@ -14,8 +14,6 @@ using Grand.Domain.Vendors;
using MediatR;
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Threading.Tasks;
namespace Grand.Business.Messages.DotLiquidDrops
@@ -117,16 +115,13 @@ namespace Grand.Business.Messages.DotLiquidDrops
return this;
}
- public LiquidObjectBuilder AddShoppingCartTokens(Customer customer, Store store, Language language,
- string personalMessage = "", string customerEmail = "")
+ public LiquidObjectBuilder AddShoppingCartTokens(Customer customer, Store store, Language language)
{
_chain.Add(async liquidObject =>
{
var liquidShoppingCart = await _mediator.Send(new GetShoppingCartTokensCommand() {
Customer = customer,
- CustomerEmail = customerEmail,
Language = language,
- PersonalMessage = personalMessage,
Store = store
});
liquidObject.ShoppingCart = liquidShoppingCart;
@@ -257,7 +252,16 @@ namespace Grand.Business.Messages.DotLiquidDrops
});
return this;
}
-
+ public LiquidObjectBuilder AddEmailAFriendTokens(string personalMessage, string customerEmail)
+ {
+ _chain.Add(async liquidObject =>
+ {
+ var liquidEmail = new LiquidEmailAFriend(personalMessage, customerEmail);
+ liquidObject.EmailAFriend = liquidEmail;
+ await Task.CompletedTask;
+ });
+ return this;
+ }
public async Task<LiquidObject> BuildAsync()
{
foreach (var f in _chain)
diff --git a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs b/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
index afc987727..34176d939 100644
--- a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
+++ b/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
@@ -800,7 +800,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
.AddCustomerTokens(customer, store, language)
- .AddShoppingCartTokens(customer, store, language, personalMessage, customerEmail);
+ .AddEmailAFriendTokens(personalMessage, customerEmail);
LiquidObject liquidObject = await builder.BuildAsync();
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
index 14d3272b3..9221141d4 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
@@ -473,7 +473,7 @@ namespace Grand.Business.System.Services.Installation
{
Name = "Wishlist.EmailAFriend",
Subject = "{{Store.Name}}. Wishlist",
- Body = "<p><a href=\"{{Store.URL}}\"> {{Store.Name}}</a> <br />\r\n<br />\r\n{{ShoppingCart.WishlistEmail}} was shopping on {{Store.Name}} and wanted to share a wishlist with you. <br />\r\n<br />\r\n<br />\r\nFor more info click <a target=\"_blank\" href=\"{{ShoppingCart.WishlistURLForCustomer}}\">here</a> <br />\r\n<br />\r\n<br />\r\n{{ShoppingCart.WishlistPersonalMessage}}<br />\r\n<br />\r\n{{Store.Name}}</p>",
+ Body = "<p><a href=\"{{Store.URL}}\"> {{Store.Name}}</a> <br />\r\n<br />\r\n{{EmailAFriend.Email}} was shopping on {{Store.Name}} and wanted to share a wishlist with you <br />\r\n<br />\r\n<br />\r\nFor more info click <a target=\"_blank\" href=\"{{Customer.WishlistURLForCustomer}}\">here</a> <br />\r\n<br />\r\n<br />\r\n{{EmailAFriend.PersonalMessage}}<br />\r\n<br />\r\n{{Store.Name}}</p>",
IsActive = true,
EmailAccountId = eaGeneral.Id,
},