diff --git a/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj b/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj index 1ae67a6..d5c5549 100644 --- a/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj +++ b/Plugins/BTCPayServer.Plugins.FixedFloat/BTCPayServer.Plugins.FixedFloat.csproj @@ -9,7 +9,7 @@ FixedFloat Allows you to embed a FixedFloat conversion screen to allow customers to pay with altcoins. - 1.1.9 + 1.1.10 true diff --git a/Plugins/BTCPayServer.Plugins.FixedFloat/Views/Shared/FixedFloat/CheckoutPaymentExtension.cshtml b/Plugins/BTCPayServer.Plugins.FixedFloat/Views/Shared/FixedFloat/CheckoutPaymentExtension.cshtml index 8fbceef..9cc13f4 100644 --- a/Plugins/BTCPayServer.Plugins.FixedFloat/Views/Shared/FixedFloat/CheckoutPaymentExtension.cshtml +++ b/Plugins/BTCPayServer.Plugins.FixedFloat/Views/Shared/FixedFloat/CheckoutPaymentExtension.cshtml @@ -87,7 +87,7 @@ }, explicitQuery (){ const isExplicit = !!this.explicitId; - const explicitFrom = isExplicit ? this.explicitId: null; + const explicitFrom = isExplicit ? this.explicitId.replace('ff_', ''): null; return isExplicit? `&from=${explicitFrom}&lockSend=true` : ''; }, amountQuery () { diff --git a/Plugins/BTCPayServer.Plugins.FixedFloat/Views/Shared/FixedFloat/CheckoutPaymentMethodExtension.cshtml b/Plugins/BTCPayServer.Plugins.FixedFloat/Views/Shared/FixedFloat/CheckoutPaymentMethodExtension.cshtml index 55d24ef..694a4f4 100644 --- a/Plugins/BTCPayServer.Plugins.FixedFloat/Views/Shared/FixedFloat/CheckoutPaymentMethodExtension.cshtml +++ b/Plugins/BTCPayServer.Plugins.FixedFloat/Views/Shared/FixedFloat/CheckoutPaymentMethodExtension.cshtml @@ -5,28 +5,30 @@ const string id = "FixedFloat"; var storeId = Model.StoreId; var settings = await FixedFloatService.GetFixedFloatForStore(storeId); - + if (settings?.Enabled is true) { - if (settings.ExplicitMethods?.Any() is true) - { - foreach (var explicitMethod in settings.ExplicitMethods) + +
+ @if (settings.ExplicitMethods?.Any() is true) { - if(FixedFloatSettings.AllowedSendingOptions.TryGetValue(explicitMethod, out var explicitMethodValue)) + foreach (var explicitMethod in settings.ExplicitMethods) { - - @explicitMethodValue - + if (FixedFloatSettings.AllowedSendingOptions.TryGetValue(explicitMethod, out var explicitMethodValue)) + { + + @explicitMethodValue + + } } - } - } - if (!settings.OnlyShowExplicitMethods || settings.ExplicitMethods?.Any() is not true) - { - - @id - - } - + @if (!settings.OnlyShowExplicitMethods || settings.ExplicitMethods?.Any() is not true) + { + + @id + + } + +
} -} +} \ No newline at end of file diff --git a/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj b/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj index 03017b1..e94cd3f 100644 --- a/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj +++ b/Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj @@ -9,7 +9,7 @@ SideShift Allows you to embed a SideShift conversion screen to allow customers to pay with altcoins. - 1.1.15 + 1.1.16 true diff --git a/Plugins/BTCPayServer.Plugins.SideShift/Views/Shared/SideShift/CheckoutPaymentExtension.cshtml b/Plugins/BTCPayServer.Plugins.SideShift/Views/Shared/SideShift/CheckoutPaymentExtension.cshtml index dd2ee24..f4f779f 100644 --- a/Plugins/BTCPayServer.Plugins.SideShift/Views/Shared/SideShift/CheckoutPaymentExtension.cshtml +++ b/Plugins/BTCPayServer.Plugins.SideShift/Views/Shared/SideShift/CheckoutPaymentExtension.cshtml @@ -25,7 +25,7 @@

Lightning is not supported via Sideshift. Select another payment method first, then come back.

- +