aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-23 15:14:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename Unavailable to Disabled

Browse Source
This commit is contained in:
Umar Bolatov
2021-09-12 21:59:18 -07:00
committed by Andrew Camilleri
parent 2dcd7db797
commit 9d48358f2a
5 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs
View File

@@ -21,7 +21,7 @@ namespace BTCPayServer.Models.AppViewModels
public string BuyButtonText { get; set; }
public int? Inventory { get; set; } = null;
public string[] PaymentMethods { get; set; }
public bool Unavailable { get; set; } = false;
public bool Disabled { get; set; } = false;
}
public class CurrencyInfoData

8
BTCPayServer/Services/Apps/AppService.cs
View File

@@ -290,7 +290,7 @@ namespace BTCPayServer.Services.Apps
itemNode.Add("image", new YamlScalarNode(item.Image));
}
itemNode.Add("custom", new YamlScalarNode(item.Custom.ToStringLowerInvariant()));
itemNode.Add("unavailable", new YamlScalarNode(item.Unavailable.ToStringLowerInvariant()));
itemNode.Add("disabled", new YamlScalarNode(item.Disabled.ToStringLowerInvariant()));
if (item.Inventory.HasValue)
{
itemNode.Add("inventory", new YamlScalarNode(item.Inventory.ToString()));
@@ -311,7 +311,7 @@ namespace BTCPayServer.Services.Apps
var serializer = new SerializerBuilder().Build();
return serializer.Serialize(mappingNode);
}
public ViewPointOfSaleViewModel.Item[] Parse(string template, string currency, bool filterUnavailable = false)
public ViewPointOfSaleViewModel.Item[] Parse(string template, string currency, bool filterDisabled = false)
{
if (string.IsNullOrWhiteSpace(template))
return Array.Empty<ViewPointOfSaleViewModel.Item>();
@@ -339,9 +339,9 @@ namespace BTCPayServer.Services.Apps
BuyButtonText = c.GetDetailString("buyButtonText"),
Inventory = string.IsNullOrEmpty(c.GetDetailString("inventory")) ? (int?)null : int.Parse(c.GetDetailString("inventory"), CultureInfo.InvariantCulture),
PaymentMethods = c.GetDetailStringList("payment_methods"),
Unavailable = c.GetDetailString("unavailable") == "true"
Disabled = c.GetDetailString("disabled") == "true"
})
.Where(c => filterUnavailable ? !c.Unavailable : true)
.Where(c => filterDisabled ? !c.Disabled : true)
.ToArray();
}

22
BTCPayServer/Views/Apps/TemplateEditor.cshtml
View File

@@ -96,8 +96,8 @@
<input type="text" id="BuyButtonText" class="form-control mb-2" v-model="editingItem.buyButtonText" ref="txtBuyButtonText" />
</div>
<div class="form-group d-flex align-items-center">
<input type="checkbox" id="Unavailable" class="btcpay-toggle me-2" v-model="editingItem.unavailable" />
<label class="form-label mb-0">Unavailable</label>
<input type="checkbox" id="Disabled" class="btcpay-toggle me-2" v-model="editingItem.disabled" />
<label class="form-label mb-0">Disabled</label>
</div>
</div>
</div>
@@ -172,7 +172,7 @@ document.addEventListener("DOMContentLoaded", function () {
var line = lines[kl], product = line.split("\n"), goingThroughMethods = false,
id = null, price = null, title = null, description = null, image = null,
custom = null, buyButtonText = null, inventory = null, paymentMethods = [],
unavailable = false;
disabled = false;
for (var kp in product) {
var productProperty = product[kp].trim();
@@ -217,8 +217,8 @@ document.addEventListener("DOMContentLoaded", function () {
if (productProperty.indexOf('payment_methods:') !== -1) {
goingThroughMethods = true;
}
if (productProperty.indexOf('unavailable:') !== -1) {
unavailable = productProperty.replace('unavailable:', '').trim() === "true";
if (productProperty.indexOf('disabled:') !== -1) {
disabled = productProperty.replace('disabled:', '').trim() === "true";
}
}
@@ -234,7 +234,7 @@ document.addEventListener("DOMContentLoaded", function () {
buyButtonText: buyButtonText,
inventory: isNaN(inventory)? null: inventory,
paymentMethods: paymentMethods,
unavailable: unavailable
disabled: disabled
});
}
}
@@ -254,7 +254,7 @@ document.addEventListener("DOMContentLoaded", function () {
buyButtonText = product.buyButtonText,
inventory = product.inventory,
paymentMethods = product.paymentMethods,
unavailable = product.unavailable;
disabled = product.disabled;
template += id + ':\n' +
' price: ' + parseFloat(price).noExponents() + '\n' +
@@ -275,8 +275,8 @@ document.addEventListener("DOMContentLoaded", function () {
if (buyButtonText != null && buyButtonText.length > 0) {
template += ' buyButtonText: ' + buyButtonText + '\n';
}
if (unavailable != null) {
template += ' unavailable: ' + unavailable.toString() + '\n';
if (disabled != null) {
template += ' disabled: ' + disabled.toString() + '\n';
}
if(paymentMethods != null && paymentMethods.length > 0){
template+= ' payment_methods:\n';
@@ -291,7 +291,7 @@ document.addEventListener("DOMContentLoaded", function () {
editItem: function(index){
this.errors = [];
if(index < 0){
this.editingItem = {index:-1, id:"", title: "", price: 0, image: "", description: "", custom: false, inventory: null, paymentMethods: [], unavailable: false};
this.editingItem = {index:-1, id:"", title: "", price: 0, image: "", description: "", custom: false, inventory: null, paymentMethods: [], disabled: false};
}else{
this.editingItem = {...this.items[index], index};
}
@@ -382,7 +382,7 @@ document.addEventListener("DOMContentLoaded", function () {
},
unEscape: function(item){
for(var k in item){
if(k !== "paymentMethods" && k!=="id" && k !== "unavailable"){
if(k !== "paymentMethods" && k!=="id" && k !== "disabled"){
item[k] = this.unEscapeKey(item[k]);
}
}

4
BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
View File

@@ -300,8 +300,8 @@
<input type="number" step="1" class="js-product-inventory form-control mb-2" value="{inventory}" />
</div>
<div class="form-group d-flex align-items-center">
<input type="checkbox" class="btcpay-toggle me-2" value="{unavailable}" />
<label class="form-label mb-0">Unavailable</label>
<input type="checkbox" class="btcpay-toggle me-2" value="{disabled}" />
<label class="form-label mb-0">Disabled</label>
</div>
</div>
</script>

4
BTCPayServer/Views/AppsPublic/PointOfSale/Cart.cshtml
View File

@@ -216,10 +216,6 @@
var image = item.Image;
var description = item.Description;
@if (item.Unavailable) {
continue;
}
<div class="js-add-cart card px-0 card-wrapper" data-index="@index">
@if (!string.IsNullOrWhiteSpace(image))
{