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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Grand.Business.Messages - Code cleanup (ReSharper)
support99386dc1d633
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.csindex fb95a1ab1..b8a992b59 100644--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs@@ -3,36 +3,35 @@ using Grand.Data;using Grand.Domain.Messages;using MediatR;-namespace Grand.Business.Messages.Commands.Handlers.Common+namespace Grand.Business.Messages.Commands.Handlers.Common;++public class InsertContactUsCommandHandler : IRequestHandler<InsertContactUsCommand, bool>{- public class InsertContactUsCommandHandler : IRequestHandler<InsertContactUsCommand, bool>- {- private readonly IRepository<ContactUs> _repository;+ private readonly IRepository<ContactUs> _repository;- public InsertContactUsCommandHandler(- IRepository<ContactUs> repository)- {- _repository = repository;- }+ public InsertContactUsCommandHandler(+ IRepository<ContactUs> repository)+ {+ _repository = repository;+ }- public async Task<bool> Handle(InsertContactUsCommand request, CancellationToken cancellationToken)- {- var contactus = new ContactUs {- CustomerId = request.CustomerId,- StoreId = request.StoreId,- VendorId = request.VendorId,- Email = request.Email,- FullName = request.FullName,- Subject = request.Subject,- Enquiry = request.Enquiry,- EmailAccountId = request.EmailAccountId,- Attributes = request.ContactAttributes,- ContactAttributeDescription = request.ContactAttributeDescription,- IpAddress = request.RemoteIpAddress- };+ public async Task<bool> Handle(InsertContactUsCommand request, CancellationToken cancellationToken)+ {+ var contactus = new ContactUs {+ CustomerId = request.CustomerId,+ StoreId = request.StoreId,+ VendorId = request.VendorId,+ Email = request.Email,+ FullName = request.FullName,+ Subject = request.Subject,+ Enquiry = request.Enquiry,+ EmailAccountId = request.EmailAccountId,+ Attributes = request.ContactAttributes,+ ContactAttributeDescription = request.ContactAttributeDescription,+ IpAddress = request.RemoteIpAddress+ };- await _repository.InsertAsync(contactus);- return true;- }+ await _repository.InsertAsync(contactus);+ return true;}-}+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.csindex 918fc7120..690236b9f 100644--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs@@ -1,25 +1,24 @@using Grand.Business.Core.Queries.Messages;-using Grand.Domain.Catalog;using Grand.Data;+using Grand.Domain.Catalog;using MediatR;-namespace Grand.Business.Messages.Queries.Handlers+namespace Grand.Business.Messages.Queries.Handlers;++public class GetBidsByProductIdQueryHandler : IRequestHandler<GetBidsByProductIdQuery, IList<Bid>>{- public class GetBidsByProductIdQueryHandler : IRequestHandler<GetBidsByProductIdQuery, IList<Bid>>- {- private readonly IRepository<Bid> _bidRepository;+ private readonly IRepository<Bid> _bidRepository;- public GetBidsByProductIdQueryHandler(IRepository<Bid> bidRepository)- {- _bidRepository = bidRepository;- }+ public GetBidsByProductIdQueryHandler(IRepository<Bid> bidRepository)+ {+ _bidRepository = bidRepository;+ }- public async Task<IList<Bid>> Handle(GetBidsByProductIdQuery request, CancellationToken cancellationToken)- {- return await Task.FromResult(_bidRepository- .Table.Where(x => x.ProductId == request.ProductId)- .OrderByDescending(x => x.Date)- .ToList());- }+ public async Task<IList<Bid>> Handle(GetBidsByProductIdQuery request, CancellationToken cancellationToken)+ {+ return await Task.FromResult(_bidRepository+ .Table.Where(x => x.ProductId == request.ProductId)+ .OrderByDescending(x => x.Date)+ .ToList());}-}+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.csindex 0fd95a4d3..7feece9c6 100644--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs@@ -1,25 +1,24 @@using Grand.Business.Core.Queries.Messages;-using Grand.Domain.Customers;using Grand.Data;+using Grand.Domain.Customers;using MediatR;-namespace Grand.Business.Messages.Queries.Handlers+namespace Grand.Business.Messages.Queries.Handlers;++public class GetCustomerByIdQueryHandler : IRequestHandler<GetCustomerByIdQuery, Customer>{- public class GetCustomerByIdQueryHandler : IRequestHandler<GetCustomerByIdQuery, Customer>- {- private readonly IRepository<Customer> _customerRepository;+ private readonly IRepository<Customer> _customerRepository;- public GetCustomerByIdQueryHandler(IRepository<Customer> customerRepository)- {- _customerRepository = customerRepository;- }+ public GetCustomerByIdQueryHandler(IRepository<Customer> customerRepository)+ {+ _customerRepository = customerRepository;+ }- public async Task<Customer> Handle(GetCustomerByIdQuery request, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(request.Id))- return null;+ public async Task<Customer> Handle(GetCustomerByIdQuery request, CancellationToken cancellationToken)+ {+ if (string.IsNullOrWhiteSpace(request.Id))+ return null;- return await _customerRepository.GetByIdAsync(request.Id);- }+ return await _customerRepository.GetByIdAsync(request.Id);}-}+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.csindex b46247c56..a510c7cff 100644--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs@@ -1,25 +1,24 @@using Grand.Business.Core.Queries.Messages;-using Grand.Domain.Catalog;using Grand.Data;+using Grand.Domain.Catalog;using MediatR;-namespace Grand.Business.Messages.Queries.Handlers+namespace Grand.Business.Messages.Queries.Handlers;++public class GetProductByIdQueryHandler : IRequestHandler<GetProductByIdQuery, Product>{- public class GetProductByIdQueryHandler : IRequestHandler<GetProductByIdQuery, Product>- {- private readonly IRepository<Product> _productRepository;+ private readonly IRepository<Product> _productRepository;- public GetProductByIdQueryHandler(IRepository<Product> productRepository)- {- _productRepository = productRepository;- }+ public GetProductByIdQueryHandler(IRepository<Product> productRepository)+ {+ _productRepository = productRepository;+ }- public async Task<Product> Handle(GetProductByIdQuery request, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(request.Id))- return null;+ public async Task<Product> Handle(GetProductByIdQuery request, CancellationToken cancellationToken)+ {+ if (string.IsNullOrWhiteSpace(request.Id))+ return null;- return await _productRepository.GetByIdAsync(request.Id);- }+ return await _productRepository.GetByIdAsync(request.Id);}-}+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.csindex 1905343e7..2f4042a53 100644--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs@@ -3,23 +3,22 @@ using Grand.Data;using Grand.Domain.Vendors;using MediatR;-namespace Grand.Business.Messages.Queries.Handlers+namespace Grand.Business.Messages.Queries.Handlers;++public class GetVendorByIdQueryHandler : IRequestHandler<GetVendorByIdQuery, Vendor>{- public class GetVendorByIdQueryHandler : IRequestHandler<GetVendorByIdQuery, Vendor>- {- private readonly IRepository<Vendor> _vendorRepository;+ private readonly IRepository<Vendor> _vendorRepository;- public GetVendorByIdQueryHandler(IRepository<Vendor> vendorRepository)- {- _vendorRepository = vendorRepository;- }+ public GetVendorByIdQueryHandler(IRepository<Vendor> vendorRepository)+ {+ _vendorRepository = vendorRepository;+ }- public async Task<Vendor> Handle(GetVendorByIdQuery request, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(request.Id))- return null;+ public async Task<Vendor> Handle(GetVendorByIdQuery request, CancellationToken cancellationToken)+ {+ if (string.IsNullOrWhiteSpace(request.Id))+ return null;- return await _vendorRepository.GetByIdAsync(request.Id);- }+ return await _vendorRepository.GetByIdAsync(request.Id);}-}+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs b/src/Business/Grand.Business.Messages/Services/EmailAccountService.csindex 1e71f197b..af52922b0 100644--- a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs+++ b/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs@@ -1,151 +1,149 @@using Grand.Business.Core.Interfaces.Messages;+using Grand.Data;+using Grand.Domain.Messages;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;-using Grand.Data;-using Grand.Domain.Messages;using Grand.SharedKernel;using Grand.SharedKernel.Extensions;using MediatR;-namespace Grand.Business.Messages.Services+namespace Grand.Business.Messages.Services;++public class EmailAccountService : IEmailAccountService{- public class EmailAccountService : IEmailAccountService+ private readonly ICacheBase _cacheBase;+ private readonly IRepository<EmailAccount> _emailAccountRepository;+ private readonly IMediator _mediator;++ /// <summary>+ /// Ctor+ /// </summary>+ /// <param name="emailAccountRepository">Email account repository</param>+ /// <param name="cacheBase">Cache manager</param>+ /// <param name="mediator">Mediator</param>+ public EmailAccountService(+ IRepository<EmailAccount> emailAccountRepository,+ ICacheBase cacheBase,+ IMediator mediator){- private readonly IRepository<EmailAccount> _emailAccountRepository;- private readonly ICacheBase _cacheBase;- private readonly IMediator _mediator;-- /// <summary>- /// Ctor- /// </summary>- /// <param name="emailAccountRepository">Email account repository</param>- /// <param name="cacheBase">Cache manager</param>- /// <param name="mediator">Mediator</param>- public EmailAccountService(- IRepository<EmailAccount> emailAccountRepository,- ICacheBase cacheBase,- IMediator mediator)- {- _emailAccountRepository = emailAccountRepository;- _cacheBase = cacheBase;- _mediator = mediator;- }-- /// <summary>- /// Inserts an email account- /// </summary>- /// <param name="emailAccount">Email account</param>- public virtual async Task InsertEmailAccount(EmailAccount emailAccount)- {- ArgumentNullException.ThrowIfNull(emailAccount);-- emailAccount.Email = CommonHelper.EnsureNotNull(emailAccount.Email);- emailAccount.DisplayName = CommonHelper.EnsureNotNull(emailAccount.DisplayName);- emailAccount.Host = CommonHelper.EnsureNotNull(emailAccount.Host);- emailAccount.Username = CommonHelper.EnsureNotNull(emailAccount.Username);- emailAccount.Password = CommonHelper.EnsureNotNull(emailAccount.Password);-- emailAccount.Email = emailAccount.Email.Trim();- emailAccount.DisplayName = emailAccount.DisplayName.Trim();- emailAccount.Host = emailAccount.Host.Trim();- emailAccount.Username = emailAccount.Username.Trim();- emailAccount.Password = emailAccount.Password.Trim();-- emailAccount.Email = CommonHelper.EnsureMaximumLength(emailAccount.Email, 255);- emailAccount.DisplayName = CommonHelper.EnsureMaximumLength(emailAccount.DisplayName, 255);- emailAccount.Host = CommonHelper.EnsureMaximumLength(emailAccount.Host, 255);- emailAccount.Username = CommonHelper.EnsureMaximumLength(emailAccount.Username, 255);- emailAccount.Password = CommonHelper.EnsureMaximumLength(emailAccount.Password, 255);-- await _emailAccountRepository.InsertAsync(emailAccount);-- //clear cache- await _cacheBase.RemoveByPrefix(CacheKey.EMAILACCOUNT_PATTERN_KEY);-- //event notification- await _mediator.EntityInserted(emailAccount);- }-- /// <summary>- /// Updates an email account- /// </summary>- /// <param name="emailAccount">Email account</param>- public virtual async Task UpdateEmailAccount(EmailAccount emailAccount)- {- ArgumentNullException.ThrowIfNull(emailAccount);-- emailAccount.Email = CommonHelper.EnsureNotNull(emailAccount.Email);- emailAccount.DisplayName = CommonHelper.EnsureNotNull(emailAccount.DisplayName);- emailAccount.Host = CommonHelper.EnsureNotNull(emailAccount.Host);- emailAccount.Username = CommonHelper.EnsureNotNull(emailAccount.Username);- emailAccount.Password = CommonHelper.EnsureNotNull(emailAccount.Password);-- emailAccount.Email = emailAccount.Email.Trim();- emailAccount.DisplayName = emailAccount.DisplayName.Trim();- emailAccount.Host = emailAccount.Host.Trim();- emailAccount.Username = emailAccount.Username.Trim();- emailAccount.Password = emailAccount.Password.Trim();-- emailAccount.Email = CommonHelper.EnsureMaximumLength(emailAccount.Email, 255);- emailAccount.DisplayName = CommonHelper.EnsureMaximumLength(emailAccount.DisplayName, 255);- emailAccount.Host = CommonHelper.EnsureMaximumLength(emailAccount.Host, 255);- emailAccount.Username = CommonHelper.EnsureMaximumLength(emailAccount.Username, 255);- emailAccount.Password = CommonHelper.EnsureMaximumLength(emailAccount.Password, 255);-- await _emailAccountRepository.UpdateAsync(emailAccount);-- //clear cache- await _cacheBase.RemoveByPrefix(CacheKey.EMAILACCOUNT_PATTERN_KEY);-- //event notification- await _mediator.EntityUpdated(emailAccount);- }-- /// <summary>- /// Deletes an email account- /// </summary>- /// <param name="emailAccount">Email account</param>- public virtual async Task DeleteEmailAccount(EmailAccount emailAccount)- {- ArgumentNullException.ThrowIfNull(emailAccount);- var emailAccounts = await GetAllEmailAccounts();- if (emailAccounts.Count == 1)- throw new GrandException("You cannot delete this email account. At least one account is required.");-- await _emailAccountRepository.DeleteAsync(emailAccount);-- //clear cache- await _cacheBase.RemoveByPrefix(CacheKey.EMAILACCOUNT_PATTERN_KEY);-- //event notification- await _mediator.EntityDeleted(emailAccount);- }-- /// <summary>- /// Gets an email account by identifier- /// </summary>- /// <param name="emailAccountId">The email account identifier</param>- /// <returns>Email account</returns>- public virtual async Task<EmailAccount> GetEmailAccountById(string emailAccountId)- {- var key = string.Format(CacheKey.EMAILACCOUNT_BY_ID_KEY, emailAccountId);- return await _cacheBase.GetAsync(key, () => _emailAccountRepository.GetByIdAsync(emailAccountId));+ _emailAccountRepository = emailAccountRepository;+ _cacheBase = cacheBase;+ _mediator = mediator;+ }++ /// <summary>+ /// Inserts an email account+ /// </summary>+ /// <param name="emailAccount">Email account</param>+ public virtual async Task InsertEmailAccount(EmailAccount emailAccount)+ {+ ArgumentNullException.ThrowIfNull(emailAccount);++ emailAccount.Email = CommonHelper.EnsureNotNull(emailAccount.Email);+ emailAccount.DisplayName = CommonHelper.EnsureNotNull(emailAccount.DisplayName);+ emailAccount.Host = CommonHelper.EnsureNotNull(emailAccount.Host);+ emailAccount.Username = CommonHelper.EnsureNotNull(emailAccount.Username);+ emailAccount.Password = CommonHelper.EnsureNotNull(emailAccount.Password);++ emailAccount.Email = emailAccount.Email.Trim();+ emailAccount.DisplayName = emailAccount.DisplayName.Trim();+ emailAccount.Host = emailAccount.Host.Trim();+ emailAccount.Username = emailAccount.Username.Trim();+ emailAccount.Password = emailAccount.Password.Trim();++ emailAccount.Email = CommonHelper.EnsureMaximumLength(emailAccount.Email, 255);+ emailAccount.DisplayName = CommonHelper.EnsureMaximumLength(emailAccount.DisplayName, 255);+ emailAccount.Host = CommonHelper.EnsureMaximumLength(emailAccount.Host, 255);+ emailAccount.Username = CommonHelper.EnsureMaximumLength(emailAccount.Username, 255);+ emailAccount.Password = CommonHelper.EnsureMaximumLength(emailAccount.Password, 255);++ await _emailAccountRepository.InsertAsync(emailAccount);++ //clear cache+ await _cacheBase.RemoveByPrefix(CacheKey.EMAILACCOUNT_PATTERN_KEY);++ //event notification+ await _mediator.EntityInserted(emailAccount);+ }++ /// <summary>+ /// Updates an email account+ /// </summary>+ /// <param name="emailAccount">Email account</param>+ public virtual async Task UpdateEmailAccount(EmailAccount emailAccount)+ {+ ArgumentNullException.ThrowIfNull(emailAccount);++ emailAccount.Email = CommonHelper.EnsureNotNull(emailAccount.Email);+ emailAccount.DisplayName = CommonHelper.EnsureNotNull(emailAccount.DisplayName);+ emailAccount.Host = CommonHelper.EnsureNotNull(emailAccount.Host);+ emailAccount.Username = CommonHelper.EnsureNotNull(emailAccount.Username);+ emailAccount.Password = CommonHelper.EnsureNotNull(emailAccount.Password);++ emailAccount.Email = emailAccount.Email.Trim();+ emailAccount.DisplayName = emailAccount.DisplayName.Trim();+ emailAccount.Host = emailAccount.Host.Trim();+ emailAccount.Username = emailAccount.Username.Trim();+ emailAccount.Password = emailAccount.Password.Trim();- }+ emailAccount.Email = CommonHelper.EnsureMaximumLength(emailAccount.Email, 255);+ emailAccount.DisplayName = CommonHelper.EnsureMaximumLength(emailAccount.DisplayName, 255);+ emailAccount.Host = CommonHelper.EnsureMaximumLength(emailAccount.Host, 255);+ emailAccount.Username = CommonHelper.EnsureMaximumLength(emailAccount.Username, 255);+ emailAccount.Password = CommonHelper.EnsureMaximumLength(emailAccount.Password, 255);- /// <summary>- /// Gets all email accounts- /// </summary>- /// <returns>Email accounts list</returns>- public virtual async Task<IList<EmailAccount>> GetAllEmailAccounts()+ await _emailAccountRepository.UpdateAsync(emailAccount);++ //clear cache+ await _cacheBase.RemoveByPrefix(CacheKey.EMAILACCOUNT_PATTERN_KEY);++ //event notification+ await _mediator.EntityUpdated(emailAccount);+ }++ /// <summary>+ /// Deletes an email account+ /// </summary>+ /// <param name="emailAccount">Email account</param>+ public virtual async Task DeleteEmailAccount(EmailAccount emailAccount)+ {+ ArgumentNullException.ThrowIfNull(emailAccount);+ var emailAccounts = await GetAllEmailAccounts();+ if (emailAccounts.Count == 1)+ throw new GrandException("You cannot delete this email account. At least one account is required.");++ await _emailAccountRepository.DeleteAsync(emailAccount);++ //clear cache+ await _cacheBase.RemoveByPrefix(CacheKey.EMAILACCOUNT_PATTERN_KEY);++ //event notification+ await _mediator.EntityDeleted(emailAccount);+ }++ /// <summary>+ /// Gets an email account by identifier+ /// </summary>+ /// <param name="emailAccountId">The email account identifier</param>+ /// <returns>Email account</returns>+ public virtual async Task<EmailAccount> GetEmailAccountById(string emailAccountId)+ {+ var key = string.Format(CacheKey.EMAILACCOUNT_BY_ID_KEY, emailAccountId);+ return await _cacheBase.GetAsync(key, () => _emailAccountRepository.GetByIdAsync(emailAccountId));+ }++ /// <summary>+ /// Gets all email accounts+ /// </summary>+ /// <returns>Email accounts list</returns>+ public virtual async Task<IList<EmailAccount>> GetAllEmailAccounts()+ {+ return await _cacheBase.GetAsync(CacheKey.EMAILACCOUNT_ALL_KEY, async () =>{- return await _cacheBase.GetAsync(CacheKey.EMAILACCOUNT_ALL_KEY, async () =>- {- var query = from ea in _emailAccountRepository.Table- select ea;- return await Task.FromResult(query.ToList());- });- }+ var query = from ea in _emailAccountRepository.Table+ select ea;+ return await Task.FromResult(query.ToList());+ });}-}+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Services/EmailSender.cs b/src/Business/Grand.Business.Messages/Services/EmailSender.csindex 8b56c5dfd..13f23ae53 100644--- a/src/Business/Grand.Business.Messages/Services/EmailSender.cs+++ b/src/Business/Grand.Business.Messages/Services/EmailSender.cs@@ -5,135 +5,124 @@ using MailKit.Net.Smtp;using MailKit.Security;using MimeKit;-namespace Grand.Business.Messages.Services+namespace Grand.Business.Messages.Services;++/// <summary>+/// Email sender+/// </summary>+public class EmailSender : IEmailSender{+ private readonly IDownloadService _downloadService;+ private readonly IMimeMappingService _mimeMappingService;++ public EmailSender(IDownloadService downloadService, IMimeMappingService mimeMappingService)+ {+ _downloadService = downloadService;+ _mimeMappingService = mimeMappingService;+ }+/// <summary>- /// Email sender+ /// Sends an email/// </summary>- public class EmailSender : IEmailSender+ /// <param name="emailAccount">Email account to use</param>+ /// <param name="subject">Subject</param>+ /// <param name="body">Body</param>+ /// <param name="fromAddress">From address</param>+ /// <param name="fromName">From display name</param>+ /// <param name="toAddress">To address</param>+ /// <param name="toName">To display name</param>+ /// <param name="replyToAddress">ReplyTo address</param>+ /// <param name="replyToName">ReplyTo display name</param>+ /// <param name="bccAddresses">BCC addresses list</param>+ /// <param name="ccAddresses">CC addresses list</param>+ /// <param name="attachmentFilePath">Attachment file path</param>+ /// <param name="attachmentFileName">+ /// Attachment file name. If specified, then this file name will be sent to a recipient.+ /// Otherwise, "AttachmentFilePath" name will be used.+ /// </param>+ /// <param name="attachedDownloads">Attachment download ID (another attachment)</param>+ public virtual async Task SendEmail(EmailAccount emailAccount, string subject, string body,+ string fromAddress, string fromName, string toAddress, string toName,+ string replyToAddress = null, string replyToName = null,+ IEnumerable<string> bccAddresses = null, IEnumerable<string> ccAddresses = null,+ string attachmentFilePath = null, string attachmentFileName = null,+ IEnumerable<string> attachedDownloads = null)+{- private readonly IDownloadService _downloadService;- private readonly IMimeMappingService _mimeMappingService;+ var message = new MimeMessage();+ //from, to, reply to+ message.From.Add(new MailboxAddress(fromName, fromAddress));+ message.To.Add(new MailboxAddress(toName, toAddress));+ if (!string.IsNullOrEmpty(replyToAddress)) message.ReplyTo.Add(new MailboxAddress(replyToName, replyToAddress));- public EmailSender(IDownloadService downloadService, IMimeMappingService mimeMappingService)- {- _downloadService = downloadService;- _mimeMappingService = mimeMappingService;- }+ //BCC+ if (bccAddresses != null && bccAddresses.Any())+ foreach (var address in bccAddresses.Where(bccValue => !string.IsNullOrWhiteSpace(bccValue)))+ message.Bcc.Add(MailboxAddress.Parse(address.Trim()));- /// <summary>- /// Sends an email- /// </summary>- /// <param name="emailAccount">Email account to use</param>- /// <param name="subject">Subject</param>- /// <param name="body">Body</param>- /// <param name="fromAddress">From address</param>- /// <param name="fromName">From display name</param>- /// <param name="toAddress">To address</param>- /// <param name="toName">To display name</param>- /// <param name="replyToAddress">ReplyTo address</param>- /// <param name="replyToName">ReplyTo display name</param>- /// <param name="bccAddresses">BCC addresses list</param>- /// <param name="ccAddresses">CC addresses list</param>- /// <param name="attachmentFilePath">Attachment file path</param>- /// <param name="attachmentFileName">Attachment file name. If specified, then this file name will be sent to a recipient. Otherwise, "AttachmentFilePath" name will be used.</param>- /// <param name="attachedDownloads">Attachment download ID (another attachment)</param>- public virtual async Task SendEmail(EmailAccount emailAccount, string subject, string body,- string fromAddress, string fromName, string toAddress, string toName,- string replyToAddress = null, string replyToName = null,- IEnumerable<string> bccAddresses = null, IEnumerable<string> ccAddresses = null,- string attachmentFilePath = null, string attachmentFileName = null,- IEnumerable<string> attachedDownloads = null)+ //CC+ if (ccAddresses != null && ccAddresses.Any())+ foreach (var address in ccAddresses.Where(ccValue => !string.IsNullOrWhiteSpace(ccValue)))+ message.Cc.Add(MailboxAddress.Parse(address.Trim()));- {- var message = new MimeMessage();- //from, to, reply to- message.From.Add(new MailboxAddress(fromName, fromAddress));- message.To.Add(new MailboxAddress(toName, toAddress));- if (!string.IsNullOrEmpty(replyToAddress))- {- message.ReplyTo.Add(new MailboxAddress(replyToName, replyToAddress));- }+ //subject+ message.Subject = subject;- //BCC- if (bccAddresses != null && bccAddresses.Any())- {- foreach (var address in bccAddresses.Where(bccValue => !string.IsNullOrWhiteSpace(bccValue)))- {- message.Bcc.Add(MailboxAddress.Parse(address.Trim()));- }- }-- //CC- if (ccAddresses != null && ccAddresses.Any())- {- foreach (var address in ccAddresses.Where(ccValue => !string.IsNullOrWhiteSpace(ccValue)))- {- message.Cc.Add(MailboxAddress.Parse(address.Trim()));- }- }-- //subject- message.Subject = subject;+ //content+ var builder = new BodyBuilder {+ HtmlBody = body+ };- //content- var builder = new BodyBuilder {- HtmlBody = body+ //create the file attachment for this e-mail message+ if (!string.IsNullOrEmpty(attachmentFilePath) &&+ File.Exists(attachmentFilePath))+ {+ // TODO: should probably include a check for the attachmentFileName not being null or white space+ var attachment = new MimePart(_mimeMappingService.Map(attachmentFileName)) {+ Content = new MimeContent(File.OpenRead(attachmentFilePath)),+ ContentDisposition = new ContentDisposition(ContentDisposition.Attachment) {+ CreationDate = File.GetCreationTime(attachmentFilePath),+ ModificationDate = File.GetLastWriteTime(attachmentFilePath),+ ReadDate = File.GetLastAccessTime(attachmentFilePath)+ },+ ContentTransferEncoding = ContentEncoding.Base64,+ FileName = Path.GetFileName(attachmentFilePath)};+ builder.Attachments.Add(attachment);+ }- //create the file attachment for this e-mail message- if (!string.IsNullOrEmpty(attachmentFilePath) &&- File.Exists(attachmentFilePath))+ //another attachment?+ if (attachedDownloads != null)+ foreach (var attachedDownloadId in attachedDownloads){- // TODO: should probably include a check for the attachmentFileName not being null or white space- var attachment = new MimePart(_mimeMappingService.Map(attachmentFileName)) {- Content = new MimeContent(File.OpenRead(attachmentFilePath)),+ var download = await _downloadService.GetDownloadById(attachedDownloadId);+ if (download == null || download.UseDownloadUrl) continue;+ var fileName = !string.IsNullOrWhiteSpace(download.Filename) ? download.Filename : download.Id;+ fileName += download.Extension;+ var ms = new MemoryStream(download.DownloadBinary);+ var attachment = new MimePart(download.ContentType ?? _mimeMappingService.Map(fileName)) {+ Content = new MimeContent(ms),ContentDisposition = new ContentDisposition(ContentDisposition.Attachment) {- CreationDate = File.GetCreationTime(attachmentFilePath),- ModificationDate = File.GetLastWriteTime(attachmentFilePath),- ReadDate = File.GetLastAccessTime(attachmentFilePath)+ CreationDate = DateTime.UtcNow,+ ModificationDate = DateTime.UtcNow,+ ReadDate = DateTime.UtcNow},ContentTransferEncoding = ContentEncoding.Base64,- FileName = Path.GetFileName(attachmentFilePath)+ FileName = fileName};builder.Attachments.Add(attachment);}- //another attachment?- if (attachedDownloads != null)- {- foreach (var attachedDownloadId in attachedDownloads)- {- var download = await _downloadService.GetDownloadById(attachedDownloadId);- if (download == null || download.UseDownloadUrl) continue;- var fileName = !string.IsNullOrWhiteSpace(download.Filename) ? download.Filename : download.Id;- fileName += download.Extension;- var ms = new MemoryStream(download.DownloadBinary);- var attachment = new MimePart(download.ContentType ?? _mimeMappingService.Map(fileName)) {- Content = new MimeContent(ms),- ContentDisposition = new ContentDisposition(ContentDisposition.Attachment) {- CreationDate = DateTime.UtcNow,- ModificationDate = DateTime.UtcNow,- ReadDate = DateTime.UtcNow- },- ContentTransferEncoding = ContentEncoding.Base64,- FileName = fileName- };- builder.Attachments.Add(attachment);- }- }+ message.Body = builder.ToMessageBody();- message.Body = builder.ToMessageBody();-- //send email- using var smtpClient = new SmtpClient();- smtpClient.ServerCertificateValidationCallback =- (_, _, _, _) => emailAccount.UseServerCertificateValidation;- await smtpClient.ConnectAsync(emailAccount.Host, emailAccount.Port,- (SecureSocketOptions)emailAccount.SecureSocketOptionsId);- await smtpClient.AuthenticateAsync(emailAccount.Username, emailAccount.Password);- await smtpClient.SendAsync(message);- await smtpClient.DisconnectAsync(true);- }+ //send email+ using var smtpClient = new SmtpClient();+ smtpClient.ServerCertificateValidationCallback =+ (_, _, _, _) => emailAccount.UseServerCertificateValidation;+ await smtpClient.ConnectAsync(emailAccount.Host, emailAccount.Port,+ (SecureSocketOptions)emailAccount.SecureSocketOptionsId);+ await smtpClient.AuthenticateAsync(emailAccount.Username, emailAccount.Password);+ await smtpClient.SendAsync(message);+ await smtpClient.DisconnectAsync(true);}}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs b/src/Business/Grand.Business.Messages/Services/MessageProviderService.csindex 0f382315f..9e52ebcd0 100644--- a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs+++ b/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs@@ -1,11 +1,11 @@-using Grand.Business.Core.Extensions;+using Grand.Business.Core.Commands.Messages.Common;+using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Stores;-using Grand.Business.Core.Commands.Messages.Common;-using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;using Grand.Business.Core.Interfaces.Messages;using Grand.Business.Core.Queries.Messages;+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;using Grand.Domain.Blogs;using Grand.Domain.Catalog;using Grand.Domain.Common;@@ -23,1701 +23,1787 @@ using Grand.SharedKernel.Extensions;using MediatR;using System.Net;-namespace Grand.Business.Messages.Services+namespace Grand.Business.Messages.Services;++public class MessageProviderService : IMessageProviderService{- public class MessageProviderService : IMessageProviderService+ #region Ctor++ public MessageProviderService(IMessageTemplateService messageTemplateService,+ IQueuedEmailService queuedEmailService,+ ILanguageService languageService,+ IEmailAccountService emailAccountService,+ IStoreService storeService,+ IStoreHelper storeHelper,+ IGroupService groupService,+ IMediator mediator,+ EmailAccountSettings emailAccountSettings,+ CommonSettings commonSettings){- #region Fields-- private readonly IMessageTemplateService _messageTemplateService;- private readonly IQueuedEmailService _queuedEmailService;- private readonly ILanguageService _languageService;- private readonly IEmailAccountService _emailAccountService;- private readonly IStoreService _storeService;- private readonly IStoreHelper _storeHelper;- private readonly IGroupService _groupService;- private readonly IMediator _mediator;-- private readonly EmailAccountSettings _emailAccountSettings;- private readonly CommonSettings _commonSettings;-- #endregion-- #region Ctor-- public MessageProviderService(IMessageTemplateService messageTemplateService,- IQueuedEmailService queuedEmailService,- ILanguageService languageService,- IEmailAccountService emailAccountService,- IStoreService storeService,- IStoreHelper storeHelper,- IGroupService groupService,- IMediator mediator,- EmailAccountSettings emailAccountSettings,- CommonSettings commonSettings)- {- _messageTemplateService = messageTemplateService;- _queuedEmailService = queuedEmailService;- _languageService = languageService;- _emailAccountService = emailAccountService;- _storeService = storeService;- _storeHelper = storeHelper;- _groupService = groupService;- _emailAccountSettings = emailAccountSettings;- _commonSettings = commonSettings;- _mediator = mediator;- }-- #endregion-- #region Utilities-- protected virtual async Task<Store> GetStore(string storeId)- {- return await _storeService.GetStoreById(storeId) ?? (await _storeService.GetAllStores()).FirstOrDefault();- }+ _messageTemplateService = messageTemplateService;+ _queuedEmailService = queuedEmailService;+ _languageService = languageService;+ _emailAccountService = emailAccountService;+ _storeService = storeService;+ _storeHelper = storeHelper;+ _groupService = groupService;+ _emailAccountSettings = emailAccountSettings;+ _commonSettings = commonSettings;+ _mediator = mediator;+ }- protected virtual async Task<MessageTemplate> GetMessageTemplate(string messageTemplateName, string storeId)- {- var messageTemplate = await _messageTemplateService.GetMessageTemplateByName(messageTemplateName, storeId);+ #endregion- //no template found- if (messageTemplate == null)- return null;+ #region Fields- //ensure it's active- var isActive = messageTemplate.IsActive;- return !isActive ? null : messageTemplate;- }+ private readonly IMessageTemplateService _messageTemplateService;+ private readonly IQueuedEmailService _queuedEmailService;+ private readonly ILanguageService _languageService;+ private readonly IEmailAccountService _emailAccountService;+ private readonly IStoreService _storeService;+ private readonly IStoreHelper _storeHelper;+ private readonly IGroupService _groupService;+ private readonly IMediator _mediator;- protected virtual async Task<EmailAccount> GetEmailAccountOfMessageTemplate(MessageTemplate messageTemplate, string languageId)- {- var emailAccounId = messageTemplate.GetTranslation(mt => mt.EmailAccountId, languageId);- var emailAccount = (await _emailAccountService.GetEmailAccountById(emailAccounId) ?? await _emailAccountService.GetEmailAccountById(_emailAccountSettings.DefaultEmailAccountId)) ??- (await _emailAccountService.GetAllEmailAccounts()).FirstOrDefault();- return emailAccount;+ private readonly EmailAccountSettings _emailAccountSettings;+ private readonly CommonSettings _commonSettings;- }+ #endregion- protected virtual async Task<Language> EnsureLanguageIsActive(string languageId, string storeId)- {- //load language by specified ID- var language = await _languageService.GetLanguageById(languageId);+ #region Utilities- if (language is not { Published: true })- {- //load any language from the specified store- language = (await _languageService.GetAllLanguages(storeId: storeId)).FirstOrDefault();- }- if (language is not { Published: true })- {- //load any language- language = (await _languageService.GetAllLanguages()).FirstOrDefault();- }+ protected virtual async Task<Store> GetStore(string storeId)+ {+ return await _storeService.GetStoreById(storeId) ?? (await _storeService.GetAllStores()).FirstOrDefault();+ }- if (language == null)- throw new Exception("No active language could be loaded");- return language;- }+ protected virtual async Task<MessageTemplate> GetMessageTemplate(string messageTemplateName, string storeId)+ {+ var messageTemplate = await _messageTemplateService.GetMessageTemplateByName(messageTemplateName, storeId);- #endregion+ //no template found+ if (messageTemplate == null)+ return null;- #region Methods+ //ensure it's active+ var isActive = messageTemplate.IsActive;+ return !isActive ? null : messageTemplate;+ }- #region Customer messages+ protected virtual async Task<EmailAccount> GetEmailAccountOfMessageTemplate(MessageTemplate messageTemplate,+ string languageId)+ {+ var emailAccounId = messageTemplate.GetTranslation(mt => mt.EmailAccountId, languageId);+ var emailAccount = (await _emailAccountService.GetEmailAccountById(emailAccounId) ??+ await _emailAccountService.GetEmailAccountById(_emailAccountSettings+ .DefaultEmailAccountId)) ??+ (await _emailAccountService.GetAllEmailAccounts()).FirstOrDefault();+ return emailAccount;+ }- /// <summary>- /// Send a message to a customer- /// </summary>- /// <param name="customer">Customer instance</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- /// <param name="templateName">Message template name</param>- /// <param name="toEmailAccount">Send email to email account</param>- /// <param name="customerNote">Customer note</param>- protected virtual async Task<int> SendCustomerMessage(Customer customer, Store store, string languageId, string templateName, bool toEmailAccount = false, CustomerNote customerNote = null)- {- ArgumentNullException.ThrowIfNull(customer);+ protected virtual async Task<Language> EnsureLanguageIsActive(string languageId, string storeId)+ {+ //load language by specified ID+ var language = await _languageService.GetLanguageById(languageId);++ if (language is not { Published: true })+ //load any language from the specified store+ language = (await _languageService.GetAllLanguages(storeId: storeId)).FirstOrDefault();+ if (language is not { Published: true })+ //load any language+ language = (await _languageService.GetAllLanguages()).FirstOrDefault();++ if (language == null)+ throw new Exception("No active language could be loaded");+ return language;+ }- var language = await EnsureLanguageIsActive(languageId, store.Id);+ #endregion- var messageTemplate = await GetMessageTemplate(templateName, store.Id);- if (messageTemplate == null)- return 0;+ #region Methods- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ #region Customer messages- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language, customerNote);+ /// <summary>+ /// Send a message to a customer+ /// </summary>+ /// <param name="customer">Customer instance</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ /// <param name="templateName">Message template name</param>+ /// <param name="toEmailAccount">Send email to email account</param>+ /// <param name="customerNote">Customer note</param>+ protected virtual async Task<int> SendCustomerMessage(Customer customer, Store store, string languageId,+ string templateName, bool toEmailAccount = false, CustomerNote customerNote = null)+ {+ ArgumentNullException.ThrowIfNull(customer);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var toEmail = toEmailAccount ? emailAccount.Email : customer.Email;- var toName = toEmailAccount ? emailAccount.DisplayName : customer.GetFullName();- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName, reference: Reference.Customer, objectId: customer.Id);- }+ var messageTemplate = await GetMessageTemplate(templateName, store.Id);+ if (messageTemplate == null)+ return 0;- /// <summary>- /// Sends 'New customer' notification message to a store owner- /// </summary>- /// <param name="customer">Customer instance</param>- /// <param name="store">Store identifier</param>- /// <param name="languageId">Message language identifier</param>- /// <returns>Queued email identifier</returns>- public virtual async Task<int> SendCustomerRegisteredMessage(Customer customer, Store store, string languageId)- {- return await SendCustomerMessage(customer, store, languageId, MessageTemplateNames.CustomerRegistered, true);- }+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- /// <summary>- /// Sends a welcome message to a customer- /// </summary>- /// <param name="customer">Customer instance</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendCustomerWelcomeMessage(Customer customer, Store store, string languageId)- {- return await SendCustomerMessage(customer, store, languageId, MessageTemplateNames.CustomerWelcome);- }+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language, customerNote);- /// <summary>- /// Sends an email validation message to a customer- /// </summary>- /// <param name="customer">Customer instance</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendCustomerEmailValidationMessage(Customer customer, Store store, string languageId)- {- return await SendCustomerMessage(customer, store, languageId, MessageTemplateNames.CustomerEmailValidation);- }+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- /// <summary>- /// Sends password recovery message to a customer- /// </summary>- /// <param name="customer">Customer instance</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendCustomerPasswordRecoveryMessage(Customer customer, Store store, string languageId)- {- return await SendCustomerMessage(customer, store, languageId, MessageTemplateNames.CustomerPasswordRecovery);- }+ var toEmail = toEmailAccount ? emailAccount.Email : customer.Email;+ var toName = toEmailAccount ? emailAccount.DisplayName : customer.GetFullName();+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName, reference: Reference.Customer, objectId: customer.Id);+ }- /// <summary>- /// Sends a new customer note added notification to a customer- /// </summary>- /// <param name="customerNote">Customer note</param>- /// <param name="customer">Customer</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- /// <returns>Queued email identifier</returns>- public virtual async Task<int> SendNewCustomerNoteMessage(CustomerNote customerNote, Customer customer, Store store, string languageId)- {- return await SendCustomerMessage(customer, store, languageId, MessageTemplateNames.CustomerNewCustomerNote, customerNote: customerNote);- }+ /// <summary>+ /// Sends 'New customer' notification message to a store owner+ /// </summary>+ /// <param name="customer">Customer instance</param>+ /// <param name="store">Store identifier</param>+ /// <param name="languageId">Message language identifier</param>+ /// <returns>Queued email identifier</returns>+ public virtual async Task<int> SendCustomerRegisteredMessage(Customer customer, Store store, string languageId)+ {+ return await SendCustomerMessage(customer, store, languageId, MessageTemplateNames.CustomerRegistered, true);+ }- /// <summary>- /// Send an email token validation message to a customer- /// </summary>- /// <param name="customer">Customer instance</param>- /// <param name="store">Store instance</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendCustomerEmailTokenValidationMessage(Customer customer, Store store, string languageId)- {- return await SendCustomerMessage(customer, store, languageId, MessageTemplateNames.CustomerEmailTokenValidationMessage);- }+ /// <summary>+ /// Sends a welcome message to a customer+ /// </summary>+ /// <param name="customer">Customer instance</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendCustomerWelcomeMessage(Customer customer, Store store, string languageId)+ {+ return await SendCustomerMessage(customer, store, languageId, MessageTemplateNames.CustomerWelcome);+ }- #endregion+ /// <summary>+ /// Sends an email validation message to a customer+ /// </summary>+ /// <param name="customer">Customer instance</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendCustomerEmailValidationMessage(Customer customer, Store store, string languageId)+ {+ return await SendCustomerMessage(customer, store, languageId, MessageTemplateNames.CustomerEmailValidation);+ }- #region Order messages+ /// <summary>+ /// Sends password recovery message to a customer+ /// </summary>+ /// <param name="customer">Customer instance</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendCustomerPasswordRecoveryMessage(Customer customer, Store store,+ string languageId)+ {+ return await SendCustomerMessage(customer, store, languageId, MessageTemplateNames.CustomerPasswordRecovery);+ }- /// <summary>- /// Sends an order placed notification to a store owner- /// </summary>- /// <param name="order">Order instance</param>- /// <param name="customer">Customer</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendOrderPlacedStoreOwnerMessage(Order order, Customer customer, string languageId)- {- return await SendOrderStoreOwnerMessage(MessageTemplateNames.SendOrderPlacedStoreOwnerMessage, order, customer, languageId);- }+ /// <summary>+ /// Sends a new customer note added notification to a customer+ /// </summary>+ /// <param name="customerNote">Customer note</param>+ /// <param name="customer">Customer</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ /// <returns>Queued email identifier</returns>+ public virtual async Task<int> SendNewCustomerNoteMessage(CustomerNote customerNote, Customer customer, Store store,+ string languageId)+ {+ return await SendCustomerMessage(customer, store, languageId, MessageTemplateNames.CustomerNewCustomerNote,+ customerNote: customerNote);+ }- /// <summary>- /// Sends an order paid notification to a store owner- /// </summary>- /// <param name="order">Order instance</param>- /// <param name="customer">Customer instance</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendOrderPaidStoreOwnerMessage(Order order, Customer customer, string languageId)- {- return await SendOrderStoreOwnerMessage(MessageTemplateNames.SendOrderPaidStoreOwnerMessage, order, customer, languageId);- }+ /// <summary>+ /// Send an email token validation message to a customer+ /// </summary>+ /// <param name="customer">Customer instance</param>+ /// <param name="store">Store instance</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendCustomerEmailTokenValidationMessage(Customer customer, Store store,+ string languageId)+ {+ return await SendCustomerMessage(customer, store, languageId,+ MessageTemplateNames.CustomerEmailTokenValidationMessage);+ }- /// <summary>- /// Sends an order cancelled notification to an admin- /// </summary>- /// <param name="order">Order instance</param>- /// <param name="customer">Customer instance</param>- /// <param name="languageId">Message language identifier</param>- /// <returns>Queued email identifier</returns>- public virtual async Task<int> SendOrderCancelledStoreOwnerMessage(Order order, Customer customer, string languageId)- {- return await SendOrderStoreOwnerMessage(MessageTemplateNames.SendOrderCancelledStoreOwnerMessage, order, customer, languageId);- }+ #endregion- /// Sends an order refunded notification to a store owner- /// <param name="order">Order instance</param>- /// <param name="refundedAmount">Amount refunded</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendOrderRefundedStoreOwnerMessage(Order order, double refundedAmount, string languageId)- {- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = order.CustomerId });- return await SendOrderStoreOwnerMessage(MessageTemplateNames.SendOrderRefundedStoreOwnerMessage, order, customer, languageId, refundedAmount);- }+ #region Order messages- /// <summary>- /// Sends an order notification to a store owner- /// </summary>- /// <param name="template">Message template</param>- /// <param name="order">Order instance</param>- /// <param name="customer">Customer instance</param>- /// <param name="languageId">Message language identifier</param>- /// <param name="refundedAmount"></param>- private async Task<int> SendOrderStoreOwnerMessage(string template, Order order, Customer customer, string languageId, double refundedAmount = 0)- {- ArgumentNullException.ThrowIfNull(order);+ /// <summary>+ /// Sends an order placed notification to a store owner+ /// </summary>+ /// <param name="order">Order instance</param>+ /// <param name="customer">Customer</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendOrderPlacedStoreOwnerMessage(Order order, Customer customer, string languageId)+ {+ return await SendOrderStoreOwnerMessage(MessageTemplateNames.SendOrderPlacedStoreOwnerMessage, order, customer,+ languageId);+ }- var store = await GetStore(order.StoreId);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ /// <summary>+ /// Sends an order paid notification to a store owner+ /// </summary>+ /// <param name="order">Order instance</param>+ /// <param name="customer">Customer instance</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendOrderPaidStoreOwnerMessage(Order order, Customer customer, string languageId)+ {+ return await SendOrderStoreOwnerMessage(MessageTemplateNames.SendOrderPaidStoreOwnerMessage, order, customer,+ languageId);+ }- var messageTemplate = await GetMessageTemplate(template, store.Id);- if (messageTemplate == null)- return 0;+ /// <summary>+ /// Sends an order cancelled notification to an admin+ /// </summary>+ /// <param name="order">Order instance</param>+ /// <param name="customer">Customer instance</param>+ /// <param name="languageId">Message language identifier</param>+ /// <returns>Queued email identifier</returns>+ public virtual async Task<int> SendOrderCancelledStoreOwnerMessage(Order order, Customer customer,+ string languageId)+ {+ return await SendOrderStoreOwnerMessage(MessageTemplateNames.SendOrderCancelledStoreOwnerMessage, order,+ customer, languageId);+ }- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ /// Sends an order refunded notification to a store owner+ /// <param name="order">Order instance</param>+ /// <param name="refundedAmount">Amount refunded</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendOrderRefundedStoreOwnerMessage(Order order, double refundedAmount,+ string languageId)+ {+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = order.CustomerId });+ return await SendOrderStoreOwnerMessage(MessageTemplateNames.SendOrderRefundedStoreOwnerMessage, order,+ customer, languageId, refundedAmount);+ }- var liquidBuilder = new LiquidObjectBuilder(_mediator);- liquidBuilder.AddStoreTokens(store, language, emailAccount)- .AddOrderTokens(order, customer, store, _storeHelper.DomainHost);- if (customer != null)- liquidBuilder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ /// <summary>+ /// Sends an order notification to a store owner+ /// </summary>+ /// <param name="template">Message template</param>+ /// <param name="order">Order instance</param>+ /// <param name="customer">Customer instance</param>+ /// <param name="languageId">Message language identifier</param>+ /// <param name="refundedAmount"></param>+ private async Task<int> SendOrderStoreOwnerMessage(string template, Order order, Customer customer,+ string languageId, double refundedAmount = 0)+ {+ ArgumentNullException.ThrowIfNull(order);- LiquidObject liquidObject = await liquidBuilder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var store = await GetStore(order.StoreId);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Order, objectId: order.Id);- }- /// <summary>- /// Sends an order placed notification to a customer- /// </summary>- /// <param name="order">Order instance</param>- /// <param name="customer"></param>- /// <param name="languageId">Message language identifier</param>- /// <param name="attachmentFilePath">Attachment file path</param>- /// <param name="attachmentFileName">Attachment file name. If specified, then this file name will be sent to a recipient. Otherwise, "AttachmentFilePath" name will be used.</param>- /// <param name="attachments">Attachments</param>- public virtual async Task<int> SendOrderPlacedCustomerMessage(Order order, Customer customer, string languageId,- string attachmentFilePath = null, string attachmentFileName = null, IEnumerable<string> attachments = null)- {- return await SendOrderCustomerMessage(MessageTemplateNames.SendOrderPlacedCustomerMessage, order, customer, languageId, attachmentFilePath, attachmentFileName, attachments);- }+ var messageTemplate = await GetMessageTemplate(template, store.Id);+ if (messageTemplate == null)+ return 0;- /// <summary>- /// Sends an order paid notification to a customer- /// </summary>- /// <param name="order">Order instance</param>- /// <param name="customer">Customer instance</param>- /// <param name="languageId">Message language identifier</param>- /// <param name="attachmentFilePath">Attachment file path</param>- /// <param name="attachmentFileName">Attachment file name. If specified, then this file name will be sent to a recipient. Otherwise, "AttachmentFilePath" name will be used.</param>- /// <param name="attachments">Attachments ident</param>- public virtual async Task<int> SendOrderPaidCustomerMessage(Order order, Customer customer, string languageId,- string attachmentFilePath = null, string attachmentFileName = null, IEnumerable<string> attachments = null)- {- return await SendOrderCustomerMessage(MessageTemplateNames.SendOrderPaidCustomerMessage, order, customer, languageId, attachmentFilePath, attachmentFileName, attachments);- }+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);++ var liquidBuilder = new LiquidObjectBuilder(_mediator);+ liquidBuilder.AddStoreTokens(store, language, emailAccount)+ .AddOrderTokens(order, customer, store, _storeHelper.DomainHost);+ if (customer != null)+ liquidBuilder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);++ var liquidObject = await liquidBuilder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);++ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Order, objectId: order.Id);+ }- /// <summary>- /// Sends an order completed notification to a customer- /// </summary>- /// <param name="order">Order instance</param>- /// <param name="customer">Customer instance</param>- /// <param name="languageId">Message language identifier</param>- /// <param name="attachmentFilePath">Attachment file path</param>- /// <param name="attachmentFileName">Attachment file name. If specified, then this file name will be sent to a recipient. Otherwise, "AttachmentFilePath" name will be used.</param>- /// <param name="attachments">Attachments ident</param>- public virtual async Task<int> SendOrderCompletedCustomerMessage(Order order, Customer customer, string languageId,- string attachmentFilePath = null, string attachmentFileName = null, IEnumerable<string> attachments = null)- {- return await SendOrderCustomerMessage(MessageTemplateNames.SendOrderCompletedCustomerMessage, order, customer, languageId, attachmentFilePath, attachmentFileName, attachments);- }+ /// <summary>+ /// Sends an order placed notification to a customer+ /// </summary>+ /// <param name="order">Order instance</param>+ /// <param name="customer"></param>+ /// <param name="languageId">Message language identifier</param>+ /// <param name="attachmentFilePath">Attachment file path</param>+ /// <param name="attachmentFileName">+ /// Attachment file name. If specified, then this file name will be sent to a recipient.+ /// Otherwise, "AttachmentFilePath" name will be used.+ /// </param>+ /// <param name="attachments">Attachments</param>+ public virtual async Task<int> SendOrderPlacedCustomerMessage(Order order, Customer customer, string languageId,+ string attachmentFilePath = null, string attachmentFileName = null, IEnumerable<string> attachments = null)+ {+ return await SendOrderCustomerMessage(MessageTemplateNames.SendOrderPlacedCustomerMessage, order, customer,+ languageId, attachmentFilePath, attachmentFileName, attachments);+ }- /// <summary>- /// Sends an order cancelled notification to a customer- /// </summary>- /// <param name="order">Order instance</param>- /// <param name="customer">Customer instance</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendOrderCancelledCustomerMessage(Order order, Customer customer, string languageId)- {- return await SendOrderCustomerMessage(MessageTemplateNames.SendOrderCancelledCustomerMessage, order, customer, languageId);- }+ /// <summary>+ /// Sends an order paid notification to a customer+ /// </summary>+ /// <param name="order">Order instance</param>+ /// <param name="customer">Customer instance</param>+ /// <param name="languageId">Message language identifier</param>+ /// <param name="attachmentFilePath">Attachment file path</param>+ /// <param name="attachmentFileName">+ /// Attachment file name. If specified, then this file name will be sent to a recipient.+ /// Otherwise, "AttachmentFilePath" name will be used.+ /// </param>+ /// <param name="attachments">Attachments ident</param>+ public virtual async Task<int> SendOrderPaidCustomerMessage(Order order, Customer customer, string languageId,+ string attachmentFilePath = null, string attachmentFileName = null, IEnumerable<string> attachments = null)+ {+ return await SendOrderCustomerMessage(MessageTemplateNames.SendOrderPaidCustomerMessage, order, customer,+ languageId, attachmentFilePath, attachmentFileName, attachments);+ }- /// <summary>- /// Sends an order refunded notification to a customer- /// </summary>- /// <param name="order">Order instance</param>- /// <param name="refundedAmount">Amount refunded</param>- /// <param name="languageId">Message language identifier</param>- /// <returns>Queued email identifier</returns>- public virtual async Task<int> SendOrderRefundedCustomerMessage(Order order, double refundedAmount, string languageId)- {- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = order.CustomerId });- return await SendOrderCustomerMessage(MessageTemplateNames.SendOrderRefundedCustomerMessage, order, customer, languageId, refundedAmount: refundedAmount);- }+ /// <summary>+ /// Sends an order completed notification to a customer+ /// </summary>+ /// <param name="order">Order instance</param>+ /// <param name="customer">Customer instance</param>+ /// <param name="languageId">Message language identifier</param>+ /// <param name="attachmentFilePath">Attachment file path</param>+ /// <param name="attachmentFileName">+ /// Attachment file name. If specified, then this file name will be sent to a recipient.+ /// Otherwise, "AttachmentFilePath" name will be used.+ /// </param>+ /// <param name="attachments">Attachments ident</param>+ public virtual async Task<int> SendOrderCompletedCustomerMessage(Order order, Customer customer, string languageId,+ string attachmentFilePath = null, string attachmentFileName = null, IEnumerable<string> attachments = null)+ {+ return await SendOrderCustomerMessage(MessageTemplateNames.SendOrderCompletedCustomerMessage, order, customer,+ languageId, attachmentFilePath, attachmentFileName, attachments);+ }- /// <summary>- /// Sends an order notification to a customer- /// </summary>- /// <param name="message">Message template</param>- /// <param name="order">Order instance</param>- /// <param name="customer">Customer instance</param>- /// <param name="languageId">Message language identifier</param>- /// <param name="attachmentFilePath">Attachment file path</param>- /// <param name="attachmentFileName">Attachment file name. If specified, then this file name will be sent to a recipient. Otherwise, "AttachmentFilePath" name will be used.</param>- /// <param name="attachments">Attachments ident</param>- /// <param name="refundedAmount"></param>- private async Task<int> SendOrderCustomerMessage(string message, Order order, Customer customer, string languageId,- string attachmentFilePath = null, string attachmentFileName = null, IEnumerable<string> attachments = null, double refundedAmount = 0)- {- ArgumentNullException.ThrowIfNull(order);+ /// <summary>+ /// Sends an order cancelled notification to a customer+ /// </summary>+ /// <param name="order">Order instance</param>+ /// <param name="customer">Customer instance</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendOrderCancelledCustomerMessage(Order order, Customer customer, string languageId)+ {+ return await SendOrderCustomerMessage(MessageTemplateNames.SendOrderCancelledCustomerMessage, order, customer,+ languageId);+ }- var store = await GetStore(order.StoreId);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ /// <summary>+ /// Sends an order refunded notification to a customer+ /// </summary>+ /// <param name="order">Order instance</param>+ /// <param name="refundedAmount">Amount refunded</param>+ /// <param name="languageId">Message language identifier</param>+ /// <returns>Queued email identifier</returns>+ public virtual async Task<int> SendOrderRefundedCustomerMessage(Order order, double refundedAmount,+ string languageId)+ {+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = order.CustomerId });+ return await SendOrderCustomerMessage(MessageTemplateNames.SendOrderRefundedCustomerMessage, order, customer,+ languageId, refundedAmount: refundedAmount);+ }- var messageTemplate = await GetMessageTemplate(message, store.Id);- if (messageTemplate == null)- return 0;+ /// <summary>+ /// Sends an order notification to a customer+ /// </summary>+ /// <param name="message">Message template</param>+ /// <param name="order">Order instance</param>+ /// <param name="customer">Customer instance</param>+ /// <param name="languageId">Message language identifier</param>+ /// <param name="attachmentFilePath">Attachment file path</param>+ /// <param name="attachmentFileName">+ /// Attachment file name. If specified, then this file name will be sent to a recipient.+ /// Otherwise, "AttachmentFilePath" name will be used.+ /// </param>+ /// <param name="attachments">Attachments ident</param>+ /// <param name="refundedAmount"></param>+ private async Task<int> SendOrderCustomerMessage(string message, Order order, Customer customer, string languageId,+ string attachmentFilePath = null, string attachmentFileName = null, IEnumerable<string> attachments = null,+ double refundedAmount = 0)+ {+ ArgumentNullException.ThrowIfNull(order);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var store = await GetStore(order.StoreId);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddOrderTokens(order, customer, store, _storeHelper.DomainHost);+ var messageTemplate = await GetMessageTemplate(message, store.Id);+ if (messageTemplate == null)+ return 0;- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);++ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddOrderTokens(order, customer, store, _storeHelper.DomainHost);++ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);++ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);++ var toEmail = order.BillingAddress.Email;+ var toName = $"{order.BillingAddress.FirstName} {order.BillingAddress.LastName}";+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ attachmentFilePath,+ attachmentFileName,+ attachments,+ reference: Reference.Order, objectId: order.Id);+ }- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ /// <summary>+ /// Sends an order placed notification to a vendor+ /// </summary>+ /// <param name="order">Order instance</param>+ /// <param name="customer">Customer instance</param>+ /// <param name="vendor">Vendor instance</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendOrderPlacedVendorMessage(Order order, Customer customer, Vendor vendor,+ string languageId)+ {+ return await SendOrderVendorMessage(MessageTemplateNames.SendOrderPlacedVendorMessage, order, vendor,+ languageId);+ }- var toEmail = order.BillingAddress.Email;- var toName = $"{order.BillingAddress.FirstName} {order.BillingAddress.LastName}";- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- attachmentFilePath,- attachmentFileName,- attachments,- reference: Reference.Order, objectId: order.Id);- }+ /// <summary>+ /// Sends an order paid notification to a vendor+ /// </summary>+ /// <param name="order">Order instance</param>+ /// <param name="vendor">Vendor instance</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendOrderPaidVendorMessage(Order order, Vendor vendor, string languageId)+ {+ return await SendOrderVendorMessage(MessageTemplateNames.SendOrderPaidVendorMessage, order, vendor, languageId);+ }- /// <summary>- /// Sends an order placed notification to a vendor- /// </summary>- /// <param name="order">Order instance</param>- /// <param name="customer">Customer instance</param>- /// <param name="vendor">Vendor instance</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendOrderPlacedVendorMessage(Order order, Customer customer, Vendor vendor, string languageId)- {- return await SendOrderVendorMessage(MessageTemplateNames.SendOrderPlacedVendorMessage, order, vendor, languageId);- }+ /// <summary>+ /// Sends an order cancel notification to a vendor+ /// </summary>+ /// <param name="order">Order instance</param>+ /// <param name="vendor">Vendor instance</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendOrderCancelledVendorMessage(Order order, Vendor vendor, string languageId)+ {+ return await SendOrderVendorMessage(MessageTemplateNames.SendOrderCancelledVendorMessage, order, vendor,+ languageId);+ }- /// <summary>- /// Sends an order paid notification to a vendor- /// </summary>- /// <param name="order">Order instance</param>- /// <param name="vendor">Vendor instance</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendOrderPaidVendorMessage(Order order, Vendor vendor, string languageId)- {- return await SendOrderVendorMessage(MessageTemplateNames.SendOrderPaidVendorMessage, order, vendor, languageId);- }- /// <summary>- /// Sends an order cancel notification to a vendor- /// </summary>- /// <param name="order">Order instance</param>- /// <param name="vendor">Vendor instance</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendOrderCancelledVendorMessage(Order order, Vendor vendor, string languageId)- {- return await SendOrderVendorMessage(MessageTemplateNames.SendOrderCancelledVendorMessage, order, vendor, languageId);- }- /// <summary>- /// Sends an order notification to a vendor- /// </summary>- /// <param name="message">Message template</param>- /// <param name="order">Order instance</param>- /// <param name="vendor">Vendor instance</param>- /// <param name="languageId">Message language identifier</param>- private async Task<int> SendOrderVendorMessage(string message, Order order, Vendor vendor, string languageId)- {- ArgumentNullException.ThrowIfNull(order);- ArgumentNullException.ThrowIfNull(vendor);+ /// <summary>+ /// Sends an order notification to a vendor+ /// </summary>+ /// <param name="message">Message template</param>+ /// <param name="order">Order instance</param>+ /// <param name="vendor">Vendor instance</param>+ /// <param name="languageId">Message language identifier</param>+ private async Task<int> SendOrderVendorMessage(string message, Order order, Vendor vendor, string languageId)+ {+ ArgumentNullException.ThrowIfNull(order);+ ArgumentNullException.ThrowIfNull(vendor);- var store = await GetStore(order.StoreId);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ var store = await GetStore(order.StoreId);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var messageTemplate = await GetMessageTemplate(message, store.Id);- if (messageTemplate == null)- return 0;+ var messageTemplate = await GetMessageTemplate(message, store.Id);+ if (messageTemplate == null)+ return 0;- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = order.CustomerId });+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = order.CustomerId });- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddOrderTokens(order, customer, store, _storeHelper.DomainHost, vendor: vendor);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddOrderTokens(order, customer, store, _storeHelper.DomainHost, vendor: vendor);- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var toEmail = vendor.Email;- var toName = vendor.Name;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Order, objectId: order.Id);- }+ var toEmail = vendor.Email;+ var toName = vendor.Name;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Order, objectId: order.Id);+ }- /// <summary>- /// Sends a shipment sent notification to a customer- /// </summary>- /// <param name="shipment">Shipment</param>- /// <param name="order">Order</param>- public virtual async Task<int> SendShipmentSentCustomerMessage(Shipment shipment, Order order)- {- return await SendShipmentCustomerMessage(MessageTemplateNames.SendShipmentSentCustomerMessage, shipment, order);- }+ /// <summary>+ /// Sends a shipment sent notification to a customer+ /// </summary>+ /// <param name="shipment">Shipment</param>+ /// <param name="order">Order</param>+ public virtual async Task<int> SendShipmentSentCustomerMessage(Shipment shipment, Order order)+ {+ return await SendShipmentCustomerMessage(MessageTemplateNames.SendShipmentSentCustomerMessage, shipment, order);+ }- /// <summary>- /// Sends a shipment delivered notification to a customer- /// </summary>- /// <param name="shipment">Shipment</param>- /// <param name="order">Order</param>- public virtual async Task<int> SendShipmentDeliveredCustomerMessage(Shipment shipment, Order order)- {- return await SendShipmentCustomerMessage(MessageTemplateNames.SendShipmentDeliveredCustomerMessage, shipment, order);- }+ /// <summary>+ /// Sends a shipment delivered notification to a customer+ /// </summary>+ /// <param name="shipment">Shipment</param>+ /// <param name="order">Order</param>+ public virtual async Task<int> SendShipmentDeliveredCustomerMessage(Shipment shipment, Order order)+ {+ return await SendShipmentCustomerMessage(MessageTemplateNames.SendShipmentDeliveredCustomerMessage, shipment,+ order);+ }- /// <summary>- /// Send a shipment notification to a customer- /// </summary>- /// <param name="message">Message template</param>- /// <param name="shipment">Shipment</param>- /// <param name="order">Order</param>- private async Task<int> SendShipmentCustomerMessage(string message, Shipment shipment, Order order)- {- ArgumentNullException.ThrowIfNull(shipment);+ /// <summary>+ /// Send a shipment notification to a customer+ /// </summary>+ /// <param name="message">Message template</param>+ /// <param name="shipment">Shipment</param>+ /// <param name="order">Order</param>+ private async Task<int> SendShipmentCustomerMessage(string message, Shipment shipment, Order order)+ {+ ArgumentNullException.ThrowIfNull(shipment);- if (order == null)- throw new Exception("Order cannot be loaded");+ if (order == null)+ throw new Exception("Order cannot be loaded");- var store = await GetStore(order.StoreId);- var language = await EnsureLanguageIsActive(order.CustomerLanguageId, store.Id);+ var store = await GetStore(order.StoreId);+ var language = await EnsureLanguageIsActive(order.CustomerLanguageId, store.Id);- var messageTemplate = await GetMessageTemplate(message, store.Id);- if (messageTemplate == null)- return 0;+ var messageTemplate = await GetMessageTemplate(message, store.Id);+ if (messageTemplate == null)+ return 0;- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = order.CustomerId });+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = order.CustomerId });- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddShipmentTokens(shipment, order, store, _storeHelper.DomainHost, language)- .AddOrderTokens(order, customer, store, _storeHelper.DomainHost);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddShipmentTokens(shipment, order, store, _storeHelper.DomainHost, language)+ .AddOrderTokens(order, customer, store, _storeHelper.DomainHost);- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var toEmail = order.BillingAddress.Email;- var toName = $"{order.BillingAddress.FirstName} {order.BillingAddress.LastName}";- return await SendNotification(messageTemplate, emailAccount,- language.Id, liquidObject,- toEmail, toName,- reference: Reference.Shipment, objectId: shipment.Id);- }+ var toEmail = order.BillingAddress.Email;+ var toName = $"{order.BillingAddress.FirstName} {order.BillingAddress.LastName}";+ return await SendNotification(messageTemplate, emailAccount,+ language.Id, liquidObject,+ toEmail, toName,+ reference: Reference.Shipment, objectId: shipment.Id);+ }- /// <summary>- /// Sends a new order note added notification to a customer- /// </summary>- /// <param name="order">Order</param>- /// <param name="orderNote">Order note</param>- public virtual async Task<int> SendNewOrderNoteAddedCustomerMessage(Order order, OrderNote orderNote)- {- ArgumentNullException.ThrowIfNull(orderNote);- ArgumentNullException.ThrowIfNull(order);+ /// <summary>+ /// Sends a new order note added notification to a customer+ /// </summary>+ /// <param name="order">Order</param>+ /// <param name="orderNote">Order note</param>+ public virtual async Task<int> SendNewOrderNoteAddedCustomerMessage(Order order, OrderNote orderNote)+ {+ ArgumentNullException.ThrowIfNull(orderNote);+ ArgumentNullException.ThrowIfNull(order);- var store = await GetStore(order.StoreId);- var language = await EnsureLanguageIsActive(order.CustomerLanguageId, store.Id);+ var store = await GetStore(order.StoreId);+ var language = await EnsureLanguageIsActive(order.CustomerLanguageId, store.Id);- var messageTemplate = await GetMessageTemplate(MessageTemplateNames.SendNewOrderNoteAddedCustomerMessage, store.Id);- if (messageTemplate == null)- return 0;+ var messageTemplate =+ await GetMessageTemplate(MessageTemplateNames.SendNewOrderNoteAddedCustomerMessage, store.Id);+ if (messageTemplate == null)+ return 0;- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = order.CustomerId });+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = order.CustomerId });- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddOrderTokens(order, customer, store, _storeHelper.DomainHost, orderNote);- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddOrderTokens(order, customer, store, _storeHelper.DomainHost, orderNote);+ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var toEmail = order.BillingAddress.Email;- var toName = $"{order.BillingAddress.FirstName} {order.BillingAddress.LastName}";- return await SendNotification(messageTemplate, emailAccount,- language.Id, liquidObject,- toEmail, toName,- reference: Reference.Order, objectId: order.Id);- }+ var toEmail = order.BillingAddress.Email;+ var toName = $"{order.BillingAddress.FirstName} {order.BillingAddress.LastName}";+ return await SendNotification(messageTemplate, emailAccount,+ language.Id, liquidObject,+ toEmail, toName,+ reference: Reference.Order, objectId: order.Id);+ }- #endregion+ #endregion- #region Newsletter messages+ #region Newsletter messages- /// <summary>- /// Sends a newsletter subscription activation message- /// </summary>- /// <param name="subscription">Newsletter subscription</param>- /// <param name="languageId">Language identifier</param>- public virtual async Task<int> SendNewsLetterSubscriptionActivationMessage(NewsLetterSubscription subscription,- string languageId)- {- return await SendNewsLetterSubscriptionMessage(MessageTemplateNames.SendNewsLetterSubscriptionActivationMessage, subscription, languageId);- }+ /// <summary>+ /// Sends a newsletter subscription activation message+ /// </summary>+ /// <param name="subscription">Newsletter subscription</param>+ /// <param name="languageId">Language identifier</param>+ public virtual async Task<int> SendNewsLetterSubscriptionActivationMessage(NewsLetterSubscription subscription,+ string languageId)+ {+ return await SendNewsLetterSubscriptionMessage(MessageTemplateNames.SendNewsLetterSubscriptionActivationMessage,+ subscription, languageId);+ }- /// <summary>- /// Sends a newsletter subscription deactivation message- /// </summary>- /// <param name="subscription">Newsletter subscription</param>- /// <param name="languageId">Language identifier</param>- public virtual async Task<int> SendNewsLetterSubscriptionDeactivationMessage(NewsLetterSubscription subscription,- string languageId)- {- return await SendNewsLetterSubscriptionMessage(MessageTemplateNames.SendNewsLetterSubscriptionDeactivationMessage, subscription, languageId);- }+ /// <summary>+ /// Sends a newsletter subscription deactivation message+ /// </summary>+ /// <param name="subscription">Newsletter subscription</param>+ /// <param name="languageId">Language identifier</param>+ public virtual async Task<int> SendNewsLetterSubscriptionDeactivationMessage(NewsLetterSubscription subscription,+ string languageId)+ {+ return await SendNewsLetterSubscriptionMessage(+ MessageTemplateNames.SendNewsLetterSubscriptionDeactivationMessage, subscription, languageId);+ }- /// <summary>- /// Send a newsletter subscription message- /// </summary>- /// <param name="message">Message template</param>- /// <param name="subscription">Newsletter subscription</param>- /// <param name="languageId">Language identifier</param>- private async Task<int> SendNewsLetterSubscriptionMessage(string message, NewsLetterSubscription subscription,- string languageId)- {- ArgumentNullException.ThrowIfNull(subscription);+ /// <summary>+ /// Send a newsletter subscription message+ /// </summary>+ /// <param name="message">Message template</param>+ /// <param name="subscription">Newsletter subscription</param>+ /// <param name="languageId">Language identifier</param>+ private async Task<int> SendNewsLetterSubscriptionMessage(string message, NewsLetterSubscription subscription,+ string languageId)+ {+ ArgumentNullException.ThrowIfNull(subscription);- var store = await GetStore(subscription.StoreId);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ var store = await GetStore(subscription.StoreId);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var messageTemplate = await GetMessageTemplate(message, store.Id);- if (messageTemplate == null)- return 0;+ var messageTemplate = await GetMessageTemplate(message, store.Id);+ if (messageTemplate == null)+ return 0;- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddNewsLetterSubscriptionTokens(subscription, store, _storeHelper.DomainHost);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddNewsLetterSubscriptionTokens(subscription, store, _storeHelper.DomainHost);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var toEmail = subscription.Email;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, string.Empty,- reference: Reference.Customer, objectId: subscription.CustomerId);- }- #endregion-- #region Send a message to a friend, ask question-- /// <summary>- /// Sends "email a friend" message- /// </summary>- /// <param name="customer">Customer instance</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- /// <param name="product">Product instance</param>- /// <param name="customerEmail">Customer's email</param>- /// <param name="friendsEmail">Friend's email</param>- /// <param name="personalMessage">Personal message</param>- /// <returns>Queued email identifier</returns>- public virtual async Task<int> SendProductEmailAFriendMessage(Customer customer, Store store, string languageId,- Product product, string customerEmail, string friendsEmail, string personalMessage)- {- ArgumentNullException.ThrowIfNull(customer);- ArgumentNullException.ThrowIfNull(product);+ var toEmail = subscription.Email;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, string.Empty,+ reference: Reference.Customer, objectId: subscription.CustomerId);+ }- var language = await EnsureLanguageIsActive(languageId, store.Id);+ #endregion++ #region Send a message to a friend, ask question++ /// <summary>+ /// Sends "email a friend" message+ /// </summary>+ /// <param name="customer">Customer instance</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ /// <param name="product">Product instance</param>+ /// <param name="customerEmail">Customer's email</param>+ /// <param name="friendsEmail">Friend's email</param>+ /// <param name="personalMessage">Personal message</param>+ /// <returns>Queued email identifier</returns>+ public virtual async Task<int> SendProductEmailAFriendMessage(Customer customer, Store store, string languageId,+ Product product, string customerEmail, string friendsEmail, string personalMessage)+ {+ ArgumentNullException.ThrowIfNull(customer);+ ArgumentNullException.ThrowIfNull(product);- var messageTemplate = await GetMessageTemplate(MessageTemplateNames.SendProductEmailAFriendMessage, store.Id);- if (messageTemplate == null)- return 0;+ var language = await EnsureLanguageIsActive(languageId, store.Id);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var messageTemplate = await GetMessageTemplate(MessageTemplateNames.SendProductEmailAFriendMessage, store.Id);+ if (messageTemplate == null)+ return 0;- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddEmailAFriendTokens(personalMessage, customerEmail, friendsEmail)- .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)- .AddProductTokens(product, language, store, _storeHelper.DomainHost);- LiquidObject liquidObject = await builder.BuildAsync();+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);++ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddEmailAFriendTokens(personalMessage, customerEmail, friendsEmail)+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)+ .AddProductTokens(product, language, store, _storeHelper.DomainHost);+ var liquidObject = await builder.BuildAsync();++ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);++ var toEmail = friendsEmail;+ var toName = "";+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Customer, objectId: customer.Id);+ }- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ /// <summary>+ /// Sends wishlist "email a friend" message+ /// </summary>+ /// <param name="customer">Customer</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ /// <param name="customerEmail">Customer's email</param>+ /// <param name="friendsEmail">Friend's email</param>+ /// <param name="personalMessage">Personal message</param>+ /// <returns>Queued email identifier</returns>+ public virtual async Task<int> SendWishlistEmailAFriendMessage(Customer customer, Store store, string languageId,+ string customerEmail, string friendsEmail, string personalMessage)+ {+ ArgumentNullException.ThrowIfNull(customer);- var toEmail = friendsEmail;- var toName = "";- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Customer, objectId: customer.Id);- }+ var language = await EnsureLanguageIsActive(languageId, store.Id);- /// <summary>- /// Sends wishlist "email a friend" message- /// </summary>- /// <param name="customer">Customer</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- /// <param name="customerEmail">Customer's email</param>- /// <param name="friendsEmail">Friend's email</param>- /// <param name="personalMessage">Personal message</param>- /// <returns>Queued email identifier</returns>- public virtual async Task<int> SendWishlistEmailAFriendMessage(Customer customer, Store store, string languageId,- string customerEmail, string friendsEmail, string personalMessage)- {- ArgumentNullException.ThrowIfNull(customer);+ var messageTemplate = await GetMessageTemplate(MessageTemplateNames.SendWishlistEmailAFriendMessage, store.Id);+ if (messageTemplate == null)+ return 0;- var language = await EnsureLanguageIsActive(languageId, store.Id);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var messageTemplate = await GetMessageTemplate(MessageTemplateNames.SendWishlistEmailAFriendMessage, store.Id);- if (messageTemplate == null)- return 0;- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)+ .AddEmailAFriendTokens(personalMessage, customerEmail, friendsEmail);+ var liquidObject = await builder.BuildAsync();- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)- .AddEmailAFriendTokens(personalMessage, customerEmail, friendsEmail);+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- LiquidObject liquidObject = await builder.BuildAsync();+ var toEmail = friendsEmail;+ var toName = "";+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Customer, objectId: customer.Id);+ }- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var toEmail = friendsEmail;- var toName = "";- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Customer, objectId: customer.Id);- }+ /// <summary>+ /// Sends "email a friend" message+ /// </summary>+ /// <returns>Queued email identifier</returns>+ public virtual async Task<int> SendProductQuestionMessage(Customer customer, Store store, string languageId,+ Product product, string customerEmail, string fullName, string phone, string message, string ipaddress)+ {+ ArgumentNullException.ThrowIfNull(customer);+ ArgumentNullException.ThrowIfNull(product);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- /// <summary>- /// Sends "email a friend" message- /// </summary>- /// <returns>Queued email identifier</returns>- public virtual async Task<int> SendProductQuestionMessage(Customer customer, Store store, string languageId,- Product product, string customerEmail, string fullName, string phone, string message, string ipaddress)- {- ArgumentNullException.ThrowIfNull(customer);- ArgumentNullException.ThrowIfNull(product);+ var messageTemplate = await GetMessageTemplate(MessageTemplateNames.SendProductQuestionMessage, store.Id);+ if (messageTemplate == null)+ return 0;- var language = await EnsureLanguageIsActive(languageId, store.Id);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var messageTemplate = await GetMessageTemplate(MessageTemplateNames.SendProductQuestionMessage, store.Id);- if (messageTemplate == null)- return 0;+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)+ .AddProductTokens(product, language, store, _storeHelper.DomainHost);+ var liquidObject = await builder.BuildAsync();+ liquidObject.AskQuestion = new LiquidAskQuestion(message, customerEmail, fullName, phone);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)- .AddProductTokens(product, language, store, _storeHelper.DomainHost);- LiquidObject liquidObject = await builder.BuildAsync();- liquidObject.AskQuestion = new LiquidAskQuestion(message, customerEmail, fullName, phone);+ //store in database+ if (_commonSettings.StoreInDatabaseContactUsForm)+ {+ var subject = messageTemplate.GetTranslation(mt => mt.Subject, languageId);+ var body = messageTemplate.GetTranslation(mt => mt.Body, languageId);- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var subjectReplaced = LiquidExtensions.Render(liquidObject, subject);+ var bodyReplaced = LiquidExtensions.Render(liquidObject, body);- //store in database- if (_commonSettings.StoreInDatabaseContactUsForm)- {- var subject = messageTemplate.GetTranslation(mt => mt.Subject, languageId);- var body = messageTemplate.GetTranslation(mt => mt.Body, languageId);-- var subjectReplaced = LiquidExtensions.Render(liquidObject, subject);- var bodyReplaced = LiquidExtensions.Render(liquidObject, body);-- await _mediator.Send(new InsertContactUsCommand {- CustomerId = customer.Id,- StoreId = store.Id,- VendorId = product.VendorId,- Email = customerEmail,- Enquiry = bodyReplaced,- FullName = fullName,- Subject = subjectReplaced,- EmailAccountId = emailAccount.Id,- RemoteIpAddress = ipaddress- });- }+ await _mediator.Send(new InsertContactUsCommand {+ CustomerId = customer.Id,+ StoreId = store.Id,+ VendorId = product.VendorId,+ Email = customerEmail,+ Enquiry = bodyReplaced,+ FullName = fullName,+ Subject = subjectReplaced,+ EmailAccountId = emailAccount.Id,+ RemoteIpAddress = ipaddress+ });+ }- var toEmail = emailAccount.Email;- var toName = "";+ var toEmail = emailAccount.Email;+ var toName = "";- if (!string.IsNullOrEmpty(product?.VendorId))+ if (!string.IsNullOrEmpty(product?.VendorId))+ {+ var vendor = await _mediator.Send(new GetVendorByIdQuery { Id = product.VendorId });+ if (vendor != null){- var vendor = await _mediator.Send(new GetVendorByIdQuery { Id = product.VendorId });- if (vendor != null)- {- toEmail = vendor.Email;- toName = vendor.Name;- }+ toEmail = vendor.Email;+ toName = vendor.Name;}- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName, replyToEmailAddress: customerEmail,- reference: Reference.Customer, objectId: customer.Id);}- #endregion+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName, replyToEmailAddress: customerEmail,+ reference: Reference.Customer, objectId: customer.Id);+ }- #region Merchandise returns+ #endregion- /// <summary>- /// Sends 'New Merchandise Return' message to a store owner- /// </summary>- /// <param name="merchandiseReturn">Merchandise return</param>- /// <param name="order">Order</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendNewMerchandiseReturnStoreOwnerMessage(MerchandiseReturn merchandiseReturn, Order order, string languageId)- {- ArgumentNullException.ThrowIfNull(merchandiseReturn);+ #region Merchandise returns- var store = await GetStore(order.StoreId);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ /// <summary>+ /// Sends 'New Merchandise Return' message to a store owner+ /// </summary>+ /// <param name="merchandiseReturn">Merchandise return</param>+ /// <param name="order">Order</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendNewMerchandiseReturnStoreOwnerMessage(MerchandiseReturn merchandiseReturn,+ Order order, string languageId)+ {+ ArgumentNullException.ThrowIfNull(merchandiseReturn);- var messageTemplate = await GetMessageTemplate(MessageTemplateNames.SendNewMerchandiseReturnStoreOwnerMessage, store.Id);- if (messageTemplate == null)- return 0;+ var store = await GetStore(order.StoreId);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var messageTemplate =+ await GetMessageTemplate(MessageTemplateNames.SendNewMerchandiseReturnStoreOwnerMessage, store.Id);+ if (messageTemplate == null)+ return 0;- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = merchandiseReturn.CustomerId });+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount);+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = merchandiseReturn.CustomerId });- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount);- builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language);+ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- LiquidObject liquidObject = await builder.BuildAsync();+ builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language);- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var liquidObject = await builder.BuildAsync();++ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- if (!string.IsNullOrEmpty(merchandiseReturn.VendorId))+ if (!string.IsNullOrEmpty(merchandiseReturn.VendorId))+ {+ var vendor = await _mediator.Send(new GetVendorByIdQuery { Id = merchandiseReturn.VendorId });+ if (vendor != null){- var vendor = await _mediator.Send(new GetVendorByIdQuery { Id = merchandiseReturn.VendorId });- if (vendor != null)- {- var vendorEmail = vendor.Email;- var vendorName = vendor.Name;- await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- vendorEmail, vendorName);- }+ var vendorEmail = vendor.Email;+ var vendorName = vendor.Name;+ await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ vendorEmail, vendorName);}- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.MerchandiseReturn, objectId: merchandiseReturn.Id);}- /// <summary>- /// Sends 'Merchandise Return status changed' message to a customer- /// </summary>- /// <param name="merchandiseReturn">Merchandise return</param>- /// <param name="order">Order</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendMerchandiseReturnStatusChangedCustomerMessage(MerchandiseReturn merchandiseReturn, Order order, string languageId)- {- ArgumentNullException.ThrowIfNull(merchandiseReturn);+ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.MerchandiseReturn, objectId: merchandiseReturn.Id);+ }- var store = await GetStore(order.StoreId);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ /// <summary>+ /// Sends 'Merchandise Return status changed' message to a customer+ /// </summary>+ /// <param name="merchandiseReturn">Merchandise return</param>+ /// <param name="order">Order</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendMerchandiseReturnStatusChangedCustomerMessage(+ MerchandiseReturn merchandiseReturn, Order order, string languageId)+ {+ ArgumentNullException.ThrowIfNull(merchandiseReturn);- var messageTemplate = await GetMessageTemplate(MessageTemplateNames.SendMerchandiseReturnStatusChangedCustomerMessage, store.Id);- if (messageTemplate == null)- return 0;+ var store = await GetStore(order.StoreId);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var messageTemplate =+ await GetMessageTemplate(MessageTemplateNames.SendMerchandiseReturnStatusChangedCustomerMessage, store.Id);+ if (messageTemplate == null)+ return 0;- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = merchandiseReturn.CustomerId });-- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount);- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);-- var toEmail = string.IsNullOrEmpty(customer?.Email) ?- order.BillingAddress.Email :- customer.Email;- var toName = string.IsNullOrEmpty(customer?.Email) ?- order.BillingAddress.FirstName :- customer.GetFullName();- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.MerchandiseReturn, objectId: merchandiseReturn.Id);- }+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = merchandiseReturn.CustomerId });- /// <summary>- /// Sends 'New Merchandise Return' message to a customer- /// </summary>- /// <param name="merchandiseReturn">Merchandise return</param>- /// <param name="order">Order</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendNewMerchandiseReturnCustomerMessage(MerchandiseReturn merchandiseReturn, Order order, string languageId)- {- ArgumentNullException.ThrowIfNull(merchandiseReturn);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount);+ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- var store = await GetStore(order.StoreId);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var messageTemplate = await GetMessageTemplate(MessageTemplateNames.SendNewMerchandiseReturnCustomerMessage, store.Id);- if (messageTemplate == null)- return 0;+ var toEmail = string.IsNullOrEmpty(customer?.Email) ? order.BillingAddress.Email : customer.Email;+ var toName = string.IsNullOrEmpty(customer?.Email) ? order.BillingAddress.FirstName : customer.GetFullName();+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.MerchandiseReturn, objectId: merchandiseReturn.Id);+ }- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ /// <summary>+ /// Sends 'New Merchandise Return' message to a customer+ /// </summary>+ /// <param name="merchandiseReturn">Merchandise return</param>+ /// <param name="order">Order</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendNewMerchandiseReturnCustomerMessage(MerchandiseReturn merchandiseReturn,+ Order order, string languageId)+ {+ ArgumentNullException.ThrowIfNull(merchandiseReturn);- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = merchandiseReturn.CustomerId });+ var store = await GetStore(order.StoreId);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount);- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var messageTemplate =+ await GetMessageTemplate(MessageTemplateNames.SendNewMerchandiseReturnCustomerMessage, store.Id);+ if (messageTemplate == null)+ return 0;- builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);-- var toEmail = string.IsNullOrEmpty(customer?.Email) ?- order.BillingAddress.Email :- customer.Email;- var toName = string.IsNullOrEmpty(customer?.Email) ?- order.BillingAddress.FirstName :- customer.GetFullName();- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.MerchandiseReturn, objectId: merchandiseReturn.Id);- }+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- /// <summary>- /// Sends a new merchandise return note added notification to a customer- /// </summary>- /// <param name="merchandiseReturn">Merchandise return</param>- /// <param name="merchandiseReturnNote">Merchandise return note</param>- /// <param name="order">Order</param>- public virtual async Task<int> SendNewMerchandiseReturnNoteAddedCustomerMessage(MerchandiseReturn merchandiseReturn, MerchandiseReturnNote merchandiseReturnNote, Order order)- {- ArgumentNullException.ThrowIfNull(merchandiseReturnNote);- ArgumentNullException.ThrowIfNull(merchandiseReturn);+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = merchandiseReturn.CustomerId });- var store = await GetStore(order.StoreId);- var language = await EnsureLanguageIsActive(order.CustomerLanguageId, store.Id);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount);+ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- var messageTemplate = await GetMessageTemplate(MessageTemplateNames.SendNewMerchandiseReturnNoteAddedCustomerMessage, store.Id);- if (messageTemplate == null)- return 0;+ builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var toEmail = string.IsNullOrEmpty(customer?.Email) ? order.BillingAddress.Email : customer.Email;+ var toName = string.IsNullOrEmpty(customer?.Email) ? order.BillingAddress.FirstName : customer.GetFullName();+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.MerchandiseReturn, objectId: merchandiseReturn.Id);+ }- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = merchandiseReturn.CustomerId });+ /// <summary>+ /// Sends a new merchandise return note added notification to a customer+ /// </summary>+ /// <param name="merchandiseReturn">Merchandise return</param>+ /// <param name="merchandiseReturnNote">Merchandise return note</param>+ /// <param name="order">Order</param>+ public virtual async Task<int> SendNewMerchandiseReturnNoteAddedCustomerMessage(MerchandiseReturn merchandiseReturn,+ MerchandiseReturnNote merchandiseReturnNote, Order order)+ {+ ArgumentNullException.ThrowIfNull(merchandiseReturnNote);+ ArgumentNullException.ThrowIfNull(merchandiseReturn);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount);- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var store = await GetStore(order.StoreId);+ var language = await EnsureLanguageIsActive(order.CustomerLanguageId, store.Id);- builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language, merchandiseReturnNote);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);-- var toEmail = string.IsNullOrEmpty(customer?.Email) ?- order.BillingAddress.Email :- customer.Email;- var toName = string.IsNullOrEmpty(customer?.Email) ?- order.BillingAddress.FirstName :- customer.GetFullName();- return await SendNotification(messageTemplate, emailAccount,- language.Id, liquidObject,- toEmail, toName,- reference: Reference.MerchandiseReturn, objectId: merchandiseReturn.Id);- }+ var messageTemplate =+ await GetMessageTemplate(MessageTemplateNames.SendNewMerchandiseReturnNoteAddedCustomerMessage, store.Id);+ if (messageTemplate == null)+ return 0;- #endregion+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- #region Misc+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = merchandiseReturn.CustomerId });- /// <summary>- /// Sends 'New vendor account submitted' message to a store owner- /// </summary>- /// <param name="customer">Customer</param>- /// <param name="vendor">Vendor</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendNewVendorAccountApplyStoreOwnerMessage(Customer customer, Vendor vendor, Store store, string languageId)- {- ArgumentNullException.ThrowIfNull(customer);- ArgumentNullException.ThrowIfNull(vendor);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount);+ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language,+ merchandiseReturnNote);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var messageTemplate = await GetMessageTemplate("VendorAccountApply.StoreOwnerNotification", store.Id);- if (messageTemplate == null)- return 0;+ var toEmail = string.IsNullOrEmpty(customer?.Email) ? order.BillingAddress.Email : customer.Email;+ var toName = string.IsNullOrEmpty(customer?.Email) ? order.BillingAddress.FirstName : customer.GetFullName();+ return await SendNotification(messageTemplate, emailAccount,+ language.Id, liquidObject,+ toEmail, toName,+ reference: Reference.MerchandiseReturn, objectId: merchandiseReturn.Id);+ }- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ #endregion- var builder = new LiquidObjectBuilder(_mediator).AddStoreTokens(store, language, emailAccount)- .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)- .AddVendorTokens(vendor, language);+ #region Misc- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ /// <summary>+ /// Sends 'New vendor account submitted' message to a store owner+ /// </summary>+ /// <param name="customer">Customer</param>+ /// <param name="vendor">Vendor</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendNewVendorAccountApplyStoreOwnerMessage(Customer customer, Vendor vendor,+ Store store, string languageId)+ {+ ArgumentNullException.ThrowIfNull(customer);+ ArgumentNullException.ThrowIfNull(vendor);- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Customer, objectId: customer.Id);- }+ var language = await EnsureLanguageIsActive(languageId, store.Id);- /// <summary>- /// Sends 'Vendor information changed' message to a store owner- /// </summary>- /// <param name="vendor">Vendor</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendVendorInformationChangeMessage(Vendor vendor, Store store, string languageId)- {- ArgumentNullException.ThrowIfNull(vendor);+ var messageTemplate = await GetMessageTemplate("VendorAccountApply.StoreOwnerNotification", store.Id);+ if (messageTemplate == null)+ return 0;- var language = await EnsureLanguageIsActive(languageId, store.Id);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var messageTemplate = await GetMessageTemplate("VendorInformationChange.StoreOwnerNotification", store.Id);- if (messageTemplate == null)- return 0;+ var builder = new LiquidObjectBuilder(_mediator).AddStoreTokens(store, language, emailAccount)+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)+ .AddVendorTokens(vendor, language);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddVendorTokens(vendor, language);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Customer, objectId: customer.Id);+ }- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;+ /// <summary>+ /// Sends 'Vendor information changed' message to a store owner+ /// </summary>+ /// <param name="vendor">Vendor</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendVendorInformationChangeMessage(Vendor vendor, Store store, string languageId)+ {+ ArgumentNullException.ThrowIfNull(vendor);- return await SendNotification(messageTemplate, emailAccount, languageId, liquidObject, toEmail, toName,- reference: Reference.Vendor, objectId: vendor.Id);- }+ var language = await EnsureLanguageIsActive(languageId, store.Id);+ var messageTemplate = await GetMessageTemplate("VendorInformationChange.StoreOwnerNotification", store.Id);+ if (messageTemplate == null)+ return 0;- /// <summary>- /// Sends a gift voucher notification- /// </summary>- /// <param name="giftVoucher">Gift voucher</param>- /// <param name="order">Order</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendGiftVoucherMessage(GiftVoucher giftVoucher, Order order, string languageId)- {- ArgumentNullException.ThrowIfNull(giftVoucher);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- Store store = null;- if (order != null) store = await _storeService.GetStoreById(order.StoreId);- store ??= (await _storeService.GetAllStores()).FirstOrDefault();+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddVendorTokens(vendor, language);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var language = await EnsureLanguageIsActive(languageId, store?.Id);+ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;- var messageTemplate = await GetMessageTemplate("GiftVoucher.Notification", store?.Id);- if (messageTemplate == null)- return 0;+ return await SendNotification(messageTemplate, emailAccount, languageId, liquidObject, toEmail, toName,+ reference: Reference.Vendor, objectId: vendor.Id);+ }- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddGiftVoucherTokens(giftVoucher, language);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var toEmail = giftVoucher.RecipientEmail;- var toName = giftVoucher.RecipientName;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName);- }+ /// <summary>+ /// Sends a gift voucher notification+ /// </summary>+ /// <param name="giftVoucher">Gift voucher</param>+ /// <param name="order">Order</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendGiftVoucherMessage(GiftVoucher giftVoucher, Order order, string languageId)+ {+ ArgumentNullException.ThrowIfNull(giftVoucher);- /// <summary>- /// Sends a product review notification message to a store owner- /// </summary>- /// <param name="product">Product</param>- /// <param name="productReview">Product review</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendProductReviewMessage(Product product, ProductReview productReview,- Store store, string languageId)- {- ArgumentNullException.ThrowIfNull(productReview);+ Store store = null;+ if (order != null) store = await _storeService.GetStoreById(order.StoreId);+ store ??= (await _storeService.GetAllStores()).FirstOrDefault();- var language = await EnsureLanguageIsActive(languageId, store.Id);+ var language = await EnsureLanguageIsActive(languageId, store?.Id);- var messageTemplate = await GetMessageTemplate("Product.ProductReview", store.Id);- if (messageTemplate == null)- return 0;+ var messageTemplate = await GetMessageTemplate("GiftVoucher.Notification", store?.Id);+ if (messageTemplate == null)+ return 0;- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);++ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddGiftVoucherTokens(giftVoucher, language);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var toEmail = giftVoucher.RecipientEmail;+ var toName = giftVoucher.RecipientName;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName);+ }- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = productReview.CustomerId });+ /// <summary>+ /// Sends a product review notification message to a store owner+ /// </summary>+ /// <param name="product">Product</param>+ /// <param name="productReview">Product review</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendProductReviewMessage(Product product, ProductReview productReview,+ Store store, string languageId)+ {+ ArgumentNullException.ThrowIfNull(productReview);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddProductReviewTokens(product, productReview);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var messageTemplate = await GetMessageTemplate("Product.ProductReview", store.Id);+ if (messageTemplate == null)+ return 0;- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Product, objectId: product.Id);- }+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = productReview.CustomerId });+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddProductReviewTokens(product, productReview);- /// <summary>- /// Sends a vendor review notification message to a store owner- /// </summary>- /// <param name="vendorReview">Vendor review</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendVendorReviewMessage(VendorReview vendorReview, Store store,- string languageId)- {- ArgumentNullException.ThrowIfNull(vendorReview);+ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var messageTemplate = await GetMessageTemplate("Vendor.VendorReview", store.Id);- if (messageTemplate == null)- return 0;+ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Product, objectId: product.Id);+ }- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- //customer- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = vendorReview.CustomerId });- //vendor- var vendor = await _mediator.Send(new GetVendorByIdQuery { Id = vendorReview.VendorId });- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddVendorReviewTokens(vendor, vendorReview);+ /// <summary>+ /// Sends a vendor review notification message to a store owner+ /// </summary>+ /// <param name="vendorReview">Vendor review</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendVendorReviewMessage(VendorReview vendorReview, Store store,+ string languageId)+ {+ ArgumentNullException.ThrowIfNull(vendorReview);- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- builder.AddVendorTokens(vendor, language);- LiquidObject liquidObject = await builder.BuildAsync();+ var messageTemplate = await GetMessageTemplate("Vendor.VendorReview", store.Id);+ if (messageTemplate == null)+ return 0;- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ //customer+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = vendorReview.CustomerId });+ //vendor+ var vendor = await _mediator.Send(new GetVendorByIdQuery { Id = vendorReview.VendorId });- var toEmail = vendor.Email;- var toName = vendor.Name;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Customer, objectId: customer?.Id);- }+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddVendorReviewTokens(vendor, vendorReview);- /// <summary>- /// Sends a "quantity below" notification to a store owner- /// </summary>- /// <param name="product">Product</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendQuantityBelowStoreOwnerMessage(Product product, string languageId)- {- ArgumentNullException.ThrowIfNull(product);+ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- var store = await GetStore("");- var language = await EnsureLanguageIsActive(languageId, store.Id);+ builder.AddVendorTokens(vendor, language);+ var liquidObject = await builder.BuildAsync();- var messageTemplate = await GetMessageTemplate("QuantityBelow.StoreOwnerNotification", store.Id);- if (messageTemplate == null)- return 0;+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);++ var toEmail = vendor.Email;+ var toName = vendor.Name;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Customer, objectId: customer?.Id);+ }- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ /// <summary>+ /// Sends a "quantity below" notification to a store owner+ /// </summary>+ /// <param name="product">Product</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendQuantityBelowStoreOwnerMessage(Product product, string languageId)+ {+ ArgumentNullException.ThrowIfNull(product);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddProductTokens(product, language, store, _storeHelper.DomainHost);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var store = await GetStore("");+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Product, objectId: product.Id);- }+ var messageTemplate = await GetMessageTemplate("QuantityBelow.StoreOwnerNotification", store.Id);+ if (messageTemplate == null)+ return 0;- /// <summary>- /// Sends a "quantity below" notification to a store owner- /// </summary>- /// <param name="product"></param>- /// <param name="combination">Attribute combination</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendQuantityBelowStoreOwnerMessage(Product product, ProductAttributeCombination combination, string languageId)- {- ArgumentNullException.ThrowIfNull(combination);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);++ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddProductTokens(product, language, store, _storeHelper.DomainHost);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);++ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Product, objectId: product.Id);+ }- var store = await GetStore("");- var language = await EnsureLanguageIsActive(languageId, store.Id);+ /// <summary>+ /// Sends a "quantity below" notification to a store owner+ /// </summary>+ /// <param name="product"></param>+ /// <param name="combination">Attribute combination</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendQuantityBelowStoreOwnerMessage(Product product,+ ProductAttributeCombination combination, string languageId)+ {+ ArgumentNullException.ThrowIfNull(combination);- var messageTemplate = await GetMessageTemplate("QuantityBelow.AttributeCombination.StoreOwnerNotification", store.Id);- if (messageTemplate == null)- return 0;+ var store = await GetStore("");+ var language = await EnsureLanguageIsActive(languageId, store.Id);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var messageTemplate =+ await GetMessageTemplate("QuantityBelow.AttributeCombination.StoreOwnerNotification", store.Id);+ if (messageTemplate == null)+ return 0;- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddProductTokens(product, language, store, _storeHelper.DomainHost)- .AddAttributeCombinationTokens(product, combination);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);++ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddProductTokens(product, language, store, _storeHelper.DomainHost)+ .AddAttributeCombinationTokens(product, combination);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);++ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Product, objectId: product.Id);+ }- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Product, objectId: product.Id);- }+ /// <summary>+ /// Sends a "new VAT" notification to a store owner+ /// </summary>+ /// <param name="customer">Customer</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendCustomerDeleteStoreOwnerMessage(Customer customer, string languageId)+ {+ ArgumentNullException.ThrowIfNull(customer);- /// <summary>- /// Sends a "new VAT" notification to a store owner- /// </summary>- /// <param name="customer">Customer</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendCustomerDeleteStoreOwnerMessage(Customer customer, string languageId)- {- ArgumentNullException.ThrowIfNull(customer);+ var store = await GetStore("");+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var store = await GetStore("");- var language = await EnsureLanguageIsActive(languageId, store.Id);+ var messageTemplate = await GetMessageTemplate("CustomerDelete.StoreOwnerNotification", store.Id);+ if (messageTemplate == null)+ return 0;- var messageTemplate = await GetMessageTemplate("CustomerDelete.StoreOwnerNotification", store.Id);- if (messageTemplate == null)- return 0;+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var liquidObject = await builder.BuildAsync();- LiquidObject liquidObject = await builder.BuildAsync();+ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Customer, objectId: customer.Id);+ }- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Customer, objectId: customer.Id);- }+ /// <summary>+ /// Sends a blog comment notification message to a store owner+ /// </summary>+ public virtual async Task<int> SendBlogCommentMessage(BlogPost blogPost, BlogComment blogComment, string languageId)+ {+ ArgumentNullException.ThrowIfNull(blogComment);- /// <summary>- /// Sends a blog comment notification message to a store owner- /// </summary>- public virtual async Task<int> SendBlogCommentMessage(BlogPost blogPost, BlogComment blogComment, string languageId)- {- ArgumentNullException.ThrowIfNull(blogComment);+ var store = await GetStore(blogComment.StoreId);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var store = await GetStore(blogComment.StoreId);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ var messageTemplate = await GetMessageTemplate("Blog.BlogComment", store.Id);+ if (messageTemplate == null)+ return 0;- var messageTemplate = await GetMessageTemplate("Blog.BlogComment", store.Id);- if (messageTemplate == null)- return 0;+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddBlogCommentTokens(blogPost, blogComment, store, _storeHelper.DomainHost, language);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddBlogCommentTokens(blogPost, blogComment, store, _storeHelper.DomainHost, language);+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = blogComment.CustomerId });+ if (customer != null && await _groupService.IsRegistered(customer))+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = blogComment.CustomerId });- if (customer != null && await _groupService.IsRegistered(customer))- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Blog, objectId: blogPost.Id);+ }- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Blog, objectId: blogPost.Id);- }+ /// <summary>+ /// Sends an article comment notification message to a store owner+ /// </summary>+ /// <param name="article"></param>+ /// <param name="articleComment">Article comment</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendArticleCommentMessage(KnowledgebaseArticle article,+ KnowledgebaseArticleComment articleComment, string languageId)+ {+ ArgumentNullException.ThrowIfNull(articleComment);- /// <summary>- /// Sends an article comment notification message to a store owner- /// </summary>- /// <param name="article"></param>- /// <param name="articleComment">Article comment</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendArticleCommentMessage(KnowledgebaseArticle article, KnowledgebaseArticleComment articleComment, string languageId)- {- ArgumentNullException.ThrowIfNull(articleComment);+ var store = await GetStore("");+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var store = await GetStore("");- var language = await EnsureLanguageIsActive(languageId, store.Id);+ var messageTemplate = await GetMessageTemplate("Knowledgebase.ArticleComment", store.Id);+ if (messageTemplate == null)+ return 0;- var messageTemplate = await GetMessageTemplate("Knowledgebase.ArticleComment", store.Id);- if (messageTemplate == null)- return 0;+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);++ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddArticleCommentTokens(article, articleComment, store, _storeHelper.DomainHost, language);++ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = articleComment.CustomerId });+ if (customer != null && await _groupService.IsRegistered(customer))+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);++ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName);+ }- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ /// <summary>+ /// Sends a news comment notification message to a store owner+ /// </summary>+ /// <param name="newsItem">News item</param>+ /// <param name="newsComment">News comment</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendNewsCommentMessage(NewsItem newsItem, NewsComment newsComment, string languageId)+ {+ ArgumentNullException.ThrowIfNull(newsComment);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddArticleCommentTokens(article, articleComment, store, _storeHelper.DomainHost, language);+ var store = await GetStore(newsComment.StoreId);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = articleComment.CustomerId });- if (customer != null && await _groupService.IsRegistered(customer))- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var messageTemplate = await GetMessageTemplate("News.NewsComment", store.Id);+ if (messageTemplate == null)+ return 0;- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName);- }+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);++ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddNewsCommentTokens(newsItem, newsComment, store, _storeHelper.DomainHost, language);+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = newsComment.CustomerId });+ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);++ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);++ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName);+ }- /// <summary>- /// Sends a news comment notification message to a store owner- /// </summary>- /// <param name="newsItem">News item</param>- /// <param name="newsComment">News comment</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendNewsCommentMessage(NewsItem newsItem, NewsComment newsComment, string languageId)- {- ArgumentNullException.ThrowIfNull(newsComment);+ /// <summary>+ /// Sends a 'Out of stock' notification message to a customer+ /// </summary>+ /// <param name="customer">Customer</param>+ /// <param name="product">Product</param>+ /// <param name="subscription">Subscription</param>+ /// <param name="languageId">Message language identifier</param>+ public virtual async Task<int> SendBackInStockMessage(Customer customer, Product product,+ OutOfStockSubscription subscription, string languageId)+ {+ ArgumentNullException.ThrowIfNull(subscription);- var store = await GetStore(newsComment.StoreId);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ var store = await GetStore(subscription.StoreId);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var messageTemplate = await GetMessageTemplate("News.NewsComment", store.Id);- if (messageTemplate == null)- return 0;+ var messageTemplate = await GetMessageTemplate("Customer.OutOfStock", store.Id);+ if (messageTemplate == null)+ return 0;- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);++ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount);+ if (customer != null)+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);++ builder.AddOutOfStockTokens(product, subscription, store, _storeHelper.DomainHost, language);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);++ var toEmail = customer?.Email;+ var toName = customer.GetFullName();+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Customer, objectId: customer?.Id);+ }- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddNewsCommentTokens(newsItem, newsComment, store, _storeHelper.DomainHost, language);- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = newsComment.CustomerId });- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ /// <summary>+ /// Sends "contact us" message+ /// </summary>+ /// <param name="customer">Customer</param>+ /// <param name="store">Store</param>+ /// <param name="languageId">Message language identifier</param>+ /// <param name="senderEmail">Sender email</param>+ /// <param name="senderName">Sender name</param>+ /// <param name="subject">Email subject. Pass null if you want a message template subject to be used.</param>+ /// <param name="body">Email body</param>+ /// <param name="attrInfo">Attr info</param>+ /// <param name="customAttributes">CustomAttributes</param>+ /// <param name="ipaddress">Ip address</param>+ public virtual async Task<int> SendContactUsMessage(Customer customer, Store store, string languageId,+ string senderEmail,+ string senderName, string subject, string body, string attrInfo, IList<CustomAttribute> customAttributes,+ string ipaddress)+ {+ var language = await EnsureLanguageIsActive(languageId, store.Id);+ var messageTemplate = await GetMessageTemplate("Service.ContactUs", store.Id);+ if (messageTemplate == null)+ return 0;- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName);+ string fromEmail;+ string fromName;+ senderName = WebUtility.HtmlEncode(senderName);+ senderEmail = WebUtility.HtmlEncode(senderEmail);+ //required for some SMTP servers+ if (_commonSettings.UseSystemEmailForContactUsForm)+ {+ fromEmail = emailAccount.Email;+ fromName = emailAccount.DisplayName;}-- /// <summary>- /// Sends a 'Out of stock' notification message to a customer- /// </summary>- /// <param name="customer">Customer</param>- /// <param name="product">Product</param>- /// <param name="subscription">Subscription</param>- /// <param name="languageId">Message language identifier</param>- public virtual async Task<int> SendBackInStockMessage(Customer customer, Product product, OutOfStockSubscription subscription, string languageId)+ else{- ArgumentNullException.ThrowIfNull(subscription);+ fromEmail = senderEmail;+ fromName = senderName;+ }- var store = await GetStore(subscription.StoreId);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);++ var liquidObject = await builder.BuildAsync();+ liquidObject.ContactUs = new LiquidContactUs(senderEmail, senderName, body, attrInfo);+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);++ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;++ //store in database+ if (_commonSettings.StoreInDatabaseContactUsForm)+ await _mediator.Send(new InsertContactUsCommand {+ CustomerId = customer.Id,+ StoreId = store.Id,+ VendorId = "",+ Email = senderEmail,+ Enquiry = body,+ FullName = senderName,+ Subject = string.IsNullOrEmpty(subject) ? "Contact Us (form)" : subject,+ ContactAttributeDescription = attrInfo,+ ContactAttributes = customAttributes,+ EmailAccountId = emailAccount.Id,+ RemoteIpAddress = ipaddress+ });+ return await SendNotification(messageTemplate, emailAccount, languageId, liquidObject, toEmail, toName,+ fromEmail: fromEmail,+ fromName: fromName,+ subject: subject,+ replyToEmailAddress: senderEmail,+ replyToName: senderName, reference: Reference.Customer, objectId: customer?.Id);+ }- var messageTemplate = await GetMessageTemplate("Customer.OutOfStock", store.Id);- if (messageTemplate == null)- return 0;+ /// <summary>+ /// Sends "contact vendor" message+ /// </summary>+ /// <param name="customer">Customer</param>+ /// <param name="store">Store</param>+ /// <param name="vendor">Vendor</param>+ /// <param name="languageId">Message language identifier</param>+ /// <param name="senderEmail">Sender email</param>+ /// <param name="senderName">Sender name</param>+ /// <param name="subject">Email subject. Pass null if you want a message template subject to be used.</param>+ /// <param name="body">Email body</param>+ /// <param name="ipaddress">Ip address</param>+ public virtual async Task<int> SendContactVendorMessage(Customer customer, Store store, Vendor vendor,+ string languageId, string senderEmail,+ string senderName, string subject, string body, string ipaddress)+ {+ ArgumentNullException.ThrowIfNull(vendor);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount);- if (customer != null)- builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var messageTemplate = await GetMessageTemplate("Service.ContactVendor", store.Id);+ if (messageTemplate == null)+ return 0;- builder.AddOutOfStockTokens(product, subscription, store, _storeHelper.DomainHost, language);- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ //email account+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var toEmail = customer?.Email;- var toName = customer.GetFullName();- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Customer, objectId: customer?.Id);- }+ string fromEmail;+ string fromName;+ senderName = WebUtility.HtmlEncode(senderName);+ senderEmail = WebUtility.HtmlEncode(senderEmail);- /// <summary>- /// Sends "contact us" message- /// </summary>- /// <param name="customer">Customer</param>- /// <param name="store">Store</param>- /// <param name="languageId">Message language identifier</param>- /// <param name="senderEmail">Sender email</param>- /// <param name="senderName">Sender name</param>- /// <param name="subject">Email subject. Pass null if you want a message template subject to be used.</param>- /// <param name="body">Email body</param>- /// <param name="attrInfo">Attr info</param>- /// <param name="customAttributes">CustomAttributes</param>- /// <param name="ipaddress">Ip address</param>- public virtual async Task<int> SendContactUsMessage(Customer customer, Store store, string languageId, string senderEmail,- string senderName, string subject, string body, string attrInfo, IList<CustomAttribute> customAttributes, string ipaddress)+ //required for some SMTP servers+ if (_commonSettings.UseSystemEmailForContactUsForm){- var language = await EnsureLanguageIsActive(languageId, store.Id);- var messageTemplate = await GetMessageTemplate("Service.ContactUs", store.Id);- if (messageTemplate == null)- return 0;-- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ fromEmail = emailAccount.Email;+ fromName = emailAccount.DisplayName;+ }+ else+ {+ fromEmail = senderEmail;+ fromName = senderName;+ }- string fromEmail;- string fromName;- senderName = WebUtility.HtmlEncode(senderName);- senderEmail = WebUtility.HtmlEncode(senderEmail);- //required for some SMTP servers- if (_commonSettings.UseSystemEmailForContactUsForm)- {- fromEmail = emailAccount.Email;- fromName = emailAccount.DisplayName;- }- else- {- fromEmail = senderEmail;- fromName = senderName;- }+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddStoreTokens(store, language, emailAccount)+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var liquidObject = await builder.BuildAsync();+ liquidObject.ContactUs = new LiquidContactUs(senderEmail, senderName, body, "");+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);++ var toEmail = vendor.Email;+ var toName = vendor.Name;++ //store in database+ if (_commonSettings.StoreInDatabaseContactUsForm)+ await _mediator.Send(new InsertContactUsCommand {+ CustomerId = customer.Id,+ StoreId = store.Id,+ VendorId = vendor.Id,+ Email = senderEmail,+ Enquiry = body,+ RemoteIpAddress = ipaddress,+ FullName = senderName,+ Subject = string.IsNullOrEmpty(subject) ? "Contact Us (form)" : subject,+ EmailAccountId = emailAccount.Id+ });++ return await SendNotification(messageTemplate, emailAccount, languageId, liquidObject, toEmail, toName,+ fromEmail: fromEmail,+ fromName: fromName,+ subject: subject,+ replyToEmailAddress: senderEmail,+ replyToName: senderName,+ reference: Reference.Vendor, objectId: vendor?.Id);+ }- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ #region Auction notification- LiquidObject liquidObject = await builder.BuildAsync();- liquidObject.ContactUs = new LiquidContactUs(senderEmail, senderName, body, attrInfo);- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ public virtual async Task<int> SendAuctionWinEndedCustomerMessage(Product product, string languageId, Bid bid)+ {+ ArgumentNullException.ThrowIfNull(product);- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = bid.CustomerId });+ if (customer == null) return 0;+ if (string.IsNullOrEmpty(languageId))+ languageId = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.LanguageId);- //store in database- if (_commonSettings.StoreInDatabaseContactUsForm)- {- await _mediator.Send(new InsertContactUsCommand {- CustomerId = customer.Id,- StoreId = store.Id,- VendorId = "",- Email = senderEmail,- Enquiry = body,- FullName = senderName,- Subject = string.IsNullOrEmpty(subject) ? "Contact Us (form)" : subject,- ContactAttributeDescription = attrInfo,- ContactAttributes = customAttributes,- EmailAccountId = emailAccount.Id,- RemoteIpAddress = ipaddress- });- }- return await SendNotification(messageTemplate, emailAccount, languageId, liquidObject, toEmail, toName,- fromEmail: fromEmail,- fromName: fromName,- subject: subject,- replyToEmailAddress: senderEmail,- replyToName: senderName, reference: Reference.Customer, objectId: customer?.Id);- }+ var store = await GetStore(bid.StoreId);+ var language = await EnsureLanguageIsActive(languageId, store.Id);- /// <summary>- /// Sends "contact vendor" message- /// </summary>- /// <param name="customer">Customer</param>- /// <param name="store">Store</param>- /// <param name="vendor">Vendor</param>- /// <param name="languageId">Message language identifier</param>- /// <param name="senderEmail">Sender email</param>- /// <param name="senderName">Sender name</param>- /// <param name="subject">Email subject. Pass null if you want a message template subject to be used.</param>- /// <param name="body">Email body</param>- /// <param name="ipaddress">Ip address</param>- public virtual async Task<int> SendContactVendorMessage(Customer customer, Store store, Vendor vendor, string languageId, string senderEmail,- string senderName, string subject, string body, string ipaddress)- {- ArgumentNullException.ThrowIfNull(vendor);+ var messageTemplate = await GetMessageTemplate("AuctionEnded.CustomerNotificationWin", store.Id);+ if (messageTemplate == null)+ return 0;- var language = await EnsureLanguageIsActive(languageId, store.Id);+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var messageTemplate = await GetMessageTemplate("Service.ContactVendor", store.Id);- if (messageTemplate == null)- return 0;+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddAuctionTokens(product, bid)+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)+ .AddProductTokens(product, language, store, _storeHelper.DomainHost)+ .AddStoreTokens(store, language, emailAccount);- //email account- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- string fromEmail;- string fromName;- senderName = WebUtility.HtmlEncode(senderName);- senderEmail = WebUtility.HtmlEncode(senderEmail);+ var toEmail = customer.Email;+ var toName = customer.GetFullName();+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Customer, objectId: customer.Id);+ }- //required for some SMTP servers- if (_commonSettings.UseSystemEmailForContactUsForm)- {- fromEmail = emailAccount.Email;- fromName = emailAccount.DisplayName;+ public virtual async Task<int> SendAuctionEndedLostCustomerMessage(Product product, string languageId, Bid bid)+ {+ ArgumentNullException.ThrowIfNull(product);- }- else- {- fromEmail = senderEmail;- fromName = senderName;- }+ var winner = await _mediator.Send(new GetCustomerByIdQuery { Id = bid.CustomerId });+ if (winner == null) return 0;- var builder = new LiquidObjectBuilder(_mediator);- builder.AddStoreTokens(store, language, emailAccount)- .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- LiquidObject liquidObject = await builder.BuildAsync();- liquidObject.ContactUs = new LiquidContactUs(senderEmail, senderName, body, "");- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ var store = await GetStore(bid.StoreId);- var toEmail = vendor.Email;- var toName = vendor.Name;+ var language = await EnsureLanguageIsActive(languageId, store.Id);- //store in database- if (_commonSettings.StoreInDatabaseContactUsForm)- {- await _mediator.Send(new InsertContactUsCommand {- CustomerId = customer.Id,- StoreId = store.Id,- VendorId = vendor.Id,- Email = senderEmail,- Enquiry = body,- RemoteIpAddress = ipaddress,- FullName = senderName,- Subject = string.IsNullOrEmpty(subject) ? "Contact Us (form)" : subject,- EmailAccountId = emailAccount.Id- });- }+ var messageTemplate = await GetMessageTemplate("AuctionEnded.CustomerNotificationLost", store.Id);+ if (messageTemplate == null)+ return 0;- return await SendNotification(messageTemplate, emailAccount, languageId, liquidObject, toEmail, toName,- fromEmail: fromEmail,- fromName: fromName,- subject: subject,- replyToEmailAddress: senderEmail,- replyToName: senderName,- reference: Reference.Vendor, objectId: vendor?.Id);- }+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- #region Auction notification+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddAuctionTokens(product, bid)+ .AddProductTokens(product, language, store, _storeHelper.DomainHost)+ .AddStoreTokens(store, language, emailAccount);+ var liquidObject = await builder.BuildAsync();- public virtual async Task<int> SendAuctionWinEndedCustomerMessage(Product product, string languageId, Bid bid)+ var bids = (await _mediator.Send(new GetBidsByProductIdQuery { ProductId = bid.ProductId }))+ .Where(x => x.CustomerId != bid.CustomerId).GroupBy(x => x.CustomerId);+ foreach (var item in bids){- ArgumentNullException.ThrowIfNull(product);-- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = bid.CustomerId });- if (customer == null) return 0;+ var builder2 = new LiquidObjectBuilder(_mediator, liquidObject);+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = item.Key });if (string.IsNullOrEmpty(languageId))- {languageId = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.LanguageId);- }-- var store = await GetStore(bid.StoreId);- var language = await EnsureLanguageIsActive(languageId, store.Id);-- var messageTemplate = await GetMessageTemplate("AuctionEnded.CustomerNotificationWin", store.Id);- if (messageTemplate == null)- return 0;-- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);-- var builder = new LiquidObjectBuilder(_mediator);- builder.AddAuctionTokens(product, bid)- .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)- .AddProductTokens(product, language, store, _storeHelper.DomainHost)- .AddStoreTokens(store, language, emailAccount);+ builder2.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var liquidObject2 = await builder2.BuildAsync();- LiquidObject liquidObject = await builder.BuildAsync();//event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject2);var toEmail = customer.Email;var toName = customer.GetFullName();- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,+ await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject2,toEmail, toName,- reference: Reference.Customer, objectId: customer.Id);+ reference: Reference.Customer, objectId: customer?.Id);}- public virtual async Task<int> SendAuctionEndedLostCustomerMessage(Product product, string languageId, Bid bid)- {- ArgumentNullException.ThrowIfNull(product);+ return 0;+ }- var winner = await _mediator.Send(new GetCustomerByIdQuery { Id = bid.CustomerId });- if (winner == null) return 0;-- var store = await GetStore(bid.StoreId);+ public virtual async Task<int> SendAuctionEndedBinCustomerMessage(Product product, string customerId,+ string languageId, string storeId)+ {+ ArgumentNullException.ThrowIfNull(product);- var language = await EnsureLanguageIsActive(languageId, store.Id);+ var store = await GetStore(storeId);- var messageTemplate = await GetMessageTemplate("AuctionEnded.CustomerNotificationLost", store.Id);- if (messageTemplate == null)- return 0;+ var messageTemplate = await GetMessageTemplate("AuctionEnded.CustomerNotificationBin", storeId);+ if (messageTemplate == null)+ return 0;- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ var language = await EnsureLanguageIsActive(languageId, store.Id);+ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- var builder = new LiquidObjectBuilder(_mediator);- builder.AddAuctionTokens(product, bid)- .AddProductTokens(product, language, store, _storeHelper.DomainHost)- .AddStoreTokens(store, language, emailAccount);- LiquidObject liquidObject = await builder.BuildAsync();+ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddProductTokens(product, language, store, _storeHelper.DomainHost)+ .AddStoreTokens(store, language, emailAccount);- var bids = (await _mediator.Send(new GetBidsByProductIdQuery { ProductId = bid.ProductId })).Where(x => x.CustomerId != bid.CustomerId).GroupBy(x => x.CustomerId);- foreach (var item in bids)+ var liquidObject = await builder.BuildAsync();+ var bids = (await _mediator.Send(new GetBidsByProductIdQuery { ProductId = product.Id }))+ .Where(x => x.CustomerId != customerId).GroupBy(x => x.CustomerId);+ foreach (var item in bids)+ {+ var builder2 = new LiquidObjectBuilder(_mediator, liquidObject);+ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = item.Key });+ if (customer != null){- var builder2 = new LiquidObjectBuilder(_mediator, liquidObject);- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = item.Key });if (string.IsNullOrEmpty(languageId))- {languageId = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.LanguageId);- }- builder2.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- LiquidObject liquidObject2 = await builder2.BuildAsync();+ builder2.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);+ var liquidObject2 = await builder2.BuildAsync();//event notificationawait _mediator.MessageTokensAdded(messageTemplate, liquidObject2);@@ -1726,214 +1812,169 @@ namespace Grand.Business.Messages.Servicesawait SendNotification(messageTemplate, emailAccount,languageId, liquidObject2,toEmail, toName,- reference: Reference.Customer, objectId: customer?.Id);- }- return 0;- }-- public virtual async Task<int> SendAuctionEndedBinCustomerMessage(Product product, string customerId, string languageId, string storeId)- {- ArgumentNullException.ThrowIfNull(product);-- var store = await GetStore(storeId);-- var messageTemplate = await GetMessageTemplate("AuctionEnded.CustomerNotificationBin", storeId);- if (messageTemplate == null)- return 0;-- var language = await EnsureLanguageIsActive(languageId, store.Id);- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);-- var builder = new LiquidObjectBuilder(_mediator);- builder.AddProductTokens(product, language, store, _storeHelper.DomainHost)- .AddStoreTokens(store, language, emailAccount);-- LiquidObject liquidObject = await builder.BuildAsync();- var bids = (await _mediator.Send(new GetBidsByProductIdQuery { ProductId = product.Id })).Where(x => x.CustomerId != customerId).GroupBy(x => x.CustomerId);- foreach (var item in bids)- {- var builder2 = new LiquidObjectBuilder(_mediator, liquidObject);- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = item.Key });- if (customer != null)- {- if (string.IsNullOrEmpty(languageId))- {- languageId = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.LanguageId);- }-- builder2.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);- LiquidObject liquidObject2 = await builder2.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject2);-- var toEmail = customer.Email;- var toName = customer.GetFullName();- await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject2,- toEmail, toName,- reference: Reference.Customer, objectId: customer.Id);- }+ reference: Reference.Customer, objectId: customer.Id);}-- return 0;}- public virtual async Task<int> SendAuctionEndedStoreOwnerMessage(Product product, string languageId, Bid bid)- {- ArgumentNullException.ThrowIfNull(product);- var builder = new LiquidObjectBuilder(_mediator);- MessageTemplate messageTemplate;- EmailAccount emailAccount;-- if (bid != null)- {- var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = bid.CustomerId });- if (string.IsNullOrEmpty(languageId))- {- languageId = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.LanguageId);- }-- var store = await GetStore(bid.StoreId);-- var language = await EnsureLanguageIsActive(languageId, store.Id);-- messageTemplate = await GetMessageTemplate("AuctionEnded.StoreOwnerNotification", store.Id);- if (messageTemplate == null)- return 0;-- emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- builder.AddAuctionTokens(product, bid)- .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)- .AddStoreTokens(store, language, emailAccount);- }- else- {- var store = (await _storeService.GetAllStores()).FirstOrDefault();- var language = await EnsureLanguageIsActive(languageId, store?.Id);- messageTemplate = await GetMessageTemplate("AuctionExpired.StoreOwnerNotification", "");- if (messageTemplate == null)- return 0;-- emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);- builder.AddProductTokens(product, language, store, _storeHelper.DomainHost);- }- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);-- var toEmail = emailAccount.Email;- var toName = emailAccount.DisplayName;+ return 0;+ }- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName);- }+ public virtual async Task<int> SendAuctionEndedStoreOwnerMessage(Product product, string languageId, Bid bid)+ {+ ArgumentNullException.ThrowIfNull(product);+ var builder = new LiquidObjectBuilder(_mediator);+ MessageTemplate messageTemplate;+ EmailAccount emailAccount;- /// <summary>- /// Send outbid notification to a customer- /// </summary>- /// <param name="languageId">Message language identifier</param>- /// <param name="product">Product</param>- /// <param name="bid"></param>- public virtual async Task<int> SendOutBidCustomerMessage(Product product, string languageId, Bid bid)+ if (bid != null){- ArgumentNullException.ThrowIfNull(product);-var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = bid.CustomerId });if (string.IsNullOrEmpty(languageId))- {languageId = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.LanguageId);- }var store = await GetStore(bid.StoreId);var language = await EnsureLanguageIsActive(languageId, store.Id);- var messageTemplate = await GetMessageTemplate("BidUp.CustomerNotification", store.Id);+ messageTemplate = await GetMessageTemplate("AuctionEnded.StoreOwnerNotification", store.Id);if (messageTemplate == null)return 0;- var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);-- var builder = new LiquidObjectBuilder(_mediator);+ emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);builder.AddAuctionTokens(product, bid)- .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)- .AddStoreTokens(store, language, emailAccount);-- LiquidObject liquidObject = await builder.BuildAsync();- //event notification- await _mediator.MessageTokensAdded(messageTemplate, liquidObject);-- var toEmail = customer.Email;- var toName = customer.GetFullName();- return await SendNotification(messageTemplate, emailAccount,- languageId, liquidObject,- toEmail, toName,- reference: Reference.Customer, objectId: customer?.Id);+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)+ .AddStoreTokens(store, language, emailAccount);}- #endregion-- public virtual async Task<int> SendNotification(MessageTemplate messageTemplate,- EmailAccount emailAccount, string languageId, LiquidObject liquidObject,- string toEmailAddress, string toName,- string attachmentFilePath = null, string attachmentFileName = null,- IEnumerable<string> attachedDownloads = null,- string replyToEmailAddress = null, string replyToName = null,- string fromEmail = null, string fromName = null, string subject = null,- Reference reference = Reference.None, string objectId = "")+ else{- if (string.IsNullOrEmpty(toEmailAddress))+ var store = (await _storeService.GetAllStores()).FirstOrDefault();+ var language = await EnsureLanguageIsActive(languageId, store?.Id);+ messageTemplate = await GetMessageTemplate("AuctionExpired.StoreOwnerNotification", "");+ if (messageTemplate == null)return 0;- //retrieve translation message template data- var bcc = messageTemplate.GetTranslation(mt => mt.BccEmailAddresses, languageId);+ emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);+ builder.AddProductTokens(product, language, store, _storeHelper.DomainHost);+ }- if (string.IsNullOrEmpty(subject))- subject = messageTemplate.GetTranslation(mt => mt.Subject, languageId);+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- var body = messageTemplate.GetTranslation(mt => mt.Body, languageId);+ var toEmail = emailAccount.Email;+ var toName = emailAccount.DisplayName;- var email = new QueuedEmail();- liquidObject.Email = new LiquidEmail(email.Id);+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName);+ }- var subjectReplaced = LiquidExtensions.Render(liquidObject, subject);- var bodyReplaced = LiquidExtensions.Render(liquidObject, body);- var attachments = new List<string>();- if (attachedDownloads != null)- attachments.AddRange(attachedDownloads);- if (!string.IsNullOrEmpty(messageTemplate.AttachedDownloadId))- attachments.Add(messageTemplate.AttachedDownloadId);-- //limit name length- toName = CommonHelper.EnsureMaximumLength(toName, 300);- email.PriorityId = QueuedEmailPriority.High;- email.From = !string.IsNullOrEmpty(fromEmail) ? fromEmail : emailAccount.Email;- email.FromName = !string.IsNullOrEmpty(fromName) ? fromName : emailAccount.DisplayName;- email.To = toEmailAddress;- email.ToName = toName;- email.ReplyTo = replyToEmailAddress;- email.ReplyToName = replyToName;- email.CC = string.Empty;- email.Bcc = bcc;- email.Subject = subjectReplaced;- email.Body = bodyReplaced;- email.AttachmentFilePath = attachmentFilePath;- email.AttachmentFileName = attachmentFileName;- email.AttachedDownloads = attachments;- email.EmailAccountId = emailAccount.Id;- email.DontSendBeforeDateUtc = !messageTemplate.DelayBeforeSend.HasValue ? null- : DateTime.UtcNow + TimeSpan.FromHours(messageTemplate.DelayPeriodId.ToHours(messageTemplate.DelayBeforeSend.Value));- email.Reference = reference;- email.ObjectId = objectId;-- await _queuedEmailService.InsertQueuedEmail(email);- return 1;- }+ /// <summary>+ /// Send outbid notification to a customer+ /// </summary>+ /// <param name="languageId">Message language identifier</param>+ /// <param name="product">Product</param>+ /// <param name="bid"></param>+ public virtual async Task<int> SendOutBidCustomerMessage(Product product, string languageId, Bid bid)+ {+ ArgumentNullException.ThrowIfNull(product);++ var customer = await _mediator.Send(new GetCustomerByIdQuery { Id = bid.CustomerId });+ if (string.IsNullOrEmpty(languageId))+ languageId = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.LanguageId);++ var store = await GetStore(bid.StoreId);++ var language = await EnsureLanguageIsActive(languageId, store.Id);++ var messageTemplate = await GetMessageTemplate("BidUp.CustomerNotification", store.Id);+ if (messageTemplate == null)+ return 0;++ var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);++ var builder = new LiquidObjectBuilder(_mediator);+ builder.AddAuctionTokens(product, bid)+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)+ .AddStoreTokens(store, language, emailAccount);- #endregion+ var liquidObject = await builder.BuildAsync();+ //event notification+ await _mediator.MessageTokensAdded(messageTemplate, liquidObject);- #endregion+ var toEmail = customer.Email;+ var toName = customer.GetFullName();+ return await SendNotification(messageTemplate, emailAccount,+ languageId, liquidObject,+ toEmail, toName,+ reference: Reference.Customer, objectId: customer?.Id);}-}++ #endregion++ public virtual async Task<int> SendNotification(MessageTemplate messageTemplate,+ EmailAccount emailAccount, string languageId, LiquidObject liquidObject,+ string toEmailAddress, string toName,+ string attachmentFilePath = null, string attachmentFileName = null,+ IEnumerable<string> attachedDownloads = null,+ string replyToEmailAddress = null, string replyToName = null,+ string fromEmail = null, string fromName = null, string subject = null,+ Reference reference = Reference.None, string objectId = "")+ {+ if (string.IsNullOrEmpty(toEmailAddress))+ return 0;++ //retrieve translation message template data+ var bcc = messageTemplate.GetTranslation(mt => mt.BccEmailAddresses, languageId);++ if (string.IsNullOrEmpty(subject))+ subject = messageTemplate.GetTranslation(mt => mt.Subject, languageId);++ var body = messageTemplate.GetTranslation(mt => mt.Body, languageId);++ var email = new QueuedEmail();+ liquidObject.Email = new LiquidEmail(email.Id);++ var subjectReplaced = LiquidExtensions.Render(liquidObject, subject);+ var bodyReplaced = LiquidExtensions.Render(liquidObject, body);++ var attachments = new List<string>();+ if (attachedDownloads != null)+ attachments.AddRange(attachedDownloads);+ if (!string.IsNullOrEmpty(messageTemplate.AttachedDownloadId))+ attachments.Add(messageTemplate.AttachedDownloadId);++ //limit name length+ toName = CommonHelper.EnsureMaximumLength(toName, 300);+ email.PriorityId = QueuedEmailPriority.High;+ email.From = !string.IsNullOrEmpty(fromEmail) ? fromEmail : emailAccount.Email;+ email.FromName = !string.IsNullOrEmpty(fromName) ? fromName : emailAccount.DisplayName;+ email.To = toEmailAddress;+ email.ToName = toName;+ email.ReplyTo = replyToEmailAddress;+ email.ReplyToName = replyToName;+ email.CC = string.Empty;+ email.Bcc = bcc;+ email.Subject = subjectReplaced;+ email.Body = bodyReplaced;+ email.AttachmentFilePath = attachmentFilePath;+ email.AttachmentFileName = attachmentFileName;+ email.AttachedDownloads = attachments;+ email.EmailAccountId = emailAccount.Id;+ email.DontSendBeforeDateUtc = !messageTemplate.DelayBeforeSend.HasValue+ ? null+ : DateTime.UtcNow ++ TimeSpan.FromHours(messageTemplate.DelayPeriodId.ToHours(messageTemplate.DelayBeforeSend.Value));+ email.Reference = reference;+ email.ObjectId = objectId;++ await _queuedEmailService.InsertQueuedEmail(email);+ return 1;+ }++ #endregion++ #endregion+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Services/MessageTemplateNames.cs b/src/Business/Grand.Business.Messages/Services/MessageTemplateNames.csindex fb0e9f4ed..6b34d0837 100644--- a/src/Business/Grand.Business.Messages/Services/MessageTemplateNames.cs+++ b/src/Business/Grand.Business.Messages/Services/MessageTemplateNames.cs@@ -1,45 +1,46 @@--namespace Grand.Business.Messages.Services+namespace Grand.Business.Messages.Services;++public static class MessageTemplateNames{- public static class MessageTemplateNames- {- public const string CustomerRegistered = "NewCustomer.Notification";- public const string CustomerWelcome = "Customer.WelcomeMessage";- public const string CustomerEmailValidation = "Customer.EmailValidationMessage";- public const string CustomerPasswordRecovery = "Customer.PasswordRecovery";- public const string CustomerNewCustomerNote = "Customer.NewCustomerNote";- public const string CustomerEmailTokenValidationMessage = "Customer.EmailTokenValidationMessage";-- public const string SendOrderPlacedStoreOwnerMessage = "OrderPlaced.StoreOwnerNotification";- public const string SendOrderPaidStoreOwnerMessage = "OrderPaid.StoreOwnerNotification";- public const string SendOrderCancelledStoreOwnerMessage = "OrderCancelled.StoreOwnerNotification";- public const string SendOrderRefundedStoreOwnerMessage = "OrderRefunded.StoreOwnerNotification";-- public const string SendOrderPlacedCustomerMessage = "OrderPlaced.CustomerNotification";- public const string SendOrderPaidCustomerMessage = "OrderPaid.CustomerNotification";- public const string SendOrderCompletedCustomerMessage = "OrderCompleted.CustomerNotification";- public const string SendOrderCancelledCustomerMessage = "OrderCancelled.CustomerNotification";- public const string SendOrderRefundedCustomerMessage = "OrderRefunded.CustomerNotification";-- public const string SendOrderPlacedVendorMessage = "OrderPlaced.VendorNotification";- public const string SendOrderPaidVendorMessage = "OrderPaid.VendorNotification";- public const string SendOrderCancelledVendorMessage = "OrderCancelled.VendorNotification";-- public const string SendShipmentSentCustomerMessage = "ShipmentSent.CustomerNotification";- public const string SendShipmentDeliveredCustomerMessage = "ShipmentDelivered.CustomerNotification";-- public const string SendNewOrderNoteAddedCustomerMessage = "Customer.NewOrderNote";-- public const string SendNewsLetterSubscriptionActivationMessage = "NewsLetterSubscription.ActivationMessage";- public const string SendNewsLetterSubscriptionDeactivationMessage = "NewsLetterSubscription.DeactivationMessage";-- public const string SendWishlistEmailAFriendMessage = "Wishlist.EmailAFriend";- public const string SendProductEmailAFriendMessage = "Service.EmailAFriend";- public const string SendProductQuestionMessage = "Service.AskQuestion";-- public const string SendNewMerchandiseReturnStoreOwnerMessage = "NewMerchandiseReturn.StoreOwnerNotification";- public const string SendMerchandiseReturnStatusChangedCustomerMessage = "MerchandiseReturnStatusChanged.CustomerNotification";- public const string SendNewMerchandiseReturnCustomerMessage = "NewMerchandiseReturn.CustomerNotification";- public const string SendNewMerchandiseReturnNoteAddedCustomerMessage = "Customer.NewMerchandiseReturnNote";- }-}+ public const string CustomerRegistered = "NewCustomer.Notification";+ public const string CustomerWelcome = "Customer.WelcomeMessage";+ public const string CustomerEmailValidation = "Customer.EmailValidationMessage";+ public const string CustomerPasswordRecovery = "Customer.PasswordRecovery";+ public const string CustomerNewCustomerNote = "Customer.NewCustomerNote";+ public const string CustomerEmailTokenValidationMessage = "Customer.EmailTokenValidationMessage";++ public const string SendOrderPlacedStoreOwnerMessage = "OrderPlaced.StoreOwnerNotification";+ public const string SendOrderPaidStoreOwnerMessage = "OrderPaid.StoreOwnerNotification";+ public const string SendOrderCancelledStoreOwnerMessage = "OrderCancelled.StoreOwnerNotification";+ public const string SendOrderRefundedStoreOwnerMessage = "OrderRefunded.StoreOwnerNotification";++ public const string SendOrderPlacedCustomerMessage = "OrderPlaced.CustomerNotification";+ public const string SendOrderPaidCustomerMessage = "OrderPaid.CustomerNotification";+ public const string SendOrderCompletedCustomerMessage = "OrderCompleted.CustomerNotification";+ public const string SendOrderCancelledCustomerMessage = "OrderCancelled.CustomerNotification";+ public const string SendOrderRefundedCustomerMessage = "OrderRefunded.CustomerNotification";++ public const string SendOrderPlacedVendorMessage = "OrderPlaced.VendorNotification";+ public const string SendOrderPaidVendorMessage = "OrderPaid.VendorNotification";+ public const string SendOrderCancelledVendorMessage = "OrderCancelled.VendorNotification";++ public const string SendShipmentSentCustomerMessage = "ShipmentSent.CustomerNotification";+ public const string SendShipmentDeliveredCustomerMessage = "ShipmentDelivered.CustomerNotification";++ public const string SendNewOrderNoteAddedCustomerMessage = "Customer.NewOrderNote";++ public const string SendNewsLetterSubscriptionActivationMessage = "NewsLetterSubscription.ActivationMessage";+ public const string SendNewsLetterSubscriptionDeactivationMessage = "NewsLetterSubscription.DeactivationMessage";++ public const string SendWishlistEmailAFriendMessage = "Wishlist.EmailAFriend";+ public const string SendProductEmailAFriendMessage = "Service.EmailAFriend";+ public const string SendProductQuestionMessage = "Service.AskQuestion";++ public const string SendNewMerchandiseReturnStoreOwnerMessage = "NewMerchandiseReturn.StoreOwnerNotification";++ public const string SendMerchandiseReturnStatusChangedCustomerMessage =+ "MerchandiseReturnStatusChanged.CustomerNotification";++ public const string SendNewMerchandiseReturnCustomerMessage = "NewMerchandiseReturn.CustomerNotification";+ public const string SendNewMerchandiseReturnNoteAddedCustomerMessage = "Customer.NewMerchandiseReturnNote";+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.csindex 58f27d2f1..a9e64c48b 100644--- a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs+++ b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs@@ -8,189 +8,186 @@ using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Extensions;using MediatR;-namespace Grand.Business.Messages.Services+namespace Grand.Business.Messages.Services;++public class MessageTemplateService : IMessageTemplateService{- public class MessageTemplateService : IMessageTemplateService+ #region Ctor++ /// <summary>+ /// Ctor+ /// </summary>+ public MessageTemplateService(ICacheBase cacheBase,+ IAclService aclService,+ IRepository<MessageTemplate> messageTemplateRepository,+ IMediator mediator, AccessControlConfig accessControlConfig){- #region Fields+ _cacheBase = cacheBase;+ _aclService = aclService;+ _messageTemplateRepository = messageTemplateRepository;+ _mediator = mediator;+ _accessControlConfig = accessControlConfig;+ }- private readonly IRepository<MessageTemplate> _messageTemplateRepository;- private readonly IAclService _aclService;- private readonly IMediator _mediator;- private readonly ICacheBase _cacheBase;- private readonly AccessControlConfig _accessControlConfig;+ #endregion- #endregion+ #region Fields- #region Ctor+ private readonly IRepository<MessageTemplate> _messageTemplateRepository;+ private readonly IAclService _aclService;+ private readonly IMediator _mediator;+ private readonly ICacheBase _cacheBase;+ private readonly AccessControlConfig _accessControlConfig;- /// <summary>- /// Ctor- /// </summary>- public MessageTemplateService(ICacheBase cacheBase,- IAclService aclService,- IRepository<MessageTemplate> messageTemplateRepository,- IMediator mediator, AccessControlConfig accessControlConfig)- {- _cacheBase = cacheBase;- _aclService = aclService;- _messageTemplateRepository = messageTemplateRepository;- _mediator = mediator;- _accessControlConfig = accessControlConfig;- }-- #endregion-- #region Methods-- /// <summary>- /// Inserts a message template- /// </summary>- /// <param name="messageTemplate">Message template</param>- public virtual async Task InsertMessageTemplate(MessageTemplate messageTemplate)- {- ArgumentNullException.ThrowIfNull(messageTemplate);+ #endregion- await _messageTemplateRepository.InsertAsync(messageTemplate);+ #region Methods- await _cacheBase.RemoveByPrefix(CacheKey.MESSAGETEMPLATES_PATTERN_KEY);+ /// <summary>+ /// Inserts a message template+ /// </summary>+ /// <param name="messageTemplate">Message template</param>+ public virtual async Task InsertMessageTemplate(MessageTemplate messageTemplate)+ {+ ArgumentNullException.ThrowIfNull(messageTemplate);- //event notification- await _mediator.EntityInserted(messageTemplate);- }+ await _messageTemplateRepository.InsertAsync(messageTemplate);- /// <summary>- /// Updates a message template- /// </summary>- /// <param name="messageTemplate">Message template</param>- public virtual async Task UpdateMessageTemplate(MessageTemplate messageTemplate)- {- ArgumentNullException.ThrowIfNull(messageTemplate);+ await _cacheBase.RemoveByPrefix(CacheKey.MESSAGETEMPLATES_PATTERN_KEY);- await _messageTemplateRepository.UpdateAsync(messageTemplate);+ //event notification+ await _mediator.EntityInserted(messageTemplate);+ }- await _cacheBase.RemoveByPrefix(CacheKey.MESSAGETEMPLATES_PATTERN_KEY);+ /// <summary>+ /// Updates a message template+ /// </summary>+ /// <param name="messageTemplate">Message template</param>+ public virtual async Task UpdateMessageTemplate(MessageTemplate messageTemplate)+ {+ ArgumentNullException.ThrowIfNull(messageTemplate);- //event notification- await _mediator.EntityUpdated(messageTemplate);- }+ await _messageTemplateRepository.UpdateAsync(messageTemplate);- /// <summary>- /// Delete a message template- /// </summary>- /// <param name="messageTemplate">Message template</param>- public virtual async Task DeleteMessageTemplate(MessageTemplate messageTemplate)- {- ArgumentNullException.ThrowIfNull(messageTemplate);+ await _cacheBase.RemoveByPrefix(CacheKey.MESSAGETEMPLATES_PATTERN_KEY);- await _messageTemplateRepository.DeleteAsync(messageTemplate);+ //event notification+ await _mediator.EntityUpdated(messageTemplate);+ }- await _cacheBase.RemoveByPrefix(CacheKey.MESSAGETEMPLATES_PATTERN_KEY);+ /// <summary>+ /// Delete a message template+ /// </summary>+ /// <param name="messageTemplate">Message template</param>+ public virtual async Task DeleteMessageTemplate(MessageTemplate messageTemplate)+ {+ ArgumentNullException.ThrowIfNull(messageTemplate);- //event notification- await _mediator.EntityDeleted(messageTemplate);- }+ await _messageTemplateRepository.DeleteAsync(messageTemplate);- /// <summary>- /// Gets a message template- /// </summary>- /// <param name="messageTemplateId">Message template identifier</param>- /// <returns>Message template</returns>- public virtual Task<MessageTemplate> GetMessageTemplateById(string messageTemplateId)- {- return _messageTemplateRepository.GetByIdAsync(messageTemplateId);- }-- /// <summary>- /// Gets a message template- /// </summary>- /// <param name="messageTemplateName">Message template name</param>- /// <param name="storeId">Store identifier</param>- /// <returns>Message template</returns>- public virtual async Task<MessageTemplate> GetMessageTemplateByName(string messageTemplateName, string storeId)- {- if (string.IsNullOrWhiteSpace(messageTemplateName))- throw new ArgumentException(null, nameof(messageTemplateName));-- var key = string.Format(CacheKey.MESSAGETEMPLATES_BY_NAME_KEY, messageTemplateName, storeId);- return await _cacheBase.GetAsync(key, async () =>- {- var query = from p in _messageTemplateRepository.Table- select p;-- query = query.Where(t => t.Name == messageTemplateName);- query = query.OrderBy(t => t.Id);- var templates = await Task.FromResult(query.ToList());-- //store acl- if (!string.IsNullOrEmpty(storeId))- {- templates = templates- .Where(t => _aclService.Authorize(t, storeId))- .ToList();- }-- return templates.FirstOrDefault();- });- }-- /// <summary>- /// Gets all message templates- /// </summary>- /// <param name="storeId">Store identifier; pass "" to load all records</param>- /// <returns>Message template list</returns>- public virtual async Task<IList<MessageTemplate>> GetAllMessageTemplates(string storeId)+ await _cacheBase.RemoveByPrefix(CacheKey.MESSAGETEMPLATES_PATTERN_KEY);++ //event notification+ await _mediator.EntityDeleted(messageTemplate);+ }++ /// <summary>+ /// Gets a message template+ /// </summary>+ /// <param name="messageTemplateId">Message template identifier</param>+ /// <returns>Message template</returns>+ public virtual Task<MessageTemplate> GetMessageTemplateById(string messageTemplateId)+ {+ return _messageTemplateRepository.GetByIdAsync(messageTemplateId);+ }++ /// <summary>+ /// Gets a message template+ /// </summary>+ /// <param name="messageTemplateName">Message template name</param>+ /// <param name="storeId">Store identifier</param>+ /// <returns>Message template</returns>+ public virtual async Task<MessageTemplate> GetMessageTemplateByName(string messageTemplateName, string storeId)+ {+ if (string.IsNullOrWhiteSpace(messageTemplateName))+ throw new ArgumentException(null, nameof(messageTemplateName));++ var key = string.Format(CacheKey.MESSAGETEMPLATES_BY_NAME_KEY, messageTemplateName, storeId);+ return await _cacheBase.GetAsync(key, async () =>{- var key = string.Format(CacheKey.MESSAGETEMPLATES_ALL_KEY, storeId);- return await _cacheBase.GetAsync(key, async () =>- {- var query = from p in _messageTemplateRepository.Table- select p;+ var query = from p in _messageTemplateRepository.Table+ select p;- query = query.OrderBy(t => t.Name);+ query = query.Where(t => t.Name == messageTemplateName);+ query = query.OrderBy(t => t.Id);+ var templates = await Task.FromResult(query.ToList());- //Store acl- if (string.IsNullOrEmpty(storeId) || _accessControlConfig.IgnoreStoreLimitations)- return await Task.FromResult(query.ToList());+ //store acl+ if (!string.IsNullOrEmpty(storeId))+ templates = templates+ .Where(t => _aclService.Authorize(t, storeId))+ .ToList();- query = from p in query- where !p.LimitedToStores || p.Stores.Contains(storeId)- select p;- query = query.OrderBy(t => t.Name);+ return templates.FirstOrDefault();+ });+ }- return await Task.FromResult(query.ToList());- });- }-- /// <summary>- /// Create a copy of message template with all depended data- /// </summary>- /// <param name="messageTemplate">Message template</param>- /// <returns>Message template copy</returns>- public virtual async Task<MessageTemplate> CopyMessageTemplate(MessageTemplate messageTemplate)+ /// <summary>+ /// Gets all message templates+ /// </summary>+ /// <param name="storeId">Store identifier; pass "" to load all records</param>+ /// <returns>Message template list</returns>+ public virtual async Task<IList<MessageTemplate>> GetAllMessageTemplates(string storeId)+ {+ var key = string.Format(CacheKey.MESSAGETEMPLATES_ALL_KEY, storeId);+ return await _cacheBase.GetAsync(key, async () =>{- ArgumentNullException.ThrowIfNull(messageTemplate);-- var mtCopy = new MessageTemplate {- Name = messageTemplate.Name,- BccEmailAddresses = messageTemplate.BccEmailAddresses,- Subject = messageTemplate.Subject,- Body = messageTemplate.Body,- IsActive = messageTemplate.IsActive,- AttachedDownloadId = messageTemplate.AttachedDownloadId,- EmailAccountId = messageTemplate.EmailAccountId,- LimitedToStores = messageTemplate.LimitedToStores,- Locales = messageTemplate.Locales,- Stores = messageTemplate.Stores,- DelayBeforeSend = messageTemplate.DelayBeforeSend,- DelayPeriodId = messageTemplate.DelayPeriodId- };-- await InsertMessageTemplate(mtCopy);-- return mtCopy;- }-- #endregion+ var query = from p in _messageTemplateRepository.Table+ select p;++ query = query.OrderBy(t => t.Name);++ //Store acl+ if (string.IsNullOrEmpty(storeId) || _accessControlConfig.IgnoreStoreLimitations)+ return await Task.FromResult(query.ToList());++ query = from p in query+ where !p.LimitedToStores || p.Stores.Contains(storeId)+ select p;+ query = query.OrderBy(t => t.Name);++ return await Task.FromResult(query.ToList());+ });}++ /// <summary>+ /// Create a copy of message template with all depended data+ /// </summary>+ /// <param name="messageTemplate">Message template</param>+ /// <returns>Message template copy</returns>+ public virtual async Task<MessageTemplate> CopyMessageTemplate(MessageTemplate messageTemplate)+ {+ ArgumentNullException.ThrowIfNull(messageTemplate);++ var mtCopy = new MessageTemplate {+ Name = messageTemplate.Name,+ BccEmailAddresses = messageTemplate.BccEmailAddresses,+ Subject = messageTemplate.Subject,+ Body = messageTemplate.Body,+ IsActive = messageTemplate.IsActive,+ AttachedDownloadId = messageTemplate.AttachedDownloadId,+ EmailAccountId = messageTemplate.EmailAccountId,+ LimitedToStores = messageTemplate.LimitedToStores,+ Locales = messageTemplate.Locales,+ Stores = messageTemplate.Stores,+ DelayBeforeSend = messageTemplate.DelayBeforeSend,+ DelayPeriodId = messageTemplate.DelayPeriodId+ };++ await InsertMessageTemplate(mtCopy);++ return mtCopy;+ }++ #endregion}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.cs b/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.csindex 582623eda..a66083d2d 100644--- a/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.cs+++ b/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.cs@@ -1,57 +1,56 @@using Grand.Business.Core.Interfaces.Messages;using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;-namespace Grand.Business.Messages.Services-{- public class MessageTokenProvider : IMessageTokenProvider- {- #region Methods+namespace Grand.Business.Messages.Services;- /// <summary>- /// Gets list of allowed (supported) message tokens for campaigns- /// </summary>- /// <returns>List of allowed (supported) message tokens for campaigns</returns>- public virtual string[] GetListOfCampaignAllowedTokens()- {- var allowedTokens = LiquidExtensions.GetTokens(typeof(LiquidStore),- typeof(LiquidNewsLetterSubscription),- typeof(LiquidShoppingCart),- typeof(LiquidCustomer));+public class MessageTokenProvider : IMessageTokenProvider+{+ #region Methods- return allowedTokens.ToArray();- }+ /// <summary>+ /// Gets list of allowed (supported) message tokens for campaigns+ /// </summary>+ /// <returns>List of allowed (supported) message tokens for campaigns</returns>+ public virtual string[] GetListOfCampaignAllowedTokens()+ {+ var allowedTokens = LiquidExtensions.GetTokens(typeof(LiquidStore),+ typeof(LiquidNewsLetterSubscription),+ typeof(LiquidShoppingCart),+ typeof(LiquidCustomer));- public virtual string[] GetListOfAllowedTokens()- {- var allowedTokens = LiquidExtensions.GetTokens(- typeof(LiquidAskQuestion),- typeof(LiquidAttributeCombination),- typeof(LiquidAuctions),- typeof(LiquidOutOfStockSubscription),- typeof(LiquidBlogComment),- typeof(LiquidContactUs),- typeof(LiquidCustomer),- typeof(LiquidEmailAFriend),- typeof(LiquidGiftVoucher),- typeof(LiquidKnowledgebase),- typeof(LiquidNewsComment),- typeof(LiquidNewsLetterSubscription),- typeof(LiquidOrder),- typeof(LiquidOrderItem),- typeof(LiquidProduct),- typeof(LiquidProductReview),- typeof(LiquidMerchandiseReturn),- typeof(LiquidShipment),- typeof(LiquidShipmentItem),- typeof(LiquidShoppingCart),- typeof(LiquidStore),- typeof(LiquidVatValidationResult),- typeof(LiquidVendor),- typeof(LiquidVendorReview));+ return allowedTokens.ToArray();+ }- return allowedTokens.ToArray();- }+ public virtual string[] GetListOfAllowedTokens()+ {+ var allowedTokens = LiquidExtensions.GetTokens(+ typeof(LiquidAskQuestion),+ typeof(LiquidAttributeCombination),+ typeof(LiquidAuctions),+ typeof(LiquidOutOfStockSubscription),+ typeof(LiquidBlogComment),+ typeof(LiquidContactUs),+ typeof(LiquidCustomer),+ typeof(LiquidEmailAFriend),+ typeof(LiquidGiftVoucher),+ typeof(LiquidKnowledgebase),+ typeof(LiquidNewsComment),+ typeof(LiquidNewsLetterSubscription),+ typeof(LiquidOrder),+ typeof(LiquidOrderItem),+ typeof(LiquidProduct),+ typeof(LiquidProductReview),+ typeof(LiquidMerchandiseReturn),+ typeof(LiquidShipment),+ typeof(LiquidShipmentItem),+ typeof(LiquidShoppingCart),+ typeof(LiquidStore),+ typeof(LiquidVatValidationResult),+ typeof(LiquidVendor),+ typeof(LiquidVendorReview));- #endregion+ return allowedTokens.ToArray();}++ #endregion}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Services/MimeMappingService.cs b/src/Business/Grand.Business.Messages/Services/MimeMappingService.csindex 84a6aa5c1..62ae8a1b8 100644--- a/src/Business/Grand.Business.Messages/Services/MimeMappingService.cs+++ b/src/Business/Grand.Business.Messages/Services/MimeMappingService.cs@@ -1,24 +1,21 @@using Grand.Business.Core.Interfaces.Messages;using Microsoft.AspNetCore.StaticFiles;-namespace Grand.Business.Messages.Services+namespace Grand.Business.Messages.Services;++public class MimeMappingService : IMimeMappingService{- public class MimeMappingService : IMimeMappingService- {- private readonly FileExtensionContentTypeProvider _contentTypeProvider;+ private readonly FileExtensionContentTypeProvider _contentTypeProvider;- public MimeMappingService(FileExtensionContentTypeProvider contentTypeProvider)- {- _contentTypeProvider = contentTypeProvider;- }+ public MimeMappingService(FileExtensionContentTypeProvider contentTypeProvider)+ {+ _contentTypeProvider = contentTypeProvider;+ }- public string Map(string filename)- {- if (!_contentTypeProvider.TryGetContentType(filename, out var contentType))- {- contentType = "application/octet-stream";- }- return contentType;- }+ public string Map(string filename)+ {+ if (!_contentTypeProvider.TryGetContentType(filename, out var contentType))+ contentType = "application/octet-stream";+ return contentType;}-}+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.csindex c8ecad649..b4c963eb4 100644--- a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs+++ b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs@@ -1,183 +1,184 @@using Grand.Business.Core.Interfaces.Messages;-using Grand.Infrastructure.Extensions;-using Grand.Domain;using Grand.Data;+using Grand.Domain;+using Grand.Domain.Common;using Grand.Domain.Messages;+using Grand.Infrastructure.Extensions;using MediatR;-using Grand.Domain.Common;-namespace Grand.Business.Messages.Services+namespace Grand.Business.Messages.Services;++public class QueuedEmailService : IQueuedEmailService{- public class QueuedEmailService : IQueuedEmailService+ private readonly IMediator _mediator;+ private readonly IRepository<QueuedEmail> _queuedEmailRepository;++ /// <summary>+ /// Ctor+ /// </summary>+ /// <param name="queuedEmailRepository">Queued email repository</param>+ /// <param name="mediator">Mediator</param>+ public QueuedEmailService(IRepository<QueuedEmail> queuedEmailRepository,+ IMediator mediator){- private readonly IRepository<QueuedEmail> _queuedEmailRepository;- private readonly IMediator _mediator;-- /// <summary>- /// Ctor- /// </summary>- /// <param name="queuedEmailRepository">Queued email repository</param>- /// <param name="mediator">Mediator</param>- public QueuedEmailService(IRepository<QueuedEmail> queuedEmailRepository,- IMediator mediator)- {- _queuedEmailRepository = queuedEmailRepository;- _mediator = mediator;- }+ _queuedEmailRepository = queuedEmailRepository;+ _mediator = mediator;+ }- /// <summary>- /// Inserts a queued email- /// </summary>- /// <param name="queuedEmail">Queued email</param>- public virtual async Task InsertQueuedEmail(QueuedEmail queuedEmail)- {- ArgumentNullException.ThrowIfNull(queuedEmail);+ /// <summary>+ /// Inserts a queued email+ /// </summary>+ /// <param name="queuedEmail">Queued email</param>+ public virtual async Task InsertQueuedEmail(QueuedEmail queuedEmail)+ {+ ArgumentNullException.ThrowIfNull(queuedEmail);- await _queuedEmailRepository.InsertAsync(queuedEmail);+ await _queuedEmailRepository.InsertAsync(queuedEmail);- //event notification- await _mediator.EntityInserted(queuedEmail);- }+ //event notification+ await _mediator.EntityInserted(queuedEmail);+ }- /// <summary>- /// Updates a queued email- /// </summary>- /// <param name="queuedEmail">Queued email</param>- public virtual async Task UpdateQueuedEmail(QueuedEmail queuedEmail)- {- ArgumentNullException.ThrowIfNull(queuedEmail);+ /// <summary>+ /// Updates a queued email+ /// </summary>+ /// <param name="queuedEmail">Queued email</param>+ public virtual async Task UpdateQueuedEmail(QueuedEmail queuedEmail)+ {+ ArgumentNullException.ThrowIfNull(queuedEmail);- await _queuedEmailRepository.UpdateAsync(queuedEmail);+ await _queuedEmailRepository.UpdateAsync(queuedEmail);- //event notification- await _mediator.EntityUpdated(queuedEmail);- }+ //event notification+ await _mediator.EntityUpdated(queuedEmail);+ }- /// <summary>- /// Deleted a queued email- /// </summary>- /// <param name="queuedEmail">Queued email</param>- public virtual async Task DeleteQueuedEmail(QueuedEmail queuedEmail)- {- ArgumentNullException.ThrowIfNull(queuedEmail);+ /// <summary>+ /// Deleted a queued email+ /// </summary>+ /// <param name="queuedEmail">Queued email</param>+ public virtual async Task DeleteQueuedEmail(QueuedEmail queuedEmail)+ {+ ArgumentNullException.ThrowIfNull(queuedEmail);- await _queuedEmailRepository.DeleteAsync(queuedEmail);+ await _queuedEmailRepository.DeleteAsync(queuedEmail);- //event notification- await _mediator.EntityDeleted(queuedEmail);- }+ //event notification+ await _mediator.EntityDeleted(queuedEmail);+ }- /// <summary>- /// Deleted a customer emails- /// </summary>- /// <param name="email">email</param>- public virtual async Task DeleteCustomerEmail(string email)- {- ArgumentNullException.ThrowIfNull(email);+ /// <summary>+ /// Deleted a customer emails+ /// </summary>+ /// <param name="email">email</param>+ public virtual async Task DeleteCustomerEmail(string email)+ {+ ArgumentNullException.ThrowIfNull(email);- var deleteCustomerEmail = _queuedEmailRepository.Table.Where(x => x.To == email);+ var deleteCustomerEmail = _queuedEmailRepository.Table.Where(x => x.To == email);- await _queuedEmailRepository.DeleteAsync(deleteCustomerEmail);- }+ await _queuedEmailRepository.DeleteAsync(deleteCustomerEmail);+ }- /// <summary>- /// Gets a queued email by identifier- /// </summary>- /// <param name="queuedEmailId">Queued email identifier</param>- /// <returns>Queued email</returns>- public virtual Task<QueuedEmail> GetQueuedEmailById(string queuedEmailId)- {- return _queuedEmailRepository.GetByIdAsync(queuedEmailId);+ /// <summary>+ /// Gets a queued email by identifier+ /// </summary>+ /// <param name="queuedEmailId">Queued email identifier</param>+ /// <returns>Queued email</returns>+ public virtual Task<QueuedEmail> GetQueuedEmailById(string queuedEmailId)+ {+ return _queuedEmailRepository.GetByIdAsync(queuedEmailId);+ }- }+ /// <summary>+ /// Get queued emails by identifiers+ /// </summary>+ /// <param name="queuedEmailIds">queued email identifiers</param>+ /// <returns>Queued emails</returns>+ public virtual async Task<IList<QueuedEmail>> GetQueuedEmailsByIds(string[] queuedEmailIds)+ {+ if (queuedEmailIds == null || queuedEmailIds.Length == 0)+ return new List<QueuedEmail>();++ var query = from qe in _queuedEmailRepository.Table+ where queuedEmailIds.Contains(qe.Id)+ select qe;+ var queuedEmails = query.ToList();+ //sort by passed identifiers+ var sortedQueuedEmails =+ queuedEmailIds.Select(id => queuedEmails.Find(x => x.Id == id)).Where(queuedEmail => queuedEmail != null)+ .ToList();+ return await Task.FromResult(sortedQueuedEmails);+ }- /// <summary>- /// Get queued emails by identifiers- /// </summary>- /// <param name="queuedEmailIds">queued email identifiers</param>- /// <returns>Queued emails</returns>- public virtual async Task<IList<QueuedEmail>> GetQueuedEmailsByIds(string[] queuedEmailIds)+ /// <summary>+ /// Gets all queued emails+ /// </summary>+ /// <param name="fromEmail">From Email</param>+ /// <param name="toEmail">To Email</param>+ /// <param name="text">Text</param>+ /// <param name="createdFromUtc">Created date from (UTC); null to load all records</param>+ /// <param name="createdToUtc">Created date to (UTC); null to load all records</param>+ /// <param name="loadNotSentItemsOnly">A value indicating whether to load only not sent emails</param>+ /// <param name="maxSendTries">Maximum send tries</param>+ /// <param name="loadOnlyItemsToBeSent">Load only items to be sent</param>+ /// <param name="loadNewest">A value indicating whether we should sort queued email descending; otherwise, ascending.</param>+ /// <param name="referenceId">Reference object</param>+ /// <param name="objectId">Object reference id</param>+ /// <param name="pageIndex">Page index</param>+ /// <param name="pageSize">Page size</param>+ /// <returns>Email item list</returns>+ public virtual async Task<IPagedList<QueuedEmail>> SearchEmails(string fromEmail,+ string toEmail, string text, DateTime? createdFromUtc, DateTime? createdToUtc,+ bool loadNotSentItemsOnly, bool loadOnlyItemsToBeSent, int maxSendTries,+ bool loadNewest, int referenceId = -1, string objectId = "", int pageIndex = 0, int pageSize = int.MaxValue)+ {+ fromEmail = (fromEmail ?? string.Empty).Trim();+ toEmail = (toEmail ?? string.Empty).Trim();++ var query = from p in _queuedEmailRepository.Table+ select p;++ if (!string.IsNullOrEmpty(fromEmail))+ query = query.Where(qe => qe.From.ToLower().Contains(fromEmail.ToLower()));+ if (!string.IsNullOrEmpty(toEmail))+ query = query.Where(qe => qe.To.ToLower().Contains(toEmail.ToLower()));+ if (!string.IsNullOrEmpty(text))+ query = query.Where(qe =>+ qe.Subject.ToLower().Contains(text.ToLower()) || qe.Body.ToLower().Contains(text.ToLower()));++ if (createdFromUtc.HasValue)+ query = query.Where(qe => qe.CreatedOnUtc >= createdFromUtc.Value);+ if (createdToUtc.HasValue)+ query = query.Where(qe => qe.CreatedOnUtc <= createdToUtc.Value);+ if (loadNotSentItemsOnly)+ query = query.Where(qe => !qe.SentOnUtc.HasValue);++ if (loadOnlyItemsToBeSent){- if (queuedEmailIds == null || queuedEmailIds.Length == 0)- return new List<QueuedEmail>();-- var query = from qe in _queuedEmailRepository.Table- where queuedEmailIds.Contains(qe.Id)- select qe;- var queuedEmails = query.ToList();- //sort by passed identifiers- var sortedQueuedEmails =- queuedEmailIds.Select(id => queuedEmails.Find(x => x.Id == id)).Where(queuedEmail => queuedEmail != null).ToList();- return await Task.FromResult(sortedQueuedEmails);+ var nowUtc = DateTime.UtcNow;+ query = query.Where(qe => !qe.DontSendBeforeDateUtc.HasValue || qe.DontSendBeforeDateUtc.Value <= nowUtc);}- /// <summary>- /// Gets all queued emails- /// </summary>- /// <param name="fromEmail">From Email</param>- /// <param name="toEmail">To Email</param>- /// <param name="text">Text</param>- /// <param name="createdFromUtc">Created date from (UTC); null to load all records</param>- /// <param name="createdToUtc">Created date to (UTC); null to load all records</param>- /// <param name="loadNotSentItemsOnly">A value indicating whether to load only not sent emails</param>- /// <param name="maxSendTries">Maximum send tries</param>- /// <param name="loadOnlyItemsToBeSent">Load only items to be sent</param>- /// <param name="loadNewest">A value indicating whether we should sort queued email descending; otherwise, ascending.</param>- /// <param name="referenceId">Reference object</param>- /// <param name="objectId">Object reference id</param>- /// <param name="pageIndex">Page index</param>- /// <param name="pageSize">Page size</param>- /// <returns>Email item list</returns>- public virtual async Task<IPagedList<QueuedEmail>> SearchEmails(string fromEmail,- string toEmail, string text, DateTime? createdFromUtc, DateTime? createdToUtc,- bool loadNotSentItemsOnly, bool loadOnlyItemsToBeSent, int maxSendTries,- bool loadNewest, int referenceId = -1, string objectId = "", int pageIndex = 0, int pageSize = int.MaxValue)- {- fromEmail = (fromEmail ?? string.Empty).Trim();- toEmail = (toEmail ?? string.Empty).Trim();-- var query = from p in _queuedEmailRepository.Table- select p;-- if (!string.IsNullOrEmpty(fromEmail))- query = query.Where(qe => qe.From.ToLower().Contains(fromEmail.ToLower()));- if (!string.IsNullOrEmpty(toEmail))- query = query.Where(qe => qe.To.ToLower().Contains(toEmail.ToLower()));- if (!string.IsNullOrEmpty(text))- query = query.Where(qe => qe.Subject.ToLower().Contains(text.ToLower()) || qe.Body.ToLower().Contains(text.ToLower()));-- if (createdFromUtc.HasValue)- query = query.Where(qe => qe.CreatedOnUtc >= createdFromUtc.Value);- if (createdToUtc.HasValue)- query = query.Where(qe => qe.CreatedOnUtc <= createdToUtc.Value);- if (loadNotSentItemsOnly)- query = query.Where(qe => !qe.SentOnUtc.HasValue);-- if (loadOnlyItemsToBeSent)- {- var nowUtc = DateTime.UtcNow;- query = query.Where(qe => !qe.DontSendBeforeDateUtc.HasValue || qe.DontSendBeforeDateUtc.Value <= nowUtc);- }- if (referenceId >= 0)- {- query = query.Where(qe => qe.Reference == (Reference)referenceId && qe.ObjectId == objectId);- }- if (maxSendTries > 0)- query = query.Where(qe => qe.SentTries < maxSendTries);-- //load the newest records- query = loadNewest ? query.OrderByDescending(qe => qe.CreatedOnUtc) :- //load by priority- query.OrderByDescending(qe => qe.PriorityId).ThenBy(qe => qe.CreatedOnUtc);- return await PagedList<QueuedEmail>.Create(query, pageIndex, pageSize);- }+ if (referenceId >= 0)+ query = query.Where(qe => qe.Reference == (Reference)referenceId && qe.ObjectId == objectId);+ if (maxSendTries > 0)+ query = query.Where(qe => qe.SentTries < maxSendTries);++ //load the newest records+ query = loadNewest+ ? query.OrderByDescending(qe => qe.CreatedOnUtc)+ :+ //load by priority+ query.OrderByDescending(qe => qe.PriorityId).ThenBy(qe => qe.CreatedOnUtc);+ return await PagedList<QueuedEmail>.Create(query, pageIndex, pageSize);+ }- /// <summary>- /// Delete all queued emails- /// </summary>- public virtual async Task DeleteAllEmails()- {- await _queuedEmailRepository.ClearAsync();- }+ /// <summary>+ /// Delete all queued emails+ /// </summary>+ public virtual async Task DeleteAllEmails()+ {+ await _queuedEmailRepository.ClearAsync();}-}+}\ No newline at end of filediff --git a/src/Business/Grand.Business.Messages/Startup/StartupApplication.cs b/src/Business/Grand.Business.Messages/Startup/StartupApplication.csindex 5c7d54fc3..2c9a942d6 100644--- a/src/Business/Grand.Business.Messages/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Messages/Startup/StartupApplication.cs@@ -7,31 +7,30 @@ using Microsoft.AspNetCore.StaticFiles;using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;-namespace Grand.Business.Messages.Startup+namespace Grand.Business.Messages.Startup;++public class StartupApplication : IStartupApplication{- public class StartupApplication : IStartupApplication+ public void ConfigureServices(IServiceCollection services, IConfiguration configuration){- public void ConfigureServices(IServiceCollection services, IConfiguration configuration)+ services.AddScoped<IMessageTemplateService, MessageTemplateService>();+ services.AddScoped<IQueuedEmailService, QueuedEmailService>();+ services.AddScoped<IEmailAccountService, EmailAccountService>();+ services.AddScoped<IMessageProviderService, MessageProviderService>();+ services.AddScoped<IMessageTokenProvider, MessageTokenProvider>();+ services.AddScoped<IEmailSender, EmailSender>();+ services.AddScoped<IMimeMappingService, MimeMappingService>(_ =>{- services.AddScoped<IMessageTemplateService, MessageTemplateService>();- services.AddScoped<IQueuedEmailService, QueuedEmailService>();- services.AddScoped<IEmailAccountService, EmailAccountService>();- services.AddScoped<IMessageProviderService, MessageProviderService>();- services.AddScoped<IMessageTokenProvider, MessageTokenProvider>();- services.AddScoped<IEmailSender, EmailSender>();- services.AddScoped<IMimeMappingService, MimeMappingService>(_ =>- {- var provider = new FileExtensionContentTypeProvider();- return new MimeMappingService(provider);- });- }+ var provider = new FileExtensionContentTypeProvider();+ return new MimeMappingService(provider);+ });+ }- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)- {+ public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ {+ }- }- public int Priority => 100;+ public int Priority => 100;- public bool BeforeConfigure => false;- }-}+ public bool BeforeConfigure => false;+}\ No newline at end of file