From 6a262fb9a77d37084e14ca9ae06154269fe708d5 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 21 Feb 2019 10:53:01 +0100 Subject: [PATCH] Some work on payment targets --- Basic/Basic.csproj | 1 + Basic/Types/Financial/BasicPaymentTarget.cs | 28 +++++++++++++++ Common/Common.csproj | 3 ++ Common/Enums/ForeignObjectType.cs | 16 +++++++++ Common/Enums/PaymentTargetField.cs | 24 +++++++++++++ Common/Enums/PaymentTargetType.cs | 17 +++++++++ .../Pages.Financial.designer.cs | 27 ++++++++++++++ Site/App_GlobalResources/Pages.Financial.resx | 12 +++++++ Site/Pages/v5/Financial/PayOutMoney.aspx | 26 ++++++++++---- Site/Pages/v5/Financial/PayOutMoney.aspx.cs | 6 ++-- .../v5/Financial/PayOutMoney.aspx.designer.cs | 35 +++++++------------ 11 files changed, 162 insertions(+), 33 deletions(-) create mode 100644 Basic/Types/Financial/BasicPaymentTarget.cs create mode 100644 Common/Enums/ForeignObjectType.cs create mode 100644 Common/Enums/PaymentTargetField.cs create mode 100644 Common/Enums/PaymentTargetType.cs diff --git a/Basic/Basic.csproj b/Basic/Basic.csproj index 1b61a3b0..3b73013d 100644 --- a/Basic/Basic.csproj +++ b/Basic/Basic.csproj @@ -63,6 +63,7 @@ + diff --git a/Basic/Types/Financial/BasicPaymentTarget.cs b/Basic/Types/Financial/BasicPaymentTarget.cs new file mode 100644 index 00000000..43580065 --- /dev/null +++ b/Basic/Types/Financial/BasicPaymentTarget.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Swarmops.Common.Enums; +using Swarmops.Common.Interfaces; + +namespace Swarmops.Basic.Types.Financial +{ + public class BasicPaymentTarget: IHasIdentity + { + public int PaymentTargetId { get; private set; } + public DateTime CreatedDateTime { get; private set; } + public int CreatedByPersonId { get; private set; } + public int ForeignId { get; private set; } + public ForeignObjectType ForeignType { get; private set; } + public bool Active { get; protected set; } + public bool Open { get; protected set; } + public int CurrencyId { get; private set; } + public string TargetType { get; private set; } + public string Description { get; private set; } + public Dictionary Fields { get; private set; } + + + public int Identity { get { return PaymentTargetId; } } + } +} diff --git a/Common/Common.csproj b/Common/Common.csproj index 42a06436..7e405a4d 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -61,6 +61,7 @@ + @@ -70,6 +71,8 @@ + + diff --git a/Common/Enums/ForeignObjectType.cs b/Common/Enums/ForeignObjectType.cs new file mode 100644 index 00000000..3d78ac67 --- /dev/null +++ b/Common/Enums/ForeignObjectType.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Swarmops.Common.Enums +{ + public enum ForeignObjectType + { + Unknown = 0, + Person, + Client, + Supplier + } +} diff --git a/Common/Enums/PaymentTargetField.cs b/Common/Enums/PaymentTargetField.cs new file mode 100644 index 00000000..f351130c --- /dev/null +++ b/Common/Enums/PaymentTargetField.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Swarmops.Common.Enums +{ + public enum PaymentTargetField + { + Unknown = 0, + Iban, + Bban, + BicSwift, + GiroNumber, + GiroService, + ClearingNumber, + AccountNumber, + BankAccountHolderName, + BankName, + CashAccount, + CryptoAddress + } +} diff --git a/Common/Enums/PaymentTargetType.cs b/Common/Enums/PaymentTargetType.cs new file mode 100644 index 00000000..98db961e --- /dev/null +++ b/Common/Enums/PaymentTargetType.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Swarmops.Common.Enums +{ + public enum PaymentTargetType + { + Unknown = 0, + BitcoinCashAccount, + DomesticBankTransfer, + DomesticBankGiro, + InternationalBankTransfer + } +} diff --git a/Site/App_GlobalResources/Pages.Financial.designer.cs b/Site/App_GlobalResources/Pages.Financial.designer.cs index 60c03f92..7a74f5ac 100644 --- a/Site/App_GlobalResources/Pages.Financial.designer.cs +++ b/Site/App_GlobalResources/Pages.Financial.designer.cs @@ -1302,6 +1302,15 @@ namespace Resources.Pages { } } + /// + /// Looks up a localized string similar to Currency, Method. + /// + internal static string PayOutMoney_GridHeader_CurrencyMethod { + get { + return ResourceManager.GetString("PayOutMoney_GridHeader_CurrencyMethod", resourceCulture); + } + } + /// /// Looks up a localized string similar to Due Date. /// @@ -1320,6 +1329,15 @@ namespace Resources.Pages { } } + /// + /// Looks up a localized string similar to Pay. + /// + internal static string PayOutMoney_GridHeader_PayThis { + get { + return ResourceManager.GetString("PayOutMoney_GridHeader_PayThis", resourceCulture); + } + } + /// /// Looks up a localized string similar to Recipient. /// @@ -1374,6 +1392,15 @@ namespace Resources.Pages { } } + /// + /// Looks up a localized string similar to Confirm. + /// + internal static string PayOutMoney_ModalPay_Confirm { + get { + return ResourceManager.GetString("PayOutMoney_ModalPay_Confirm", resourceCulture); + } + } + /// /// Looks up a localized string similar to Show OCR for mobile apps. /// diff --git a/Site/App_GlobalResources/Pages.Financial.resx b/Site/App_GlobalResources/Pages.Financial.resx index 4d7c3255..86c32ef8 100644 --- a/Site/App_GlobalResources/Pages.Financial.resx +++ b/Site/App_GlobalResources/Pages.Financial.resx @@ -731,4 +731,16 @@ Approval for Expense Claim #{0:N0} from {1} was RETRACTED. It will not be paid unless approved again. When somebody undoes a previous attestation. + + Currency, Method + "Method" refers to the method of payout -- wire transfer, direct deposit, giro service, etc. + + + Pay + Like the "Actions" column in other grids, but just with one option, "Pay this expense" + + + Confirm + As in "Confirm The Listed Payment Has Been Made Manually" -- try to keep below 8-9 characters + \ No newline at end of file diff --git a/Site/Pages/v5/Financial/PayOutMoney.aspx b/Site/Pages/v5/Financial/PayOutMoney.aspx index f0e026f9..3e70bd17 100644 --- a/Site/Pages/v5/Financial/PayOutMoney.aspx +++ b/Site/Pages/v5/Financial/PayOutMoney.aspx @@ -70,6 +70,10 @@ $(".LocalIconApproval, .LocalIconUndo, .LocalIconDenial").css("cursor", "pointer"); $(".LocalIconApproval").click(function () { + + <%=this.ModalConfirmPayment.ClientID%>_open(); + + /* var itemId = $(this).attr("baseid"); var prototypeId = $(this).attr("protoid"); $(this).hide(); @@ -99,7 +103,7 @@ } } - ); + );*/ }); @@ -137,6 +141,9 @@ /* + + OLD CODE BELOW FROM PREVIOUS TYPE OF ICON LOGIC, KEPT A WHILE FOR REFERENCE -- + $(".LocalIconApproval").click(function() { if ($(this).attr("rel") != "loading") { @@ -253,12 +260,10 @@ - - - - - - + + + + @@ -291,6 +296,13 @@ + + + +

