From 129245da10be1d645f61e929e40b128bd7813f17 Mon Sep 17 00:00:00 2001
From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com>
Date: Mon, 19 Aug 2024 06:08:46 -0500
Subject: [PATCH] fix(Invoice Ninja Node): Fix payment types (#10462)

---
 .../nodes/InvoiceNinja/ExpenseDescription.ts  | 138 ++++++++++++++++--
 .../nodes/InvoiceNinja/PaymentDescription.ts  |  39 +++--
 2 files changed, 157 insertions(+), 20 deletions(-)

diff --git a/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
index 729c6a8b77a4b..a53d0e271e809 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
@@ -53,6 +53,7 @@ export const expenseFields: INodeProperties[] = [
 		default: {},
 		displayOptions: {
 			show: {
+				apiVersion: ['v4'],
 				operation: ['create'],
 				resource: ['expense'],
 			},
@@ -120,11 +121,6 @@ export const expenseFields: INodeProperties[] = [
 				displayName: 'Payment Type',
 				name: 'paymentType',
 				type: 'options',
-				displayOptions: {
-					show: {
-						apiVersion: ['v4'],
-					},
-				},
 				options: [
 					{
 						name: 'ACH',
@@ -257,15 +253,137 @@ export const expenseFields: INodeProperties[] = [
 				],
 				default: 1,
 			},
+			{
+				displayName: 'Private Notes',
+				name: 'privateNotes',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Public Notes',
+				name: 'publicNotes',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Tax Name 1',
+				name: 'taxName1',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Tax Name 2',
+				name: 'taxName2',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Tax Rate 1',
+				name: 'taxRate1',
+				type: 'number',
+				default: 0,
+			},
+			{
+				displayName: 'Tax Rate 2',
+				name: 'taxRate2',
+				type: 'number',
+				default: 0,
+			},
+			{
+				displayName: 'Transaction Reference',
+				name: 'transactionReference',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Vendor Name or ID',
+				name: 'vendor',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getVendors',
+				},
+				default: '',
+			},
+		],
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				apiVersion: ['v5'],
+				operation: ['create'],
+				resource: ['expense'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Amount',
+				name: 'amount',
+				type: 'number',
+				default: 0,
+			},
+			{
+				displayName: 'Billable',
+				name: 'billable',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Client Name or ID',
+				name: 'client',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getClients',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Custom Value 1',
+				name: 'customValue1',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Custom Value 2',
+				name: 'customValue2',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Category Name or ID',
+				name: 'category',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getExpenseCategories',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Expense Date',
+				name: 'expenseDate',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Payment Date',
+				name: 'paymentDate',
+				type: 'dateTime',
+				default: '',
+			},
 			{
 				displayName: 'Payment Type',
 				name: 'paymentType',
 				type: 'options',
-				displayOptions: {
-					show: {
-						apiVersion: ['v5'],
-					},
-				},
 				options: [
 					{
 						name: 'Bank Transfer',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
index 17ae0938e99c5..82680ef85ec6e 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
@@ -85,6 +85,7 @@ export const paymentFields: INodeProperties[] = [
 		default: {},
 		displayOptions: {
 			show: {
+				apiVersion: ['v4'],
 				operation: ['create'],
 				resource: ['payment'],
 			},
@@ -94,11 +95,6 @@ export const paymentFields: INodeProperties[] = [
 				displayName: 'Payment Type',
 				name: 'paymentType',
 				type: 'options',
-				displayOptions: {
-					show: {
-						apiVersion: ['v4'],
-					},
-				},
 				options: [
 					{
 						name: 'ACH',
@@ -231,15 +227,38 @@ export const paymentFields: INodeProperties[] = [
 				],
 				default: 1,
 			},
+			{
+				displayName: 'Transfer Reference',
+				name: 'transferReference',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Private Notes',
+				name: 'privateNotes',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				apiVersion: ['v5'],
+				operation: ['create'],
+				resource: ['payment'],
+			},
+		},
+		options: [
 			{
 				displayName: 'Payment Type',
 				name: 'paymentType',
 				type: 'options',
-				displayOptions: {
-					show: {
-						apiVersion: ['v5'],
-					},
-				},
 				options: [
 					{
 						name: 'Bank Transfer',