Merge pull request #731 from Kukks/coinswitch-shitcoin-tax

add coinswitch shitcoin tax

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -333,6 +333,7 @@ namespace BTCPayServer.Controllers
                 ChangellyMerchantId = changelly?.ChangellyMerchantId,
                 ChangellyAmountDue = changellyAmountDue,
                 CoinSwitchEnabled = coinswitch != null,
+                CoinSwitchAmountMarkupPercentage = coinswitch?.AmountMarkupPercentage?? 0,
                 CoinSwitchMerchantId = coinswitch?.MerchantId,
                 CoinSwitchMode = coinswitch?.Mode,
                 StoreId = store.Id,

BTCPayServer/Controllers/StoresController.CoinSwitch.cs

@@ -28,6 +28,7 @@ namespace BTCPayServer.Controllers
             vm.MerchantId = existing.MerchantId;
             vm.Enabled = existing.Enabled;
             vm.Mode = existing.Mode;
+            vm.AmountMarkupPercentage = existing.AmountMarkupPercentage;
         }
 
         [HttpPost]
@@ -50,7 +51,8 @@ namespace BTCPayServer.Controllers
             {
                 MerchantId =  vm.MerchantId,
                 Enabled = vm.Enabled,
-                Mode = vm.Mode
+                Mode = vm.Mode,
+                AmountMarkupPercentage = vm.AmountMarkupPercentage
             };
             
             switch (command)

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -66,5 +66,6 @@ namespace BTCPayServer.Models.InvoicingModels
         public string CoinSwitchMode { get; set; }
         public string CoinSwitchMerchantId { get; set; }
         public string RootPath { get; set; }
+        public decimal CoinSwitchAmountMarkupPercentage { get; set; }
     }
 }

BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs

@@ -13,6 +13,12 @@ namespace BTCPayServer.Models.StoreViewModels
         [Display(Name = "Integration Mode")]
         public string Mode { get; set; } = "inline";
         
+        [Required]
+        [Range(0, 100)]
+        [Display(Name =
+            "Percentage to multiply amount requested at Coinswitch to avoid underpaid situations due to Coinswitch not guaranteeing rates. ")]
+        public decimal AmountMarkupPercentage { get; set; } = new decimal(2);
+
         public List<SelectListItem> Modes { get; } = new List<SelectListItem>
         {
             new SelectListItem { Value = "popup", Text = "Open in a popup" },

BTCPayServer/Payments/Coinswitch/CoinswitchSettings.cs

@@ -5,6 +5,7 @@ namespace BTCPayServer.Payments.CoinSwitch
         public string MerchantId { get; set; }
         public string Mode { get; set; }
         public bool Enabled { get; set; }
+        public decimal AmountMarkupPercentage { get; set; }
         
         public bool IsConfigured()
         {

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -303,7 +303,7 @@
                                     :mode="srvModel.coinSwitchMode"
                                     :merchant-id="srvModel.coinSwitchMerchantId"
                                     :to-currency="srvModel.paymentMethodId"
-                                    :to-currency-due="srvModel.btcDue"
+                                    :to-currency-due="srvModel.coinSwitchAmountMarkupPercentage? (1 + (srvModel.coinSwitchAmountMarkupPercentage / 100) :srvModel.btcDue"
                                     :autoload="selectedThirdPartyProcessor === 'coinswitch'"
                                     :to-currency-address="srvModel.btcAddress">
                             <div>

BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml

@@ -30,7 +30,11 @@
                 <select asp-for="Mode" asp-items="Model.Modes" class="form-control">
                 </select>
             </div>
-
+            <div class="form-group">
+                <label asp-for="AmountMarkupPercentage"></label>
+                <input asp-for="AmountMarkupPercentage" class="form-control"/>
+                <span asp-validation-for="AmountMarkupPercentage" class="text-danger"></span>
+            </div>
             <div class="form-group">
                 <label asp-for="Enabled"></label>
                 <input asp-for="Enabled" type="checkbox" class="form-check"/>