Skip to content

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

Add support for multiple domains per store #99 (#104)

Krzysztof Pajak26eba48ade62
diff --git a/src/API/Grand.Api/Controllers/TokenWebController.cs b/src/API/Grand.Api/Controllers/TokenWebController.cs
index 0528e85fe..8b96e175e 100644
--- a/src/API/Grand.Api/Controllers/TokenWebController.cs
+++ b/src/API/Grand.Api/Controllers/TokenWebController.cs
@@ -51,7 +51,7 @@ namespace Grand.Api.Controllers
[HttpPost]
public async Task<IActionResult> Guest()
{
- var customer = await _customerService.InsertGuestCustomer(_storeHelper.HostStore);
+ var customer = await _customerService.InsertGuestCustomer(_storeHelper.StoreHost);
var claims = new Dictionary<string, string> {
{ "Guid", customer.CustomerGuid.ToString()}
};
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
index 0589e3ee2..28f3e89cc 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
@@ -224,7 +224,7 @@ namespace Grand.Business.Catalog.Services.Products
fileName = WebUtility.HtmlEncode(fileName);
if (allowHyperlinks)
{
- var downloadLink = string.Format("{0}/download/getfileupload/?downloadId={1}", _workContext.CurrentStore.Url.TrimEnd('/'), download.DownloadGuid);
+ var downloadLink = string.Format("{0}/download/getfileupload/?downloadId={1}", _workContext.CurrentHost.Url.TrimEnd('/'), download.DownloadGuid);
attributeText = string.Format("<a href=\"{0}\" class=\"fileuploadattribute\">{1}</a>", downloadLink, fileName);
}
else
diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
index 6dbf0e3ef..c9ab921c5 100644
--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
@@ -108,7 +108,7 @@ namespace Grand.Business.Checkout.Services.CheckoutAttributes
if (allowHyperlinks)
{
//hyperlinks are allowed
- var downloadLink = string.Format("{0}/download/getfileupload/?downloadId={1}", _workContext.CurrentStore.Url.TrimEnd('/'), download.DownloadGuid);
+ var downloadLink = string.Format("{0}/download/getfileupload/?downloadId={1}", _workContext.CurrentHost.Url.TrimEnd('/'), download.DownloadGuid);
attributeText = string.Format("<a href=\"{0}\" class=\"fileuploadattribute\">{1}</a>", downloadLink, fileName);
}
else
diff --git a/src/Business/Grand.Business.Customers/Extensions/AffiliateExtensions.cs b/src/Business/Grand.Business.Customers/Extensions/AffiliateExtensions.cs
index 4fcff6d3d..5375edc63 100644
--- a/src/Business/Grand.Business.Customers/Extensions/AffiliateExtensions.cs
+++ b/src/Business/Grand.Business.Customers/Extensions/AffiliateExtensions.cs
@@ -54,8 +54,8 @@ namespace Grand.Business.Customers.Extensions
if (workContext == null)
throw new ArgumentNullException(nameof(workContext));
- var storeUrl = workContext.CurrentStore.Url.TrimEnd('/');
- var url = !String.IsNullOrEmpty(affiliate.FriendlyUrlName) ?
+ var storeUrl = workContext.CurrentHost == null ? workContext.CurrentStore.Url : workContext.CurrentHost.Url.TrimEnd('/');
+ var url = !string.IsNullOrEmpty(affiliate.FriendlyUrlName) ?
CommonExtensions.ModifyQueryString(storeUrl, "affiliate", affiliate.FriendlyUrlName) : CommonExtensions.ModifyQueryString(storeUrl, "affiliateid", affiliate.Id);
return url;
diff --git a/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs b/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
index 77063b311..7fb8abb52 100644
--- a/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
@@ -15,6 +15,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using Grand.Infrastructure;
namespace Grand.Business.Marketing.Services.Campaigns
{
@@ -33,6 +34,7 @@ namespace Grand.Business.Marketing.Services.Campaigns
private readonly ICustomerActivityService _customerActivityService;
private readonly ITranslationService _translationService;
private readonly ILanguageService _languageService;
+ private readonly IWorkContext _workContext;
public CampaignService(IRepository<Campaign> campaignRepository,
IRepository<CampaignHistory> campaignHistoryRepository,
@@ -44,7 +46,8 @@ namespace Grand.Business.Marketing.Services.Campaigns
IMediator mediator,
ICustomerActivityService customerActivityService,
ITranslationService translationService,
- ILanguageService languageService)
+ ILanguageService languageService,
+ IWorkContext workContext)
{
_campaignRepository = campaignRepository;
_campaignHistoryRepository = campaignHistoryRepository;
@@ -59,6 +62,7 @@ namespace Grand.Business.Marketing.Services.Campaigns
_customerActivityService = customerActivityService;
_translationService = translationService;
_languageService = languageService;
+ _workContext = workContext;
}
/// <summary>
@@ -326,11 +330,11 @@ namespace Grand.Business.Marketing.Services.Campaigns
store = (await _storeService.GetAllStores()).FirstOrDefault();
builder.AddStoreTokens(store, language, emailAccount)
- .AddNewsLetterSubscriptionTokens(subscription, store);
+ .AddNewsLetterSubscriptionTokens(subscription, store, _workContext.CurrentHost);
if (customer != null)
{
- builder.AddCustomerTokens(customer, store, language)
+ builder.AddCustomerTokens(customer, store, _workContext.CurrentHost, language)
.AddShoppingCartTokens(customer, store, language);
}
@@ -392,7 +396,7 @@ namespace Grand.Business.Marketing.Services.Campaigns
var customer = await _customerService.GetCustomerByEmail(email);
if (customer != null)
{
- builder.AddCustomerTokens(customer, store, language)
+ builder.AddCustomerTokens(customer, store, _workContext.CurrentHost, language)
.AddShoppingCartTokens(customer, store, language);
}
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs
index 778449b75..58ebab721 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs
@@ -232,7 +232,7 @@ namespace Grand.Business.Marketing.Services.Contacts
if (allowHyperlinks)
{
//hyperlinks are allowed
- var downloadLink = string.Format("{0}download/getfileupload/?downloadId={1}", _workContext.CurrentStore.Url.TrimEnd('/'), download.DownloadGuid);
+ var downloadLink = string.Format("{0}/download/getfileupload/?downloadId={1}", _workContext.CurrentHost.Url.TrimEnd('/'), download.DownloadGuid);
attributeText = string.Format("<a href=\"{0}\" class=\"fileuploadattribute\">{1}</a>", downloadLink, fileName);
}
else
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs
index 54c442407..87b8e44cd 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs
@@ -101,7 +101,7 @@ namespace Grand.Business.Marketing.Services.Customers
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddCustomerTokens(customer, store, language)
+ .AddCustomerTokens(customer, store, null, language)
.AddShoppingCartTokens(customer, store, language);
LiquidObject liquidObject = await builder.BuildAsync();
@@ -171,9 +171,9 @@ namespace Grand.Business.Marketing.Services.Customers
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddCustomerTokens(customer, store, language)
+ .AddCustomerTokens(customer, store, null, language)
.AddShoppingCartTokens(customer, store, language)
- .AddOrderTokens(order, customer, await _storeService.GetStoreById(order.StoreId));
+ .AddOrderTokens(order, customer, await _storeService.GetStoreById(order.StoreId), null);
var liquidObject = await builder.BuildAsync();
var body = LiquidExtensions.Render(liquidObject, reminderLevel.Body);
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetMerchandiseReturnTokensCommand.cs b/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetMerchandiseReturnTokensCommand.cs
index e3f891514..3f3af103e 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetMerchandiseReturnTokensCommand.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetMerchandiseReturnTokensCommand.cs
@@ -11,6 +11,7 @@ namespace Grand.Business.Messages.Commands.Models
public MerchandiseReturn MerchandiseReturn { get; set; }
public Store Store { get; set; }
public Order Order { get; set; }
+ public DomainHost Host { get; set; }
public Language Language { get; set; }
public MerchandiseReturnNote MerchandiseReturnNote { get; set; } = null;
}
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetOrderTokensCommand.cs b/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetOrderTokensCommand.cs
index 2748811b8..7e7043d1c 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetOrderTokensCommand.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetOrderTokensCommand.cs
@@ -12,6 +12,7 @@ namespace Grand.Business.Messages.Commands.Models
public Order Order { get; set; }
public Customer Customer { get; set; }
public Store Store { get; set; }
+ public DomainHost Host { get; set; }
public OrderNote OrderNote { get; set; } = null;
public Vendor Vendor { get; set; } = null;
public double RefundedAmount { get; set; } = 0;
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShipmentTokensCommand.cs b/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShipmentTokensCommand.cs
index 86ce4d384..440a3885f 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShipmentTokensCommand.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShipmentTokensCommand.cs
@@ -12,6 +12,7 @@ namespace Grand.Business.Messages.Commands.Models
public Shipment Shipment { get; set; }
public Order Order { get; set; }
public Store Store { get; set; }
+ public DomainHost Host { get; set; }
public Language Language { get; set; }
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAskQuestion.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAskQuestion.cs
index 4bc2fe83f..bfdef407f 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAskQuestion.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAskQuestion.cs
@@ -5,10 +5,10 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidAskQuestion : Drop
{
- private string message;
- private string email;
- private string fullName;
- private string phone;
+ private readonly string message;
+ private readonly string email;
+ private readonly string fullName;
+ private readonly string phone;
public LiquidAskQuestion(string message, string email, string fullName, string phone)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs
index 1499c9ec9..15083984a 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs
@@ -7,7 +7,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidAttributeCombination : Drop
{
- private ProductAttributeCombination _combination;
+ private readonly ProductAttributeCombination _combination;
public LiquidAttributeCombination(ProductAttributeCombination combination)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAuctions.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAuctions.cs
index 32bc9e87b..04a05e697 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAuctions.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAuctions.cs
@@ -6,8 +6,8 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidAuctions : Drop
{
- private Product _product;
- private Bid _bid;
+ private readonly Product _product;
+ private readonly Bid _bid;
public LiquidAuctions(Product product, Bid bid = null)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidBlogComment.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidBlogComment.cs
index ccfa0bd03..9b6b3d5f8 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidBlogComment.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidBlogComment.cs
@@ -9,16 +9,24 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidBlogComment : Drop
{
- private BlogComment _blogComment;
- private BlogPost _blogPost;
- private Store _store;
+ private readonly BlogComment _blogComment;
+ private readonly BlogPost _blogPost;
+ private readonly Store _store;
+ private readonly DomainHost _host;
private readonly Language _language;
- public LiquidBlogComment(BlogComment blogComment, BlogPost blogPost, Store store, Language language)
+
+ private string url;
+
+ public LiquidBlogComment(BlogComment blogComment, BlogPost blogPost, Store store, DomainHost host, Language language)
{
_blogComment = blogComment;
_blogPost = blogPost;
_store = store;
+ _host = host;
_language = language;
+
+ url = _host?.Url.Trim('/') ?? (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'));
+
AdditionalTokens = new Dictionary<string, string>();
}
@@ -31,7 +39,15 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
get
{
- return $"{(_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'))}/{_blogPost.GetSeName(_language.Id)}";
+ return $"{url}/{_blogPost.GetSeName(_language.Id)}";
+ }
+ }
+
+ public string BlogPostCommentText
+ {
+ get
+ {
+ return _blogComment?.CommentText;
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidContactUs.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidContactUs.cs
index 1dbdb23d2..2a3c63d57 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidContactUs.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidContactUs.cs
@@ -5,10 +5,10 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidContactUs : Drop
{
- private string senderEmail;
- private string senderName;
- private string body;
- private string attributeDescription;
+ private readonly string senderEmail;
+ private readonly string senderName;
+ private readonly string body;
+ private readonly string attributeDescription;
public LiquidContactUs(string senderEmail, string senderName, string body, string attributeDescription)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidCustomer.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidCustomer.cs
index 9a894755b..a81071b07 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidCustomer.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidCustomer.cs
@@ -11,15 +11,18 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidCustomer : Drop
{
- private Customer _customer;
- private CustomerNote _customerNote;
- private Store _store;
-
- public LiquidCustomer(Customer customer, Store store, CustomerNote customerNote = null)
+ private readonly Customer _customer;
+ private readonly CustomerNote _customerNote;
+ private readonly Store _store;
+ private readonly DomainHost _host;
+ private readonly string url;
+ public LiquidCustomer(Customer customer, Store store, DomainHost host, CustomerNote customerNote = null)
{
_customer = customer;
_customerNote = customerNote;
_store = store;
+ _host = host;
+ url = _host?.Url.Trim('/') ?? (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'));
AdditionalTokens = new Dictionary<string, string>();
}
@@ -105,17 +108,17 @@ namespace Grand.Business.Messages.DotLiquidDrops
public string PasswordRecoveryURL
{
- get { return string.Format("{0}/passwordrecovery/confirm?token={1}&email={2}", (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.PasswordRecoveryToken), WebUtility.UrlEncode(_customer.Email)); }
+ get { return string.Format("{0}/passwordrecovery/confirm?token={1}&email={2}", url, _customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.PasswordRecoveryToken), WebUtility.UrlEncode(_customer.Email)); }
}
public string AccountActivationURL
{
- get { return string.Format("{0}/account/activation?token={1}&email={2}", (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.AccountActivationToken), WebUtility.UrlEncode(_customer.Email)); ; }
+ get { return string.Format("{0}/account/activation?token={1}&email={2}", url, _customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.AccountActivationToken), WebUtility.UrlEncode(_customer.Email)); ; }
}
public string WishlistURLForCustomer
{
- get { return string.Format("{0}/wishlist/{1}", (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _customer.CustomerGuid); }
+ get { return string.Format("{0}/wishlist/{1}", url, _customer.CustomerGuid); }
}
public string NewNoteText
@@ -130,7 +133,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
public string CustomerNoteAttachmentUrl
{
- get { return string.Format("{0}/download/customernotefile/{1}", (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _customerNote.Id); }
+ get { return string.Format("{0}/download/customernotefile/{1}", url, _customerNote.Id); }
}
public string Token
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmail.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmail.cs
index 0163e619e..771545d49 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmail.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmail.cs
@@ -4,7 +4,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidEmail : Drop
{
- private string _emailId { get; set; }
+ private readonly string _emailId;
public LiquidEmail(string emailId)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmailAFriend.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmailAFriend.cs
index 656531ff7..9c9218412 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmailAFriend.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmailAFriend.cs
@@ -5,9 +5,9 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidEmailAFriend : Drop
{
- private string _personalMessage;
- private string _customerEmail;
- private string _friendsEmail;
+ private readonly string _personalMessage;
+ private readonly string _customerEmail;
+ private readonly string _friendsEmail;
public LiquidEmailAFriend(string personalMessage, string customerEmail, string friendsEmail)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidGiftVoucher.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidGiftVoucher.cs
index 16089f6cf..22b2b6db5 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidGiftVoucher.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidGiftVoucher.cs
@@ -8,7 +8,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidGiftVoucher : Drop
{
- private GiftVoucher _giftVoucher;
+ private readonly GiftVoucher _giftVoucher;
public LiquidGiftVoucher(GiftVoucher giftVoucher)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidKnowledgebase.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidKnowledgebase.cs
index 5180ef3f7..ea4a11984 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidKnowledgebase.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidKnowledgebase.cs
@@ -9,30 +9,40 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidKnowledgebase : Drop
{
- private KnowledgebaseArticle _article;
- private KnowledgebaseArticleComment _articleComment;
- private Store _store;
- private Language _language;
+ private readonly KnowledgebaseArticle _article;
+ private readonly KnowledgebaseArticleComment _articleComment;
+ private readonly Store _store;
+ private readonly DomainHost _host;
+ private readonly Language _language;
- public LiquidKnowledgebase(KnowledgebaseArticle article, KnowledgebaseArticleComment articleComment, Store store, Language language)
+ private string url;
+
+ public LiquidKnowledgebase(KnowledgebaseArticle article, KnowledgebaseArticleComment articleComment, Store store, DomainHost host, Language language)
{
_article = article;
_articleComment = articleComment;
_store = store;
+ _host = host;
_language = language;
+
+ url = _host?.Url.Trim('/') ?? (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'));
+
AdditionalTokens = new Dictionary<string, string>();
}
- public string ArticleCommentTitle
+ public string ArticleTitle
{
get { return _article.Name; }
}
+ public string ArticleCommentText {
+ get { return _articleComment.CommentText; }
+ }
public string ArticleCommentUrl
{
get
{
- return $"{(_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'))}/{_article.GetSeName(_language.Id)}";
+ return $"{url}/{_article.GetSeName(_language.Id)}";
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs
index 463a570ce..c27c55384 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs
@@ -9,18 +9,27 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidMerchandiseReturn : Drop
{
- private MerchandiseReturn _merchandiseReturn;
- private Order _order;
- private Store _store;
+ private readonly MerchandiseReturn _merchandiseReturn;
+ private readonly Order _order;
+ private readonly Store _store;
+ private readonly DomainHost _host;
+
private MerchandiseReturnNote _merchandiseReturnNote;
private ICollection<LiquidMerchandiseReturnItem> _items;
- public LiquidMerchandiseReturn(MerchandiseReturn merchandiseReturn, Store store, Order order, MerchandiseReturnNote merchandiseReturnNote = null)
+ private string url;
+
+ public LiquidMerchandiseReturn(MerchandiseReturn merchandiseReturn, Store store, DomainHost host,
+ Order order, MerchandiseReturnNote merchandiseReturnNote = null)
{
_merchandiseReturn = merchandiseReturn;
_order = order;
_store = store;
+ _host = host;
_merchandiseReturnNote = merchandiseReturnNote;
+
+ url = _host?.Url.Trim('/') ?? (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'));
+
_items = new List<LiquidMerchandiseReturnItem>();
AdditionalTokens = new Dictionary<string, string>();
}
@@ -156,7 +165,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
get
{
- return string.Format("{0}/download/merchandisereturnnotefile/{1}", (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _merchandiseReturnNote?.Id);
+ return string.Format("{0}/download/merchandisereturnnotefile/{1}", url, _merchandiseReturnNote?.Id);
}
}
public IDictionary<string, string> AdditionalTokens { get; set; }
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs
index b68958e90..24c1cb06d 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs
@@ -9,10 +9,10 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidMerchandiseReturnItem : Drop
{
- private MerchandiseReturnItem _item;
- private Product _product;
- private OrderItem _orderItem;
- private string _languageId;
+ private readonly MerchandiseReturnItem _item;
+ private readonly Product _product;
+ private readonly OrderItem _orderItem;
+ private readonly string _languageId;
public LiquidMerchandiseReturnItem(MerchandiseReturnItem item, OrderItem orderItem, Product product, string languageid)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsComment.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsComment.cs
index de9b4e47f..746ef78c8 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsComment.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsComment.cs
@@ -9,17 +9,23 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidNewsComment : Drop
{
- private NewsComment _newsComment;
- private NewsItem _newsItem;
- private Store _store;
- private Language _language;
+ private readonly NewsComment _newsComment;
+ private readonly NewsItem _newsItem;
+ private readonly Store _store;
+ private readonly DomainHost _host;
+ private readonly Language _language;
- public LiquidNewsComment(NewsItem newsItem, NewsComment newsComment, Store store, Language language)
+ private string url;
+
+ public LiquidNewsComment(NewsItem newsItem, NewsComment newsComment, Store store, DomainHost host, Language language)
{
_newsComment = newsComment;
_newsItem = newsItem;
_store = store;
_language = language;
+ _host = host;
+
+ url = _host?.Url.Trim('/') ?? (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'));
AdditionalTokens = new Dictionary<string, string>();
}
@@ -41,7 +47,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
public string NewsURL
{
- get { return $"{(_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'))}/{_newsItem.GetSeName(_language.Id)}"; }
+ get { return $"{url}/{_newsItem.GetSeName(_language.Id)}"; }
}
public IDictionary<string, string> AdditionalTokens { get; set; }
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs
index 2af613f19..31010d86b 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs
@@ -8,12 +8,20 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidNewsLetterSubscription : Drop
{
- private NewsLetterSubscription _subscription;
- private Store _store;
- public LiquidNewsLetterSubscription(NewsLetterSubscription subscription, Store store)
+ private readonly NewsLetterSubscription _subscription;
+ private readonly Store _store;
+ private readonly DomainHost _host;
+
+ private string url;
+
+ public LiquidNewsLetterSubscription(NewsLetterSubscription subscription, Store store, DomainHost host)
{
_subscription = subscription;
_store = store;
+ _host = host;
+
+ url = _host?.Url.Trim('/') ?? (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'));
+
AdditionalTokens = new Dictionary<string, string>();
}
@@ -27,7 +35,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
get
{
string urlFormat = "{0}/newsletter/subscriptionactivation/{1}/{2}";
- var activationUrl = String.Format(urlFormat, (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _subscription.NewsLetterSubscriptionGuid, "true");
+ var activationUrl = String.Format(urlFormat, url, _subscription.NewsLetterSubscriptionGuid, "true");
return activationUrl;
}
}
@@ -37,7 +45,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
get
{
string urlFormat = "{0}/newsletter/subscriptionactivation/{1}/{2}";
- var deActivationUrl = String.Format(urlFormat, (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _subscription.NewsLetterSubscriptionGuid, "false");
+ var deActivationUrl = String.Format(urlFormat, url, _subscription.NewsLetterSubscriptionGuid, "false");
return deActivationUrl;
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs
index f9abf7709..ab6eb3518 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs
@@ -49,7 +49,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
return this;
}
- public LiquidObjectBuilder AddOrderTokens(Order order, Customer customer, Store store, OrderNote orderNote = null, Vendor vendor = null, double refundedAmount = 0)
+ public LiquidObjectBuilder AddOrderTokens(Order order, Customer customer, Store store, DomainHost host, OrderNote orderNote = null, Vendor vendor = null, double refundedAmount = 0)
{
_chain.Add(async liquidObject =>
{
@@ -58,6 +58,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
Customer = customer,
Vendor = vendor,
Store = store,
+ Host = host,
OrderNote = orderNote,
RefundedAmount = refundedAmount
});
@@ -67,23 +68,23 @@ namespace Grand.Business.Messages.DotLiquidDrops
return this;
}
- public LiquidObjectBuilder AddShipmentTokens(Shipment shipment, Order order, Store store, Language language)
+ public LiquidObjectBuilder AddShipmentTokens(Shipment shipment, Order order, Store store, DomainHost host, Language language)
{
_chain.Add(async liquidObject =>
{
- var liquidShipment = await _mediator.Send(new GetShipmentTokensCommand() { Shipment = shipment, Order = order, Store = store, Language = language });
+ var liquidShipment = await _mediator.Send(new GetShipmentTokensCommand() { Shipment = shipment, Order = order, Store = store, Host = host, Language = language });
liquidObject.Shipment = liquidShipment;
await _mediator.EntityTokensAdded(shipment, liquidShipment, liquidObject);
});
return this;
}
- public LiquidObjectBuilder AddMerchandiseReturnTokens(MerchandiseReturn merchandiseReturn, Store store, Order order, Language language, MerchandiseReturnNote merchandiseReturnNote = null)
+ public LiquidObjectBuilder AddMerchandiseReturnTokens(MerchandiseReturn merchandiseReturn, Store store, DomainHost host, Order order, Language language, MerchandiseReturnNote merchandiseReturnNote = null)
{
_chain.Add(async liquidObject =>
{
- var liquidMerchandiseReturn = await _mediator.Send(new GetMerchandiseReturnTokensCommand() { Order = order, Language = language, MerchandiseReturn = merchandiseReturn, MerchandiseReturnNote = merchandiseReturnNote, Store = store });
+ var liquidMerchandiseReturn = await _mediator.Send(new GetMerchandiseReturnTokensCommand() { Order = order, Language = language, MerchandiseReturn = merchandiseReturn, MerchandiseReturnNote = merchandiseReturnNote, Store = store, Host = host });
liquidObject.MerchandiseReturn = liquidMerchandiseReturn;
await _mediator.EntityTokensAdded(merchandiseReturn, liquidMerchandiseReturn, liquidObject);
});
@@ -101,11 +102,11 @@ namespace Grand.Business.Messages.DotLiquidDrops
return this;
}
- public LiquidObjectBuilder AddCustomerTokens(Customer customer, Store store, Language language, CustomerNote customerNote = null)
+ public LiquidObjectBuilder AddCustomerTokens(Customer customer, Store store, DomainHost host, Language language, CustomerNote customerNote = null)
{
_chain.Add(async liquidObject =>
{
- var liquidCustomer = new LiquidCustomer(customer, store, customerNote);
+ var liquidCustomer = new LiquidCustomer(customer, store, host, customerNote);
liquidObject.Customer = liquidCustomer;
await _mediator.EntityTokensAdded(customer, liquidCustomer, liquidObject);
@@ -142,11 +143,11 @@ namespace Grand.Business.Messages.DotLiquidDrops
return this;
}
- public LiquidObjectBuilder AddNewsLetterSubscriptionTokens(NewsLetterSubscription subscription, Store store)
+ public LiquidObjectBuilder AddNewsLetterSubscriptionTokens(NewsLetterSubscription subscription, Store store, DomainHost host)
{
_chain.Add(async liquidObject =>
{
- var liquidNewsletterSubscription = new LiquidNewsLetterSubscription(subscription, store);
+ var liquidNewsletterSubscription = new LiquidNewsLetterSubscription(subscription, store, host);
liquidObject.NewsLetterSubscription = liquidNewsletterSubscription;
await _mediator.EntityTokensAdded(subscription, liquidNewsletterSubscription, liquidObject);
});
@@ -175,44 +176,44 @@ namespace Grand.Business.Messages.DotLiquidDrops
return this;
}
- public LiquidObjectBuilder AddBlogCommentTokens(BlogPost blogPost, BlogComment blogComment, Store store, Language language)
+ public LiquidObjectBuilder AddBlogCommentTokens(BlogPost blogPost, BlogComment blogComment, Store store, DomainHost host, Language language)
{
_chain.Add(async liquidObject =>
{
- var liquidBlogComment = new LiquidBlogComment(blogComment, blogPost, store, language);
+ var liquidBlogComment = new LiquidBlogComment(blogComment, blogPost, store, host, language);
liquidObject.BlogComment = liquidBlogComment;
await _mediator.EntityTokensAdded(blogComment, liquidBlogComment, liquidObject);
});
return this;
}
- public LiquidObjectBuilder AddArticleCommentTokens(KnowledgebaseArticle article, KnowledgebaseArticleComment articleComment, Store store, Language language)
+ public LiquidObjectBuilder AddArticleCommentTokens(KnowledgebaseArticle article, KnowledgebaseArticleComment articleComment, Store store, DomainHost host, Language language)
{
_chain.Add(async liquidObject =>
{
- var liquidKnowledgebase = new LiquidKnowledgebase(article, articleComment, store, language);
+ var liquidKnowledgebase = new LiquidKnowledgebase(article, articleComment, store, host, language);
liquidObject.Knowledgebase = liquidKnowledgebase;
await _mediator.EntityTokensAdded(articleComment, liquidKnowledgebase, liquidObject);
});
return this;
}
- public LiquidObjectBuilder AddNewsCommentTokens(NewsItem newsItem, NewsComment newsComment, Store store, Language language)
+ public LiquidObjectBuilder AddNewsCommentTokens(NewsItem newsItem, NewsComment newsComment, Store store, DomainHost host, Language language)
{
_chain.Add(async liquidObject =>
{
- var liquidNewsComment = new LiquidNewsComment(newsItem, newsComment, store, language);
+ var liquidNewsComment = new LiquidNewsComment(newsItem, newsComment, store, host, language);
liquidObject.NewsComment = liquidNewsComment;
await _mediator.EntityTokensAdded(newsComment, liquidNewsComment, liquidObject);
});
return this;
}
- public LiquidObjectBuilder AddProductTokens(Product product, Language language, Store store)
+ public LiquidObjectBuilder AddProductTokens(Product product, Language language, Store store, DomainHost host)
{
_chain.Add(async liquidObject =>
{
- var liquidProduct = new LiquidProduct(product, language, store);
+ var liquidProduct = new LiquidProduct(product, language, store, host);
liquidObject.Product = liquidProduct;
await _mediator.EntityTokensAdded(product, liquidProduct, liquidObject);
});
@@ -231,11 +232,11 @@ namespace Grand.Business.Messages.DotLiquidDrops
return this;
}
- public LiquidObjectBuilder AddOutOfStockTokens(Product product, OutOfStockSubscription subscription, Store store, Language language)
+ public LiquidObjectBuilder AddOutOfStockTokens(Product product, OutOfStockSubscription subscription, Store store, DomainHost host, Language language)
{
_chain.Add(async liquidObject =>
{
- var liquidOutOfStockSubscription = new LiquidOutOfStockSubscription(product, subscription, store, language);
+ var liquidOutOfStockSubscription = new LiquidOutOfStockSubscription(product, subscription, store, host, language);
liquidObject.OutOfStockSubscription = liquidOutOfStockSubscription;
await _mediator.EntityTokensAdded(subscription, liquidOutOfStockSubscription, liquidObject);
});
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrder.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrder.cs
index 970525676..2b724d933 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrder.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrder.cs
@@ -14,15 +14,20 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidOrder : Drop
{
- private Order _order;
- private Language _language;
- private Customer _customer;
- private Currency _currency;
- private Store _store;
- private OrderNote _orderNote;
+ private readonly Order _order;
+ private readonly Language _language;
+ private readonly Customer _customer;
+ private readonly Currency _currency;
+ private readonly Store _store;
+ private readonly Vendor _vendor;
+ private readonly DomainHost _host;
+ private readonly OrderNote _orderNote;
+
private ICollection<LiquidOrderItem> _orderItems;
- private Vendor _vendor;
- public LiquidOrder(Order order, Customer customer, Language language, Currency currency, Store store, OrderNote orderNote = null, Vendor vendor = null)
+
+ private string url;
+
+ public LiquidOrder(Order order, Customer customer, Language language, Currency currency, Store store, DomainHost host, OrderNote orderNote = null, Vendor vendor = null)
{
_order = order;
@@ -32,6 +37,11 @@ namespace Grand.Business.Messages.DotLiquidDrops
_currency = currency;
_store = store;
_vendor = vendor;
+ _host = host;
+
+ url = _host?.Url.Trim('/') ?? (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'));
+
+
_orderItems = new List<LiquidOrderItem>();
AdditionalTokens = new Dictionary<string, string>();
}
@@ -209,7 +219,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
public string OrderURLForCustomer
{
- get { return string.Format("{0}/orderdetails/{1}", (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _order.Id); }
+ get { return string.Format("{0}/orderdetails/{1}", url, _order.Id); }
}
public string AmountRefunded { get; set; }
@@ -223,7 +233,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
get
{
- return string.Format("{0}/download/ordernotefile/{1}", (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _orderNote.Id);
+ return string.Format("{0}/download/ordernotefile/{1}", url, _orderNote.Id);
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrderItem.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrderItem.cs
index da657e6f2..bb6d421bc 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrderItem.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrderItem.cs
@@ -13,19 +13,26 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidOrderItem : Drop
{
- private OrderItem _orderItem;
- private Product _product;
- private Language _language;
- private Store _store;
- private Vendor _vendor;
+ private readonly OrderItem _orderItem;
+ private readonly Product _product;
+ private readonly Language _language;
+ private readonly Store _store;
+ private readonly DomainHost _host;
+ private readonly Vendor _vendor;
- public LiquidOrderItem(OrderItem orderItem, Product product, Language language, Store store, Vendor vendor)
+ private string url;
+
+ public LiquidOrderItem(OrderItem orderItem, Product product, Language language, Store store, DomainHost host, Vendor vendor)
{
_orderItem = orderItem;
_store = store;
_language = language;
_product = product;
_vendor = vendor;
+ _host = host;
+
+ url = _host?.Url.Trim('/') ?? (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'));
+
AdditionalTokens = new Dictionary<string, string>();
}
@@ -41,14 +48,14 @@ namespace Grand.Business.Messages.DotLiquidDrops
public string DownloadUrl {
get {
- string downloadUrl = string.Format("{0}/download/getdownload/{1}", (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _orderItem.OrderItemGuid);
+ string downloadUrl = string.Format("{0}/download/getdownload/{1}", url, _orderItem.OrderItemGuid);
return downloadUrl;
}
}
public string LicenseUrl {
get {
- string licenseUrl = string.Format("{0}/download/getlicense/{1}", (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _orderItem.OrderItemGuid);
+ string licenseUrl = string.Format("{0}/download/getlicense/{1}", url, _orderItem.OrderItemGuid);
return licenseUrl;
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs
index 7040283ff..56ef41854 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs
@@ -12,14 +12,19 @@ namespace Grand.Business.Messages.DotLiquidDrops
private readonly OutOfStockSubscription _outOfStockSubscription;
private readonly Product _product;
private readonly Store _store;
+ private readonly DomainHost _host;
private readonly Language _language;
+ private readonly string url;
- public LiquidOutOfStockSubscription(Product product, OutOfStockSubscription outOfStockSubscription, Store store, Language language)
+ public LiquidOutOfStockSubscription(Product product, OutOfStockSubscription outOfStockSubscription, Store store, DomainHost host, Language language)
{
_outOfStockSubscription = outOfStockSubscription;
_product = product;
_store = store;
_language = language;
+ _host = host;
+
+ url = _host?.Url.Trim('/') ?? (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'));
AdditionalTokens = new Dictionary<string, string>();
}
@@ -36,7 +41,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
public string ProductUrl
{
- get { return string.Format("{0}/{1}", _store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'), _product.GetSeName(_language.Id)); }
+ get { return string.Format("{0}/{1}", url, _product.GetSeName(_language.Id)); }
}
public IDictionary<string, string> AdditionalTokens { get; set; }
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProduct.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProduct.cs
index 0468e9a20..525758006 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProduct.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProduct.cs
@@ -9,15 +9,20 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidProduct : Drop
{
- private Product _product;
- private Language _language;
- private Store _store;
+ private readonly Product _product;
+ private readonly Language _language;
+ private readonly Store _store;
+ private readonly DomainHost _host;
+ private readonly string url;
- public LiquidProduct(Product product, Language language, Store store)
+ public LiquidProduct(Product product, Language language, Store store, DomainHost host)
{
_product = product;
_language = language;
_store = store;
+ _host = host;
+ url = _host?.Url.Trim('/') ?? (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'));
+
AdditionalTokens = new Dictionary<string, string>();
}
@@ -76,7 +81,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
}
public string ProductURLForCustomer {
- get { return string.Format("{0}/{1}", (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _product.GetSeName(_language.Id)); }
+ get { return string.Format("{0}/{1}", url, _product.GetSeName(_language.Id)); }
}
public double Weight {
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProductReview.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProductReview.cs
index fcec1254d..ace2ca1ad 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProductReview.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProductReview.cs
@@ -6,8 +6,8 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidProductReview : Drop
{
- private ProductReview _productReview;
- private Product _product;
+ private readonly ProductReview _productReview;
+ private readonly Product _product;
public LiquidProductReview(Product product, ProductReview productReview)
{
@@ -24,6 +24,12 @@ namespace Grand.Business.Messages.DotLiquidDrops
}
}
+ public string ProductReviewReplyText {
+ get {
+ return _productReview.ReplyText;
+ }
+ }
+
public IDictionary<string, string> AdditionalTokens { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipment.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipment.cs
index 0fabc3a7f..109df5285 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipment.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipment.cs
@@ -10,20 +10,25 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidShipment : Drop
{
- private Shipment _shipment;
- private Order _order;
- private Store _store;
- private Language _language;
+ private readonly Shipment _shipment;
+ private readonly Order _order;
+ private readonly Store _store;
+ private readonly Language _language;
+ private readonly DomainHost _host;
+ private readonly string url;
private ICollection<LiquidShipmentItem> _shipmentItems;
- public LiquidShipment(Shipment shipment, Order order, Store store, Language language)
+ public LiquidShipment(Shipment shipment, Order order, Store store, DomainHost host, Language language)
{
_shipment = shipment;
_language = language;
_store = store;
_order = order;
+ _host = host;
+ url = _host?.Url.Trim('/') ?? (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/'));
+
_shipmentItems = new List<LiquidShipmentItem>();
AdditionalTokens = new Dictionary<string, string>();
}
@@ -63,7 +68,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
get
{
- return string.Format("{0}/orderdetails/shipment/{1}", (_store.SslEnabled ? _store.SecureUrl.Trim('/') : _store.Url.Trim('/')), _shipment.Id);
+ return string.Format("{0}/orderdetails/shipment/{1}", url, _shipment.Id);
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipmentItem.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipmentItem.cs
index 92ca7f464..57e49a0c4 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipmentItem.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipmentItem.cs
@@ -11,12 +11,12 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidShipmentItem : Drop
{
- private ShipmentItem _shipmentItem;
- private Shipment _shipment;
- private Product _product;
- private Order _order;
- private OrderItem _orderItem;
- private Language _language;
+ private readonly ShipmentItem _shipmentItem;
+ private readonly Shipment _shipment;
+ private readonly Product _product;
+ private readonly Order _order;
+ private readonly OrderItem _orderItem;
+ private readonly Language _language;
public LiquidShipmentItem(ShipmentItem shipmentItem, Shipment shipment, Order order, OrderItem orderItem, Product product, Language language)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCart.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCart.cs
index 5f37b56c3..f8cf6acb9 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCart.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCart.cs
@@ -8,7 +8,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
public partial class LiquidShoppingCart : Drop
{
private ICollection<LiquidShoppingCartItem> _items;
- private Customer _customer;
+ private readonly Customer _customer;
public LiquidShoppingCart(Customer customer)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCartItem.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCartItem.cs
index 02e13e813..b6485fe75 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCartItem.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCartItem.cs
@@ -10,11 +10,11 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidShoppingCartItem : Drop
{
- private Product _product;
- private Language _language;
- private string _attributeDescription;
- private string _pictureUrl;
- private ShoppingCartItem _shoppingCartItem;
+ private readonly Product _product;
+ private readonly Language _language;
+ private readonly string _attributeDescription;
+ private readonly string _pictureUrl;
+ private readonly ShoppingCartItem _shoppingCartItem;
public LiquidShoppingCartItem(Product product,
string attributeDescription,
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidStore.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidStore.cs
index e89343288..53382337e 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidStore.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidStore.cs
@@ -9,9 +9,9 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidStore : Drop
{
- private Store _store;
- private EmailAccount _emailAccount;
- private Language _language;
+ private readonly Store _store;
+ private readonly EmailAccount _emailAccount;
+ private readonly Language _language;
public LiquidStore(Store store, Language language, EmailAccount emailAccount = null)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVatValidationResult.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVatValidationResult.cs
index 4627fdd0f..e6dd37793 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVatValidationResult.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVatValidationResult.cs
@@ -5,8 +5,8 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidVatValidationResult : Drop
{
- private string name;
- private string address;
+ private readonly string name;
+ private readonly string address;
public LiquidVatValidationResult(string name, string address)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendor.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendor.cs
index 0755e3832..c7f011a6c 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendor.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendor.cs
@@ -6,7 +6,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidVendor : Drop
{
- private Vendor _vendor;
+ private readonly Vendor _vendor;
public LiquidVendor(Vendor vendor)
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendorReview.cs b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendorReview.cs
index 77bd025b1..9d95c82f7 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendorReview.cs
+++ b/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendorReview.cs
@@ -6,8 +6,8 @@ namespace Grand.Business.Messages.DotLiquidDrops
{
public partial class LiquidVendorReview : Drop
{
- private VendorReview _vendorReview;
- private Vendor _vendor;
+ private readonly VendorReview _vendorReview;
+ private readonly Vendor _vendor;
public LiquidVendorReview(Vendor vendor, VendorReview vendorReview)
{
_vendorReview = vendorReview;
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IMessageProviderService.cs b/src/Business/Grand.Business.Messages/Interfaces/IMessageProviderService.cs
index 5dd958751..bd7b47e88 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IMessageProviderService.cs
+++ b/src/Business/Grand.Business.Messages/Interfaces/IMessageProviderService.cs
@@ -411,8 +411,6 @@ namespace Grand.Business.Messages.Interfaces
/// <summary>
/// Sends a blog comment notification message to a store owner
/// </summary>
- /// <param name="blogComment">Blog comment</param>
- /// <param name="languageId">Message language identifier</param>
/// <returns>Queued email identifier</returns>
Task<int> SendBlogCommentMessage(BlogPost blogPost, BlogComment blogComment, string languageId);
diff --git a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs b/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
index c59aa2481..4018c4df0 100644
--- a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
+++ b/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
@@ -19,6 +19,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
+using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
using MediatR;
using System;
@@ -39,6 +40,7 @@ namespace Grand.Business.Messages.Services
private readonly IEmailAccountService _emailAccountService;
private readonly IMessageTokenProvider _messageTokenProvider;
private readonly IStoreService _storeService;
+ private readonly IStoreHelper _storeHelper;
private readonly IGroupService _groupService;
private readonly IMediator _mediator;
@@ -55,6 +57,7 @@ namespace Grand.Business.Messages.Services
IEmailAccountService emailAccountService,
IMessageTokenProvider messageTokenProvider,
IStoreService storeService,
+ IStoreHelper storeHelper,
IGroupService groupService,
IMediator mediator,
EmailAccountSettings emailAccountSettings,
@@ -66,6 +69,7 @@ namespace Grand.Business.Messages.Services
_emailAccountService = emailAccountService;
_messageTokenProvider = messageTokenProvider;
_storeService = storeService;
+ _storeHelper = storeHelper;
_groupService = groupService;
_emailAccountSettings = emailAccountSettings;
_commonSettings = commonSettings;
@@ -162,7 +166,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddCustomerTokens(customer, store, language, customerNote);
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language, customerNote);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -325,9 +329,9 @@ namespace Grand.Business.Messages.Services
var liquidBuilder = new LiquidObjectBuilder(_mediator);
liquidBuilder.AddStoreTokens(store, language, emailAccount)
- .AddOrderTokens(order, customer, store);
+ .AddOrderTokens(order, customer, store, _storeHelper.DomainHost);
if (customer != null)
- liquidBuilder.AddCustomerTokens(customer, store, language);
+ liquidBuilder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await liquidBuilder.BuildAsync();
//event notification
@@ -443,10 +447,10 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddOrderTokens(order, customer, store);
+ .AddOrderTokens(order, customer, store, _storeHelper.DomainHost);
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -528,10 +532,10 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddOrderTokens(order, customer, store, vendor: vendor);
+ .AddOrderTokens(order, customer, store, _storeHelper.DomainHost, vendor: vendor);
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -596,11 +600,11 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddShipmentTokens(shipment, order, store, language)
- .AddOrderTokens(order, customer, store);
+ .AddShipmentTokens(shipment, order, store, _storeHelper.DomainHost, language)
+ .AddOrderTokens(order, customer, store, _storeHelper.DomainHost);
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -642,9 +646,9 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddOrderTokens(order, customer, store, orderNote);
+ .AddOrderTokens(order, customer, store, _storeHelper.DomainHost, orderNote);
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -710,7 +714,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddNewsLetterSubscriptionTokens(subscription, store);
+ .AddNewsLetterSubscriptionTokens(subscription, store, _storeHelper.DomainHost);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -758,8 +762,8 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
.AddEmailAFriendTokens(personalMessage, customerEmail, friendsEmail)
- .AddCustomerTokens(customer, store, language)
- .AddProductTokens(product, language, store);
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)
+ .AddProductTokens(product, language, store, _storeHelper.DomainHost);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -800,7 +804,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddCustomerTokens(customer, store, language)
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)
.AddEmailAFriendTokens(personalMessage, customerEmail, friendsEmail);
LiquidObject liquidObject = await builder.BuildAsync();
@@ -847,8 +851,8 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddCustomerTokens(customer, store, language)
- .AddProductTokens(product, language, store);
+ .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);
@@ -864,8 +868,7 @@ namespace Grand.Business.Messages.Services
var subjectReplaced = LiquidExtensions.Render(liquidObject, subject);
var bodyReplaced = LiquidExtensions.Render(liquidObject, body);
- await _mediator.Send(new InsertContactUsCommand()
- {
+ await _mediator.Send(new InsertContactUsCommand() {
CustomerId = customer.Id,
StoreId = store.Id,
VendorId = product.VendorId,
@@ -926,9 +929,9 @@ namespace Grand.Business.Messages.Services
builder.AddStoreTokens(store, language, emailAccount);
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
- builder.AddMerchandiseReturnTokens(merchandiseReturn, store, order, language);
+ builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language);
LiquidObject liquidObject = await builder.BuildAsync();
@@ -982,9 +985,9 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount);
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
- builder.AddMerchandiseReturnTokens(merchandiseReturn, store, order, language);
+ builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
await _mediator.MessageTokensAdded(messageTemplate, liquidObject);
@@ -1027,9 +1030,9 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount);
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
- builder.AddMerchandiseReturnTokens(merchandiseReturn, store, order, language);
+ builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
await _mediator.MessageTokensAdded(messageTemplate, liquidObject);
@@ -1075,9 +1078,9 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount);
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
- builder.AddMerchandiseReturnTokens(merchandiseReturn, store, order, language, merchandiseReturnNote);
+ builder.AddMerchandiseReturnTokens(merchandiseReturn, store, _storeHelper.DomainHost, order, language, merchandiseReturnNote);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
await _mediator.MessageTokensAdded(messageTemplate, liquidObject);
@@ -1123,7 +1126,7 @@ namespace Grand.Business.Messages.Services
var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);
var builder = new LiquidObjectBuilder(_mediator).AddStoreTokens(store, language, emailAccount)
- .AddCustomerTokens(customer, store, language)
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)
.AddVendorTokens(vendor, language);
LiquidObject liquidObject = await builder.BuildAsync();
@@ -1242,7 +1245,7 @@ namespace Grand.Business.Messages.Services
.AddProductReviewTokens(product, productReview);
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -1287,7 +1290,7 @@ namespace Grand.Business.Messages.Services
.AddVendorReviewTokens(vendor, vendorReview);
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
builder.AddVendorTokens(vendor, language);
LiquidObject liquidObject = await builder.BuildAsync();
@@ -1325,7 +1328,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddProductTokens(product, language, store);
+ .AddProductTokens(product, language, store, _storeHelper.DomainHost);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
await _mediator.MessageTokensAdded(messageTemplate, liquidObject);
@@ -1360,7 +1363,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddProductTokens(product, language, store)
+ .AddProductTokens(product, language, store, _storeHelper.DomainHost)
.AddAttributeCombinationTokens(product, combination);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -1398,7 +1401,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddCustomerTokens(customer, store, language);
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
@@ -1412,8 +1415,6 @@ namespace Grand.Business.Messages.Services
/// <summary>
/// Sends a blog comment notification message to a store owner
/// </summary>
- /// <param name="blogComment">Blog comment</param>
- /// <param name="languageId">Message language identifier</param>
/// <returns>Queued email identifier</returns>
public virtual async Task<int> SendBlogCommentMessage(BlogPost blogPost, BlogComment blogComment, string languageId)
{
@@ -1432,11 +1433,11 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddBlogCommentTokens(blogPost, blogComment, store, language);
+ .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, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -1472,11 +1473,11 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddArticleCommentTokens(article, articleComment, store, language);
+ .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, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
await _mediator.MessageTokensAdded(messageTemplate, liquidObject);
@@ -1511,10 +1512,10 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddNewsCommentTokens(newsItem, newsComment, store, language);
+ .AddNewsCommentTokens(newsItem, newsComment, store, _storeHelper.DomainHost, language);
var customer = await _mediator.Send(new GetCustomerByIdQuery() { Id = newsComment.CustomerId });
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -1553,9 +1554,9 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount);
if (customer != null)
- builder.AddCustomerTokens(customer, store, language);
+ builder.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
- builder.AddOutOfStockTokens(product, subscription, store, language);
+ builder.AddOutOfStockTokens(product, subscription, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
await _mediator.MessageTokensAdded(messageTemplate, liquidObject);
@@ -1609,7 +1610,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddCustomerTokens(customer, store, language);
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
liquidObject.ContactUs = new LiquidContactUs(senderEmail, senderName, body, attrInfo);
@@ -1622,8 +1623,7 @@ namespace Grand.Business.Messages.Services
//store in database
if (_commonSettings.StoreInDatabaseContactUsForm)
{
- await _mediator.Send(new InsertContactUsCommand()
- {
+ await _mediator.Send(new InsertContactUsCommand() {
CustomerId = customer.Id,
StoreId = store.Id,
VendorId = "",
@@ -1690,7 +1690,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddCustomerTokens(customer, store, language);
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
liquidObject.ContactUs = new LiquidContactUs(senderEmail, senderName, body, "");
//event notification
@@ -1702,8 +1702,7 @@ namespace Grand.Business.Messages.Services
//store in database
if (_commonSettings.StoreInDatabaseContactUsForm)
{
- await _mediator.Send(new InsertContactUsCommand()
- {
+ await _mediator.Send(new InsertContactUsCommand() {
CustomerId = customer.Id,
StoreId = store.Id,
VendorId = vendor.Id,
@@ -1752,7 +1751,7 @@ namespace Grand.Business.Messages.Services
builder.AddStoreTokens(store, language, emailAccount);
//product
var product = await _mediator.Send(new GetProductByIdQuery() { Id = cartItem.ProductId });
- builder.AddProductTokens(product, language, store);
+ builder.AddProductTokens(product, language, store, _storeHelper.DomainHost);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -1794,8 +1793,8 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddOrderTokens(order, customer, store)
- .AddCustomerTokens(customer, store, language);
+ .AddOrderTokens(order, customer, store, _storeHelper.DomainHost)
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -1850,8 +1849,8 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddAuctionTokens(product, bid)
- .AddCustomerTokens(customer, store, language)
- .AddProductTokens(product, language, store)
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)
+ .AddProductTokens(product, language, store, _storeHelper.DomainHost)
.AddStoreTokens(store, language, emailAccount);
LiquidObject liquidObject = await builder.BuildAsync();
@@ -1887,7 +1886,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddAuctionTokens(product, bid)
- .AddProductTokens(product, language, store)
+ .AddProductTokens(product, language, store, _storeHelper.DomainHost)
.AddStoreTokens(store, language, emailAccount);
LiquidObject liquidObject = await builder.BuildAsync();
@@ -1900,7 +1899,7 @@ namespace Grand.Business.Messages.Services
{
languageId = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.LanguageId);
}
- builder2.AddCustomerTokens(customer, store, language);
+ builder2.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject2 = await builder2.BuildAsync();
//event notification
@@ -1931,7 +1930,7 @@ namespace Grand.Business.Messages.Services
var emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);
var builder = new LiquidObjectBuilder(_mediator);
- builder.AddProductTokens(product, language, store)
+ builder.AddProductTokens(product, language, store, _storeHelper.DomainHost)
.AddStoreTokens(store, language, emailAccount);
LiquidObject liquidObject = await builder.BuildAsync();
@@ -1947,7 +1946,7 @@ namespace Grand.Business.Messages.Services
languageId = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.LanguageId);
}
- builder2.AddCustomerTokens(customer, store, language);
+ builder2.AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject2 = await builder2.BuildAsync();
//event notification
await _mediator.MessageTokensAdded(messageTemplate, liquidObject2);
@@ -1989,7 +1988,7 @@ namespace Grand.Business.Messages.Services
emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);
builder.AddAuctionTokens(product, bid)
- .AddCustomerTokens(customer, store, language)
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)
.AddStoreTokens(store, language, emailAccount);
}
else
@@ -2001,7 +2000,7 @@ namespace Grand.Business.Messages.Services
return 0;
emailAccount = await GetEmailAccountOfMessageTemplate(messageTemplate, language.Id);
- builder.AddProductTokens(product, language, store);
+ builder.AddProductTokens(product, language, store, _storeHelper.DomainHost);
}
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
@@ -2046,7 +2045,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddAuctionTokens(product, bid)
- .AddCustomerTokens(customer, store, language)
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language)
.AddStoreTokens(store, language, emailAccount);
LiquidObject liquidObject = await builder.BuildAsync();
@@ -2084,7 +2083,7 @@ namespace Grand.Business.Messages.Services
var builder = new LiquidObjectBuilder(_mediator);
builder.AddStoreTokens(store, language, emailAccount)
- .AddCustomerTokens(customer, store, language);
+ .AddCustomerTokens(customer, store, _storeHelper.DomainHost, language);
LiquidObject liquidObject = await builder.BuildAsync();
//event notification
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
index 58e41bc02..1f9ca6c8e 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
@@ -1,16 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Catalog.Interfaces.Products;
using Grand.Business.Common.Extensions;
using Grand.Business.Common.Interfaces.Directory;
using Grand.Business.Common.Interfaces.Localization;
using Grand.Business.Messages.Commands.Models;
using Grand.Business.Messages.DotLiquidDrops;
-using Grand.Domain.Messages;
-using Grand.Domain.Tax;
using MediatR;
using System.Linq;
-using System.Net;
-using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -34,15 +29,15 @@ namespace Grand.Business.System.Commands.Handlers.Messages
public async Task<LiquidMerchandiseReturn> Handle(GetMerchandiseReturnTokensCommand request, CancellationToken cancellationToken)
{
- var liquidMerchandiseReturn = new LiquidMerchandiseReturn(request.MerchandiseReturn, request.Store, request.Order, request.MerchandiseReturnNote);
+ var liquidMerchandiseReturn = new LiquidMerchandiseReturn(request.MerchandiseReturn, request.Store, request.Host, request.Order, request.MerchandiseReturnNote);
var country = await _countryService.GetCountryById(request.MerchandiseReturn.PickupAddress.CountryId);
liquidMerchandiseReturn.Status = request.MerchandiseReturn.MerchandiseReturnStatus.GetTranslationEnum(_translationService, request.Language.Id);
-
+
liquidMerchandiseReturn.PickupAddressStateProvince =
!string.IsNullOrEmpty(request.MerchandiseReturn.PickupAddress.StateProvinceId) ?
- country?.StateProvinces.FirstOrDefault(x=>x.Id == request.MerchandiseReturn.PickupAddress.StateProvinceId)?.GetTranslation(x => x.Name, request.Language.Id) : "";
+ country?.StateProvinces.FirstOrDefault(x => x.Id == request.MerchandiseReturn.PickupAddress.StateProvinceId)?.GetTranslation(x => x.Name, request.Language.Id) : "";
liquidMerchandiseReturn.PickupAddressCountry =
!string.IsNullOrEmpty(request.MerchandiseReturn.PickupAddress.CountryId) ?
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
index 1d04dccb2..6b2f247ac 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
@@ -73,12 +73,12 @@ namespace Grand.Business.System.Commands.Handlers.Messages
var language = await _languageService.GetLanguageById(request.Order.CustomerLanguageId);
var currency = await _currencyService.GetCurrencyByCode(request.Order.CustomerCurrencyCode);
- var liquidOrder = new LiquidOrder(request.Order, request.Customer, language, currency, request.Store, request.OrderNote, request.Vendor);
+ var liquidOrder = new LiquidOrder(request.Order, request.Customer, language, currency, request.Store, request.Host, request.OrderNote, request.Vendor);
foreach (var item in request.Order.OrderItems.Where(x => x.VendorId == request.Vendor?.Id || request.Vendor == null))
{
var product = await _productService.GetProductById(item.ProductId);
Vendor vendorItem = string.IsNullOrEmpty(item.VendorId) ? null : await _vendorService.GetVendorById(item.VendorId);
- var liqitem = new LiquidOrderItem(item, product, language, request.Store, vendorItem);
+ var liqitem = new LiquidOrderItem(item, product, language, request.Store, request.Host, vendorItem);
#region Download
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
index ac5c2eb28..c99a2a958 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
@@ -20,7 +20,7 @@ namespace Grand.Business.System.Commands.Handlers.Messages
public async Task<LiquidShipment> Handle(GetShipmentTokensCommand request, CancellationToken cancellationToken)
{
- var liquidShipment = new LiquidShipment(request.Shipment, request.Order, request.Store, request.Language);
+ var liquidShipment = new LiquidShipment(request.Shipment, request.Order, request.Store, request.Host, request.Language);
foreach (var shipmentItem in request.Shipment.ShipmentItems)
{
var orderitem = request.Order.OrderItems.FirstOrDefault(x => x.Id == shipmentItem.OrderItemId);
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs
index 063efdd8c..a95eef5a7 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs
@@ -21,14 +21,14 @@ namespace Grand.Business.System.Services.Installation
Shortcut = "Store",
Url = storeUrl,
SslEnabled = false,
- Hosts = "yourstore.com,www.yourstore.com",
DisplayOrder = 1,
CompanyName = companyName,
CompanyAddress = companyAddress,
CompanyPhoneNumber = companyPhoneNumber,
CompanyVat = null,
CompanyEmail = companyEmail,
- CompanyHours = "Monday - Sunday / 8:00AM - 6:00PM"
+ CompanyHours = "Monday - Sunday / 8:00AM - 6:00PM",
+ Domains = new List<DomainHost>(){ new DomainHost() { HostName = httpContextAccessor.HttpContext?.Request?.Host.Host, Url = storeUrl, Primary = true } }
},
};
diff --git a/src/Core/Grand.Domain/Stores/DomainHost.cs b/src/Core/Grand.Domain/Stores/DomainHost.cs
new file mode 100644
index 000000000..2dca87875
--- /dev/null
+++ b/src/Core/Grand.Domain/Stores/DomainHost.cs
@@ -0,0 +1,10 @@
+namespace Grand.Domain.Stores
+{
+ public class DomainHost : SubBaseEntity
+ {
+ public string HostName { get; set; }
+ public string Url { get; set; }
+ public bool Primary { get; set; }
+
+ }
+}
diff --git a/src/Core/Grand.Domain/Stores/Store.cs b/src/Core/Grand.Domain/Stores/Store.cs
index 713df6bfb..e9c8b8e4f 100644
--- a/src/Core/Grand.Domain/Stores/Store.cs
+++ b/src/Core/Grand.Domain/Stores/Store.cs
@@ -11,6 +11,7 @@ namespace Grand.Domain.Stores
public Store()
{
Locales = new List<TranslationEntity>();
+ Domains = new List<DomainHost>();
}
/// <summary>
@@ -39,9 +40,9 @@ namespace Grand.Domain.Stores
public string SecureUrl { get; set; }
/// <summary>
- /// Gets or sets the comma separated list of possible HTTP_HOST values
+ /// Gets or sets the list of domains
/// </summary>
- public string Hosts { get; set; }
+ public IList<DomainHost> Domains { get; set; }
/// <summary>
/// Gets or sets the identifier of the default language for this store; "" is set when we use the default language display order
diff --git a/src/Core/Grand.Domain/Stores/StoreExtensions.cs b/src/Core/Grand.Domain/Stores/StoreExtensions.cs
index c25da9d7b..ad970e478 100644
--- a/src/Core/Grand.Domain/Stores/StoreExtensions.cs
+++ b/src/Core/Grand.Domain/Stores/StoreExtensions.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using System.Linq;
namespace Grand.Domain.Stores
@@ -7,46 +6,38 @@ namespace Grand.Domain.Stores
public static class StoreExtensions
{
/// <summary>
- /// Parse comma-separated Hosts
+ /// Indicates whether a store contains a specified host
/// </summary>
/// <param name="store">Store</param>
- /// <returns>Comma-separated hosts</returns>
- public static string[] ParseHostValues(this Store store)
+ /// <param name="host">Host</param>
+ /// <returns>true - contains, false - no</returns>
+ public static bool ContainsHostValue(this Store store, string host)
{
if (store == null)
throw new ArgumentNullException(nameof(store));
- var parsedValues = new List<string>();
- if (!String.IsNullOrEmpty(store.Hosts))
- {
- string[] hosts = store.Hosts.Split(new [] { ',' }, StringSplitOptions.RemoveEmptyEntries);
- foreach (string host in hosts)
- {
- var tmp = host.Trim();
- if (!String.IsNullOrEmpty(tmp))
- parsedValues.Add(tmp);
- }
- }
- return parsedValues.ToArray();
+ if (string.IsNullOrEmpty(host))
+ return false;
+
+ var contains = store.Domains.FirstOrDefault(x => x.HostName.Equals(host, StringComparison.OrdinalIgnoreCase)) != null;
+ return contains;
}
/// <summary>
- /// Indicates whether a store contains a specified host
+ /// Return domain host
/// </summary>
/// <param name="store">Store</param>
/// <param name="host">Host</param>
- /// <returns>true - contains, false - no</returns>
- public static bool ContainsHostValue(this Store store, string host)
+ /// <returns>DomainHost</returns>
+ public static DomainHost HostValue(this Store store, string host)
{
if (store == null)
throw new ArgumentNullException(nameof(store));
- if (String.IsNullOrEmpty(host))
- return false;
+ if (string.IsNullOrEmpty(host))
+ return null;
- var contains = store.ParseHostValues()
- .FirstOrDefault(x => x.Equals(host, StringComparison.OrdinalIgnoreCase)) != null;
- return contains;
+ return store.Domains.FirstOrDefault(x => x.HostName.Equals(host, StringComparison.OrdinalIgnoreCase));
}
}
}
diff --git a/src/Core/Grand.Domain/SubBaseEntity.cs b/src/Core/Grand.Domain/SubBaseEntity.cs
index d7ac10d3e..2ebbab9b3 100644
--- a/src/Core/Grand.Domain/SubBaseEntity.cs
+++ b/src/Core/Grand.Domain/SubBaseEntity.cs
@@ -1,8 +1,8 @@
namespace Grand.Domain
{
- public abstract partial class SubBaseEntity: ParentEntity
+ public abstract partial class SubBaseEntity : ParentEntity
{
-
+
}
}
diff --git a/src/Core/Grand.Infrastructure/Caching/Constants/CommonCacheKey.cs b/src/Core/Grand.Infrastructure/Caching/Constants/CommonCacheKey.cs
index 7ffa08fbe..834e0d72e 100644
--- a/src/Core/Grand.Infrastructure/Caching/Constants/CommonCacheKey.cs
+++ b/src/Core/Grand.Infrastructure/Caching/Constants/CommonCacheKey.cs
@@ -165,6 +165,29 @@
#endregion
+ #region Domains
+
+ /// <summary>
+ /// Key for caching
+ /// </summary>
+ public static string DOMAINS_PATTERN_KEY => "Grand.domains";
+
+ /// <summary>
+ /// Key for caching
+ /// </summary>
+ public static string DOMAINS_ALL_KEY => "Grand.domains.all";
+
+ /// <summary>
+ /// Key for caching
+ /// </summary>
+ /// <remarks>
+ /// {0} : store ID
+ /// </remarks>
+ public static string DOMAINS_BY_ID_KEY => "Grand.domains.id-{0}";
+
+ #endregion
+
+
#region Tax
/// <summary>
diff --git a/src/Core/Grand.Infrastructure/IStoreHelper.cs b/src/Core/Grand.Infrastructure/IStoreHelper.cs
index 54a7a5b19..077d296e4 100644
--- a/src/Core/Grand.Infrastructure/IStoreHelper.cs
+++ b/src/Core/Grand.Infrastructure/IStoreHelper.cs
@@ -5,10 +5,10 @@ namespace Grand.Infrastructure
{
public interface IStoreHelper
{
- Store HostStore { get; }
+ Store StoreHost { get; }
+ DomainHost DomainHost { get; }
Task SetStoreCookie(string storeId);
-
Task<Store> SetCurrentStore(string storeId);
}
}
diff --git a/src/Core/Grand.Infrastructure/IWorkContext.cs b/src/Core/Grand.Infrastructure/IWorkContext.cs
index 66a8b5311..35d8af0f4 100644
--- a/src/Core/Grand.Infrastructure/IWorkContext.cs
+++ b/src/Core/Grand.Infrastructure/IWorkContext.cs
@@ -40,6 +40,11 @@ namespace Grand.Infrastructure
/// </summary>
Vendor CurrentVendor { get; }
+ /// <summary>
+ /// Gets the current host
+ /// </summary>
+ DomainHost CurrentHost { get; }
+
/// <summary>
/// Set the current vendor (logged-in manager)
/// </summary>
diff --git a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
index 7526cc900..bc99133ee 100644
--- a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
+++ b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
@@ -104,7 +104,7 @@ namespace Payments.PayPalStandard
private async Task<IDictionary<string, string>> CreateQueryParameters(Order order)
{
//get store location
- var storeLocation = _workContext.CurrentStore.SslEnabled ? _workContext.CurrentStore.SecureUrl.TrimEnd('/') : _workContext.CurrentStore.Url.TrimEnd('/');
+ var storeLocation = _workContext.CurrentHost.Url;
var stateProvince = "";
var countryCode = "";
if (!String.IsNullOrEmpty(order.ShippingAddress?.StateProvinceId))
diff --git a/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs b/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs
index 77017c9cb..26dd27ba3 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs
@@ -110,7 +110,7 @@ namespace Widgets.GoogleAnalytics.Components
var analyticsEcommerceScript = _googleAnalyticsEcommerceSettings.EcommerceScript + "\n";
analyticsEcommerceScript = analyticsEcommerceScript.Replace("{GOOGLEID}", _googleAnalyticsEcommerceSettings.GoogleId);
analyticsEcommerceScript = analyticsEcommerceScript.Replace("{ORDERID}", order.Id.ToString());
- analyticsEcommerceScript = analyticsEcommerceScript.Replace("{SITE}", _workContext.CurrentStore.Url.Replace("http://", "").Replace("/", ""));
+ analyticsEcommerceScript = analyticsEcommerceScript.Replace("{SITE}", _workContext.CurrentHost.Url.Replace("http://", "").Replace("/", ""));
analyticsEcommerceScript = analyticsEcommerceScript.Replace("{TOTAL}", order.OrderTotal.ToString("0.00", usCulture));
analyticsEcommerceScript = analyticsEcommerceScript.Replace("{TAX}", order.OrderTax.ToString("0.00", usCulture));
var orderShipping = _googleAnalyticsEcommerceSettings.IncludingTax ? order.OrderShippingInclTax : order.OrderShippingExclTax;
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
index bf73320bc..7c0668d29 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
@@ -33,7 +33,7 @@ namespace Grand.Business.Messages.Tests.Services
var liquidObject = await builder
.AddVendorReviewTokens(vendor, vendorReview)
.AddVendorTokens(vendor, new Language())
- .AddOutOfStockTokens(product, new OutOfStockSubscription(), new Store(), new Language())
+ .AddOutOfStockTokens(product, new OutOfStockSubscription(), new Store(), new DomainHost() { Url = "https://localhost:44350/" }, new Language())
.BuildAsync();
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs b/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
index 744b1cc77..cf26afa42 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
@@ -11,6 +11,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Messages;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
+using Grand.Infrastructure;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
@@ -29,6 +30,7 @@ namespace Grand.Business.Messages.Tests.Services
private Mock<IEmailAccountService> _emailAccountServiceMock;
private Mock<IMessageTokenProvider> _messageTokenProviderMock;
private Mock<IStoreService> _storeServiceMock;
+ private Mock<IStoreHelper> _storeHelperServiceMock;
private Mock<IMediator> _mediatorMock;
private Mock<EmailAccountSettings> _emailAccountSettingsMock;
private Mock<CommonSettings> _commonSetting;
@@ -56,9 +58,11 @@ namespace Grand.Business.Messages.Tests.Services
_messageTokenProviderMock = new Mock<IMessageTokenProvider>();
_storeServiceMock = new Mock<IStoreService>();
- _storeServiceMock.Setup(x => x.GetStoreById(It.IsAny<string>())).Returns(Task.FromResult(new Store()));
+ _storeServiceMock.Setup(x => x.GetStoreById(It.IsAny<string>())).Returns(Task.FromResult(new Store() { Url = "https://localhost:44350/" }));
_storeServiceMock.Setup(x => x.GetAllStores()).Returns(Task.FromResult(new List<Store>() as IList<Store>));
+ _storeHelperServiceMock = new Mock<IStoreHelper>();
+
_mediatorMock = new Mock<IMediator>();
_mediatorMock.Setup(x => x.Send(It.IsAny<GetCustomerByIdQuery>(), default))
.Returns(Task.FromResult(new Customer { Email = "[email protected]" }));
@@ -73,6 +77,7 @@ namespace Grand.Business.Messages.Tests.Services
_emailAccountServiceMock.Object,
_messageTokenProviderMock.Object,
_storeServiceMock.Object,
+ _storeHelperServiceMock.Object,
_groupService.Object,
_mediatorMock.Object,
_emailAccountSettingsMock.Object,
@@ -98,7 +103,7 @@ namespace Grand.Business.Messages.Tests.Services
[TestMethod()]
public async Task SendNewVendorAccountApplyStoreOwnerNotificationRetunsCorrectResult()
{
- var result = await _messageService.SendNewVendorAccountApplyStoreOwnerMessage(new Customer(), new Vendor(), new Store(), "123");
+ var result = await _messageService.SendNewVendorAccountApplyStoreOwnerMessage(new Customer(), new Vendor(), new Store() { Url = "https://localhost:44350/" }, "123");
Assert.AreEqual(result, 1);
}
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Store/_CreateOrUpdate.TabDomains.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Store/_CreateOrUpdate.TabDomains.cshtml
new file mode 100644
index 000000000..7d54971c8
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Store/_CreateOrUpdate.TabDomains.cshtml
@@ -0,0 +1,119 @@
+@model StoreModel
+@if (!String.IsNullOrEmpty(Model.Id))
+{
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div id="domains-grid"></div>
+ </div>
+ </div>
+ <script>
+ $(document).ready(function () {
+ $("#domains-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("Domains", "Store", new { storeid = Model.Id, area = Constants.AreaAdmin }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ create: {
+ url: "@Html.Raw(Url.Action("DomainInsert", "Store", new { storeid = Model.Id, area = Constants.AreaAdmin }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ update: {
+ url: "@Html.Raw(Url.Action("DomainUpdate", "Store", new { storeid = Model.Id, area = Constants.AreaAdmin }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ destroy: {
+ url: "@Html.Raw(Url.Action("DomainDelete", "Store", new { storeid = Model.Id, area = Constants.AreaAdmin }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors",
+ model: {
+ id: "Id",
+ fields: {
+ Url: { editable: true, type: "string" },
+ HostName: { editable: false, type: "string" },
+ Primary: { editable: false, type: "boolean" },
+ }
+ }
+ },
+ requestEnd: function (e) {
+ if (e.type == "create") {
+ this.read();
+ }
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ // Cancel the changes
+ this.cancelChanges();
+ },
+ serverPaging: false,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ numeric: false,
+ previousNext: false,
+ info: false
+ },
+ toolbar: [{
+ name: "create",
+ text: "@Loc["Admin.Common.AddNewRecord"]"
+ }, { name: "save", text: "@Loc["Admin.Common.Save"]" }, { name: "cancel", text: "@Loc["Admin.Common.Cancel"]" }],
+ editable: {
+ confirmation: false,
+ mode: "inline",
+ },
+ scrollable: false,
+ columns: [{
+ field: "Url",
+ title: "@Loc["Admin.Configuration.Stores.Domains.Fields.Url"]"
+ },
+ {
+ field: "HostName",
+ title: "@Loc["Admin.Configuration.Stores.Domains.Fields.HostName"]"
+ },
+ {
+ field: "Primary",
+ title: "@Loc["Admin.Configuration.Stores.Domains.Fields.Primary"]",
+ headerAttributes: { style: "text-align:center" },
+ attributes: { style: "text-align:center" },
+ template: '# if(Primary) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
+ },
+ {
+ command: [{
+ name: "edit",
+ text: {
+ edit: "@Loc["Admin.Common.Edit"]",
+ update: "@Loc["Admin.Common.Update"]",
+ cancel: "@Loc["Admin.Common.Cancel"]"
+ }
+ }, {
+ name: "destroy",
+ text: "@Loc["Admin.Common.Delete"]"
+ }]
+ }]
+ });
+ });
+ </script>
+
+}
+else
+{
+ <div class="note note-info">
+ @Loc["Admin.Configuration.Stores.Domains.SaveBeforeEdit"]
+ </div>
+}
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Store/_CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Store/_CreateOrUpdate.TabInfo.cshtml
new file mode 100644
index 000000000..cc28f627c
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Store/_CreateOrUpdate.TabInfo.cshtml
@@ -0,0 +1,157 @@
+@model StoreModel
+@using Microsoft.AspNetCore.Mvc.Razor;
+
+@{ Func<int, HelperResult>
+ template = @<div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="@Model.Locales[item].Name" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="@Model.Locales[item].Name" />
+ <span asp-validation-for="@Model.Locales[item].Name"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="@Model.Locales[item].Shortcut" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="@Model.Locales[item].Shortcut" />
+ <span asp-validation-for="@Model.Locales[item].Shortcut"></span>
+ </div>
+ </div>
+ <input asp-for="@Model.Locales[item].LanguageId" type="hidden" />
+</div>;
+}
+<div class="form-horizontal">
+ <localized-editor localized-template=@template name="store-localized" [email protected](c=>c.LanguageId).ToList()>
+ <div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="Name" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Name" />
+ <span asp-validation-for="Name"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="Shortcut" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Shortcut" />
+ <span asp-validation-for="Shortcut"></span>
+ </div>
+ </div>
+ </div>
+ </localized-editor>
+ <div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="Url" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Url" />
+ <span asp-validation-for="Url"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="SslEnabled" />
+ <div class="col-md-9 col-sm-9">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SslEnabled" />
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SslEnabled"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="note note-info">
+ <em>@Loc["Admin.Configuration.Stores.Fields.SslEnabled.Hint2"]</em>
+ </div>
+ </div>
+ <div class="form-group" id="pnlSecureUrl">
+ <admin-label asp-for="SecureUrl" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="SecureUrl" />
+ <span asp-validation-for="SecureUrl"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="DefaultLanguageId" />
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="DefaultLanguageId" asp-items="Model.AvailableLanguages" />
+ <span asp-validation-for="DefaultLanguageId"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="DefaultWarehouseId" />
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="DefaultWarehouseId" asp-items="Model.AvailableWarehouses" />
+ <span asp-validation-for="DefaultWarehouseId"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="DefaultCountryId" />
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="DefaultCountryId" asp-items="Model.AvailableCountries" />
+ <span asp-validation-for="DefaultCountryId"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="DefaultCurrencyId" />
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="DefaultCurrencyId" asp-items="Model.AvailableCurrencies" />
+ <span asp-validation-for="DefaultCurrencyId"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="CompanyName" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="CompanyName" />
+ <span asp-validation-for="CompanyName"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="CompanyAddress" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="CompanyAddress" />
+ <span asp-validation-for="CompanyAddress"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="CompanyPhoneNumber" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="CompanyPhoneNumber" />
+ <span asp-validation-for="CompanyPhoneNumber"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="CompanyVat" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="CompanyVat" />
+ <span asp-validation-for="CompanyVat"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="CompanyEmail" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="CompanyEmail" />
+ <span asp-validation-for="CompanyEmail"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="CompanyHours" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="CompanyHours" />
+ <span asp-validation-for="CompanyHours"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="DisplayOrder" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="DisplayOrder" />
+ <span asp-validation-for="DisplayOrder"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="DefaultAdminTheme " />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="DefaultAdminTheme " />
+ <span asp-validation-for="DefaultAdminTheme "></span>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Store/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Store/_CreateOrUpdate.cshtml
index 5bf2d4024..9669092e1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Store/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Store/_CreateOrUpdate.cshtml
@@ -22,165 +22,27 @@
</script>
<vc:admin-widget widget-zone="store_details_top" additional-data="Model" />
-@{ Func<int, HelperResult>
- template = @<div class="form-body">
- <div class="form-group">
- <admin-label asp-for="@Model.Locales[item].Name" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="@Model.Locales[item].Name" />
- <span asp-validation-for="@Model.Locales[item].Name"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="@Model.Locales[item].Shortcut" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="@Model.Locales[item].Shortcut" />
- <span asp-validation-for="@Model.Locales[item].Shortcut"></span>
- </div>
- </div>
- <input asp-for="@Model.Locales[item].LanguageId" type="hidden" />
-</div>;
-}
-<div class="form-horizontal">
- <localized-editor localized-template=@template name="store-localized" [email protected](c=>c.LanguageId).ToList()>
- <div class="form-body">
- <div class="form-group">
- <admin-label asp-for="Name" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Name" />
- <span asp-validation-for="Name"></span>
+<div asp-validation-summary="All"></div>
+<input asp-for="Id" type="hidden" />
+<admin-tabstrip name="store-edit">
+ <items>
+ <tabstrip-item text="@Loc["Admin.Stores.Info"]" tab-index="0">
+ <content>
+ <div>
+ <partial name="_CreateOrUpdate.TabInfo" model="Model" />
</div>
- </div>
- <div class="form-group">
- <admin-label asp-for="Shortcut" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Shortcut" />
- <span asp-validation-for="Shortcut"></span>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Stores.Domains"]" tab-index="1">
+ <content>
+ <div>
+ <partial name="_CreateOrUpdate.TabDomains" model="Model" />
</div>
- </div>
- </div>
- </localized-editor>
- <div class="form-body">
- <div class="form-group">
- <admin-label asp-for="Url" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Url" />
- <span asp-validation-for="Url"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="SslEnabled" />
- <div class="col-md-9 col-sm-9">
- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
- <admin-input asp-for="SslEnabled" />
- <div class="control__indicator"></div>
- </label>
- <span asp-validation-for="SslEnabled"></span>
- </div>
- </div>
- <div class="form-group">
- <div class="note note-info">
- <em>@Loc["Admin.Configuration.Stores.Fields.SslEnabled.Hint2"]</em>
- </div>
- </div>
- <div class="form-group" id="pnlSecureUrl">
- <admin-label asp-for="SecureUrl" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="SecureUrl" />
- <span asp-validation-for="SecureUrl"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="Hosts" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Hosts" />
- <span asp-validation-for="Hosts"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="DefaultAdminTheme " />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="DefaultAdminTheme " />
- <span asp-validation-for="DefaultAdminTheme "></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="DefaultLanguageId" />
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="DefaultLanguageId" asp-items="Model.AvailableLanguages" />
- <span asp-validation-for="DefaultLanguageId"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="DisplayOrder" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="DisplayOrder" />
- <span asp-validation-for="DisplayOrder"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CompanyName" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="CompanyName" />
- <span asp-validation-for="CompanyName"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CompanyAddress" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="CompanyAddress" />
- <span asp-validation-for="CompanyAddress"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CompanyPhoneNumber" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="CompanyPhoneNumber" />
- <span asp-validation-for="CompanyPhoneNumber"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CompanyVat" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="CompanyVat" />
- <span asp-validation-for="CompanyVat"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CompanyEmail" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="CompanyEmail" />
- <span asp-validation-for="CompanyEmail"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CompanyHours" />
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="CompanyHours" />
- <span asp-validation-for="CompanyHours"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="DefaultWarehouseId" />
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="DefaultWarehouseId" asp-items="Model.AvailableWarehouses" />
- <span asp-validation-for="DefaultWarehouseId"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="DefaultCountryId" />
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="DefaultCountryId" asp-items="Model.AvailableCountries" />
- <span asp-validation-for="DefaultCountryId"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="DefaultCurrencyId" />
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="DefaultCurrencyId" asp-items="Model.AvailableCurrencies" />
- <span asp-validation-for="DefaultCurrencyId"></span>
- </div>
- </div>
- </div>
-</div>
+ </content>
+ </tabstrip-item>
+ <vc:admin-widget widget-zone="store_details_tabs" additional-data="Model" />
+ </items>
+</admin-tabstrip>
+
+
<vc:admin-widget widget-zone="store_details_bottom" additional-data="Model" />
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Controllers/CommonController.cs b/src/Web/Grand.Web.Admin/Controllers/CommonController.cs
index 9d8b2a7a4..09860d230 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CommonController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CommonController.cs
@@ -144,7 +144,7 @@ namespace Grand.Web.Admin.Controllers
});
}
//store URL
- var currentStoreUrl = _workContext.CurrentStore.Url;
+ var currentStoreUrl = _workContext.CurrentHost.Url;
if (!String.IsNullOrEmpty(currentStoreUrl) && (currentStoreUrl.Equals(HttpContext.Request.Host.Host, StringComparison.OrdinalIgnoreCase)))
model.SystemWarnings.Add(new SystemInfoModel.SystemWarningModel {
Level = SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass,
diff --git a/src/Web/Grand.Web.Admin/Controllers/StoreController.cs b/src/Web/Grand.Web.Admin/Controllers/StoreController.cs
index 8aeb22610..f765cd160 100644
--- a/src/Web/Grand.Web.Admin/Controllers/StoreController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/StoreController.cs
@@ -44,8 +44,7 @@ namespace Grand.Web.Admin.Controllers
.Select(x => x.ToModel())
.ToList();
- var gridModel = new DataSourceResult
- {
+ var gridModel = new DataSourceResult {
Data = storeModels,
Total = storeModels.Count()
};
@@ -167,5 +166,93 @@ namespace Grand.Web.Admin.Controllers
Error(ModelState);
return RedirectToAction("Edit", new { id = store.Id });
}
+
+ #region Domains
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ [HttpPost]
+ public async Task<IActionResult> Domains(string storeId)
+ {
+ var store = await _storeService.GetStoreById(storeId);
+ if (store == null)
+ //No store found with the specified id
+ return ErrorForKendoGridJson("Store not found");
+
+ var model = store.ToModel();
+
+ var gridModel = new DataSourceResult {
+ Data = model.Domains.ToList(),
+ Total = model.Domains.Count
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> DomainInsert(string storeId, DomainHostModel model)
+ {
+ var store = await _storeService.GetStoreById(storeId);
+ if (store == null)
+ //No store found with the specified id
+ return ErrorForKendoGridJson("Store not found");
+
+ if (ModelState.IsValid)
+ {
+ await _storeViewModelService.InsertDomainHostModel(store, model);
+ return new JsonResult("");
+ }
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> DomainUpdate(string storeId, DomainHostModel model)
+ {
+ var store = await _storeService.GetStoreById(storeId);
+ if (store == null)
+ //No store found with the specified id
+ return ErrorForKendoGridJson("Store not found");
+
+ var domain = store.Domains.FirstOrDefault(x => x.Id == model.Id);
+ if (domain == null)
+ return ErrorForKendoGridJson("Domain not found");
+
+ if (domain.Primary)
+ return ErrorForKendoGridJson("You can't edit primary domain");
+
+ if (ModelState.IsValid)
+ {
+ await _storeViewModelService.UpdateDomainHostModel(store, model);
+ return new JsonResult("");
+ }
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> DomainDelete(string storeId, string id)
+ {
+ var store = await _storeService.GetStoreById(storeId);
+ if (store == null)
+ //No store found with the specified id
+ return ErrorForKendoGridJson("Store not found");
+
+ var domain = store.Domains.FirstOrDefault(x => x.Id == id);
+ if (domain == null)
+ return ErrorForKendoGridJson("Domain not found");
+
+ if (domain.Primary)
+ return ErrorForKendoGridJson("You can't delete primary domain");
+
+ if (ModelState.IsValid)
+ {
+ await _storeViewModelService.DeleteDomainHostModel(store, id);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+ #endregion
}
}
diff --git a/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.cs
index 49df00ced..6cd0e2847 100644
--- a/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.cs
@@ -19,7 +19,7 @@ namespace Grand.Web.Admin.Extensions
{
return null;
}
- var storeLocation = workContext.CurrentStore.SslEnabled ? workContext.CurrentStore.SecureUrl.TrimEnd('/') : workContext.CurrentStore.Url.TrimEnd('/');
+ var storeLocation = workContext.CurrentHost.Url.TrimEnd('/');
var pluginDirectory = pluginDescriptor.OriginalAssemblyFile.Directory;
var logoPluginJpg = Path.Combine(pluginDirectory.FullName, "logo.jpg");
if (File.Exists(logoPluginJpg))
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IStoreViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IStoreViewModelService.cs
index b78a0d702..c42e96ee8 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IStoreViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IStoreViewModelService.cs
@@ -14,6 +14,9 @@ namespace Grand.Web.Admin.Interfaces
Task<Store> InsertStoreModel(StoreModel model);
Task<Store> UpdateStoreModel(Store store, StoreModel model);
Task DeleteStore(Store store);
+ Task InsertDomainHostModel(Store store, DomainHostModel model);
+ Task UpdateDomainHostModel(Store store, DomainHostModel model);
+ Task DeleteDomainHostModel(Store store, string id);
}
}
diff --git a/src/Web/Grand.Web.Admin/Mapper/StoreProfile.cs b/src/Web/Grand.Web.Admin/Mapper/StoreProfile.cs
index 3ecc776cd..a983f7224 100644
--- a/src/Web/Grand.Web.Admin/Mapper/StoreProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/StoreProfile.cs
@@ -11,6 +11,7 @@ namespace Grand.Web.Admin.Mapper
public StoreProfile()
{
CreateMap<Store, StoreModel>()
+ .ForMember(dest => dest.Domains, mo => mo.MapFrom(x => x.Domains))
.ForMember(dest => dest.AvailableLanguages, mo => mo.Ignore())
.ForMember(dest => dest.AvailableWarehouses, mo => mo.Ignore())
.ForMember(dest => dest.AvailableCountries, mo => mo.Ignore())
@@ -18,7 +19,12 @@ namespace Grand.Web.Admin.Mapper
.ForMember(dest => dest.Locales, mo => mo.Ignore());
CreateMap<StoreModel, Store>()
.ForMember(dest => dest.Id, mo => mo.Ignore())
+ .ForMember(dest => dest.Domains, mo => mo.Ignore())
.ForMember(dest => dest.Locales, mo => mo.MapFrom(x => x.Locales.ToTranslationProperty()));
+
+ CreateMap<DomainHost, DomainHostModel>();
+ CreateMap<DomainHostModel, DomainHost>();
+
}
public int Order => 0;
diff --git a/src/Web/Grand.Web.Admin/Models/Stores/StoreModel.cs b/src/Web/Grand.Web.Admin/Models/Stores/StoreModel.cs
index 89abbeb1b..fe4347515 100644
--- a/src/Web/Grand.Web.Admin/Models/Stores/StoreModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Stores/StoreModel.cs
@@ -11,6 +11,7 @@ namespace Grand.Web.Admin.Models.Stores
public StoreModel()
{
Locales = new List<StoreLocalizedModel>();
+ Domains = new List<DomainHostModel>();
AvailableLanguages = new List<SelectListItem>();
AvailableWarehouses = new List<SelectListItem>();
AvailableCountries = new List<SelectListItem>();
@@ -32,9 +33,6 @@ namespace Grand.Web.Admin.Models.Stores
[GrandResourceDisplayName("Admin.Configuration.Stores.Fields.SecureUrl")]
public virtual string SecureUrl { get; set; }
- [GrandResourceDisplayName("Admin.Configuration.Stores.Fields.Hosts")]
- public string Hosts { get; set; }
-
[GrandResourceDisplayName("Admin.Configuration.Stores.Fields.DefaultAdminTheme")]
public string DefaultAdminTheme { get; set; }
@@ -78,6 +76,9 @@ namespace Grand.Web.Admin.Models.Stores
[GrandResourceDisplayName("Admin.Configuration.Stores.Fields.DefaultCurrency")]
public string DefaultCurrencyId { get; set; }
public IList<SelectListItem> AvailableCurrencies { get; set; }
+
+ public IList<DomainHostModel> Domains { get; set; }
+
}
public partial class StoreLocalizedModel : ILocalizedModelLocal
@@ -90,4 +91,14 @@ namespace Grand.Web.Admin.Models.Stores
[GrandResourceDisplayName("Admin.Configuration.Stores.Fields.Shortcut")]
public string Shortcut { get; set; }
}
+
+ public class DomainHostModel : BaseEntityModel
+ {
+ [GrandResourceDisplayName("Admin.Configuration.Stores.Domains.Fields.HostName")]
+ public string HostName { get; set; }
+ [GrandResourceDisplayName("Admin.Configuration.Stores.Domains.Fields.Url")]
+ public string Url { get; set; }
+ [GrandResourceDisplayName("Admin.Configuration.Stores.Domains.Fields.Primary")]
+ public bool Primary { get; set; }
+ }
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs b/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs
index ecd2c2c26..f48103a52 100644
--- a/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs
@@ -243,7 +243,7 @@ namespace Grand.Web.Admin.Services
if (discount == null)
throw new ArgumentNullException(nameof(discount));
- var storeLocation = _workContext.CurrentStore.SslEnabled ? _workContext.CurrentStore.SecureUrl.TrimEnd('/') : _workContext.CurrentStore.Url.TrimEnd('/');
+ var storeLocation = _workContext.CurrentHost.Url.TrimEnd('/');
string url = string.Format("{0}/{1}", storeLocation, discountRequirementRule.GetConfigurationUrl(discount.Id, discountRequirementId));
return url;
diff --git a/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs b/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs
index c59cf06c8..413f43cbc 100644
--- a/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs
@@ -39,16 +39,14 @@ namespace Grand.Web.Admin.Services
if (model == null)
throw new ArgumentNullException(nameof(model));
- model.AvailableLanguages.Add(new SelectListItem
- {
+ model.AvailableLanguages.Add(new SelectListItem {
Text = "---",
Value = ""
});
var languages = await _languageService.GetAllLanguages(true);
foreach (var language in languages)
{
- model.AvailableLanguages.Add(new SelectListItem
- {
+ model.AvailableLanguages.Add(new SelectListItem {
Text = language.Name,
Value = language.Id
});
@@ -61,16 +59,14 @@ namespace Grand.Web.Admin.Services
throw new ArgumentNullException(nameof(model));
//warehouse
- model.AvailableWarehouses.Add(new SelectListItem
- {
+ model.AvailableWarehouses.Add(new SelectListItem {
Text = "---",
Value = ""
});
var warehouses = await _warehouseService.GetAllWarehouses();
foreach (var warehouse in warehouses)
{
- model.AvailableWarehouses.Add(new SelectListItem
- {
+ model.AvailableWarehouses.Add(new SelectListItem {
Text = warehouse.Name,
Value = warehouse.Id
});
@@ -82,8 +78,7 @@ namespace Grand.Web.Admin.Services
throw new ArgumentNullException(nameof(model));
//countries
- model.AvailableCountries.Add(new SelectListItem
- {
+ model.AvailableCountries.Add(new SelectListItem {
Text = "---",
Value = ""
});
@@ -91,8 +86,7 @@ namespace Grand.Web.Admin.Services
var countries = await _countryService.GetAllCountries();
foreach (var country in countries)
{
- model.AvailableCountries.Add(new SelectListItem
- {
+ model.AvailableCountries.Add(new SelectListItem {
Text = country.Name,
Value = country.Id
});
@@ -104,8 +98,7 @@ namespace Grand.Web.Admin.Services
throw new ArgumentNullException(nameof(model));
//countries
- model.AvailableCurrencies.Add(new SelectListItem
- {
+ model.AvailableCurrencies.Add(new SelectListItem {
Text = "---",
Value = ""
});
@@ -113,8 +106,7 @@ namespace Grand.Web.Admin.Services
var currencies = await _currencyService.GetAllCurrencies();
foreach (var currency in currencies)
{
- model.AvailableCurrencies.Add(new SelectListItem
- {
+ model.AvailableCurrencies.Add(new SelectListItem {
Text = currency.Name,
Value = currency.Id
});
@@ -135,18 +127,43 @@ namespace Grand.Web.Admin.Services
if (!string.IsNullOrEmpty(store.SecureUrl) && !store.SecureUrl.EndsWith("/"))
store.SecureUrl += "/";
+ var storeUri = new Uri(store.Url);
+ store.Domains.Add(new DomainHost() {
+ HostName = storeUri.Host,
+ Url = store.SslEnabled ? store.SecureUrl : store.Url,
+ Primary = true
+ });
+
await _storeService.InsertStore(store);
return store;
}
public virtual async Task<Store> UpdateStoreModel(Store store, StoreModel model)
{
store = model.ToEntity(store);
+
//ensure we have "/" at the end
if (!store.Url.EndsWith("/"))
store.Url += "/";
if (!string.IsNullOrEmpty(store.SecureUrl) && !store.SecureUrl.EndsWith("/"))
store.SecureUrl += "/";
+ var domain = store.Domains.FirstOrDefault(x => x.Primary);
+ if (domain == null)
+ {
+ var storeUri = new Uri(store.Url);
+ store.Domains.Add(new DomainHost() {
+ HostName = storeUri.Host,
+ Url = store.SslEnabled ? store.SecureUrl : store.Url,
+ Primary = true
+ });
+ }
+ else
+ {
+ var storeUri = new Uri(store.Url);
+ domain.HostName = storeUri.Host;
+ domain.Url = store.SslEnabled ? store.SecureUrl : store.Url;
+ }
+
await _storeService.UpdateStore(store);
return store;
}
@@ -173,5 +190,62 @@ namespace Grand.Web.Admin.Services
await _settingService.DeleteSetting(setting);
}
}
+
+ #region DomainHost
+
+ public virtual async Task InsertDomainHostModel(Store store, DomainHostModel model)
+ {
+ if (store == null)
+ throw new ArgumentNullException(nameof(store));
+ if (model == null)
+ throw new ArgumentNullException(nameof(model));
+
+ if (!model.Url.EndsWith("/"))
+ model.Url += "/";
+
+ var storeUri = new Uri(model.Url);
+
+ store.Domains.Add(new DomainHost() {
+ HostName = storeUri.Host,
+ Url = model.Url
+ });
+ await _storeService.UpdateStore(store);
+
+ }
+
+ public virtual async Task UpdateDomainHostModel(Store store, DomainHostModel model)
+ {
+ if (store == null)
+ throw new ArgumentNullException(nameof(store));
+ if (model == null)
+ throw new ArgumentNullException(nameof(model));
+
+ if (!model.Url.EndsWith("/"))
+ model.Url += "/";
+
+ var domain = store.Domains.FirstOrDefault(x => x.Id == model.Id);
+ if (domain != null)
+ {
+ var storeUri = new Uri(model.Url);
+ domain.HostName = storeUri.Host;
+ domain.Url = model.Url;
+ }
+
+ await _storeService.UpdateStore(store);
+ }
+
+ public virtual async Task DeleteDomainHostModel(Store store, string id)
+ {
+ var domain = store.Domains.FirstOrDefault(x => x.Id == id);
+ if (domain != null)
+ {
+ store.Domains.Remove(domain);
+ await _storeService.UpdateStore(store);
+ }
+
+ }
+
+ #endregion
+
}
}
diff --git a/src/Web/Grand.Web.Admin/Validators/Stores/DomainHostValidator.cs b/src/Web/Grand.Web.Admin/Validators/Stores/DomainHostValidator.cs
new file mode 100644
index 000000000..f911515ab
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Validators/Stores/DomainHostValidator.cs
@@ -0,0 +1,32 @@
+using FluentValidation;
+using Grand.Infrastructure.Validators;
+using Grand.Business.Common.Interfaces.Localization;
+using Grand.Web.Admin.Models.Stores;
+using System.Collections.Generic;
+using System;
+
+namespace Grand.Web.Admin.Validators.Stores
+{
+ public class DomainHostValidator : BaseGrandValidator<DomainHostModel>
+ {
+ public DomainHostValidator(
+ IEnumerable<IValidatorConsumer<DomainHostModel>> validators,
+ ITranslationService translationService)
+ : base(validators)
+ {
+ RuleFor(x => x.Url).NotEmpty().WithMessage(translationService.GetResource("Admin.Configuration.Stores.Domains.Fields.Url.Required"));
+ RuleFor(x => x.Url).Must((x, y, context) =>
+ {
+ try
+ {
+ var storeUri = new Uri(x.Url);
+ return true;
+ }
+ catch
+ {
+ return false;
+ }
+ }).WithMessage(translationService.GetResource("Admin.Configuration.Stores.Domains.Fields.Url.WrongFormat"));
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
index 5629a2e78..db6ffe24c 100644
--- a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
@@ -275,7 +275,7 @@ namespace Grand.Web.Common.Infrastructure
var type = item.GetType();
var storeId = "";
var settingService = x.GetRequiredService<ISettingService>();
- var store = x.GetRequiredService<IStoreHelper>().HostStore;
+ var store = x.GetRequiredService<IStoreHelper>().StoreHost;
if (store != null)
storeId = store.Id;
diff --git a/src/Web/Grand.Web.Common/StoreHelper.cs b/src/Web/Grand.Web.Common/StoreHelper.cs
index 06658067a..9926a0493 100644
--- a/src/Web/Grand.Web.Common/StoreHelper.cs
+++ b/src/Web/Grand.Web.Common/StoreHelper.cs
@@ -16,7 +16,9 @@ namespace Grand.Web.Common
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly IStoreService _storeService;
+
private Store _cachedStore;
+ private DomainHost _cachedDomainHost;
private const string STORE_COOKIE_NAME = ".Grand.Store";
@@ -24,7 +26,9 @@ namespace Grand.Web.Common
#region Ctor
- public StoreHelper(IHttpContextAccessor httpContextAccessor, IStoreService storeService)
+ public StoreHelper(
+ IHttpContextAccessor httpContextAccessor,
+ IStoreService storeService)
{
_httpContextAccessor = httpContextAccessor;
_storeService = storeService;
@@ -44,10 +48,8 @@ namespace Grand.Web.Common
}
#endregion
- public Store HostStore
- {
- get
- {
+ public Store StoreHost {
+ get {
if (_cachedStore == null)
{
//try to determine the current store by HOST header
@@ -85,6 +87,35 @@ namespace Grand.Web.Common
}
}
+ public DomainHost DomainHost {
+ get
+ {
+ if (_cachedDomainHost == null)
+ {
+ //try to determine the current HOST header
+ string host = _httpContextAccessor.HttpContext?.Request?.Headers[HeaderNames.Host];
+ if (StoreHost != null)
+ {
+ _cachedDomainHost = StoreHost.HostValue(host) ?? new DomainHost() {
+ Id = int.MinValue.ToString(),
+ Url = StoreHost.SslEnabled ? StoreHost.SecureUrl : StoreHost.Url,
+ HostName = "temporary-store"
+ };
+ }
+ if (_cachedDomainHost == null)
+ {
+ _cachedDomainHost = new DomainHost() {
+ Id = int.MinValue.ToString(),
+ Url = host,
+ HostName = "temporary"
+ };
+ }
+ return _cachedDomainHost;
+ }
+ return _cachedDomainHost;
+ }
+ }
+
/// <summary>
/// Set the current store by BackgroundService
/// </summary>
@@ -124,8 +155,7 @@ namespace Grand.Web.Common
var cookieExpiresDate = DateTime.UtcNow.AddHours(CommonHelper.CookieAuthExpires);
//set new cookie value
- var options = new CookieOptions
- {
+ var options = new CookieOptions {
HttpOnly = true,
Expires = cookieExpiresDate
};
diff --git a/src/Web/Grand.Web.Common/WorkContext.cs b/src/Web/Grand.Web.Common/WorkContext.cs
index 025bebc93..ad0493e8c 100644
--- a/src/Web/Grand.Web.Common/WorkContext.cs
+++ b/src/Web/Grand.Web.Common/WorkContext.cs
@@ -519,7 +519,12 @@ namespace Grand.Web.Common
/// <summary>
/// Gets the current store
/// </summary>
- public virtual Store CurrentStore => _storeHelper.HostStore;
+ public virtual Store CurrentStore => _storeHelper.StoreHost;
+
+ /// <summary>
+ /// Gets the current domain host
+ /// </summary>
+ public virtual DomainHost CurrentHost => _storeHelper.DomainHost;
#endregion
}
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
index 4f6edc00c..247c85814 100644
--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
@@ -5066,6 +5066,24 @@
</Resource>
<Resource Name="Admin.Configuration.Stores.Deleted">
<Value>The store has been deleted successfully.</Value>
+ </Resource>
+ <Resource Name="Admin.Configuration.Stores.Domains.Fields.HostName">
+ <Value>Host name</Value>
+ </Resource>
+ <Resource Name="Admin.Configuration.Stores.Domains.Fields.Primary">
+ <Value>Primary URL</Value>
+ </Resource>
+ <Resource Name="Admin.Configuration.Stores.Domains.Fields.Url">
+ <Value>URL address</Value>
+ </Resource>
+ <Resource Name="Admin.Configuration.Stores.Domains.Fields.Url.Required">
+ <Value>URL address is required</Value>
+ </Resource>
+ <Resource Name="Admin.Configuration.Stores.Domains.Fields.Url.WrongFormat">
+ <Value>Wrong format for URL address</Value>
+ </Resource>
+ <Resource Name="Admin.Configuration.Stores.Domains.SaveBeforeEdit">
+ <Value>You need to save the store before you can add values for domains.</Value>
</Resource>
<Resource Name="Admin.Configuration.Stores.EditStoreDetails">
<Value>Edit store details</Value>
@@ -11961,6 +11979,12 @@
<Resource Name="Admin.Settings.Vendor.VendorSettings">
<Value>Vendor settings</Value>
</Resource>
+ <Resource Name="Admin.Stores.Domains">
+ <Value>Domains</Value>
+ </Resource>
+ <Resource Name="Admin.Stores.Info">
+ <Value>Store info</Value>
+ </Resource>
<Resource Name="Admin.System">
<Value>System</Value>
</Resource>
diff --git a/src/Web/Grand.Web/Controllers/CheckoutController.cs b/src/Web/Grand.Web/Controllers/CheckoutController.cs
index fbd506677..c4580259c 100644
--- a/src/Web/Grand.Web/Controllers/CheckoutController.cs
+++ b/src/Web/Grand.Web/Controllers/CheckoutController.cs
@@ -1010,7 +1010,7 @@ namespace Grand.Web.Controllers
if (paymentMethod.PaymentMethodType == PaymentMethodType.Redirection)
{
//Redirection will not work because it's AJAX request.
- var storeLocation = _workContext.CurrentStore.SslEnabled ? _workContext.CurrentStore.SecureUrl.TrimEnd('/') : _workContext.CurrentStore.Url.TrimEnd('/');
+ var storeLocation = _workContext.CurrentHost.Url.TrimEnd('/');
//redirect
return Json(new
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
index e9cbba890..fc43d3caf 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
@@ -112,7 +112,7 @@ namespace Grand.Web.Features.Handlers.Catalog
var categories = new List<string>();
var brands = new List<string>();
- var storeurl = _workContext.CurrentStore.SslEnabled ? _workContext.CurrentStore.SecureUrl.TrimEnd('/') : _workContext.CurrentStore.Url.TrimEnd('/');
+ var storeurl = _workContext.CurrentHost.Url.TrimEnd('/');
var displayPrices = await _permissionService.Authorize(StandardPermission.DisplayPrices, _workContext.CurrentCustomer);
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
index 94072347c..ad1a107ea 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
@@ -117,24 +117,14 @@ namespace Grand.Web.Features.Handlers.Common
const string newLine = "\r\n"; //Environment.NewLine
sb.Append("User-agent: *");
sb.Append(newLine);
+
+ var storeLocation = _workContext.CurrentHost.Url.TrimEnd('/');
+
//sitemaps
- if (_config.SeoFriendlyUrlsForLanguagesEnabled)
- {
- //URLs are localizable. Append SEO code
- foreach (var language in await _languageService.GetAllLanguages(storeId: _workContext.CurrentStore.Id))
- {
- sb.AppendFormat("Sitemap: {0}{1}/sitemap.xml", _workContext.CurrentStore.Url, language.UniqueSeoCode);
- sb.Append(newLine);
- }
- }
- else
- {
- //localizable paths (without SEO code)
- sb.AppendFormat("Sitemap: {0}sitemap.xml", _workContext.CurrentStore.Url);
- sb.Append(newLine);
- }
+ sb.AppendFormat("Sitemap: {0}/sitemap.xml", storeLocation);
+ sb.Append(newLine);
+
//host
- var storeLocation = _workContext.CurrentStore.SslEnabled ? _workContext.CurrentStore.SecureUrl.TrimEnd('/') : _workContext.CurrentStore.Url.TrimEnd('/');
sb.AppendFormat("Host: {0}", storeLocation);
sb.Append(newLine);
diff --git a/src/Web/Grand.Web/Views/Checkout/Start.cshtml b/src/Web/Grand.Web/Views/Checkout/Start.cshtml
index 5d8b7224e..2d2d9d8e6 100644
--- a/src/Web/Grand.Web/Views/Checkout/Start.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/Start.cshtml
@@ -16,8 +16,6 @@
}
<script asp-location="Head" asp-src="/theme/script/public.checkout.js"></script>
- var storeLocation = workContext.CurrentStore.SslEnabled ? workContext.CurrentStore.SecureUrl.TrimEnd('/') : workContext.CurrentStore.Url.TrimEnd('/');
-
//title
pagebuilder.AddTitleParts(Loc["Title.Checkout"]);
}