Skip to content

Connection check improvements #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DWDBE merged 2 commits into from
Feb 13, 2026
Merged

Connection check improvements #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef3aa18
Connection check improvements
DWDBE Feb 12, 2026
670aa8c
fix for Global tags
DWDBE Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...Ecommerce.DynamicwebLiveIntegration/Dynamicweb.Ecommerce.DynamicwebLiveIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>10.4.34</Version>
<Version>10.4.35</Version>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<Title>Live Integration</Title>
<Description>Live Integration</Description>
Expand Down
8 changes: 5 additions & 3 deletions src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/NotificationSubscribers/PageLoaded.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Configuration;
using Dynamicweb.Ecommerce.DynamicwebLiveIntegration.Connectors;
using Dynamicweb.Extensibility.Notifications;
using Dynamicweb.Frontend;
using System;

namespace Dynamicweb.Ecommerce.DynamicwebLiveIntegration.NotificationSubscribers
Expand Down Expand Up @@ -30,7 +29,10 @@ public override void OnNotify(string notification, NotificationArgs args)
var settings = SettingsManager.GetSettingsByShop(Global.GetShopId(loadedArgs.PageViewInstance));
if (settings != null && Global.IsIntegrationActive(settings))
{
isWebServiceConnectionAvailable = Connector.IsWebServiceConnectionAvailable(settings, SubmitType.Live);
if (settings.EnableLivePrices || settings.CartCommunicationType != Constants.CartCommunicationType.None || !string.IsNullOrEmpty(settings.WebServiceConnectionStatusGlobalTagName))
{
isWebServiceConnectionAvailable = Connector.IsWebServiceConnectionAvailable(settings, SubmitType.Live);
}
isLazyLoadingForProductInfoEnabled = Global.IsLazyLoadingForProductInfoEnabled(settings);

if (Context.Current.Session != null && Convert.ToBoolean(Context.Current.Session["DynamicwebLiveIntegration.OrderExportFailed"]))
Expand All @@ -46,6 +48,6 @@ public override void OnNotify(string notification, NotificationArgs args)
Context.Current.Items["IsWebServiceConnectionAvailable"] = isWebServiceConnectionAvailable;
Context.Current.Items["IsLazyLoadingForProductInfoEnabled"] = isLazyLoadingForProductInfoEnabled;
}
}
}
}
}
15 changes: 7 additions & 8 deletions ...ynamicweb.Ecommerce.DynamicwebLiveIntegration/NotificationSubscribers/PageOnGlobalTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@ public override void OnNotify(string notification, NotificationArgs args)
if (pageviewNotificationArgs != null)
{
var settings = SettingsManager.GetSettingsByShop(Global.GetShopId(pageviewNotificationArgs.Pageview));
if (settings != null && EnabledAndActive(settings, SubmitType.Live))
{
if (settings != null)
{
string globalTagName = settings.WebServiceConnectionStatusGlobalTagName;
if (!string.IsNullOrEmpty(globalTagName))
if (!string.IsNullOrEmpty(globalTagName)
&& pageviewNotificationArgs.Template.TagExists(globalTagName)
&& EnabledAndActive(settings, SubmitType.Live))
{
if (pageviewNotificationArgs.Template.TagExists(globalTagName))
{
pageviewNotificationArgs.Template.SetTag(globalTagName, Connector.IsWebServiceConnectionAvailable(settings, SubmitType.Live).ToString().ToLower());
pageviewNotificationArgs.Template.SetTag("Global:LiveIntegration.IsLazyLoadingForProductInfoEnabled", Global.IsLazyLoadingForProductInfoEnabled(settings).ToString().ToLower());
}
pageviewNotificationArgs.Template.SetTag(globalTagName, Connector.IsWebServiceConnectionAvailable(settings, SubmitType.Live).ToString().ToLower());
pageviewNotificationArgs.Template.SetTag("Global:LiveIntegration.IsLazyLoadingForProductInfoEnabled", Global.IsLazyLoadingForProductInfoEnabled(settings).ToString().ToLower());
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...eb.Ecommerce.DynamicwebLiveIntegration/NotificationSubscribers/VariantListBeforeRender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public override void OnNotify(string notification, NotificationArgs args)

private static bool CanCheckPrice(Settings settings)
{
return EnabledAndActive(settings, SubmitType.Live) && settings.EnableLivePrices &&
return settings.EnableLivePrices && EnabledAndActive(settings, SubmitType.Live) &&
(settings.LiveProductInfoForAnonymousUsers || Helpers.GetCurrentExtranetUser() != null) &&
(Helpers.GetCurrentExtranetUser() == null || !Helpers.GetCurrentExtranetUser().IsLivePricesDisabled) &&
!Global.IsProductLazyLoad(settings);
Expand Down
6 changes: 3 additions & 3 deletions src/Dynamicweb.Ecommerce.DynamicwebLiveIntegration/Orders/LiveCartCalculationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ public override bool CalculateCart(Order cart)
var settings = SettingsManager.GetSettingsByShop(cart.ShopId);
SubmitType submitType = SubmitType.LiveOrderOrCart;

if (Global.IsIntegrationActive(settings) &&
Connector.IsWebServiceConnectionAvailable(settings, submitType))
if (Global.IsIntegrationActive(settings))
{
if (Global.EnableCartCommunication(settings, cart.Complete))
if (Global.EnableCartCommunication(settings, cart.Complete) &&
Connector.IsWebServiceConnectionAvailable(settings, submitType))
{
var contextCurrency = Context.Current?.Request?.GetString("CurrencyCode");
if (!string.IsNullOrEmpty(contextCurrency) && !string.Equals(cart.CurrencyCode, contextCurrency, System.StringComparison.OrdinalIgnoreCase))
Expand Down
Loading