Org registration #
diff --git a/Site5/Pages/v5/Admin/OrgSettings.aspx.cs b/Site5/Pages/v5/Admin/OrgSettings.aspx.cs
index 452814a7..442b56ed 100644
--- a/Site5/Pages/v5/Admin/OrgSettings.aspx.cs
+++ b/Site5/Pages/v5/Admin/OrgSettings.aspx.cs
@@ -427,6 +427,18 @@ namespace Swarmops.Frontend.Pages.v5.Admin
authenticationData.CurrentOrganization.PaypalAccountMailAddress = result.NewData;
break;
+ case "GovernmentRegistrationId":
+ result.NewData = newValue.Trim();
+ result.ResultCode = AjaxTextBox.CodeSuccess;
+ authenticationData.CurrentOrganization.GovernmentRegistrationId = result.NewData;
+ break;
+
+ case "TaxPaymentOcr":
+ result.NewData = newValue.Trim();
+ result.ResultCode = AjaxTextBox.CodeSuccess;
+ authenticationData.CurrentOrganization.TaxPaymentOcr = result.NewData;
+ break;
+
default:
throw new NotImplementedException("Unknown cookie in StoreCallback");
}
diff --git a/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs b/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs
index 3c191e69..236dfa06 100644
--- a/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs
+++ b/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs
@@ -69,11 +69,11 @@ namespace Swarmops.Frontend.Pages.Financial
"\"reference\":\"{5}\"," +
"\"amount\":\"{6:N2}\"," +
"\"action\":\"" +
- "
![]()
" +
- "
![]()
" +
- "
![]()
" +
- "
![]()
" +
- "
![]()
" +
+ "
![]()
" +
+ "
![]()
" +
+ "
![]()
" +
+ "
![]()
" +
+ "
![]()
" +
"\"",
payout.ProtoIdentity,
(payout.ExpectedTransactionDate <= today
@@ -115,11 +115,11 @@ namespace Swarmops.Frontend.Pages.Financial
"\"reference\":\"{5}\"," +
"\"amount\":\"{6:N2}\"," +
"\"action\":\"" +
- "
![]()
" +
- "
![]()
" +
- "
![]()
" +
- "
![]()
" +
- "
![]()
" +
+ "
![]()
" +
+ "
![]()
" +
+ "
![]()
" +
+ "
![]()
" +
+ "
![]()
" +
"\"",
payout.ProtoIdentity,
payout.ExpectedTransactionDate.ToShortDateString(),
diff --git a/Site5/Pages/v5/Financial/Json-PayableCostsOcr.aspx b/Site5/Pages/v5/Financial/Json-PayableCostsOcr.aspx
new file mode 100644
index 00000000..bc8230e2
--- /dev/null
+++ b/Site5/Pages/v5/Financial/Json-PayableCostsOcr.aspx
@@ -0,0 +1 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Json-PayableCostsOcr.aspx.cs" Inherits="Swarmops.Frontend.Pages.Financial.JsonPayableCostsOcr" %>
diff --git a/Site5/Pages/v5/Financial/Json-PayableCostsOcr.aspx.cs b/Site5/Pages/v5/Financial/Json-PayableCostsOcr.aspx.cs
new file mode 100644
index 00000000..29051433
--- /dev/null
+++ b/Site5/Pages/v5/Financial/Json-PayableCostsOcr.aspx.cs
@@ -0,0 +1,126 @@
+using System;
+using System.Globalization;
+using System.Text;
+using Resources;
+using Swarmops.Logic.Financial;
+using Swarmops.Logic.Security;
+
+namespace Swarmops.Frontend.Pages.Financial
+{
+ public partial class JsonPayableCostsOcr : DataV5Base
+ {
+ protected void Page_Load (object sender, EventArgs e)
+ {
+ // Access required is change access to financials
+
+ PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Financials, AccessType.Write);
+
+ // Get all payable items
+
+ Payouts prototypePayouts = Payouts.Construct (CurrentOrganization);
+ Payouts previousPayouts = Payouts.ForOrganization (CurrentOrganization); // gets all currently open payouts - enabled for undoing
+
+ // Format as JSON and return
+
+ string elements = FormatPrototypesAsJson (prototypePayouts);
+
+ Response.ContentType = "application/json";
+ string json = "{\"rows\":[" + elements + "]}";
+ Response.Output.WriteLine (json);
+ Response.End();
+ }
+
+ private string FormatPrototypesAsJson (Payouts payouts)
+ {
+ StringBuilder result = new StringBuilder (16384);
+
+ DateTime today = DateTime.Today;
+ bool bitcoinHotWalletActive = (this.CurrentOrganization.FinancialAccounts.AssetsBitcoinHot != null
+ ? true
+ : false);
+
+ foreach (Payout payout in payouts)
+ {
+ if (bitcoinHotWalletActive && payout.RecipientPerson != null && payout.RecipientPerson.BitcoinPayoutAddress.Length > 0 && payout.Account.Length < 4) // 4 because an empty account will be " / ", length 3
+ {
+ // This is a person who will be paid in bitcoin per personal preferences, so don't show for manual payout
+
+ continue;
+ }
+
+ if (bitcoinHotWalletActive && payout.Account.StartsWith ("bitcoin:"))
+ {
+ // This is a payout registered to be paid in bitcoin, so don't show for manual payout
+
+ continue;
+ }
+
+ if (payout.Reference.Length < 2)
+ {
+ continue; // must have at least a reference and a checksum - two digits minimum
+ }
+
+ if (!Swarmops.Logic.Support.Formatting.CheckLuhnChecksum (payout.Reference))
+ {
+ // invalid checksum
+
+ continue;
+ }
+
+ if (!Swarmops.Logic.Support.Formatting.CheckLuhnChecksum (payout.Account))
+ {
+ continue;
+ }
+
+ result.Append ("{");
+ result.AppendFormat (
+ "\"itemId\":\"{0}\"," +
+ "\"due\":\"{1}\"," +
+ "\"reference\":\"
{2}\"," +
+ "\"amount\":\"
{3}\"," +
+ "\"account\":\"
{4}\"," +
+ "\"action\":\"" +
+ "
![]()
" +
+ "
![]()
" +
+ "
![]()
" +
+ "
![]()
" +
+ "
![]()
" +
+ "\"" ,
+ payout.ProtoIdentity,
+ (payout.ExpectedTransactionDate <= today
+ ? Global.Global_ASAP
+ : payout.ExpectedTransactionDate.ToShortDateString()),
+ GetReferenceOcr (payout),
+ GetAmountOcr (payout),
+ GetAccountOcr (payout),
+ payout.ProtoIdentity.Replace ("|", ""));
+ result.Append ("},");
+ }
+
+ if (result.Length > 0)
+ {
+ result.Remove (result.Length - 1, 1); // remove last comma, if there are any elements
+ }
+
+ return result.ToString();
+ }
+
+ private string GetReferenceOcr (Payout payout)
+ {
+ return payout.Reference + " # ";
+ }
+
+ private string GetAmountOcr (Payout payout)
+ {
+ return string.Format ("{0} {1:00} {2} >",
+ payout.AmountCents/100, payout.AmountCents %100,
+ Swarmops.Logic.Support.Formatting.GetLuhnChecksum (
+ payout.AmountCents.ToString (CultureInfo.InvariantCulture)));
+ }
+
+ private string GetAccountOcr (Payout payout)
+ {
+ return Swarmops.Logic.Support.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 f700af9c..5236f536 100644
--- a/Site5/Pages/v5/Financial/PayOutMoney.aspx
+++ b/Site5/Pages/v5/Financial/PayOutMoney.aspx
@@ -2,6 +2,12 @@
+
+
+
+
+
+
-
-
+
+
@@ -219,6 +270,9 @@
+