diff --git a/Common/Enums/ObjectOptionalDataType.cs b/Common/Enums/ObjectOptionalDataType.cs
index f576bf3f..2add12f7 100644
--- a/Common/Enums/ObjectOptionalDataType.cs
+++ b/Common/Enums/ObjectOptionalDataType.cs
@@ -366,6 +366,21 @@ namespace Swarmops.Common.Enums
///
/// For invoices or other claims, an exact bitcoin amount that overrides native currency
///
- ExactBitcoinAmountSatoshis
+ ExactBitcoinAmountSatoshis,
+
+ ///
+ /// If the org is a legal entity, its registration number
+ ///
+ OrgGovtRegistrationId,
+
+ ///
+ /// If the org is a legal entity, its tax authority
+ ///
+ OrgTaxAuthority,
+
+ ///
+ /// When (if) the org pays taxes, what number to put on the payment to identify the sender
+ ///
+ OrgTaxPaymentOcr
}
}
\ No newline at end of file
diff --git a/Logic/Structure/Organization.cs b/Logic/Structure/Organization.cs
index fa578411..55186c7d 100644
--- a/Logic/Structure/Organization.cs
+++ b/Logic/Structure/Organization.cs
@@ -989,5 +989,22 @@ namespace Swarmops.Logic.Structure
set { OptionalData.SetOptionalDataString(ObjectOptionalDataType.OrgOpenLedgersDomain, value); }
}
+ public string GovernmentRegistrationId
+ {
+ get { return OptionalData.GetOptionalDataString (ObjectOptionalDataType.OrgGovtRegistrationId); }
+ set { OptionalData.SetOptionalDataString (ObjectOptionalDataType.OrgGovtRegistrationId, value); }
+ }
+
+ public string TaxAuthority
+ {
+ get { return OptionalData.GetOptionalDataString (ObjectOptionalDataType.OrgTaxAuthority); }
+ set { OptionalData.SetOptionalDataString (ObjectOptionalDataType.OrgTaxAuthority, value); }
+ }
+
+ public string TaxPaymentOcr
+ {
+ get { return OptionalData.GetOptionalDataString (ObjectOptionalDataType.OrgTaxPaymentOcr); }
+ set { OptionalData.SetOptionalDataString (ObjectOptionalDataType.OrgTaxPaymentOcr, value); }
+ }
}
}
\ No newline at end of file
diff --git a/Site5/Images/Icons/iconshock-buildings-256px.png b/Site5/Images/Icons/iconshock-buildings-256px.png
new file mode 100644
index 00000000..ce85187e
Binary files /dev/null and b/Site5/Images/Icons/iconshock-buildings-256px.png differ
diff --git a/Site5/Pages/v5/Admin/OrgSettings.aspx b/Site5/Pages/v5/Admin/OrgSettings.aspx
index 9cb99772..a759a8e8 100644
--- a/Site5/Pages/v5/Admin/OrgSettings.aspx
+++ b/Site5/Pages/v5/Admin/OrgSettings.aspx
@@ -107,6 +107,10 @@
$('.paypalAccountField').show();
}
+ $('#<%=this.TextGovtRegistrationId.ClientID%>_TextInput').val(orgSettings.GovernmentRegistrationId);
+ $('#<%=this.DropTaxAuthority.ClientID%>').val(orgSettings.TaxAuthority);
+ $('#<%=this.TextTaxPaymentOcr.ClientID%>_TextInput').val(orgSettings.TaxPaymentOcr);
+
$('#<%=this.TextOpenLedgersDomain.ClientID%>_TextInput').val(orgSettings.OpenLedgersDomain);
$('#<%=this.TextVanityDomain.ClientID%>_TextInput').val(orgSettings.VanityDomain);
}
@@ -201,7 +205,7 @@
- Logo, landscape version [PNG]
+ Logo, landscape 16x9 version [PNG]
Logo, square version [PNG]
MAIL TEMPLATES
Outbound invoice [SVG]
@@ -228,6 +232,19 @@
SMTP server (default if blank)
+
+
Regulatory stuff (optional)
+
+
+
+
+
+
+ Org registration #
+ Tax authority
+ Tax payment ID/OCR
+
+
Premium Features
diff --git a/Site5/Pages/v5/Admin/OrgSettings.aspx.cs b/Site5/Pages/v5/Admin/OrgSettings.aspx.cs
index b09a2d52..452814a7 100644
--- a/Site5/Pages/v5/Admin/OrgSettings.aspx.cs
+++ b/Site5/Pages/v5/Admin/OrgSettings.aspx.cs
@@ -108,6 +108,9 @@ namespace Swarmops.Frontend.Pages.v5.Admin
this.DropMemberNumber.Items.Clear();
this.DropMemberNumber.Items.Add (new ListItem ("Global for installation", "Global"));
this.DropMemberNumber.Items.Add (new ListItem ("Local for each organzation", "Local"));
+
+ this.DropTaxAuthority.Items.Clear();
+ this.DropTaxAuthority.Items.Add (new ListItem ("[SE] Sweden", "SE"));
}
[WebMethod]
@@ -135,6 +138,10 @@ namespace Swarmops.Frontend.Pages.v5.Admin
result.ParticipantFinancials = org.ParticipantFinancialsEnabled;
result.PaypalAccountAddress = org.PaypalAccountMailAddress;
+ result.GovernmentRegistrationId = org.GovernmentRegistrationId;
+ result.TaxAuthority = org.TaxAuthority;
+ result.TaxPaymentOcr = org.TaxPaymentOcr;
+
result.OpenLedgersDomain = org.OpenLedgersDomain;
result.VanityDomain = org.VanityDomain;
@@ -447,6 +454,10 @@ namespace Swarmops.Frontend.Pages.v5.Admin
public bool ParticipantFinancials;
public string PaypalAccountAddress;
+ public string GovernmentRegistrationId;
+ public string TaxAuthority;
+ public string TaxPaymentOcr;
+
public string OpenLedgersDomain;
public string VanityDomain;
}