Testing

+ Foobar high chaparral +
+
diff --git a/Site/Pages/v5/Financial/PayOutMoney.aspx.cs b/Site/Pages/v5/Financial/PayOutMoney.aspx.cs index 7586a2fd..39329e58 100644 --- a/Site/Pages/v5/Financial/PayOutMoney.aspx.cs +++ b/Site/Pages/v5/Financial/PayOutMoney.aspx.cs @@ -38,13 +38,11 @@ namespace Swarmops.Frontend.Pages.Financial PageTitle = Resources.Pages.Financial.PayOutMoney_PageTitle; InfoBoxLiteral = Resources.Pages.Financial.PayOutMoney_Info; this.LabelPayOutMoneyHeader.Text = Resources.Pages.Financial.PayOutMoney_Header; - this.LabelGridHeaderAccount.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_BankAccount; this.LabelGridHeaderAmount.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_Amount; - this.LabelGridHeaderBank.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_BankName; this.LabelGridHeaderDue.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_DueDate; - this.LabelGridHeaderPaid.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_PaidOut; + this.LabelGridHeaderPay.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_PayThis; this.LabelGridHeaderRecipient.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_Recipient; - this.LabelGridHeaderReference.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_Reference; + this.LabelGridHeaderCurrencyMethod.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_CurrencyMethod; this.LabelPayOutMoneyOcrHeader.Text = Resources.Pages.Financial.PayoutMoney_Header_Ocr; this.LabelGridHeaderAccountOcr.Text = Resources.Pages.Financial.PayoutMoney_GridHeader_Account_Ocr; diff --git a/Site/Pages/v5/Financial/PayOutMoney.aspx.designer.cs b/Site/Pages/v5/Financial/PayOutMoney.aspx.designer.cs index d7218d92..1d914393 100644 --- a/Site/Pages/v5/Financial/PayOutMoney.aspx.designer.cs +++ b/Site/Pages/v5/Financial/PayOutMoney.aspx.designer.cs @@ -40,31 +40,13 @@ namespace Swarmops.Frontend.Pages.Financial { protected global::System.Web.UI.WebControls.Label LabelGridHeaderRecipient; /// - /// LabelGridHeaderBank control. + /// LabelGridHeaderCurrencyMethod control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label LabelGridHeaderBank; - - /// - /// LabelGridHeaderAccount control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label LabelGridHeaderAccount; - - /// - /// LabelGridHeaderReference control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label LabelGridHeaderReference; + protected global::System.Web.UI.WebControls.Label LabelGridHeaderCurrencyMethod; /// /// LabelGridHeaderAmount control. @@ -76,13 +58,13 @@ namespace Swarmops.Frontend.Pages.Financial { protected global::System.Web.UI.WebControls.Label LabelGridHeaderAmount; /// - /// LabelGridHeaderPaid control. + /// LabelGridHeaderPay control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label LabelGridHeaderPaid; + protected global::System.Web.UI.WebControls.Label LabelGridHeaderPay; /// /// LabelPayOutMoneyOcrHeader control. @@ -155,5 +137,14 @@ namespace Swarmops.Frontend.Pages.Financial { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label LabelOptionsShowOcr; + + /// + /// ModalConfirmPayment control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Swarmops.Frontend.Controls.Base.ModalDialog ModalConfirmPayment; } }