From db5eef176b03a9da829c4eba12919ac68bb1a856 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sun, 24 Feb 2019 12:35:25 +0100 Subject: [PATCH] Work on Payment Targets 3 --- .../Pages.Financial.designer.cs | 18 ++++++++++++++++++ Site/App_GlobalResources/Pages.Financial.resx | 8 ++++++++ Site/Pages/v5/Financial/PayOutMoney.aspx | 7 +++---- Site/Pages/v5/Financial/PayOutMoney.aspx.cs | 3 +++ .../v5/Financial/PayOutMoney.aspx.designer.cs | 13 +++++++++++-- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/Site/App_GlobalResources/Pages.Financial.designer.cs b/Site/App_GlobalResources/Pages.Financial.designer.cs index e9629a68..3a16c618 100644 --- a/Site/App_GlobalResources/Pages.Financial.designer.cs +++ b/Site/App_GlobalResources/Pages.Financial.designer.cs @@ -1401,6 +1401,24 @@ namespace Resources.Pages { } } + /// + /// Looks up a localized string similar to Are you scanning this payment?. + /// + internal static string PayOutMoney_Modal_LabelOcr1 { + get { + return ResourceManager.GetString("PayOutMoney_Modal_LabelOcr1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Show in machine-readable format. + /// + internal static string PayOutMoney_Modal_LabelOcr2 { + get { + return ResourceManager.GetString("PayOutMoney_Modal_LabelOcr2", resourceCulture); + } + } + /// /// Looks up a localized string similar to Show OCR for mobile apps. /// diff --git a/Site/App_GlobalResources/Pages.Financial.resx b/Site/App_GlobalResources/Pages.Financial.resx index 73eb0453..812eb855 100644 --- a/Site/App_GlobalResources/Pages.Financial.resx +++ b/Site/App_GlobalResources/Pages.Financial.resx @@ -743,4 +743,12 @@ This is Paid As in "Confirm The Currently Displayed Payout Has Been Manually Executed" -- try to keep short, "This is Paid" length is ideal + + Are you scanning this payment? + In longer form, the question would be "Are you using a mobile phone or other device to capture this payment data automatically?". Some banking apps can scan QR codes or specially formatted number sequences. + + + Show in machine-readable format + Don't make this string much longer than it is. + \ No newline at end of file diff --git a/Site/Pages/v5/Financial/PayOutMoney.aspx b/Site/Pages/v5/Financial/PayOutMoney.aspx index 9209ba10..3357e8aa 100644 --- a/Site/Pages/v5/Financial/PayOutMoney.aspx +++ b/Site/Pages/v5/Financial/PayOutMoney.aspx @@ -269,7 +269,7 @@ // Localization - $('#idModalButtonConfirm').value(SwarmopsJS.unescape('<%=this.Localized_ConfirmDialog_ConfirmPaid%>')); + $('#idModalButtonConfirm').val(SwarmopsJS.unescape('<%=this.Localized_ConfirmDialog_ConfirmPaid%>')); @@ -340,7 +340,7 @@ ​
​
​
- + - Foobar high chaparral diff --git a/Site/Pages/v5/Financial/PayOutMoney.aspx.cs b/Site/Pages/v5/Financial/PayOutMoney.aspx.cs index 46fb0cdd..8ea8cf69 100644 --- a/Site/Pages/v5/Financial/PayOutMoney.aspx.cs +++ b/Site/Pages/v5/Financial/PayOutMoney.aspx.cs @@ -45,6 +45,9 @@ namespace Swarmops.Frontend.Pages.Financial this.LabelGridHeaderRecipient.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_Recipient; this.LabelGridHeaderCurrencyMethod.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_CurrencyMethod; + this.LabelModalOcr1.Text = Resources.Pages.Financial.PayOutMoney_Modal_LabelOcr1; + this.ToggleModalMachineReadable.Label = Resources.Pages.Financial.PayOutMoney_Modal_LabelOcr2; + this.LabelPayOutMoneyOcrHeader.Text = Resources.Pages.Financial.PayoutMoney_Header_Ocr; this.LabelGridHeaderAccountOcr.Text = Resources.Pages.Financial.PayoutMoney_GridHeader_Account_Ocr; this.LabelGridHeaderDue2.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_DueDate; // same as above diff --git a/Site/Pages/v5/Financial/PayOutMoney.aspx.designer.cs b/Site/Pages/v5/Financial/PayOutMoney.aspx.designer.cs index f5ac6208..4d377b0e 100644 --- a/Site/Pages/v5/Financial/PayOutMoney.aspx.designer.cs +++ b/Site/Pages/v5/Financial/PayOutMoney.aspx.designer.cs @@ -139,13 +139,13 @@ namespace Swarmops.Frontend.Pages.Financial { protected global::System.Web.UI.WebControls.Label LabelPayoutModalHeader; /// - /// MasterEditPerson2FAProvisioning control. + /// ToggleModalMachineReadable control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::Swarmops.Frontend.Controls.Base.AjaxToggleSlider MasterEditPerson2FAProvisioning; + protected global::Swarmops.Frontend.Controls.Base.AjaxToggleSlider ToggleModalMachineReadable; /// /// LabelModalRecipient control. @@ -183,6 +183,15 @@ namespace Swarmops.Frontend.Pages.Financial { /// protected global::System.Web.UI.WebControls.Label LabelModalTransferMethod; + /// + /// LabelModalOcr1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label LabelModalOcr1; + /// /// LabelSidebarOptions control. ///