Work on Payment Targets
This commit is contained in:
@@ -14,10 +14,11 @@ namespace Swarmops.Common.Enums
|
||||
BicSwift,
|
||||
GiroNumber,
|
||||
GiroService,
|
||||
ClearingNumber,
|
||||
ClearingCode,
|
||||
AccountNumber,
|
||||
BankAccountHolderName,
|
||||
AccountHolderName,
|
||||
BankName,
|
||||
BankAddress,
|
||||
CashAccount,
|
||||
CryptoAddress
|
||||
}
|
||||
|
||||
@@ -10,8 +10,17 @@ namespace Swarmops.Common.Enums
|
||||
{
|
||||
Unknown = 0,
|
||||
BitcoinCashAccount,
|
||||
/// <summary>
|
||||
/// Different countries will require different data to execute a domestic transfer.
|
||||
/// </summary>
|
||||
DomesticBankTransfer,
|
||||
/// <summary>
|
||||
/// The "Giro" is a special meta-account in some countries that map to an underlying (changeable) account.
|
||||
/// </summary>
|
||||
DomesticBankGiro,
|
||||
/// <summary>
|
||||
/// The
|
||||
/// </summary>
|
||||
InternationalBankTransfer
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Resources;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Swarmops.Common.Enums;
|
||||
using Swarmops.Common.Interfaces;
|
||||
using Swarmops.Logic.Swarm;
|
||||
|
||||
namespace Swarmops.Logic.Financial
|
||||
{
|
||||
public class PaymentTransferMethodInfo
|
||||
{
|
||||
public Currency Currency { get; set; }
|
||||
public PaymentTargetType TargetType { get; set; }
|
||||
public string LocalizedPaymentMethodName { get; set; }
|
||||
Dictionary<string,string> LocalizedPaymentInformation { get; set; }
|
||||
|
||||
public static PaymentTransferMethodInfo FromObject(IHasIdentity financialObject)
|
||||
{
|
||||
if (financialObject is ExpenseClaim)
|
||||
{
|
||||
return FromObject((financialObject as ExpenseClaim).Claimer);
|
||||
}
|
||||
|
||||
if (financialObject is CashAdvance)
|
||||
{
|
||||
return FromObject((financialObject as CashAdvance).Person);
|
||||
}
|
||||
|
||||
if (financialObject is Salary)
|
||||
{
|
||||
return FromObject((financialObject as Salary).PayrollItem.Person);
|
||||
}
|
||||
|
||||
if (financialObject is Person)
|
||||
{
|
||||
Person person = financialObject as Person;
|
||||
|
||||
// For now, assume the bank - clearing - account triplet
|
||||
// TODO: Implement payment targets on teh Person object
|
||||
|
||||
PaymentTransferMethodInfo result = new PaymentTransferMethodInfo();
|
||||
result.TargetType = PaymentTargetType.DomesticBankTransfer;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -25,25 +25,6 @@ namespace Swarmops.Logic.Financial
|
||||
LoadDependencies();
|
||||
}
|
||||
|
||||
public static void Create()
|
||||
{
|
||||
// is this even needed?
|
||||
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public static Payout Create(Payout payout)
|
||||
{
|
||||
throw new NotImplementedException(); // Seems not to be needed
|
||||
|
||||
// This is quite unique in PW4 -- this is the only class which is pre-constructed and
|
||||
// can take an instance of its own kind as parameter in creation
|
||||
|
||||
// TODO: Create in database
|
||||
|
||||
// return payout;
|
||||
}
|
||||
|
||||
public static Payout FromDependency(IHasIdentity dependency, FinancialDependencyType dependencyType = FinancialDependencyType.Unknown)
|
||||
{
|
||||
int payoutId = 0;
|
||||
@@ -225,7 +206,7 @@ namespace Swarmops.Logic.Financial
|
||||
|
||||
}
|
||||
|
||||
public new string Reference
|
||||
public new string Reference
|
||||
{
|
||||
set
|
||||
{
|
||||
|
||||
@@ -176,6 +176,9 @@ namespace Swarmops.Logic.Financial
|
||||
Formatting.GenerateRangeString (claimIds);
|
||||
}
|
||||
|
||||
// Finally, add the payout to the result list if and only if the resulting debt less cash advances
|
||||
// is greater than zero. (Cash advances paid may exceed existing expense claims.)
|
||||
|
||||
if (newAmountCents > 0)
|
||||
{
|
||||
payoutList.Add (payout);
|
||||
|
||||
@@ -143,6 +143,7 @@
|
||||
<Compile Include="Financial\HotBitcoinAddressUnspent.cs" />
|
||||
<Compile Include="Financial\HotBitcoinAddressUnspents.cs" />
|
||||
<Compile Include="Financial\IPayable.cs" />
|
||||
<Compile Include="Financial\PaymentTransferMethodInfo.cs" />
|
||||
<Compile Include="Financial\VatReport.cs" />
|
||||
<Compile Include="Financial\VatReportItem.cs" />
|
||||
<Compile Include="Financial\VatReportItems.cs" />
|
||||
@@ -162,6 +163,11 @@
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>Logic.Financial.FinancialTransactionTagSetTypesStock.resx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Resources\Logic.Financial.PaymentTransferMethodInfo.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>Logic.Financial.PaymentTransferMethodInfo.resx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Resources\Logic.Financial.Payout.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
@@ -693,6 +699,10 @@
|
||||
<EmbeddedResource Include="Resources\Logic.Financial.FinancialTransactionTagSetTypesStock.tr-TR.resx" />
|
||||
<EmbeddedResource Include="Resources\Logic.Financial.FinancialTransactionTagSetTypesStock.yo-NG.resx" />
|
||||
<EmbeddedResource Include="Resources\Logic.Financial.FinancialTransactionTagSetTypesStock.zh-CN.resx" />
|
||||
<EmbeddedResource Include="Resources\Logic.Financial.PaymentTransferMethodInfo.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Logic.Financial.PaymentTransferMethodInfo.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Resources\Logic.Financial.Payout.af-ZA.resx" />
|
||||
<EmbeddedResource Include="Resources\Logic.Financial.Payout.ar-SA.resx" />
|
||||
<EmbeddedResource Include="Resources\Logic.Financial.Payout.ca-ES.resx" />
|
||||
|
||||
@@ -0,0 +1,207 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.42000
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace Swarmops.Logic.Resources {
|
||||
using System;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// A strongly-typed resource class, for looking up localized strings, etc.
|
||||
/// </summary>
|
||||
// This class was auto-generated by the StronglyTypedResourceBuilder
|
||||
// class via a tool like ResGen or Visual Studio.
|
||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||
// with the /str option, or rebuild your VS project.
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
internal class Logic_Financial_PaymentTransferMethodInfo {
|
||||
|
||||
private static global::System.Resources.ResourceManager resourceMan;
|
||||
|
||||
private static global::System.Globalization.CultureInfo resourceCulture;
|
||||
|
||||
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
||||
internal Logic_Financial_PaymentTransferMethodInfo() {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns the cached ResourceManager instance used by this class.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Resources.ResourceManager ResourceManager {
|
||||
get {
|
||||
if (object.ReferenceEquals(resourceMan, null)) {
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Swarmops.Logic.Resources.Logic.Financial.PaymentTransferMethodInfo", typeof(Logic_Financial_PaymentTransferMethodInfo).Assembly);
|
||||
resourceMan = temp;
|
||||
}
|
||||
return resourceMan;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Overrides the current thread's CurrentUICulture property for all
|
||||
/// resource lookups using this strongly typed resource class.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Globalization.CultureInfo Culture {
|
||||
get {
|
||||
return resourceCulture;
|
||||
}
|
||||
set {
|
||||
resourceCulture = value;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Account Holder Name.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_AccountHolderName {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_AccountHolderName", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Account Number.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_AccountNumber {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_AccountNumber", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Bank Address.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_BankAddress {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_BankAddress", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Bank Name.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_BankName {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_BankName", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to BBAN.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_Bban {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_Bban", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to BIC/Swift Code.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_BicSwift {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_BicSwift", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Bitcoin Cash Account.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_CashAccount {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_CashAccount", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Clearing Code.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_ClearingCode {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_ClearingCode", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Cryptocurrency Address.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_CryptoAddress {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_CryptoAddress", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Giro Number.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_GiroNumber {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_GiroNumber", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Giro Service.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_GiroService {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_GiroService", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to IBAN.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetField_Iban {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetField_Iban", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Bitcoin Cash Account.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetType_BitcoinCashAccount {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetType_BitcoinCashAccount", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Domestic Giro.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetType_DomesticBankGiro {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetType_DomesticBankGiro", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Domestic Bank Transfer.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetType_DomesticBankTransfer {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetType_DomesticBankTransfer", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to International Bank Transfer.
|
||||
/// </summary>
|
||||
internal static string PaymentTargetType_InternationalBankTransfer {
|
||||
get {
|
||||
return ResourceManager.GetString("PaymentTargetType_InternationalBankTransfer", resourceCulture);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,177 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<data name="PaymentTargetField_AccountHolderName" xml:space="preserve">
|
||||
<value>Account Holder Name</value>
|
||||
<comment>This is the name of the person that a (bank) account is assigned to</comment>
|
||||
</data>
|
||||
<data name="PaymentTargetField_AccountNumber" xml:space="preserve">
|
||||
<value>Account Number</value>
|
||||
</data>
|
||||
<data name="PaymentTargetField_BankAddress" xml:space="preserve">
|
||||
<value>Bank Address</value>
|
||||
</data>
|
||||
<data name="PaymentTargetField_BankName" xml:space="preserve">
|
||||
<value>Bank Name</value>
|
||||
</data>
|
||||
<data name="PaymentTargetField_Bban" xml:space="preserve">
|
||||
<value>BBAN</value>
|
||||
<comment>A Basic Bank Account Number (BBAN), a part of the IBAN code</comment>
|
||||
</data>
|
||||
<data name="PaymentTargetField_BicSwift" xml:space="preserve">
|
||||
<value>BIC/Swift Code</value>
|
||||
<comment>This code uniquely identifies a bank (the Bank Identifier Code, BIC).</comment>
|
||||
</data>
|
||||
<data name="PaymentTargetField_CashAccount" xml:space="preserve">
|
||||
<value>Bitcoin Cash Account</value>
|
||||
<comment>This is a special way of denoting a Bitcoin Cash address; search for "CashAccount" or look at cashaccount.info</comment>
|
||||
</data>
|
||||
<data name="PaymentTargetField_ClearingCode" xml:space="preserve">
|
||||
<value>Clearing Code</value>
|
||||
<comment>This is sometimes necessary for domestic bank transfers</comment>
|
||||
</data>
|
||||
<data name="PaymentTargetField_CryptoAddress" xml:space="preserve">
|
||||
<value>Cryptocurrency Address</value>
|
||||
</data>
|
||||
<data name="PaymentTargetField_GiroNumber" xml:space="preserve">
|
||||
<value>Giro Number</value>
|
||||
<comment>This is like an account number, but abstracted one level.</comment>
|
||||
</data>
|
||||
<data name="PaymentTargetField_GiroService" xml:space="preserve">
|
||||
<value>Giro Service</value>
|
||||
</data>
|
||||
<data name="PaymentTargetField_Iban" xml:space="preserve">
|
||||
<value>IBAN</value>
|
||||
<comment>The International Bank Account Number (IBAN)</comment>
|
||||
</data>
|
||||
<data name="PaymentTargetType_BitcoinCashAccount" xml:space="preserve">
|
||||
<value>Bitcoin Cash Account</value>
|
||||
<comment>This is a special way of denoting a Bitcoin Cash address; search for "CashAccount" or look at cashaccount.info</comment>
|
||||
</data>
|
||||
<data name="PaymentTargetType_DomesticBankGiro" xml:space="preserve">
|
||||
<value>Domestic Giro</value>
|
||||
<comment>Some countries have meta-accounts called "giro" accounts, that map to bank accounts.</comment>
|
||||
</data>
|
||||
<data name="PaymentTargetType_DomesticBankTransfer" xml:space="preserve">
|
||||
<value>Domestic Bank Transfer</value>
|
||||
</data>
|
||||
<data name="PaymentTargetType_InternationalBankTransfer" xml:space="preserve">
|
||||
<value>International Bank Transfer</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -4,6 +4,7 @@ Logic.Communications.Transmission.NotificationPayload.resx
|
||||
Logic.Financial.FinancialAccount.resx
|
||||
Logic.Financial.FinancialTransactionTagSetTypesStock.resx
|
||||
Logic.Financial.Payout.resx
|
||||
Logic.Financial.PaymentTransferMethodInfo.resx
|
||||
Logic.Financial.VatReport.resx
|
||||
Logic.Structure.Country.resx
|
||||
Logic.Structure.Geography.resx
|
||||
|
||||
@@ -21,7 +21,9 @@
|
||||
'/Images/Icons/iconshock-green-tick-128x96px.png',
|
||||
'/Images/Icons/iconshock-red-cross-128x96px.png',
|
||||
'/Images/Icons/iconshock-red-cross-circled-128x96px.png',
|
||||
'/Images/Icons/iconshock-balloon-undo-128x96px.png'
|
||||
'/Images/Icons/iconshock-balloon-undo-128x96px.png',
|
||||
'/Images/Icons/iconshock-balloon-yes-128x96px.png',
|
||||
'/Images/Icons/iconshock-balloon-no-128x96px-disabled.png'
|
||||
]);
|
||||
|
||||
$(document).ready(function () {
|
||||
@@ -71,8 +73,45 @@
|
||||
|
||||
$(".LocalIconApproval").click(function () {
|
||||
|
||||
// TODO: Check UX-level concurrency lock
|
||||
|
||||
$('#idModalInputRecipient').val(loadingBreadcrumb);
|
||||
$('#idModalInputCurrencyAmount').val(loadingBreadcrumb);
|
||||
$('#idModalReference').val(loadingBreadcrumb);
|
||||
$('#idModalTransferMethod').val(loadingBreadcrumb);
|
||||
|
||||
// TODO: The two fields below will initially be hidden, and
|
||||
// TODO: replaced with dynamically unfolding fields
|
||||
|
||||
$('#idModalClearing').val(loadingBreadcrumb);
|
||||
$('#idModalAccountNumber').val(loadingBreadcrumb);
|
||||
|
||||
<%=this.ModalConfirmPayment.ClientID%>_open();
|
||||
|
||||
|
||||
var prototypeId = $(this).attr("protoid");
|
||||
|
||||
SwarmopsJS.proxiedAjaxCall(
|
||||
"/Pages/v5/Financial/PayOutMoney.aspx/ConfirmPayout",
|
||||
{ protoIdentity: prototypeId },
|
||||
this,
|
||||
function(result) {
|
||||
if (result.Success) {
|
||||
modalPrototypeId = $(this).attr("protoid");
|
||||
|
||||
$('#idModalInputRecipient').val(loadingBreadcrumb);
|
||||
$('#idModalInputCurrencyAmount').val(loadingBreadcrumb);
|
||||
$('#idModalReference').val(loadingBreadcrumb);
|
||||
$('#idModalTransferMethod').val(loadingBreadcrumb);
|
||||
$('#idModalClearing').val(loadingBreadcrumb);
|
||||
$('#idModalAccountNumber').val(loadingBreadcrumb);
|
||||
|
||||
} else {
|
||||
// TODO: Handle server-level concurrency lock
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
/*
|
||||
var itemId = $(this).attr("baseid");
|
||||
var prototypeId = $(this).attr("protoid");
|
||||
@@ -225,6 +264,12 @@
|
||||
});
|
||||
|
||||
var gridsLoaded = 0;
|
||||
var loadingBreadcrumb = "[...]";
|
||||
var modalPrototypeId = "";
|
||||
|
||||
// Localization
|
||||
|
||||
$('#idModalButtonConfirm').value(SwarmopsJS.unescape('<%=this.Localized_ConfirmDialog_ConfirmPaid%>'));
|
||||
|
||||
</script>
|
||||
|
||||
@@ -289,16 +334,16 @@
|
||||
<DialogCode>
|
||||
<h2><asp:Label ID="LabelPayoutModalHeader" runat="server" Text="Execute this payout manually now XYZ"/></h2>
|
||||
<div class="data-entry-fields modal wide">
|
||||
<input type="text" readonly="readonly" value="Recipient"/>​<br/>
|
||||
<input type="text" readonly="readonly" class="align-for-numbers" value="Amount"/>​<br/>
|
||||
<input type="text" readonly="readonly" value="Reference"/>​<br/>
|
||||
<input type="text" readonly="readonly" value="Transfer Method"/>​<br/>
|
||||
<input type="text" readonly="readonly" value="Clearing"/>​<br/>
|
||||
<input type="text" readonly="readonly" value="Account Number"/>​<br/>
|
||||
<input type="button" value="Confirm" class="button-accent-color suppress-input-focus action-icon-button icon-yes"/>
|
||||
<input type="text" id="idModalInputRecipient" readonly="readonly" value="Recipient"/>​<br/>
|
||||
<input type="text" id="idModalInputCurrencyAmount" readonly="readonly" class="align-for-numbers" value="Amount"/>​<br/>
|
||||
<input type="text" id="idModalReference" readonly="readonly" value="Reference"/>​<br/>
|
||||
<input type="text" id="idModalTransferMethod" readonly="readonly" value="Transfer Method"/>​<br/>
|
||||
<input type="text" id="idModalClearing" readonly="readonly" value="Clearing"/>​<br/>
|
||||
<input type="text" id="idModalAccountNumber" readonly="readonly" value="Account Number"/>​<br/>
|
||||
<input type="button" id="idModalButtonConfirm" value="Confirm XYZ" class="button-accent-color suppress-input-focus action-icon-button icon-yes" onclick="onConfirmModal();"/>
|
||||
</div>
|
||||
<div class="data-entry-labels">
|
||||
<asp:Label ID="LabelModalRecipient" runat="server" Text="Recipient"/><br/>
|
||||
<asp:Label ID="LabelModalRecipient" runat="server" Text="Recipient XYZ"/><br/>
|
||||
<asp:Label ID="LabelModalCurrencyAmount" runat="server" Text="Currency and Amount XYZ"/><br/>
|
||||
<asp:Label ID="LabelModalReference" runat="server" Text="Reference XYZ"/><br/>
|
||||
<asp:Label ID="LabelModalTransferMethod" runat="server" Text="Transfer Method XYZ"/><br/>
|
||||
|
||||
@@ -118,5 +118,23 @@ namespace Swarmops.Frontend.Pages.Financial
|
||||
{
|
||||
public int AssignedId;
|
||||
};
|
||||
|
||||
public class PayoutInformationResult : AjaxCallResult
|
||||
{
|
||||
public string Recipient { get; set; }
|
||||
public string CurrencyAmount { get; set; }
|
||||
public string Reference { get; set; }
|
||||
public string TransferMethod { get; set; }
|
||||
public string[] TransferMethodLabels { get; set; }
|
||||
public string[] TransferMethodData { get; set; }
|
||||
}
|
||||
|
||||
|
||||
// --------- Localization strings UX-side ------------
|
||||
|
||||
public string Localized_ComfirmDialog_ConfirmPaid
|
||||
{
|
||||
get { return CommonV5.JavascriptEscape(Resources.Pages.Financial.PayOutMoney_Modal_ConfirmPaid); }
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user