Added some regulatory options at org level

This commit is contained in:
Rick Falkvinge
2016-05-06 13:04:43 +02:00
parent b3f7606f3c
commit 80c729cabc
5 changed files with 62 additions and 2 deletions
+16 -1
View File
@@ -366,6 +366,21 @@ namespace Swarmops.Common.Enums
/// <summary>
/// For invoices or other claims, an exact bitcoin amount that overrides native currency
/// </summary>
ExactBitcoinAmountSatoshis
ExactBitcoinAmountSatoshis,
/// <summary>
/// If the org is a legal entity, its registration number
/// </summary>
OrgGovtRegistrationId,
/// <summary>
/// If the org is a legal entity, its tax authority
/// </summary>
OrgTaxAuthority,
/// <summary>
/// When (if) the org pays taxes, what number to put on the payment to identify the sender
/// </summary>
OrgTaxPaymentOcr
}
}
+17
View File
@@ -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); }
}
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

+18 -1
View File
@@ -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 @@
<Swarmops5:FileUpload ID="UploadRenewalMailTemplate" DisplayCount="1" runat="server" />
</div>
<div class="entryLabels">
Logo, landscape version [PNG]<br/>
Logo, landscape 16x9 version [PNG]<br/>
Logo, square version [PNG]<br/>
<h2>MAIL TEMPLATES</h2>
Outbound invoice [SVG]<br/>
@@ -228,6 +232,19 @@
SMTP server (default if blank)
</div>
</div>
<div title="<img src='/Images/Icons/iconshock-buildings-256px.png' height='64' width='64' />">
<h2>Regulatory stuff (optional)</h2>
<div class="entryFields">
<Swarmops5:AjaxTextBox runat="server" ID="TextGovtRegistrationId" Text="SE1234567890" />&#8203;<br/>
<Swarmops5:DropDown ID="DropTaxAuthority" CssClass="DropTemp" runat="server"/>&#8203;<br/>
<Swarmops5:AjaxTextBox runat="server" ID="TextTaxPaymentOcr" Text="1612345678900" />&#8203;<br/>
</div>
<div class="entryLabels">
Org registration #<br/>
Tax authority<br/>
Tax payment ID/OCR
</div>
</div>
<div title="<img src='/Images/Icons/iconshock-star-gold-64px.png' />">
<h2>Premium Features</h2>
<div class="entryFields">
+11
View File
@@ -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;
}