PoS: Custom buy button text per product #2299

dennisreimann · 2021-02-18T10:01:05Z

Closes #2232.

I saw the bounty by @MaxHillebrand in the chat and did this – only realizing afterwards that @bolatovumar already discussed this with Max and wanted to take it on. As I didn't intend to get in the way I'd suggest Umar reviews this and we split the bounty if that's okay too.

Editor

Works with regular text too, this example uses the {0} to be replaced by the amount, which is supported on a store level too.

Static View

Cart View

Closes btcpayserver#2232.

Kukks

Need to take into account crowdfund app too as it uses the same templating

dennisreimann · 2021-02-18T11:33:23Z

@Kukks Thanks for the pointer, added.

MaxHillebrand · 2021-02-18T11:41:02Z

You're a treasure @dennisreimann, thanks for picking it up so fast :)

Yes, I'm happy to include reviewers of the PR in the bounty.

Kukks

LGTM, just a small quyestion if the prop name should be simpler or not but nothing major

Kukks · 2021-02-19T06:49:55Z

BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs

@@ -17,6 +17,7 @@ public class ItemPrice
            public ItemPrice Price { get; set; }
            public string Title { get; set; }
            public bool Custom { get; set; }
+            public string BuyButtonText { get; set; }


BuyButtonText or simply ButtonText?

I thought about this too and was torn: The upper level prop is called CustomButtonText – one might argue we should match this, but I wanted to avoid confusion and used the buy-prefix to be specific … so yeah, let's discuss this.

I think BuyButtonText is more accurate even though it's more verbose.

pavlenex

If custom price is set to yes the text you add in the button name field doesn't take effect. If it's desired behavior, we should probably hide the Buy Button Text field, if it's not desired, the name in the Buy Button Text should take effect even if custom price is set to yes.

bolatovumar · 2021-02-21T21:08:22Z

If custom price is set to yes the text you add in the button name field doesn't take effect. If it's desired behavior, we should probably hide the Buy Button Text field, if it's not desired, the name in the Buy Button Text should take effect even if custom price is set to yes.

Yeah, I think if you specify custom button text it should apply no matter what you select for "Custom price". The user who puts in custom button text probably doesn't care what is selected in the "Custom price" dropdown when they set the button text, they just want this text to appear no matter what.

dennisreimann · 2021-02-22T08:02:38Z

Fixed, also updated the display so that it works with long and short text …

pavlenex

tACK.

bolatovumar

I tested this branch locally on my machine and noticed a couple of issues:

If I add a custom text to the first item in the default POS app (green tea) and then update it again right after all OTHER items get the old text for the first item after the second update (see screenshot). I can reproduce this consistently.
If I add text that's too long the button overspills. This one is probably not a big deal as I don't expect people will add long text in these buttons

dennisreimann · 2021-02-23T08:53:42Z

@bolatovumar good spot, it's fixed now. As far as I read it, we had the same problem before with other properties (price, title, description and custom) because they weren't reset before parsing a new item. Fixed in 3237054.

bolatovumar

Tested the updated branch and couldn't find any issues.

bolatovumar · 2021-02-24T03:07:23Z

BTCPayServer.Tests/SeleniumTests.cs

@@ -478,12 +478,21 @@ public async Task CanCreateAppPoS()
                s.Driver.FindElement(By.Id("SelectedStore")).SendKeys(storeName);
                s.Driver.FindElement(By.Id("Create")).Click();
                s.Driver.FindElement(By.Id("DefaultView")).SendKeys("Cart");
+                s.Driver.FindElement(By.CssSelector(".template-item:nth-of-type(1) .btn-primary")).Click();


Wouldn't it be better to use some test-id attribute instead so if a new button is added or something you don't have to update this test?

In general I agree. This one selects the first article in the editor – as it is a dynamic list I thought it'd be ok this way too.

bolatovumar · 2021-02-24T03:08:56Z

BTCPayServer/Views/Apps/TemplateEditor.cshtml

+                            <div class="form-row">
+                                <div class="col">
+                                    <label>Buy Button Text</label>
+                                    <input type="text" id="BuyButtonText" class="form-control mb-2" v-model="editingItem.buyButtonText" ref="txtBuyButtonText"/>


ref attribute seems weird. txtBuyButtonText <-- looks like txt and Text are meant to represent text and are repeated?

It's the same as for the other input fields – I think the txt part refers to the input being a text input. Can change it, but think we should then change the other field refs too to be consistent.

BTCPayServer/Views/AppsPublic/PointOfSale/Cart.cshtml

dennisreimann · 2021-02-24T08:21:11Z

Fix for the Selenium test contained in #2310. Can rebase this one if the other PR gets merged first.

Using Polar to test Lightning payments.

Update README.md btcpayserver#2210

Co-authored-by: Pavlenex <pavle@pavle.org>

) closes btcpayserver#2311

Fixes an issue similar to what we fixed in btcpayserver#2293.

BTCPayServer.Tests/README.md

Co-authored-by: Max Hillebrand <30683012+MaxHillebrand@users.noreply.github.com>

MaxHillebrand · 2021-02-26T07:34:42Z

