Added loc to new Payout OCR stuff

This commit is contained in:
Rick Falkvinge
2016-05-07 11:48:12 +02:00
parent 146eeee910
commit 5a35be0431
5 changed files with 40 additions and 17 deletions
@@ -421,10 +421,16 @@
<data name="FileExpenseClaim_ValidationError_Purpose" xml:space="preserve">
<value>Please describe what this purchase was.</value>
</data>
<data name="PayoutMoney_GridHeader_Account_Ocr" xml:space="preserve">
<value>Account (OCR)</value>
</data>
<data name="PayOutMoney_GridHeader_Amount" xml:space="preserve">
<value>Amount</value>
<comment>Amount to be paid out</comment>
</data>
<data name="PayOutMoney_GridHeader_Amount_Ocr" xml:space="preserve">
<value>Amount (OCR)</value>
</data>
<data name="PayOutMoney_GridHeader_BankAccount" xml:space="preserve">
<value>Clearing / Account</value>
<comment>Will display as "XXXX / YYYYYYYY" where XXXX is the clearing number</comment>
@@ -447,12 +453,21 @@
<value>Reference</value>
<comment>Depends on cost type - can be an OCR number for an invoice, a cash advance number, a salary spec, etc.</comment>
</data>
<data name="PayOutMoney_GridHeader_Reference_Ocr" xml:space="preserve">
<value>Reference (OCR)</value>
</data>
<data name="PayOutMoney_Header" xml:space="preserve">
<value>Costs Ready For Payout</value>
</data>
<data name="PayoutMoney_Header_Ocr" xml:space="preserve">
<value>Costs for Payout (OCR for mobile apps)</value>
</data>
<data name="PayOutMoney_Info" xml:space="preserve">
<value>These are the various forms of costs to the organization that have passed all the hurdles for payout. They are ready to be paid out to the recipient. Here is where you check them off as being paid out (probably while having your bank open in another window).</value>
</data>
<data name="PayoutMoney_OptionShowOcr" xml:space="preserve">
<value>Show OCR for mobile apps</value>
</data>
<data name="PayOutMoney_OptionShowOpen" xml:space="preserve">
<value>Show open payouts ({0:N0})</value>
<comment>These are payouts that have been ordered, but aren't yet mapped to actual transactions. Can be shown for the purpose of undoing them if they were wrong.</comment>
@@ -69,7 +69,7 @@ namespace Swarmops.Frontend.Pages.Financial
"\"reference\":\"{5}\"," +
"\"amount\":\"{6:N2}\"," +
"\"action\":\"" +
"<img class=\\\"IconApproval{7} LocalIconApproval LocalPrototype\\\" baseid=\\\"{0}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img id=\\\"IconApproval{7}\\\" class=\\\"IconApproval{7} LocalIconApproval LocalPrototype\\\" baseid=\\\"{0}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img class=\\\"IconApproved{7} LocalIconApproved LocalPrototype\\\" baseid=\\\"{0}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img class=\\\"IconDenial{7} LocalIconDenial LocalPrototype\\\" baseid=\\\"{0}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img class=\\\"IconDenied{7} LocalIconDenied LocalPrototype\\\" baseid=\\\"{0}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
@@ -80,7 +80,7 @@ namespace Swarmops.Frontend.Pages.Financial
? Global.Global_ASAP
: payout.ExpectedTransactionDate.ToShortDateString()),
JsonSanitize (TryLocalize (payout.Recipient)),
JsonSanitize (payout.Bank),
JsonSanitize (TryLocalize (payout.Bank)),
JsonSanitize (payout.Account),
JsonSanitize (TryLocalize (payout.Reference)),
payout.AmountCents/100.0,
@@ -115,7 +115,7 @@ namespace Swarmops.Frontend.Pages.Financial
"\"reference\":\"{5}\"," +
"\"amount\":\"{6:N2}\"," +
"\"action\":\"" +
"<img class=\\\"IconApproval{7} LocalIconApproval LocalPrevious\\\" databaseid=\\\"{8}\\\" baseid=\\\"{0}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img id=\\\"IconApproval{7}\\\" class=\\\"IconApproval{7} LocalIconApproval LocalPrevious\\\" databaseid=\\\"{8}\\\" baseid=\\\"{0}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img class=\\\"IconApproved{7} LocalIconApproved LocalPrevious\\\" baseid=\\\"{0}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img class=\\\"IconDenial{7} LocalIconDenial LocalPrevious\\\" baseid=\\\"{0}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img class=\\\"IconDenied{7} LocalIconDenied LocalPrevious\\\" baseid=\\\"{0}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
@@ -4,6 +4,7 @@ using System.Text;
using Resources;
using Swarmops.Logic.Financial;
using Swarmops.Logic.Security;
using Swarmops.Logic.Support;
namespace Swarmops.Frontend.Pages.Financial
{
@@ -60,14 +61,14 @@ namespace Swarmops.Frontend.Pages.Financial
continue; // must have at least a reference and a checksum - two digits minimum
}
if (!Swarmops.Logic.Support.Formatting.CheckLuhnChecksum (payout.Reference))
if (!Formatting.CheckLuhnChecksum (payout.Reference))
{
// invalid checksum
continue;
}
if (!Swarmops.Logic.Support.Formatting.CheckLuhnChecksum (payout.Account))
if (!Formatting.CheckLuhnChecksum (payout.Account))
{
continue;
}
@@ -114,13 +115,12 @@ namespace Swarmops.Frontend.Pages.Financial
{
return string.Format ("{0} {1:00} &nbsp; {2} &gt;",
payout.AmountCents/100, payout.AmountCents %100,
Swarmops.Logic.Support.Formatting.GetLuhnChecksum (
payout.AmountCents.ToString (CultureInfo.InvariantCulture)));
Formatting.GetLuhnChecksum (payout.AmountCents.ToString (CultureInfo.InvariantCulture)));
}
private string GetAccountOcr (Payout payout)
{
return Swarmops.Logic.Support.Formatting.CleanNumber (payout.Account) + "#41#";
return Formatting.CleanNumber (payout.Account) + "#41#";
}
}
}
+9 -9
View File
@@ -141,12 +141,12 @@
dataType: "json",
success: $.proxy(function(msg) {
var baseid = $(this).attr("baseid").replace(/\|/g, '');
$(this).attr("databaseid", msg.d.AssignedId);
$("#IconApproval" + baseid).attr("databaseid", msg.d.AssignedId);
$(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px.png");
$(this).attr("rel", "active");
$(this).hide();
$(".IconApproval" + baseid).css('display', 'none');
$(".IconApproved" + baseid).fadeTo(250, 0.5);
$(".IconDenial" + baseid).css('opacity', 1.0).hide();
$(".IconDenial" + baseid).css('opacity', 1.0).css('display', 'none');
$(".IconUndo" + baseid).fadeIn(100);
$('.row' + baseid).animate({ color: "#AAA" }, 400);
alertify.success(msg.d.DisplayMessage);
@@ -158,11 +158,11 @@
$(".LocalIconUndo").click(function() {
if ($(this).attr("rel") != "loading") {
var jsonData = {};
jsonData.databaseId = $(".IconApproval" + $(this).attr("baseid").replace(/\|/g, '')).attr("databaseid");
jsonData.databaseId = $("#IconApproval" + $(this).attr("baseid").replace(/\|/g, '')).attr("databaseid");
$(this).attr("rel", "loading");
$(this).attr("src", "/Images/Abstract/ajaxloader-medium.gif");
$("#IconApproved" + $(this).attr("baseid").replace(/\|/g, '')).fadeTo(1000, 0.01);
$(this).attr("src", "/Images/Abstract/ajaxloader-48x36px.gif");
$(".IconApproved" + $(this).attr("baseid").replace(/\|/g, '')).fadeTo(1000, 0.01);
$.ajax({
type: "POST",
@@ -175,10 +175,10 @@
var baseid = $(this).attr("baseid").replace(/\|/g, '');
$(this).attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px.png");
$(this).attr("rel", "");
$(this).hide();
$(".IconApproved" + baseid).css('opacity', 1.0).hide();
$(".IconUndo" + baseid).css('display', 'none');
$(".IconApproved" + baseid).css('opacity', 1.0).css('display', 'none');
$(".IconApproval" + baseid).fadeIn(100);
$(".IconDenial" + baseid).fadeIn(100);
$(".IconDenial" + baseid).fadeTo(100, 1);
$('.row' + baseid).animate({ color: "#000" }, 100);
alertify.log(msg.d.DisplayMessage);
} else {
@@ -45,10 +45,18 @@ namespace Swarmops.Frontend.Pages.Financial
this.LabelGridHeaderRecipient.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_Recipient;
this.LabelGridHeaderReference.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_Reference;
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
this.LabelGridHeaderReferenceOcr.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_Reference_Ocr;
this.LabelGridHeaderAmountOcr.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_Amount_Ocr;
this.LabelGridHeaderPaid2.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_PaidOut;
this.LabelSidebarOptions.Text = Resources.Global.Sidebar_Options;
int previouslyOpenPayouts = GetOpenCount();
this.LabelOptionsShowPrevious.Text = String.Format(Resources.Pages.Financial.PayOutMoney_OptionShowOpen, previouslyOpenPayouts);
this.LabelOptionsShowOcr.Text = Resources.Pages.Financial.PayoutMoney_OptionShowOcr;
}
private int GetOpenCount()