From 5a35be0431f31f3e6dccaeefeced1cda377ba6c2 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sat, 7 May 2016 11:48:12 +0200 Subject: [PATCH] Added loc to new Payout OCR stuff --- Site5/App_GlobalResources/Pages.Financial.resx | 15 +++++++++++++++ .../v5/Financial/Json-PayableCosts.aspx.cs | 6 +++--- .../v5/Financial/Json-PayableCostsOcr.aspx.cs | 10 +++++----- Site5/Pages/v5/Financial/PayOutMoney.aspx | 18 +++++++++--------- Site5/Pages/v5/Financial/PayOutMoney.aspx.cs | 8 ++++++++ 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/Site5/App_GlobalResources/Pages.Financial.resx b/Site5/App_GlobalResources/Pages.Financial.resx index 3a5c9723..d0fd0851 100644 --- a/Site5/App_GlobalResources/Pages.Financial.resx +++ b/Site5/App_GlobalResources/Pages.Financial.resx @@ -421,10 +421,16 @@ Please describe what this purchase was. + + Account (OCR) + Amount Amount to be paid out + + Amount (OCR) + Clearing / Account Will display as "XXXX / YYYYYYYY" where XXXX is the clearing number @@ -447,12 +453,21 @@ Reference Depends on cost type - can be an OCR number for an invoice, a cash advance number, a salary spec, etc. + + Reference (OCR) + Costs Ready For Payout + + Costs for Payout (OCR for mobile apps) + 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). + + Show OCR for mobile apps + Show open payouts ({0:N0}) 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. diff --git a/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs b/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs index 236dfa06..df010c6d 100644 --- a/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs +++ b/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs @@ -69,7 +69,7 @@ namespace Swarmops.Frontend.Pages.Financial "\"reference\":\"{5}\"," + "\"amount\":\"{6:N2}\"," + "\"action\":\"" + - "" + + "" + "" + "" + "" + @@ -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\":\"" + - "" + + "" + "" + "" + "" + diff --git a/Site5/Pages/v5/Financial/Json-PayableCostsOcr.aspx.cs b/Site5/Pages/v5/Financial/Json-PayableCostsOcr.aspx.cs index 29051433..f260249a 100644 --- a/Site5/Pages/v5/Financial/Json-PayableCostsOcr.aspx.cs +++ b/Site5/Pages/v5/Financial/Json-PayableCostsOcr.aspx.cs @@ -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}   {2} >", 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#"; } } } \ No newline at end of file diff --git a/Site5/Pages/v5/Financial/PayOutMoney.aspx b/Site5/Pages/v5/Financial/PayOutMoney.aspx index 5236f536..8ff745c4 100644 --- a/Site5/Pages/v5/Financial/PayOutMoney.aspx +++ b/Site5/Pages/v5/Financial/PayOutMoney.aspx @@ -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 { diff --git a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs index 69dfa81c..94aeed6c 100644 --- a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs +++ b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs @@ -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()