Thank you @dennisreimann @bolatovumar @Kukks @pavlenex for all you past and present support of free software like BTCPay! Y'all are heroes!!

Some sats have magically found their way into your wallets. 🖤 🔥

PoS: Custom buy button text per product

757c087

Closes btcpayserver#2232.

Kukks requested changes Feb 18, 2021

View reviewed changes

dennisreimann added 2 commits February 18, 2021 12:20

PoS: Add test for custom buy button text

dfbec71

Crowdfund: Add custom buy button text

3123718

dennisreimann requested a review from Kukks February 18, 2021 13:21

Kukks approved these changes Feb 19, 2021

View reviewed changes

pavlenex requested changes Feb 19, 2021

View reviewed changes

PoS: Custom buy button text for custom price

5b4877c

pavlenex approved these changes Feb 22, 2021

View reviewed changes

pavlenex added this to In progress in 0.12 Milestone via automation Feb 22, 2021

pavlenex moved this from In progress to Review in progress in 0.12 Milestone Feb 22, 2021

pavlenex moved this from Review in progress to Reviewer approved in 0.12 Milestone Feb 22, 2021

bolatovumar reviewed Feb 23, 2021

View reviewed changes

dennisreimann added 2 commits February 23, 2021 09:50

Fix variable assignment in yaml parsing loop

3237054

JavaScript formatting fixes

4bcc18f

bolatovumar approved these changes Feb 24, 2021

View reviewed changes

radWorx and others added 7 commits February 24, 2021 15:06

Update README.md

9ed5297

Using Polar to test Lightning payments.

Update README.md

605cf40

Update README.md btcpayserver#2210

Update BTCPayServer.Tests/README.md

64a8de9

Co-authored-by: Pavlenex <pavle@pavle.org>

Add "vertical-align: middle;" to pay button image CSS (btcpayserver#2312

3a9fc52

) closes btcpayserver#2311

Fix missing view name

5a00f6a

Controller cleanups

35aeb19

Make Selenium test more robust

75c2fab

Fixes an issue similar to what we fixed in btcpayserver#2293.

MaxHillebrand reviewed Feb 24, 2021

View reviewed changes

BTCPayServer.Tests/README.md Outdated Show resolved Hide resolved

Update BTCPayServer.Tests/README.md

e25f767

Co-authored-by: Max Hillebrand <30683012+MaxHillebrand@users.noreply.github.com>

dennisreimann added Enhancement Improvements to an existing feature PoS Point of Sale app labels Feb 24, 2021

NicolasDorier merged commit 6d9b93a into btcpayserver:master Feb 26, 2021

0.12 Milestone automation moved this from Reviewer approved to Done Feb 26, 2021

dennisreimann deleted the pos-item-button-text branch February 26, 2021 07:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PoS: Custom buy button text per product #2299

PoS: Custom buy button text per product #2299

dennisreimann commented Feb 18, 2021 •

edited

Kukks left a comment

dennisreimann commented Feb 18, 2021

MaxHillebrand commented Feb 18, 2021

Kukks left a comment

Kukks Feb 19, 2021

dennisreimann Feb 19, 2021

bolatovumar Feb 21, 2021

pavlenex left a comment •

edited

bolatovumar commented Feb 21, 2021

dennisreimann commented Feb 22, 2021

pavlenex left a comment

bolatovumar left a comment

dennisreimann commented Feb 23, 2021

bolatovumar left a comment

bolatovumar Feb 24, 2021

dennisreimann Feb 24, 2021

bolatovumar Feb 24, 2021

dennisreimann Feb 24, 2021

dennisreimann commented Feb 24, 2021

MaxHillebrand commented Feb 26, 2021

PoS: Custom buy button text per product #2299

PoS: Custom buy button text per product #2299

Conversation

dennisreimann commented Feb 18, 2021 • edited

Editor

Static View

Cart View

Kukks left a comment

Choose a reason for hiding this comment

dennisreimann commented Feb 18, 2021

MaxHillebrand commented Feb 18, 2021

Kukks left a comment

Choose a reason for hiding this comment

Kukks Feb 19, 2021

Choose a reason for hiding this comment

dennisreimann Feb 19, 2021

Choose a reason for hiding this comment

bolatovumar Feb 21, 2021

Choose a reason for hiding this comment

pavlenex left a comment • edited

Choose a reason for hiding this comment

bolatovumar commented Feb 21, 2021

dennisreimann commented Feb 22, 2021

pavlenex left a comment

Choose a reason for hiding this comment

bolatovumar left a comment

Choose a reason for hiding this comment

dennisreimann commented Feb 23, 2021

bolatovumar left a comment

Choose a reason for hiding this comment

bolatovumar Feb 24, 2021

Choose a reason for hiding this comment

dennisreimann Feb 24, 2021

Choose a reason for hiding this comment

bolatovumar Feb 24, 2021

Choose a reason for hiding this comment

dennisreimann Feb 24, 2021

Choose a reason for hiding this comment

dennisreimann commented Feb 24, 2021

MaxHillebrand commented Feb 26, 2021

dennisreimann commented Feb 18, 2021 •

edited

pavlenex left a comment •

edited