btcpayserver/bitpay-plugin-for-nopcommerce
btcpayserver/bitpay-plugin-for-nopcommerce
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: btcpayserver:custom-url
Branches Tags
btcpayserver:master
btcpayserver:custom-url
btcpayserver:nopCommerce-3.90
btcpayserver:nopCommerce-3.90
..
compare: btcpayserver:master
Branches Tags
btcpayserver:custom-url
btcpayserver:master
btcpayserver:nopCommerce-3.90
btcpayserver:nopCommerce-3.90

No commits in common. "custom-url" and "master" have entirely different histories.
custom-url ... master

5 changed files with 2 additions and 21 deletions
Show Stats Expand all files Collapse all files

4
Nop.Plugin.Payments.BitPay/BitpayHelper.cs
View File

@ -6,9 +6,7 @@ namespace Nop.Plugin.Payments.BitPay
{
public static string GetEnvironmentUrl(BitpayPaymentSettings settings)
{
return string.IsNullOrEmpty(settings.CustomUrl)
? settings.UseSandbox ? "https://test.bitpay.com/" : "https://bitpay.com/"
: settings.CustomUrl;
return settings.UseSandbox ? "https://test.bitpay.com/" : "https://bitpay.com/";
}
}
}

3
Nop.Plugin.Payments.BitPay/BitpayPaymentSettings.cs
View File

@ -11,6 +11,5 @@ namespace Nop.Plugin.Payments.Bitpay
public string PairingCode { get; set; }
public TransactionSpeed TransactionSpeed { get; set; }
public bool UseSandbox { get; set; }
public string CustomUrl { get; set; }
}
}
}

2
Nop.Plugin.Payments.BitPay/Controllers/PaymentBitpayController.cs
View File

@ -95,7 +95,6 @@ namespace Nop.Plugin.Payments.Bitpay.Controllers
//save settings
bitpaySettings.PairingCode = model.PairingCode;
bitpaySettings.UseSandbox = model.UseSandbox;
bitpaySettings.CustomUrl = model.CustomUrl;
bitpaySettings.TransactionSpeed = (TransactionSpeed)model.TransactionSpeedId;
/* We do not clear cache after each setting update.
@ -103,7 +102,6 @@ namespace Nop.Plugin.Payments.Bitpay.Controllers
* and loaded from database after each update */
_settingService.SaveSettingOverridablePerStore(bitpaySettings, x => x.PairingCode, model.PairingCode_OverrideForStore, storeScope, false);
_settingService.SaveSettingOverridablePerStore(bitpaySettings, x => x.CustomUrl, model.CustomUrl_OverrideForStore, storeScope, false);
_settingService.SaveSettingOverridablePerStore(bitpaySettings, x => x.UseSandbox, model.UseSandbox_OverrideForStore, storeScope, false);
_settingService.SaveSettingOverridablePerStore(bitpaySettings, x => x.TransactionSpeed, model.TransactionSpeed_OverrideForStore, storeScope, false);

4
Nop.Plugin.Payments.BitPay/Models/ConfigurationModel.cs
View File

@ -20,9 +20,5 @@ namespace Nop.Plugin.Payments.Bitpay.Models
[NopResourceDisplayName("Plugins.Payments.Bitpay.Fields.PairingCode")]
public string PairingCode { get; set; }
public bool PairingCode_OverrideForStore { get; set; }
[NopResourceDisplayName("Plugins.Payments.Bitpay.Fields.CustomUrl")]
public string CustomUrl { get; set; }
public bool CustomUrl_OverrideForStore { get; set; }
}
}

10
Nop.Plugin.Payments.BitPay/Views/Configure.cshtml
View File

@ -41,16 +41,6 @@
@Html.ValidationMessageFor(model => model.UseSandbox)
</div>
</div>
<div class="form-group">
<div class="col-md-3">
@Html.OverrideStoreCheckboxFor(model => model.CustomUrl_OverrideForStore, model => model.CustomUrl, Model.ActiveStoreScopeConfiguration)
@Html.NopLabelFor(model => model.CustomUrl)
</div>
<div class="col-md-9">
@Html.NopEditorFor(model => model.CustomUrl)
@Html.ValidationMessageFor(model => model.CustomUrl)
</div>
</div>
<div class="form-group">
<div class="col-md-3">
&nbsp;