diff --git a/Site/App_GlobalResources/Pages.Financial.designer.cs b/Site/App_GlobalResources/Pages.Financial.designer.cs
index 2633d28f..29084b33 100644
--- a/Site/App_GlobalResources/Pages.Financial.designer.cs
+++ b/Site/App_GlobalResources/Pages.Financial.designer.cs
@@ -1257,6 +1257,24 @@ namespace Resources.Pages {
}
}
+ ///
+ /// Looks up a localized string similar to ...and this.
+ ///
+ internal static string PayOutMoney_AutomationFieldNext {
+ get {
+ return ResourceManager.GetString("PayOutMoney_AutomationFieldNext", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Scan this.
+ ///
+ internal static string PayOutMoney_AutomationFieldStart {
+ get {
+ return ResourceManager.GetString("PayOutMoney_AutomationFieldStart", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Amount.
///
diff --git a/Site/App_GlobalResources/Pages.Financial.resx b/Site/App_GlobalResources/Pages.Financial.resx
index 003e6e10..308aed57 100644
--- a/Site/App_GlobalResources/Pages.Financial.resx
+++ b/Site/App_GlobalResources/Pages.Financial.resx
@@ -429,10 +429,6 @@
Recipient
Can be org (for invoice) or person (for salary, expense, advance)
-
- Reference
- Depends on cost type - can be an OCR number for an invoice, a cash advance number, a salary spec, etc.
-
Costs Ready For Payout
@@ -741,6 +737,18 @@
Transfer Method
As in "money transfer method"; this can be a domestic bank transfer, mailing a check, et cetera.
+
+ ...and this
+ AutomationStartFirst and AutomationStartNext are shown as labels to machine-readable data fields, that the user can scan with an app in their smartphone.
+
+
+ Scan this
+ AutomationStartFirst and AutomationStartNext are shown as labels to machine-readable data fields, that the user can scan with an app in their smartphone.
+
+
+ Reference
+ Depends on cost type - can be an OCR number for an invoice, a cash advance number, a salary spec, etc.
+
Payment is late
"Late" in this context means "after its due date".
diff --git a/Site/Pages/v5/Financial/PayOutMoney.aspx b/Site/Pages/v5/Financial/PayOutMoney.aspx
index 9281c753..b584da94 100644
--- a/Site/Pages/v5/Financial/PayOutMoney.aspx
+++ b/Site/Pages/v5/Financial/PayOutMoney.aspx
@@ -96,6 +96,20 @@
}
}
+ // Show or hide the automation toggle
+
+ var automationAvailable = $(this).attr("data-ocr");
+ if (automationAvailable == "yes") {
+ $(".modal-automation-toggle").show();
+ } else {
+ $(".modal-automation-toggle").hide();
+ }
+
+ $(".input-field-needs-init").each(function() {
+ $(this).val(loadingBreadcrumb);
+ });
+
+
<%=this.ModalConfirmPayment.ClientID%>_open();
modalPrototypeId = $(this).attr("protoid");
@@ -128,6 +142,14 @@
$('#idModalExtraField' + index).val(result.TransferMethodData[index]);
}
+ // Add OCR fields if available
+
+ if (result.OcrData != null && result.OcrData.Length > 0) {
+ $('#idModalAutomationField1').val(result.OcrData[0]);
+ $('#idModalAutomationField2').val(result.OcrData[1]);
+ $('#idModalAutomationField3').val(result.OcrData[2]);
+ }
+
} else {
// TODO: Handle server-level concurrency lock
}
@@ -359,23 +381,23 @@
(