diff --git a/codbex-payments/codbex-payments.edm b/codbex-payments/codbex-payments.edm index 37af8ac..a1f258d 100644 --- a/codbex-payments/codbex-payments.edm +++ b/codbex-payments/codbex-payments.edm @@ -5,8 +5,8 @@ - - + + @@ -16,15 +16,15 @@ - + - - + + @@ -34,14 +34,15 @@ + - - + + @@ -51,18 +52,19 @@ + - - + + - - - - + + + + @@ -104,7 +106,7 @@ - + @@ -139,13 +141,13 @@ - - - - - + + + + + - + @@ -189,6 +191,10 @@ + + + + CustomerPaymentsales-navigation-group/services/web/resources/unicons/usd-square.svg300 @@ -199,5 +205,5 @@ - + \ No newline at end of file diff --git a/codbex-payments/codbex-payments.gen b/codbex-payments/codbex-payments.gen index 33647ce..3b77427 100644 --- a/codbex-payments/codbex-payments.gen +++ b/codbex-payments/codbex-payments.gen @@ -383,24 +383,24 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "CUSTOMERPAYMENT_COMPANYIBAN", - "dataNullable": true, + "dataName": "CUSTOMERPAYMENT_OURPARTYIBAN", + "dataNullable": false, "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": true, + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, - "widgetLabel": "CompanyIBAN", + "widgetLabel": "OurPartyIBAN", "widgetDropdownUrl": "", "widgetDropdownControllerUrl": "", "dataTypeJava": "string", @@ -413,20 +413,20 @@ "auditType": "NONE", "dataLength": "34", "dataName": "CUSTOMERPAYMENT_COUNTERPARTYIBAN", - "dataNullable": true, + "dataNullable": false, "dataType": "VARCHAR", "description": "", + "isRequiredProperty": true, "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "CounterpartyIBAN", @@ -710,9 +710,10 @@ { "auditType": "NONE", "dataName": "CUSTOMERPAYMENT_PAYMENTMETHOD", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", + "isRequiredProperty": true, "name": "PaymentMethod", "tooltip": "", "widgetDropDownKey": "Id", @@ -725,11 +726,10 @@ "relationshipEntityName": "PaymentMethod", "relationshipEntityPerspectiveName": "Settings", "relationshipEntityPerspectiveLabel": "methods", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "PaymentMethod", @@ -890,24 +890,24 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "CUSTOMERPAYMENT_COMPANYIBAN", - "dataNullable": true, + "dataName": "CUSTOMERPAYMENT_OURPARTYIBAN", + "dataNullable": false, "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": true, + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, - "widgetLabel": "CompanyIBAN", + "widgetLabel": "OurPartyIBAN", "widgetDropdownUrl": "", "widgetDropdownControllerUrl": "", "dataTypeJava": "string", @@ -920,20 +920,20 @@ "auditType": "NONE", "dataLength": "34", "dataName": "CUSTOMERPAYMENT_COUNTERPARTYIBAN", - "dataNullable": true, + "dataNullable": false, "dataType": "VARCHAR", "description": "", + "isRequiredProperty": true, "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "CounterpartyIBAN", @@ -1158,9 +1158,10 @@ { "auditType": "NONE", "dataName": "CUSTOMERPAYMENT_PAYMENTMETHOD", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", + "isRequiredProperty": true, "name": "PaymentMethod", "tooltip": "", "widgetDropDownKey": "Id", @@ -1173,11 +1174,10 @@ "relationshipEntityName": "PaymentMethod", "relationshipEntityPerspectiveName": "Settings", "relationshipEntityPerspectiveLabel": "methods", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "PaymentMethod", @@ -1310,24 +1310,24 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "SUPPLIERPAYMENT_COMPANYIBAN", - "dataNullable": true, + "dataName": "SUPPLIERPAYMENT_OURPARTYIBAN", + "dataNullable": false, "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": true, + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, - "widgetLabel": "CompanyIBAN", + "widgetLabel": "OurPartyIBAN", "widgetDropdownUrl": "", "widgetDropdownControllerUrl": "", "dataTypeJava": "string", @@ -1340,20 +1340,20 @@ "auditType": "NONE", "dataLength": "34", "dataName": "SUPPLIERPAYMENT_COUNTERPARTYIBAN", - "dataNullable": true, + "dataNullable": false, "dataType": "VARCHAR", "description": "", + "isRequiredProperty": true, "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "CounterpartyIBAN", @@ -1633,6 +1633,36 @@ "minLength": 0, "maxLength": 20, "inputRule": "" + }, + { + "auditType": "NONE", + "dataName": "SUPPLIERPAYMENT_PAYMENTMETHOD", + "dataNullable": false, + "dataType": "INTEGER", + "description": "", + "isRequiredProperty": true, + "name": "PaymentMethod", + "tooltip": "", + "widgetIsMajor": true, + "widgetLength": "20", + "widgetSize": "", + "widgetType": "TEXTBOX", + "relationshipName": "SupplierPayment_PaymentMethod", + "relationshipEntityName": "PaymentMethod", + "relationshipEntityPerspectiveName": "Settings", + "relationshipEntityPerspectiveLabel": "methods", + "dataNotNull": true, + "dataAutoIncrement": false, + "dataPrimaryKey": false, + "dataUnique": false, + "isCalculatedProperty": false, + "isReadOnlyProperty": false, + "widgetLabel": "PaymentMethod", + "widgetDropdownUrl": "", + "widgetDropdownControllerUrl": "", + "dataTypeJava": "int", + "dataTypeTypescript": "number", + "inputRule": "" } ], "caption": "Manage entity SupplierPayment", @@ -1680,6 +1710,11 @@ "name": "Company", "project": "codbex-companies", "genFolderName": "codbex-companies" + }, + { + "name": "PaymentMethod", + "project": "codbex-methods", + "genFolderName": "codbex-methods" } ], "dataOrderBy": "DESC", @@ -1780,24 +1815,24 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "SUPPLIERPAYMENT_COMPANYIBAN", - "dataNullable": true, + "dataName": "SUPPLIERPAYMENT_OURPARTYIBAN", + "dataNullable": false, "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": true, + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, - "widgetLabel": "CompanyIBAN", + "widgetLabel": "OurPartyIBAN", "widgetDropdownUrl": "", "widgetDropdownControllerUrl": "", "dataTypeJava": "string", @@ -1810,20 +1845,20 @@ "auditType": "NONE", "dataLength": "34", "dataName": "SUPPLIERPAYMENT_COUNTERPARTYIBAN", - "dataNullable": true, + "dataNullable": false, "dataType": "VARCHAR", "description": "", + "isRequiredProperty": true, "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "CounterpartyIBAN", @@ -2103,6 +2138,36 @@ "minLength": 0, "maxLength": 20, "inputRule": "" + }, + { + "auditType": "NONE", + "dataName": "SUPPLIERPAYMENT_PAYMENTMETHOD", + "dataNullable": false, + "dataType": "INTEGER", + "description": "", + "isRequiredProperty": true, + "name": "PaymentMethod", + "tooltip": "", + "widgetIsMajor": true, + "widgetLength": "20", + "widgetSize": "", + "widgetType": "TEXTBOX", + "relationshipName": "SupplierPayment_PaymentMethod", + "relationshipEntityName": "PaymentMethod", + "relationshipEntityPerspectiveName": "Settings", + "relationshipEntityPerspectiveLabel": "methods", + "dataNotNull": true, + "dataAutoIncrement": false, + "dataPrimaryKey": false, + "dataUnique": false, + "isCalculatedProperty": false, + "isReadOnlyProperty": false, + "widgetLabel": "PaymentMethod", + "widgetDropdownUrl": "", + "widgetDropdownControllerUrl": "", + "dataTypeJava": "int", + "dataTypeTypescript": "number", + "inputRule": "" } ] }, @@ -2227,24 +2292,24 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "EMPLOYEEPAYMENT_COMPANYIBAN", - "dataNullable": true, + "dataName": "EMPLOYEEPAYMENT_OURPARTYIBAN", + "dataNullable": false, "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": true, + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, - "widgetLabel": "CompanyIBAN", + "widgetLabel": "OurPartyIBAN", "widgetDropdownUrl": "", "widgetDropdownControllerUrl": "", "dataTypeJava": "string", @@ -2257,20 +2322,20 @@ "auditType": "NONE", "dataLength": "34", "dataName": "EMPLOYEEPAYMENT_COUNTERPARTYIBAN", - "dataNullable": true, + "dataNullable": false, "dataType": "VARCHAR", "description": "", + "isRequiredProperty": true, "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "CounterpartyIBAN", @@ -2550,6 +2615,36 @@ "minLength": 0, "maxLength": 36, "inputRule": "" + }, + { + "auditType": "NONE", + "dataName": "EMPLOYEEPAYMENT_PAYMENTMETHOD", + "dataNullable": false, + "dataType": "INTEGER", + "description": "", + "isRequiredProperty": true, + "name": "PaymentMethod", + "tooltip": "", + "widgetIsMajor": true, + "widgetLength": "20", + "widgetSize": "", + "widgetType": "TEXTBOX", + "relationshipName": "EmployeePayment_PaymentMethod", + "relationshipEntityName": "PaymentMethod", + "relationshipEntityPerspectiveName": "Settings", + "relationshipEntityPerspectiveLabel": "methods", + "dataNotNull": true, + "dataAutoIncrement": false, + "dataPrimaryKey": false, + "dataUnique": false, + "isCalculatedProperty": false, + "isReadOnlyProperty": false, + "widgetLabel": "PaymentMethod", + "widgetDropdownUrl": "", + "widgetDropdownControllerUrl": "", + "dataTypeJava": "int", + "dataTypeTypescript": "number", + "inputRule": "" } ], "caption": "Manage entity EmployeePayment", @@ -2597,6 +2692,11 @@ "name": "Company", "project": "codbex-companies", "genFolderName": "codbex-companies" + }, + { + "name": "PaymentMethod", + "project": "codbex-methods", + "genFolderName": "codbex-methods" } ], "dataOrderBy": "DESC", @@ -2697,24 +2797,24 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "EMPLOYEEPAYMENT_COMPANYIBAN", - "dataNullable": true, + "dataName": "EMPLOYEEPAYMENT_OURPARTYIBAN", + "dataNullable": false, "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": true, + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, - "widgetLabel": "CompanyIBAN", + "widgetLabel": "OurPartyIBAN", "widgetDropdownUrl": "", "widgetDropdownControllerUrl": "", "dataTypeJava": "string", @@ -2727,20 +2827,20 @@ "auditType": "NONE", "dataLength": "34", "dataName": "EMPLOYEEPAYMENT_COUNTERPARTYIBAN", - "dataNullable": true, + "dataNullable": false, "dataType": "VARCHAR", "description": "", + "isRequiredProperty": true, "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "CounterpartyIBAN", @@ -3020,6 +3120,36 @@ "minLength": 0, "maxLength": 36, "inputRule": "" + }, + { + "auditType": "NONE", + "dataName": "EMPLOYEEPAYMENT_PAYMENTMETHOD", + "dataNullable": false, + "dataType": "INTEGER", + "description": "", + "isRequiredProperty": true, + "name": "PaymentMethod", + "tooltip": "", + "widgetIsMajor": true, + "widgetLength": "20", + "widgetSize": "", + "widgetType": "TEXTBOX", + "relationshipName": "EmployeePayment_PaymentMethod", + "relationshipEntityName": "PaymentMethod", + "relationshipEntityPerspectiveName": "Settings", + "relationshipEntityPerspectiveLabel": "methods", + "dataNotNull": true, + "dataAutoIncrement": false, + "dataPrimaryKey": false, + "dataUnique": false, + "isCalculatedProperty": false, + "isReadOnlyProperty": false, + "widgetLabel": "PaymentMethod", + "widgetDropdownUrl": "", + "widgetDropdownControllerUrl": "", + "dataTypeJava": "int", + "dataTypeTypescript": "number", + "inputRule": "" } ] }, @@ -3112,24 +3242,24 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "PAYMENTRECORD_COMPANYIBAN", - "dataNullable": true, + "dataName": "PAYMENTRECORD_OURPARTYIBAN", + "dataNullable": false, "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": true, + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, - "widgetLabel": "CompanyIBAN", + "widgetLabel": "OurPartyIBAN", "widgetDropdownUrl": "", "widgetDropdownControllerUrl": "", "dataTypeJava": "string", @@ -3142,20 +3272,20 @@ "auditType": "NONE", "dataLength": "34", "dataName": "PAYMENTRECORD_COUNTERPARTYIBAN", - "dataNullable": true, + "dataNullable": false, "dataType": "VARCHAR", "description": "", + "isRequiredProperty": true, "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "CounterpartyIBAN", @@ -3200,22 +3330,22 @@ "auditType": "NONE", "dataLength": "16", "dataName": "PAYMENTRECORD_AMOUNT", - "dataNullable": true, + "dataNullable": false, "dataPrecision": "16", "dataScale": "2", "dataType": "DECIMAL", "description": "", + "isRequiredProperty": true, "name": "Amount", "tooltip": "", "widgetIsMajor": true, "widgetLength": "20", "widgetSize": "", "widgetType": "NUMBER", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "Amount", @@ -3228,9 +3358,10 @@ { "auditType": "NONE", "dataName": "PAYMENTRECORD_CURRENCY", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", + "isRequiredProperty": true, "name": "Currency", "tooltip": "", "widgetDropDownKey": "Id", @@ -3243,11 +3374,10 @@ "relationshipEntityName": "Currency", "relationshipEntityPerspectiveName": "Settings", "relationshipEntityPerspectiveLabel": "Entities", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "Currency", @@ -3260,9 +3390,10 @@ { "auditType": "NONE", "dataName": "PAYMENTRECORD_PAYMENTDIRECTION", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", + "isRequiredProperty": true, "name": "PaymentDirection", "tooltip": "", "widgetDropDownKey": "Id", @@ -3275,11 +3406,10 @@ "relationshipEntityName": "PaymentDirection", "relationshipEntityPerspectiveName": "Settings", "relationshipEntityPerspectiveLabel": "Entities", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "PaymentDirection", @@ -3292,9 +3422,10 @@ { "auditType": "NONE", "dataName": "PAYMENTRECORD_PAYMENTTYPE", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", + "isRequiredProperty": true, "name": "PaymentType", "tooltip": "", "widgetDropDownKey": "Id", @@ -3307,11 +3438,10 @@ "relationshipEntityName": "PaymentType", "relationshipEntityPerspectiveName": "Settings", "relationshipEntityPerspectiveLabel": "Entities", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "PaymentType", @@ -3660,24 +3790,24 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "PAYMENTRECORD_COMPANYIBAN", - "dataNullable": true, + "dataName": "PAYMENTRECORD_OURPARTYIBAN", + "dataNullable": false, "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": true, + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, - "widgetLabel": "CompanyIBAN", + "widgetLabel": "OurPartyIBAN", "widgetDropdownUrl": "", "widgetDropdownControllerUrl": "", "dataTypeJava": "string", @@ -3690,20 +3820,20 @@ "auditType": "NONE", "dataLength": "34", "dataName": "PAYMENTRECORD_COUNTERPARTYIBAN", - "dataNullable": true, + "dataNullable": false, "dataType": "VARCHAR", "description": "", + "isRequiredProperty": true, "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": true, "widgetLength": "34", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "CounterpartyIBAN", @@ -3748,22 +3878,22 @@ "auditType": "NONE", "dataLength": "16", "dataName": "PAYMENTRECORD_AMOUNT", - "dataNullable": true, + "dataNullable": false, "dataPrecision": "16", "dataScale": "2", "dataType": "DECIMAL", "description": "", + "isRequiredProperty": true, "name": "Amount", "tooltip": "", "widgetIsMajor": true, "widgetLength": "20", "widgetSize": "", "widgetType": "NUMBER", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "Amount", @@ -3776,9 +3906,10 @@ { "auditType": "NONE", "dataName": "PAYMENTRECORD_CURRENCY", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", + "isRequiredProperty": true, "name": "Currency", "tooltip": "", "widgetDropDownKey": "Id", @@ -3791,11 +3922,10 @@ "relationshipEntityName": "Currency", "relationshipEntityPerspectiveName": "Settings", "relationshipEntityPerspectiveLabel": "Entities", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "Currency", @@ -3808,9 +3938,10 @@ { "auditType": "NONE", "dataName": "PAYMENTRECORD_PAYMENTDIRECTION", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", + "isRequiredProperty": true, "name": "PaymentDirection", "tooltip": "", "widgetDropDownKey": "Id", @@ -3823,11 +3954,10 @@ "relationshipEntityName": "PaymentDirection", "relationshipEntityPerspectiveName": "Settings", "relationshipEntityPerspectiveLabel": "Entities", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "PaymentDirection", @@ -3840,9 +3970,10 @@ { "auditType": "NONE", "dataName": "PAYMENTRECORD_PAYMENTTYPE", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", + "isRequiredProperty": true, "name": "PaymentType", "tooltip": "", "widgetDropDownKey": "Id", @@ -3855,11 +3986,10 @@ "relationshipEntityName": "PaymentType", "relationshipEntityPerspectiveName": "Settings", "relationshipEntityPerspectiveLabel": "Entities", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "PaymentType", @@ -4755,20 +4885,20 @@ "auditType": "NONE", "dataLength": "20", "dataName": "PAYMENTTYPE_NAME", - "dataNullable": true, + "dataNullable": false, "dataType": "VARCHAR", "description": "", + "isRequiredProperty": true, "name": "Name", "tooltip": "", "widgetIsMajor": true, "widgetLength": "20", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "isReadOnlyProperty": false, "widgetLabel": "Name", @@ -5293,7 +5423,7 @@ { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_DATE", - "dataNullable": true, + "dataNullable": false, "dataType": "DATE", "description": "", "isRequiredProperty": true, @@ -5303,7 +5433,7 @@ "widgetLength": "20", "widgetSize": "", "widgetType": "DATE", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, @@ -5320,7 +5450,7 @@ { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_VALOR", - "dataNullable": true, + "dataNullable": false, "dataType": "DATE", "description": "", "isRequiredProperty": true, @@ -5330,7 +5460,7 @@ "widgetLength": "20", "widgetSize": "", "widgetType": "DATE", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, @@ -5348,7 +5478,7 @@ "auditType": "NONE", "dataLength": "16", "dataName": "PAYMENTADJUSTMENT_AMOUNT", - "dataNullable": true, + "dataNullable": false, "dataPrecision": "16", "dataScale": "2", "dataType": "DECIMAL", @@ -5360,7 +5490,7 @@ "widgetLength": "20", "widgetSize": "", "widgetType": "NUMBER", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, @@ -5376,7 +5506,7 @@ { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_CURRENCY", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", "isRequiredProperty": true, @@ -5392,7 +5522,7 @@ "relationshipEntityName": "Currency", "relationshipEntityPerspectiveName": "Settings", "relationshipEntityPerspectiveLabel": "Entities", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, @@ -5408,7 +5538,7 @@ { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_COMPANY", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", "isRequiredProperty": true, @@ -5424,7 +5554,7 @@ "relationshipEntityName": "Company", "relationshipEntityPerspectiveName": "Companies", "relationshipEntityPerspectiveLabel": "Entities", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, @@ -5473,6 +5603,7 @@ "dataName": "PAYMENTADJUSTMENT_UUID", "dataNullable": true, "dataType": "VARCHAR", + "dataUnique": true, "description": "", "isCalculatedProperty": true, "name": "UUID", @@ -5484,7 +5615,6 @@ "dataNotNull": false, "dataAutoIncrement": false, "dataPrimaryKey": false, - "dataUnique": false, "isRequiredProperty": false, "isReadOnlyProperty": false, "widgetLabel": "UUID", @@ -5546,7 +5676,7 @@ "title": { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_DATE", - "dataNullable": true, + "dataNullable": false, "dataType": "DATE", "description": "", "isRequiredProperty": true, @@ -5556,7 +5686,7 @@ "widgetLength": "20", "widgetSize": "", "widgetType": "DATE", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, @@ -5574,7 +5704,7 @@ { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_VALOR", - "dataNullable": true, + "dataNullable": false, "dataType": "DATE", "description": "", "isRequiredProperty": true, @@ -5584,7 +5714,7 @@ "widgetLength": "20", "widgetSize": "", "widgetType": "DATE", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, @@ -5602,7 +5732,7 @@ "auditType": "NONE", "dataLength": "16", "dataName": "PAYMENTADJUSTMENT_AMOUNT", - "dataNullable": true, + "dataNullable": false, "dataPrecision": "16", "dataScale": "2", "dataType": "DECIMAL", @@ -5614,7 +5744,7 @@ "widgetLength": "20", "widgetSize": "", "widgetType": "NUMBER", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, @@ -5630,7 +5760,7 @@ { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_CURRENCY", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", "isRequiredProperty": true, @@ -5646,7 +5776,7 @@ "relationshipEntityName": "Currency", "relationshipEntityPerspectiveName": "Settings", "relationshipEntityPerspectiveLabel": "Entities", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, @@ -5662,7 +5792,7 @@ { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_COMPANY", - "dataNullable": true, + "dataNullable": false, "dataType": "INTEGER", "description": "", "isRequiredProperty": true, @@ -5678,7 +5808,7 @@ "relationshipEntityName": "Company", "relationshipEntityPerspectiveName": "Companies", "relationshipEntityPerspectiveLabel": "Entities", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, "dataUnique": false, @@ -5727,6 +5857,7 @@ "dataName": "PAYMENTADJUSTMENT_UUID", "dataNullable": true, "dataType": "VARCHAR", + "dataUnique": true, "description": "", "isCalculatedProperty": true, "name": "UUID", @@ -5738,7 +5869,6 @@ "dataNotNull": false, "dataAutoIncrement": false, "dataPrimaryKey": false, - "dataUnique": false, "isRequiredProperty": false, "isReadOnlyProperty": false, "widgetLabel": "UUID", diff --git a/codbex-payments/codbex-payments.model b/codbex-payments/codbex-payments.model index 5fdb37b..61dcecc 100644 --- a/codbex-payments/codbex-payments.model +++ b/codbex-payments/codbex-payments.model @@ -70,11 +70,12 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "CUSTOMERPAYMENT_COMPANYIBAN", - "dataNullable": "true", + "dataName": "CUSTOMERPAYMENT_OURPARTYIBAN", + "dataNullable": "false", "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": "true", + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": "true", "widgetLength": "34", @@ -85,9 +86,10 @@ "auditType": "NONE", "dataLength": "34", "dataName": "CUSTOMERPAYMENT_COUNTERPARTYIBAN", - "dataNullable": "true", + "dataNullable": "false", "dataType": "VARCHAR", "description": "", + "isRequiredProperty": "true", "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": "true", @@ -244,9 +246,10 @@ { "auditType": "NONE", "dataName": "CUSTOMERPAYMENT_PAYMENTMETHOD", - "dataNullable": "true", + "dataNullable": "false", "dataType": "INTEGER", "description": "", + "isRequiredProperty": "true", "name": "PaymentMethod", "tooltip": "", "widgetDropDownKey": "Id", @@ -360,11 +363,12 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "SUPPLIERPAYMENT_COMPANYIBAN", - "dataNullable": "true", + "dataName": "SUPPLIERPAYMENT_OURPARTYIBAN", + "dataNullable": "false", "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": "true", + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": "true", "widgetLength": "34", @@ -375,9 +379,10 @@ "auditType": "NONE", "dataLength": "34", "dataName": "SUPPLIERPAYMENT_COUNTERPARTYIBAN", - "dataNullable": "true", + "dataNullable": "false", "dataType": "VARCHAR", "description": "", + "isRequiredProperty": "true", "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": "true", @@ -530,6 +535,24 @@ "widgetLength": "20", "widgetSize": "", "widgetType": "TEXTBOX" + }, + { + "auditType": "NONE", + "dataName": "SUPPLIERPAYMENT_PAYMENTMETHOD", + "dataNullable": "false", + "dataType": "INTEGER", + "description": "", + "isRequiredProperty": "true", + "name": "PaymentMethod", + "tooltip": "", + "widgetIsMajor": "true", + "widgetLength": "20", + "widgetSize": "", + "widgetType": "TEXTBOX", + "relationshipName": "SupplierPayment_PaymentMethod", + "relationshipEntityName": "PaymentMethod", + "relationshipEntityPerspectiveName": "Settings", + "relationshipEntityPerspectiveLabel": "methods" } ], "caption": "Manage entity SupplierPayment", @@ -631,11 +654,12 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "EMPLOYEEPAYMENT_COMPANYIBAN", - "dataNullable": "true", + "dataName": "EMPLOYEEPAYMENT_OURPARTYIBAN", + "dataNullable": "false", "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": "true", + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": "true", "widgetLength": "34", @@ -646,9 +670,10 @@ "auditType": "NONE", "dataLength": "34", "dataName": "EMPLOYEEPAYMENT_COUNTERPARTYIBAN", - "dataNullable": "true", + "dataNullable": "false", "dataType": "VARCHAR", "description": "", + "isRequiredProperty": "true", "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": "true", @@ -801,6 +826,24 @@ "widgetLength": "36", "widgetSize": "", "widgetType": "TEXTBOX" + }, + { + "auditType": "NONE", + "dataName": "EMPLOYEEPAYMENT_PAYMENTMETHOD", + "dataNullable": "false", + "dataType": "INTEGER", + "description": "", + "isRequiredProperty": "true", + "name": "PaymentMethod", + "tooltip": "", + "widgetIsMajor": "true", + "widgetLength": "20", + "widgetSize": "", + "widgetType": "TEXTBOX", + "relationshipName": "EmployeePayment_PaymentMethod", + "relationshipEntityName": "PaymentMethod", + "relationshipEntityPerspectiveName": "Settings", + "relationshipEntityPerspectiveLabel": "methods" } ], "caption": "Manage entity EmployeePayment", @@ -882,11 +925,12 @@ { "auditType": "NONE", "dataLength": "34", - "dataName": "PAYMENTRECORD_COMPANYIBAN", - "dataNullable": "true", + "dataName": "PAYMENTRECORD_OURPARTYIBAN", + "dataNullable": "false", "dataType": "VARCHAR", "description": "", - "name": "CompanyIBAN", + "isRequiredProperty": "true", + "name": "OurPartyIBAN", "tooltip": "", "widgetIsMajor": "true", "widgetLength": "34", @@ -897,9 +941,10 @@ "auditType": "NONE", "dataLength": "34", "dataName": "PAYMENTRECORD_COUNTERPARTYIBAN", - "dataNullable": "true", + "dataNullable": "false", "dataType": "VARCHAR", "description": "", + "isRequiredProperty": "true", "name": "CounterpartyIBAN", "tooltip": "", "widgetIsMajor": "true", @@ -925,11 +970,12 @@ "auditType": "NONE", "dataLength": "16", "dataName": "PAYMENTRECORD_AMOUNT", - "dataNullable": "true", + "dataNullable": "false", "dataPrecision": "16", "dataScale": "2", "dataType": "DECIMAL", "description": "", + "isRequiredProperty": "true", "name": "Amount", "tooltip": "", "widgetIsMajor": "true", @@ -940,9 +986,10 @@ { "auditType": "NONE", "dataName": "PAYMENTRECORD_CURRENCY", - "dataNullable": "true", + "dataNullable": "false", "dataType": "INTEGER", "description": "", + "isRequiredProperty": "true", "name": "Currency", "tooltip": "", "widgetDropDownKey": "Id", @@ -959,9 +1006,10 @@ { "auditType": "NONE", "dataName": "PAYMENTRECORD_PAYMENTDIRECTION", - "dataNullable": "true", + "dataNullable": "false", "dataType": "INTEGER", "description": "", + "isRequiredProperty": "true", "name": "PaymentDirection", "tooltip": "", "widgetDropDownKey": "Id", @@ -978,9 +1026,10 @@ { "auditType": "NONE", "dataName": "PAYMENTRECORD_PAYMENTTYPE", - "dataNullable": "true", + "dataNullable": "false", "dataType": "INTEGER", "description": "", + "isRequiredProperty": "true", "name": "PaymentType", "tooltip": "", "widgetDropDownKey": "Id", @@ -1522,9 +1571,10 @@ "auditType": "NONE", "dataLength": "20", "dataName": "PAYMENTTYPE_NAME", - "dataNullable": "true", + "dataNullable": "false", "dataType": "VARCHAR", "description": "", + "isRequiredProperty": "true", "name": "Name", "tooltip": "", "widgetIsMajor": "true", @@ -1839,7 +1889,7 @@ { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_DATE", - "dataNullable": "true", + "dataNullable": "false", "dataType": "DATE", "description": "", "isRequiredProperty": "true", @@ -1853,7 +1903,7 @@ { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_VALOR", - "dataNullable": "true", + "dataNullable": "false", "dataType": "DATE", "description": "", "isRequiredProperty": "true", @@ -1868,7 +1918,7 @@ "auditType": "NONE", "dataLength": "16", "dataName": "PAYMENTADJUSTMENT_AMOUNT", - "dataNullable": "true", + "dataNullable": "false", "dataPrecision": "16", "dataScale": "2", "dataType": "DECIMAL", @@ -1884,7 +1934,7 @@ { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_CURRENCY", - "dataNullable": "true", + "dataNullable": "false", "dataType": "INTEGER", "description": "", "isRequiredProperty": "true", @@ -1904,7 +1954,7 @@ { "auditType": "NONE", "dataName": "PAYMENTADJUSTMENT_COMPANY", - "dataNullable": "true", + "dataNullable": "false", "dataType": "INTEGER", "description": "", "isRequiredProperty": "true", @@ -1942,6 +1992,7 @@ "dataName": "PAYMENTADJUSTMENT_UUID", "dataNullable": "true", "dataType": "VARCHAR", + "dataUnique": "true", "description": "", "isCalculatedProperty": "true", "name": "UUID", diff --git a/codbex-payments/gen/codbex-payments/api/CustomerPayment/CustomerPaymentController.ts b/codbex-payments/gen/codbex-payments/api/CustomerPayment/CustomerPaymentController.ts index 4a469bc..ea1442f 100644 --- a/codbex-payments/gen/codbex-payments/api/CustomerPayment/CustomerPaymentController.ts +++ b/codbex-payments/gen/codbex-payments/api/CustomerPayment/CustomerPaymentController.ts @@ -175,8 +175,14 @@ class CustomerPaymentController { if (entity.Valor === null || entity.Valor === undefined) { throw new ValidationError(`The 'Valor' property is required, provide a valid value`); } - if (entity.CompanyIBAN?.length > 34) { - throw new ValidationError(`The 'CompanyIBAN' exceeds the maximum length of [34] characters`); + if (entity.OurPartyIBAN === null || entity.OurPartyIBAN === undefined) { + throw new ValidationError(`The 'OurPartyIBAN' property is required, provide a valid value`); + } + if (entity.OurPartyIBAN?.length > 34) { + throw new ValidationError(`The 'OurPartyIBAN' exceeds the maximum length of [34] characters`); + } + if (entity.CounterpartyIBAN === null || entity.CounterpartyIBAN === undefined) { + throw new ValidationError(`The 'CounterpartyIBAN' property is required, provide a valid value`); } if (entity.CounterpartyIBAN?.length > 34) { throw new ValidationError(`The 'CounterpartyIBAN' exceeds the maximum length of [34] characters`); @@ -208,6 +214,9 @@ class CustomerPaymentController { if (entity.Reference?.length > 36) { throw new ValidationError(`The 'Reference' exceeds the maximum length of [36] characters`); } + if (entity.PaymentMethod === null || entity.PaymentMethod === undefined) { + throw new ValidationError(`The 'PaymentMethod' property is required, provide a valid value`); + } for (const next of validationModules) { next.validate(entity); } diff --git a/codbex-payments/gen/codbex-payments/api/EmployeePayment/EmployeePaymentController.ts b/codbex-payments/gen/codbex-payments/api/EmployeePayment/EmployeePaymentController.ts index beeda30..caeca14 100644 --- a/codbex-payments/gen/codbex-payments/api/EmployeePayment/EmployeePaymentController.ts +++ b/codbex-payments/gen/codbex-payments/api/EmployeePayment/EmployeePaymentController.ts @@ -175,8 +175,14 @@ class EmployeePaymentController { if (entity.Valor === null || entity.Valor === undefined) { throw new ValidationError(`The 'Valor' property is required, provide a valid value`); } - if (entity.CompanyIBAN?.length > 34) { - throw new ValidationError(`The 'CompanyIBAN' exceeds the maximum length of [34] characters`); + if (entity.OurPartyIBAN === null || entity.OurPartyIBAN === undefined) { + throw new ValidationError(`The 'OurPartyIBAN' property is required, provide a valid value`); + } + if (entity.OurPartyIBAN?.length > 34) { + throw new ValidationError(`The 'OurPartyIBAN' exceeds the maximum length of [34] characters`); + } + if (entity.CounterpartyIBAN === null || entity.CounterpartyIBAN === undefined) { + throw new ValidationError(`The 'CounterpartyIBAN' property is required, provide a valid value`); } if (entity.CounterpartyIBAN?.length > 34) { throw new ValidationError(`The 'CounterpartyIBAN' exceeds the maximum length of [34] characters`); @@ -208,6 +214,9 @@ class EmployeePaymentController { if (entity.Reference?.length > 36) { throw new ValidationError(`The 'Reference' exceeds the maximum length of [36] characters`); } + if (entity.PaymentMethod === null || entity.PaymentMethod === undefined) { + throw new ValidationError(`The 'PaymentMethod' property is required, provide a valid value`); + } for (const next of validationModules) { next.validate(entity); } diff --git a/codbex-payments/gen/codbex-payments/api/PaymentRecord/PaymentRecordController.ts b/codbex-payments/gen/codbex-payments/api/PaymentRecord/PaymentRecordController.ts index 4e2bc9f..e11d3e0 100644 --- a/codbex-payments/gen/codbex-payments/api/PaymentRecord/PaymentRecordController.ts +++ b/codbex-payments/gen/codbex-payments/api/PaymentRecord/PaymentRecordController.ts @@ -170,8 +170,14 @@ class PaymentRecordController { if (entity.Valor === null || entity.Valor === undefined) { throw new ValidationError(`The 'Valor' property is required, provide a valid value`); } - if (entity.CompanyIBAN?.length > 34) { - throw new ValidationError(`The 'CompanyIBAN' exceeds the maximum length of [34] characters`); + if (entity.OurPartyIBAN === null || entity.OurPartyIBAN === undefined) { + throw new ValidationError(`The 'OurPartyIBAN' property is required, provide a valid value`); + } + if (entity.OurPartyIBAN?.length > 34) { + throw new ValidationError(`The 'OurPartyIBAN' exceeds the maximum length of [34] characters`); + } + if (entity.CounterpartyIBAN === null || entity.CounterpartyIBAN === undefined) { + throw new ValidationError(`The 'CounterpartyIBAN' property is required, provide a valid value`); } if (entity.CounterpartyIBAN?.length > 34) { throw new ValidationError(`The 'CounterpartyIBAN' exceeds the maximum length of [34] characters`); @@ -179,6 +185,18 @@ class PaymentRecordController { if (entity.CounterpartyName?.length > 100) { throw new ValidationError(`The 'CounterpartyName' exceeds the maximum length of [100] characters`); } + if (entity.Amount === null || entity.Amount === undefined) { + throw new ValidationError(`The 'Amount' property is required, provide a valid value`); + } + if (entity.Currency === null || entity.Currency === undefined) { + throw new ValidationError(`The 'Currency' property is required, provide a valid value`); + } + if (entity.PaymentDirection === null || entity.PaymentDirection === undefined) { + throw new ValidationError(`The 'PaymentDirection' property is required, provide a valid value`); + } + if (entity.PaymentType === null || entity.PaymentType === undefined) { + throw new ValidationError(`The 'PaymentType' property is required, provide a valid value`); + } if (entity.Reason?.length > 100) { throw new ValidationError(`The 'Reason' exceeds the maximum length of [100] characters`); } diff --git a/codbex-payments/gen/codbex-payments/api/Settings/PaymentTypeController.ts b/codbex-payments/gen/codbex-payments/api/Settings/PaymentTypeController.ts index 32ffd2b..f75d387 100644 --- a/codbex-payments/gen/codbex-payments/api/Settings/PaymentTypeController.ts +++ b/codbex-payments/gen/codbex-payments/api/Settings/PaymentTypeController.ts @@ -164,6 +164,9 @@ class PaymentTypeController { } private validateEntity(entity: any): void { + if (entity.Name === null || entity.Name === undefined) { + throw new ValidationError(`The 'Name' property is required, provide a valid value`); + } if (entity.Name?.length > 20) { throw new ValidationError(`The 'Name' exceeds the maximum length of [20] characters`); } diff --git a/codbex-payments/gen/codbex-payments/api/SupplierPayment/SupplierPaymentController.ts b/codbex-payments/gen/codbex-payments/api/SupplierPayment/SupplierPaymentController.ts index 4f9580f..4eef816 100644 --- a/codbex-payments/gen/codbex-payments/api/SupplierPayment/SupplierPaymentController.ts +++ b/codbex-payments/gen/codbex-payments/api/SupplierPayment/SupplierPaymentController.ts @@ -175,8 +175,14 @@ class SupplierPaymentController { if (entity.Valor === null || entity.Valor === undefined) { throw new ValidationError(`The 'Valor' property is required, provide a valid value`); } - if (entity.CompanyIBAN?.length > 34) { - throw new ValidationError(`The 'CompanyIBAN' exceeds the maximum length of [34] characters`); + if (entity.OurPartyIBAN === null || entity.OurPartyIBAN === undefined) { + throw new ValidationError(`The 'OurPartyIBAN' property is required, provide a valid value`); + } + if (entity.OurPartyIBAN?.length > 34) { + throw new ValidationError(`The 'OurPartyIBAN' exceeds the maximum length of [34] characters`); + } + if (entity.CounterpartyIBAN === null || entity.CounterpartyIBAN === undefined) { + throw new ValidationError(`The 'CounterpartyIBAN' property is required, provide a valid value`); } if (entity.CounterpartyIBAN?.length > 34) { throw new ValidationError(`The 'CounterpartyIBAN' exceeds the maximum length of [34] characters`); @@ -208,6 +214,9 @@ class SupplierPaymentController { if (entity.Reference?.length > 36) { throw new ValidationError(`The 'Reference' exceeds the maximum length of [36] characters`); } + if (entity.PaymentMethod === null || entity.PaymentMethod === undefined) { + throw new ValidationError(`The 'PaymentMethod' property is required, provide a valid value`); + } for (const next of validationModules) { next.validate(entity); } diff --git a/codbex-payments/gen/codbex-payments/dao/CustomerPayment/CustomerPaymentRepository.ts b/codbex-payments/gen/codbex-payments/dao/CustomerPayment/CustomerPaymentRepository.ts index 900aacb..40d13e3 100644 --- a/codbex-payments/gen/codbex-payments/dao/CustomerPayment/CustomerPaymentRepository.ts +++ b/codbex-payments/gen/codbex-payments/dao/CustomerPayment/CustomerPaymentRepository.ts @@ -11,8 +11,8 @@ export interface CustomerPaymentEntity { Customer: number; Date: Date; Valor: Date; - CompanyIBAN?: string; - CounterpartyIBAN?: string; + OurPartyIBAN: string; + CounterpartyIBAN: string; CounterpartyName?: string; Amount: number; Currency: number; @@ -22,15 +22,15 @@ export interface CustomerPaymentEntity { Name?: string; UUID: string; Reference?: string; - PaymentMethod?: number; + PaymentMethod: number; } export interface CustomerPaymentCreateEntity { readonly Customer: number; readonly Date: Date; readonly Valor: Date; - readonly CompanyIBAN?: string; - readonly CounterpartyIBAN?: string; + readonly OurPartyIBAN: string; + readonly CounterpartyIBAN: string; readonly CounterpartyName?: string; readonly Amount: number; readonly Currency: number; @@ -38,7 +38,7 @@ export interface CustomerPaymentCreateEntity { readonly Description?: string; readonly Company?: number; readonly Reference?: string; - readonly PaymentMethod?: number; + readonly PaymentMethod: number; } export interface CustomerPaymentUpdateEntity extends CustomerPaymentCreateEntity { @@ -52,7 +52,7 @@ export interface CustomerPaymentEntityOptions { Customer?: number | number[]; Date?: Date | Date[]; Valor?: Date | Date[]; - CompanyIBAN?: string | string[]; + OurPartyIBAN?: string | string[]; CounterpartyIBAN?: string | string[]; CounterpartyName?: string | string[]; Amount?: number | number[]; @@ -70,7 +70,7 @@ export interface CustomerPaymentEntityOptions { Customer?: number | number[]; Date?: Date | Date[]; Valor?: Date | Date[]; - CompanyIBAN?: string | string[]; + OurPartyIBAN?: string | string[]; CounterpartyIBAN?: string | string[]; CounterpartyName?: string | string[]; Amount?: number | number[]; @@ -88,7 +88,7 @@ export interface CustomerPaymentEntityOptions { Customer?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -106,7 +106,7 @@ export interface CustomerPaymentEntityOptions { Customer?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -124,7 +124,7 @@ export interface CustomerPaymentEntityOptions { Customer?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -142,7 +142,7 @@ export interface CustomerPaymentEntityOptions { Customer?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -160,7 +160,7 @@ export interface CustomerPaymentEntityOptions { Customer?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -228,14 +228,16 @@ export class CustomerPaymentRepository { required: true }, { - name: "CompanyIBAN", - column: "CUSTOMERPAYMENT_COMPANYIBAN", + name: "OurPartyIBAN", + column: "CUSTOMERPAYMENT_OURPARTYIBAN", type: "VARCHAR", + required: true }, { name: "CounterpartyIBAN", column: "CUSTOMERPAYMENT_COUNTERPARTYIBAN", type: "VARCHAR", + required: true }, { name: "CounterpartyName", @@ -290,6 +292,7 @@ export class CustomerPaymentRepository { name: "PaymentMethod", column: "CUSTOMERPAYMENT_PAYMENTMETHOD", type: "INTEGER", + required: true } ] }; diff --git a/codbex-payments/gen/codbex-payments/dao/EmployeePayment/EmployeePaymentRepository.ts b/codbex-payments/gen/codbex-payments/dao/EmployeePayment/EmployeePaymentRepository.ts index 88ae4d6..6959423 100644 --- a/codbex-payments/gen/codbex-payments/dao/EmployeePayment/EmployeePaymentRepository.ts +++ b/codbex-payments/gen/codbex-payments/dao/EmployeePayment/EmployeePaymentRepository.ts @@ -11,8 +11,8 @@ export interface EmployeePaymentEntity { Employee: number; Date: Date; Valor: Date; - CompanyIBAN?: string; - CounterpartyIBAN?: string; + OurPartyIBAN: string; + CounterpartyIBAN: string; CounterpartyName?: string; Amount: number; Currency: number; @@ -22,14 +22,15 @@ export interface EmployeePaymentEntity { Name?: string; UUID: string; Reference?: string; + PaymentMethod: number; } export interface EmployeePaymentCreateEntity { readonly Employee: number; readonly Date: Date; readonly Valor: Date; - readonly CompanyIBAN?: string; - readonly CounterpartyIBAN?: string; + readonly OurPartyIBAN: string; + readonly CounterpartyIBAN: string; readonly CounterpartyName?: string; readonly Amount: number; readonly Currency: number; @@ -37,6 +38,7 @@ export interface EmployeePaymentCreateEntity { readonly Description?: string; readonly Company?: number; readonly Reference?: string; + readonly PaymentMethod: number; } export interface EmployeePaymentUpdateEntity extends EmployeePaymentCreateEntity { @@ -50,7 +52,7 @@ export interface EmployeePaymentEntityOptions { Employee?: number | number[]; Date?: Date | Date[]; Valor?: Date | Date[]; - CompanyIBAN?: string | string[]; + OurPartyIBAN?: string | string[]; CounterpartyIBAN?: string | string[]; CounterpartyName?: string | string[]; Amount?: number | number[]; @@ -61,13 +63,14 @@ export interface EmployeePaymentEntityOptions { Name?: string | string[]; UUID?: string | string[]; Reference?: string | string[]; + PaymentMethod?: number | number[]; }; notEquals?: { Id?: number | number[]; Employee?: number | number[]; Date?: Date | Date[]; Valor?: Date | Date[]; - CompanyIBAN?: string | string[]; + OurPartyIBAN?: string | string[]; CounterpartyIBAN?: string | string[]; CounterpartyName?: string | string[]; Amount?: number | number[]; @@ -78,13 +81,14 @@ export interface EmployeePaymentEntityOptions { Name?: string | string[]; UUID?: string | string[]; Reference?: string | string[]; + PaymentMethod?: number | number[]; }; contains?: { Id?: number; Employee?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -95,13 +99,14 @@ export interface EmployeePaymentEntityOptions { Name?: string; UUID?: string; Reference?: string; + PaymentMethod?: number; }; greaterThan?: { Id?: number; Employee?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -112,13 +117,14 @@ export interface EmployeePaymentEntityOptions { Name?: string; UUID?: string; Reference?: string; + PaymentMethod?: number; }; greaterThanOrEqual?: { Id?: number; Employee?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -129,13 +135,14 @@ export interface EmployeePaymentEntityOptions { Name?: string; UUID?: string; Reference?: string; + PaymentMethod?: number; }; lessThan?: { Id?: number; Employee?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -146,13 +153,14 @@ export interface EmployeePaymentEntityOptions { Name?: string; UUID?: string; Reference?: string; + PaymentMethod?: number; }; lessThanOrEqual?: { Id?: number; Employee?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -163,6 +171,7 @@ export interface EmployeePaymentEntityOptions { Name?: string; UUID?: string; Reference?: string; + PaymentMethod?: number; }; }, $select?: (keyof EmployeePaymentEntity)[], @@ -219,14 +228,16 @@ export class EmployeePaymentRepository { required: true }, { - name: "CompanyIBAN", - column: "EMPLOYEEPAYMENT_COMPANYIBAN", + name: "OurPartyIBAN", + column: "EMPLOYEEPAYMENT_OURPARTYIBAN", type: "VARCHAR", + required: true }, { name: "CounterpartyIBAN", column: "EMPLOYEEPAYMENT_COUNTERPARTYIBAN", type: "VARCHAR", + required: true }, { name: "CounterpartyName", @@ -276,6 +287,12 @@ export class EmployeePaymentRepository { name: "Reference", column: "EMPLOYEEPAYMENT_REFERENCE", type: "VARCHAR", + }, + { + name: "PaymentMethod", + column: "EMPLOYEEPAYMENT_PAYMENTMETHOD", + type: "INTEGER", + required: true } ] }; diff --git a/codbex-payments/gen/codbex-payments/dao/PaymentAdjustment/PaymentAdjustmentRepository.ts b/codbex-payments/gen/codbex-payments/dao/PaymentAdjustment/PaymentAdjustmentRepository.ts index 423e823..cd8f18c 100644 --- a/codbex-payments/gen/codbex-payments/dao/PaymentAdjustment/PaymentAdjustmentRepository.ts +++ b/codbex-payments/gen/codbex-payments/dao/PaymentAdjustment/PaymentAdjustmentRepository.ts @@ -6,21 +6,21 @@ import { EntityUtils } from "../utils/EntityUtils"; export interface PaymentAdjustmentEntity { readonly Id: number; - Date?: Date; - Valor?: Date; - Amount?: number; - Currency?: number; - Company?: number; + Date: Date; + Valor: Date; + Amount: number; + Currency: number; + Company: number; Reason?: string; UUID?: string; } export interface PaymentAdjustmentCreateEntity { - readonly Date?: Date; - readonly Valor?: Date; - readonly Amount?: number; - readonly Currency?: number; - readonly Company?: number; + readonly Date: Date; + readonly Valor: Date; + readonly Amount: number; + readonly Currency: number; + readonly Company: number; readonly Reason?: string; } @@ -140,26 +140,31 @@ export class PaymentAdjustmentRepository { name: "Date", column: "PAYMENTADJUSTMENT_DATE", type: "DATE", + required: true }, { name: "Valor", column: "PAYMENTADJUSTMENT_VALOR", type: "DATE", + required: true }, { name: "Amount", column: "PAYMENTADJUSTMENT_AMOUNT", type: "DECIMAL", + required: true }, { name: "Currency", column: "PAYMENTADJUSTMENT_CURRENCY", type: "INTEGER", + required: true }, { name: "Company", column: "PAYMENTADJUSTMENT_COMPANY", type: "INTEGER", + required: true }, { name: "Reason", diff --git a/codbex-payments/gen/codbex-payments/dao/PaymentRecord/PaymentRecordRepository.ts b/codbex-payments/gen/codbex-payments/dao/PaymentRecord/PaymentRecordRepository.ts index c557eb4..8cd2a95 100644 --- a/codbex-payments/gen/codbex-payments/dao/PaymentRecord/PaymentRecordRepository.ts +++ b/codbex-payments/gen/codbex-payments/dao/PaymentRecord/PaymentRecordRepository.ts @@ -8,13 +8,13 @@ export interface PaymentRecordEntity { readonly Id: number; Date: Date; Valor: Date; - CompanyIBAN?: string; - CounterpartyIBAN?: string; + OurPartyIBAN: string; + CounterpartyIBAN: string; CounterpartyName?: string; - Amount?: number; - Currency?: number; - PaymentDirection?: number; - PaymentType?: number; + Amount: number; + Currency: number; + PaymentDirection: number; + PaymentType: number; Reason?: string; Description?: string; Company?: number; @@ -28,13 +28,13 @@ export interface PaymentRecordEntity { export interface PaymentRecordCreateEntity { readonly Date: Date; readonly Valor: Date; - readonly CompanyIBAN?: string; - readonly CounterpartyIBAN?: string; + readonly OurPartyIBAN: string; + readonly CounterpartyIBAN: string; readonly CounterpartyName?: string; - readonly Amount?: number; - readonly Currency?: number; - readonly PaymentDirection?: number; - readonly PaymentType?: number; + readonly Amount: number; + readonly Currency: number; + readonly PaymentDirection: number; + readonly PaymentType: number; readonly Reason?: string; readonly Description?: string; readonly Company?: number; @@ -54,7 +54,7 @@ export interface PaymentRecordEntityOptions { Id?: number | number[]; Date?: Date | Date[]; Valor?: Date | Date[]; - CompanyIBAN?: string | string[]; + OurPartyIBAN?: string | string[]; CounterpartyIBAN?: string | string[]; CounterpartyName?: string | string[]; Amount?: number | number[]; @@ -74,7 +74,7 @@ export interface PaymentRecordEntityOptions { Id?: number | number[]; Date?: Date | Date[]; Valor?: Date | Date[]; - CompanyIBAN?: string | string[]; + OurPartyIBAN?: string | string[]; CounterpartyIBAN?: string | string[]; CounterpartyName?: string | string[]; Amount?: number | number[]; @@ -94,7 +94,7 @@ export interface PaymentRecordEntityOptions { Id?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -114,7 +114,7 @@ export interface PaymentRecordEntityOptions { Id?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -134,7 +134,7 @@ export interface PaymentRecordEntityOptions { Id?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -154,7 +154,7 @@ export interface PaymentRecordEntityOptions { Id?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -174,7 +174,7 @@ export interface PaymentRecordEntityOptions { Id?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -239,14 +239,16 @@ export class PaymentRecordRepository { required: true }, { - name: "CompanyIBAN", - column: "PAYMENTRECORD_COMPANYIBAN", + name: "OurPartyIBAN", + column: "PAYMENTRECORD_OURPARTYIBAN", type: "VARCHAR", + required: true }, { name: "CounterpartyIBAN", column: "PAYMENTRECORD_COUNTERPARTYIBAN", type: "VARCHAR", + required: true }, { name: "CounterpartyName", @@ -257,21 +259,25 @@ export class PaymentRecordRepository { name: "Amount", column: "PAYMENTRECORD_AMOUNT", type: "DECIMAL", + required: true }, { name: "Currency", column: "PAYMENTRECORD_CURRENCY", type: "INTEGER", + required: true }, { name: "PaymentDirection", column: "PAYMENTRECORD_PAYMENTDIRECTION", type: "INTEGER", + required: true }, { name: "PaymentType", column: "PAYMENTRECORD_PAYMENTTYPE", type: "INTEGER", + required: true }, { name: "Reason", diff --git a/codbex-payments/gen/codbex-payments/dao/Settings/PaymentTypeRepository.ts b/codbex-payments/gen/codbex-payments/dao/Settings/PaymentTypeRepository.ts index 00caa5c..0807958 100644 --- a/codbex-payments/gen/codbex-payments/dao/Settings/PaymentTypeRepository.ts +++ b/codbex-payments/gen/codbex-payments/dao/Settings/PaymentTypeRepository.ts @@ -5,11 +5,11 @@ import { dao as daoApi } from "@aerokit/sdk/db"; export interface PaymentTypeEntity { readonly Id: number; - Name?: string; + Name: string; } export interface PaymentTypeCreateEntity { - readonly Name?: string; + readonly Name: string; } export interface PaymentTypeUpdateEntity extends PaymentTypeCreateEntity { @@ -86,6 +86,7 @@ export class PaymentTypeRepository { name: "Name", column: "PAYMENTTYPE_NAME", type: "VARCHAR", + required: true } ] }; diff --git a/codbex-payments/gen/codbex-payments/dao/SupplierPayment/SupplierPaymentRepository.ts b/codbex-payments/gen/codbex-payments/dao/SupplierPayment/SupplierPaymentRepository.ts index 084af67..bbcf276 100644 --- a/codbex-payments/gen/codbex-payments/dao/SupplierPayment/SupplierPaymentRepository.ts +++ b/codbex-payments/gen/codbex-payments/dao/SupplierPayment/SupplierPaymentRepository.ts @@ -11,8 +11,8 @@ export interface SupplierPaymentEntity { Supplier: number; Date: Date; Valor: Date; - CompanyIBAN?: string; - CounterpartyIBAN?: string; + OurPartyIBAN: string; + CounterpartyIBAN: string; CounterpartyName?: string; Amount: number; Currency: number; @@ -22,14 +22,15 @@ export interface SupplierPaymentEntity { Name?: string; UUID: string; Reference?: string; + PaymentMethod: number; } export interface SupplierPaymentCreateEntity { readonly Supplier: number; readonly Date: Date; readonly Valor: Date; - readonly CompanyIBAN?: string; - readonly CounterpartyIBAN?: string; + readonly OurPartyIBAN: string; + readonly CounterpartyIBAN: string; readonly CounterpartyName?: string; readonly Amount: number; readonly Currency: number; @@ -37,6 +38,7 @@ export interface SupplierPaymentCreateEntity { readonly Description?: string; readonly Company?: number; readonly Reference?: string; + readonly PaymentMethod: number; } export interface SupplierPaymentUpdateEntity extends SupplierPaymentCreateEntity { @@ -50,7 +52,7 @@ export interface SupplierPaymentEntityOptions { Supplier?: number | number[]; Date?: Date | Date[]; Valor?: Date | Date[]; - CompanyIBAN?: string | string[]; + OurPartyIBAN?: string | string[]; CounterpartyIBAN?: string | string[]; CounterpartyName?: string | string[]; Amount?: number | number[]; @@ -61,13 +63,14 @@ export interface SupplierPaymentEntityOptions { Name?: string | string[]; UUID?: string | string[]; Reference?: string | string[]; + PaymentMethod?: number | number[]; }; notEquals?: { Id?: number | number[]; Supplier?: number | number[]; Date?: Date | Date[]; Valor?: Date | Date[]; - CompanyIBAN?: string | string[]; + OurPartyIBAN?: string | string[]; CounterpartyIBAN?: string | string[]; CounterpartyName?: string | string[]; Amount?: number | number[]; @@ -78,13 +81,14 @@ export interface SupplierPaymentEntityOptions { Name?: string | string[]; UUID?: string | string[]; Reference?: string | string[]; + PaymentMethod?: number | number[]; }; contains?: { Id?: number; Supplier?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -95,13 +99,14 @@ export interface SupplierPaymentEntityOptions { Name?: string; UUID?: string; Reference?: string; + PaymentMethod?: number; }; greaterThan?: { Id?: number; Supplier?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -112,13 +117,14 @@ export interface SupplierPaymentEntityOptions { Name?: string; UUID?: string; Reference?: string; + PaymentMethod?: number; }; greaterThanOrEqual?: { Id?: number; Supplier?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -129,13 +135,14 @@ export interface SupplierPaymentEntityOptions { Name?: string; UUID?: string; Reference?: string; + PaymentMethod?: number; }; lessThan?: { Id?: number; Supplier?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -146,13 +153,14 @@ export interface SupplierPaymentEntityOptions { Name?: string; UUID?: string; Reference?: string; + PaymentMethod?: number; }; lessThanOrEqual?: { Id?: number; Supplier?: number; Date?: Date; Valor?: Date; - CompanyIBAN?: string; + OurPartyIBAN?: string; CounterpartyIBAN?: string; CounterpartyName?: string; Amount?: number; @@ -163,6 +171,7 @@ export interface SupplierPaymentEntityOptions { Name?: string; UUID?: string; Reference?: string; + PaymentMethod?: number; }; }, $select?: (keyof SupplierPaymentEntity)[], @@ -219,14 +228,16 @@ export class SupplierPaymentRepository { required: true }, { - name: "CompanyIBAN", - column: "SUPPLIERPAYMENT_COMPANYIBAN", + name: "OurPartyIBAN", + column: "SUPPLIERPAYMENT_OURPARTYIBAN", type: "VARCHAR", + required: true }, { name: "CounterpartyIBAN", column: "SUPPLIERPAYMENT_COUNTERPARTYIBAN", type: "VARCHAR", + required: true }, { name: "CounterpartyName", @@ -276,6 +287,12 @@ export class SupplierPaymentRepository { name: "Reference", column: "SUPPLIERPAYMENT_REFERENCE", type: "VARCHAR", + }, + { + name: "PaymentMethod", + column: "SUPPLIERPAYMENT_PAYMENTMETHOD", + type: "INTEGER", + required: true } ] }; diff --git a/codbex-payments/gen/codbex-payments/data/CustomerPayment/CustomerPaymentEntity.ts b/codbex-payments/gen/codbex-payments/data/CustomerPayment/CustomerPaymentEntity.ts index 964b4ee..ffcccc5 100644 --- a/codbex-payments/gen/codbex-payments/data/CustomerPayment/CustomerPaymentEntity.ts +++ b/codbex-payments/gen/codbex-payments/data/CustomerPayment/CustomerPaymentEntity.ts @@ -35,23 +35,21 @@ export class CustomerPaymentEntity { }) public Valor!: Date; - @Documentation('CompanyIBAN') + @Documentation('OurPartyIBAN') @Column({ - name: 'CUSTOMERPAYMENT_COMPANYIBAN', + name: 'CUSTOMERPAYMENT_OURPARTYIBAN', type: 'string', length: 34, - nullable: true, }) - public CompanyIBAN?: string; + public OurPartyIBAN!: string; @Documentation('CounterpartyIBAN') @Column({ name: 'CUSTOMERPAYMENT_COUNTERPARTYIBAN', type: 'string', length: 34, - nullable: true, }) - public CounterpartyIBAN?: string; + public CounterpartyIBAN!: string; @Documentation('CounterpartyName') @Column({ @@ -133,9 +131,8 @@ export class CustomerPaymentEntity { @Column({ name: 'CUSTOMERPAYMENT_PAYMENTMETHOD', type: 'integer', - nullable: true, }) - public PaymentMethod?: number; + public PaymentMethod!: number; } diff --git a/codbex-payments/gen/codbex-payments/data/EmployeePayment/EmployeePaymentEntity.ts b/codbex-payments/gen/codbex-payments/data/EmployeePayment/EmployeePaymentEntity.ts index 552834d..c78a7be 100644 --- a/codbex-payments/gen/codbex-payments/data/EmployeePayment/EmployeePaymentEntity.ts +++ b/codbex-payments/gen/codbex-payments/data/EmployeePayment/EmployeePaymentEntity.ts @@ -35,23 +35,21 @@ export class EmployeePaymentEntity { }) public Valor!: Date; - @Documentation('CompanyIBAN') + @Documentation('OurPartyIBAN') @Column({ - name: 'EMPLOYEEPAYMENT_COMPANYIBAN', + name: 'EMPLOYEEPAYMENT_OURPARTYIBAN', type: 'string', length: 34, - nullable: true, }) - public CompanyIBAN?: string; + public OurPartyIBAN!: string; @Documentation('CounterpartyIBAN') @Column({ name: 'EMPLOYEEPAYMENT_COUNTERPARTYIBAN', type: 'string', length: 34, - nullable: true, }) - public CounterpartyIBAN?: string; + public CounterpartyIBAN!: string; @Documentation('CounterpartyName') @Column({ @@ -129,6 +127,13 @@ export class EmployeePaymentEntity { }) public Reference?: string; + @Documentation('PaymentMethod') + @Column({ + name: 'EMPLOYEEPAYMENT_PAYMENTMETHOD', + type: 'integer', + }) + public PaymentMethod!: number; + } (new EmployeePaymentEntity()); diff --git a/codbex-payments/gen/codbex-payments/data/PaymentAdjustment/PaymentAdjustmentEntity.ts b/codbex-payments/gen/codbex-payments/data/PaymentAdjustment/PaymentAdjustmentEntity.ts index d29a0c4..5a02de0 100644 --- a/codbex-payments/gen/codbex-payments/data/PaymentAdjustment/PaymentAdjustmentEntity.ts +++ b/codbex-payments/gen/codbex-payments/data/PaymentAdjustment/PaymentAdjustmentEntity.ts @@ -18,7 +18,6 @@ export class PaymentAdjustmentEntity { @Column({ name: 'PAYMENTADJUSTMENT_DATE', type: 'date', - nullable: true, }) public Date!: Date; @@ -26,7 +25,6 @@ export class PaymentAdjustmentEntity { @Column({ name: 'PAYMENTADJUSTMENT_VALOR', type: 'date', - nullable: true, }) public Valor!: Date; @@ -36,7 +34,6 @@ export class PaymentAdjustmentEntity { type: 'big_decimal', precision: 16, scale: 2, - nullable: true, }) public Amount!: number; @@ -44,7 +41,6 @@ export class PaymentAdjustmentEntity { @Column({ name: 'PAYMENTADJUSTMENT_CURRENCY', type: 'integer', - nullable: true, }) public Currency!: number; @@ -52,7 +48,6 @@ export class PaymentAdjustmentEntity { @Column({ name: 'PAYMENTADJUSTMENT_COMPANY', type: 'integer', - nullable: true, }) public Company!: number; diff --git a/codbex-payments/gen/codbex-payments/data/PaymentRecord/PaymentRecordEntity.ts b/codbex-payments/gen/codbex-payments/data/PaymentRecord/PaymentRecordEntity.ts index 3e26043..fd89733 100644 --- a/codbex-payments/gen/codbex-payments/data/PaymentRecord/PaymentRecordEntity.ts +++ b/codbex-payments/gen/codbex-payments/data/PaymentRecord/PaymentRecordEntity.ts @@ -28,23 +28,21 @@ export class PaymentRecordEntity { }) public Valor!: Date; - @Documentation('CompanyIBAN') + @Documentation('OurPartyIBAN') @Column({ - name: 'PAYMENTRECORD_COMPANYIBAN', + name: 'PAYMENTRECORD_OURPARTYIBAN', type: 'string', length: 34, - nullable: true, }) - public CompanyIBAN?: string; + public OurPartyIBAN!: string; @Documentation('CounterpartyIBAN') @Column({ name: 'PAYMENTRECORD_COUNTERPARTYIBAN', type: 'string', length: 34, - nullable: true, }) - public CounterpartyIBAN?: string; + public CounterpartyIBAN!: string; @Documentation('CounterpartyName') @Column({ @@ -61,33 +59,29 @@ export class PaymentRecordEntity { type: 'big_decimal', precision: 16, scale: 2, - nullable: true, }) - public Amount?: number; + public Amount!: number; @Documentation('Currency') @Column({ name: 'PAYMENTRECORD_CURRENCY', type: 'integer', - nullable: true, }) - public Currency?: number; + public Currency!: number; @Documentation('PaymentDirection') @Column({ name: 'PAYMENTRECORD_PAYMENTDIRECTION', type: 'integer', - nullable: true, }) - public PaymentDirection?: number; + public PaymentDirection!: number; @Documentation('PaymentType') @Column({ name: 'PAYMENTRECORD_PAYMENTTYPE', type: 'integer', - nullable: true, }) - public PaymentType?: number; + public PaymentType!: number; @Documentation('Reason') @Column({ diff --git a/codbex-payments/gen/codbex-payments/data/Settings/PaymentTypeEntity.ts b/codbex-payments/gen/codbex-payments/data/Settings/PaymentTypeEntity.ts index ed3c1db..ed6ee30 100644 --- a/codbex-payments/gen/codbex-payments/data/Settings/PaymentTypeEntity.ts +++ b/codbex-payments/gen/codbex-payments/data/Settings/PaymentTypeEntity.ts @@ -19,9 +19,8 @@ export class PaymentTypeEntity { name: 'PAYMENTTYPE_NAME', type: 'string', length: 20, - nullable: true, }) - public Name?: string; + public Name!: string; } diff --git a/codbex-payments/gen/codbex-payments/data/SupplierPayment/SupplierPaymentEntity.ts b/codbex-payments/gen/codbex-payments/data/SupplierPayment/SupplierPaymentEntity.ts index 18993b0..179d110 100644 --- a/codbex-payments/gen/codbex-payments/data/SupplierPayment/SupplierPaymentEntity.ts +++ b/codbex-payments/gen/codbex-payments/data/SupplierPayment/SupplierPaymentEntity.ts @@ -35,23 +35,21 @@ export class SupplierPaymentEntity { }) public Valor!: Date; - @Documentation('CompanyIBAN') + @Documentation('OurPartyIBAN') @Column({ - name: 'SUPPLIERPAYMENT_COMPANYIBAN', + name: 'SUPPLIERPAYMENT_OURPARTYIBAN', type: 'string', length: 34, - nullable: true, }) - public CompanyIBAN?: string; + public OurPartyIBAN!: string; @Documentation('CounterpartyIBAN') @Column({ name: 'SUPPLIERPAYMENT_COUNTERPARTYIBAN', type: 'string', length: 34, - nullable: true, }) - public CounterpartyIBAN?: string; + public CounterpartyIBAN!: string; @Documentation('CounterpartyName') @Column({ @@ -129,6 +127,13 @@ export class SupplierPaymentEntity { }) public Reference?: string; + @Documentation('PaymentMethod') + @Column({ + name: 'SUPPLIERPAYMENT_PAYMENTMETHOD', + type: 'integer', + }) + public PaymentMethod!: number; + } (new SupplierPaymentEntity()); diff --git a/codbex-payments/gen/codbex-payments/schema/codbex-payments.schema b/codbex-payments/gen/codbex-payments/schema/codbex-payments.schema index 0589dcf..6f446f0 100644 --- a/codbex-payments/gen/codbex-payments/schema/codbex-payments.schema +++ b/codbex-payments/gen/codbex-payments/schema/codbex-payments.schema @@ -27,13 +27,11 @@ { "type": "VARCHAR", "length": 34, - "nullable": true, - "name": "CUSTOMERPAYMENT_COMPANYIBAN" + "name": "CUSTOMERPAYMENT_OURPARTYIBAN" }, { "type": "VARCHAR", "length": 34, - "nullable": true, "name": "CUSTOMERPAYMENT_COUNTERPARTYIBAN" }, { @@ -89,7 +87,6 @@ }, { "type": "INTEGER", - "nullable": true, "name": "CUSTOMERPAYMENT_PAYMENTMETHOD" } ] @@ -120,13 +117,11 @@ { "type": "VARCHAR", "length": 34, - "nullable": true, - "name": "SUPPLIERPAYMENT_COMPANYIBAN" + "name": "SUPPLIERPAYMENT_OURPARTYIBAN" }, { "type": "VARCHAR", "length": 34, - "nullable": true, "name": "SUPPLIERPAYMENT_COUNTERPARTYIBAN" }, { @@ -179,6 +174,10 @@ "length": 36, "nullable": true, "name": "SUPPLIERPAYMENT_REFERENCE" + }, + { + "type": "INTEGER", + "name": "SUPPLIERPAYMENT_PAYMENTMETHOD" } ] }, @@ -208,13 +207,11 @@ { "type": "VARCHAR", "length": 34, - "nullable": true, - "name": "EMPLOYEEPAYMENT_COMPANYIBAN" + "name": "EMPLOYEEPAYMENT_OURPARTYIBAN" }, { "type": "VARCHAR", "length": 34, - "nullable": true, "name": "EMPLOYEEPAYMENT_COUNTERPARTYIBAN" }, { @@ -267,6 +264,10 @@ "length": 36, "nullable": true, "name": "EMPLOYEEPAYMENT_REFERENCE" + }, + { + "type": "INTEGER", + "name": "EMPLOYEEPAYMENT_PAYMENTMETHOD" } ] }, @@ -292,13 +293,11 @@ { "type": "VARCHAR", "length": 34, - "nullable": true, - "name": "PAYMENTRECORD_COMPANYIBAN" + "name": "PAYMENTRECORD_OURPARTYIBAN" }, { "type": "VARCHAR", "length": 34, - "nullable": true, "name": "PAYMENTRECORD_COUNTERPARTYIBAN" }, { @@ -312,22 +311,18 @@ "length": 16, "precision": "16", "scale": "2", - "nullable": true, "name": "PAYMENTRECORD_AMOUNT" }, { "type": "INTEGER", - "nullable": true, "name": "PAYMENTRECORD_CURRENCY" }, { "type": "INTEGER", - "nullable": true, "name": "PAYMENTRECORD_PAYMENTDIRECTION" }, { "type": "INTEGER", - "nullable": true, "name": "PAYMENTRECORD_PAYMENTTYPE" }, { @@ -391,7 +386,6 @@ { "type": "VARCHAR", "length": 20, - "nullable": true, "name": "PAYMENTTYPE_NAME" } ] @@ -409,12 +403,10 @@ }, { "type": "DATE", - "nullable": true, "name": "PAYMENTADJUSTMENT_DATE" }, { "type": "DATE", - "nullable": true, "name": "PAYMENTADJUSTMENT_VALOR" }, { @@ -422,17 +414,14 @@ "length": 16, "precision": "16", "scale": "2", - "nullable": true, "name": "PAYMENTADJUSTMENT_AMOUNT" }, { "type": "INTEGER", - "nullable": true, "name": "PAYMENTADJUSTMENT_CURRENCY" }, { "type": "INTEGER", - "nullable": true, "name": "PAYMENTADJUSTMENT_COMPANY" }, { @@ -445,6 +434,7 @@ "type": "VARCHAR", "length": 36, "nullable": true, + "unique": true, "name": "PAYMENTADJUSTMENT_UUID" } ] @@ -530,6 +520,15 @@ "referencedTable": "CODBEX_COMPANY", "referencedColumns": "COMPANY_ID" }, + { + "name": "SupplierPayment_PaymentMethod", + "type": "foreignKey", + "table": "CODBEX_SUPPLIERPAYMENT", + "constraintName": "SupplierPayment_PaymentMethod", + "columns": "SUPPLIERPAYMENT_PAYMENTMETHOD", + "referencedTable": "CODBEX_PAYMENTMETHOD", + "referencedColumns": "PAYMENTMETHOD_ID" + }, { "name": "EmployeePayment_Employee", "type": "foreignKey", @@ -557,6 +556,15 @@ "referencedTable": "CODBEX_COMPANY", "referencedColumns": "COMPANY_ID" }, + { + "name": "EmployeePayment_PaymentMethod", + "type": "foreignKey", + "table": "CODBEX_EMPLOYEEPAYMENT", + "constraintName": "EmployeePayment_PaymentMethod", + "columns": "EMPLOYEEPAYMENT_PAYMENTMETHOD", + "referencedTable": "CODBEX_PAYMENTMETHOD", + "referencedColumns": "PAYMENTMETHOD_ID" + }, { "name": "PaymentRecord_Currency", "type": "foreignKey", diff --git a/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-filter/controller.js b/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-filter/controller.js index 162544a..9f088f8 100644 --- a/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-filter/controller.js +++ b/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-filter/controller.js @@ -62,8 +62,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale']).controlle const condition = { propertyName: 'Valor', operator: 'LE', value: entity.ValorTo }; filter.$filter.conditions.push(condition); } - if (entity.CompanyIBAN) { - const condition = { propertyName: 'CompanyIBAN', operator: 'LIKE', value: `%${entity.CompanyIBAN}%` }; + if (entity.OurPartyIBAN) { + const condition = { propertyName: 'OurPartyIBAN', operator: 'LIKE', value: `%${entity.OurPartyIBAN}%` }; filter.$filter.conditions.push(condition); } if (entity.CounterpartyIBAN) { diff --git a/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-filter/index.html b/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-filter/index.html index 91f0d1c..ced7655 100644 --- a/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-filter/index.html +++ b/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-filter/index.html @@ -90,17 +90,17 @@
- {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_OURPARTYIBAN' | t }}
- - + + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_OURPARTYIBAN)'} }}">
diff --git a/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-window/index.html b/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-window/index.html index 363c880..3ee43f2 100644 --- a/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-window/index.html +++ b/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/dialog-window/index.html @@ -71,28 +71,28 @@
- {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_OURPARTYIBAN' | t }}
- + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_OURPARTYIBAN)'} }}">
- {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_COUNTERPARTYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_COUNTERPARTYIBAN' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_PAYMENTMETHOD' | t }} + {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_PAYMENTMETHOD' | t }}
{{next.Date | date: "dd/MMM/yyyy"}} | {{next.Valor | date: "dd/MMM/yyyy"}} | - {{next.CompanyIBAN}} | + {{next.OurPartyIBAN}} | {{next.CounterpartyIBAN}} | {{next.CounterpartyName}} | {{next.Amount}} | diff --git a/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/main-details/index.html b/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/main-details/index.html index ea6ae3d..d89ced1 100644 --- a/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/main-details/index.html +++ b/codbex-payments/gen/codbex-payments/ui/CustomerPayment/CustomerPayment/main-details/index.html @@ -73,28 +73,28 @@
- {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_OURPARTYIBAN' | t }}
- + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_OURPARTYIBAN)'} }}">
- {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_COUNTERPARTYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_COUNTERPARTYIBAN' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_PAYMENTMETHOD' | t }} + {{ 'codbex-payments:codbex-payments-model.t.CUSTOMERPAYMENT_PAYMENTMETHOD' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_OURPARTYIBAN' | t }}
- - + + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_OURPARTYIBAN)'} }}">
@@ -267,6 +267,22 @@
+ +
+ {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_PAYMENTMETHOD' | t }} +
+
+ + + + +
+ diff --git a/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/dialog-window/index.html b/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/dialog-window/index.html index cffcbf0..05cbf8e 100644 --- a/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/dialog-window/index.html +++ b/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/dialog-window/index.html @@ -71,28 +71,28 @@
- {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_OURPARTYIBAN' | t }}
- + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_OURPARTYIBAN)'} }}">
- {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_COUNTERPARTYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_COUNTERPARTYIBAN' | t }}
+ +
+ {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_PAYMENTMETHOD' | t }} +
+
+ + + + +
+ diff --git a/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/index.html b/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/index.html index ad1b1fd..c74af3f 100644 --- a/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/index.html +++ b/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/index.html @@ -42,7 +42,7 @@ {{next.Date | date: "dd/MMM/yyyy"}} | {{next.Valor | date: "dd/MMM/yyyy"}} | - {{next.CompanyIBAN}} | + {{next.OurPartyIBAN}} | {{next.CounterpartyIBAN}} | {{next.CounterpartyName}} | {{next.Amount}} | @@ -52,7 +52,8 @@ {{optionsCompanyValue(next.Company)}} | {{next.Name}} | {{next.UUID}} | - {{next.Reference}} + {{next.Reference}} | + {{next.PaymentMethod}} diff --git a/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/main-details/index.html b/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/main-details/index.html index 8390676..d5b2765 100644 --- a/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/main-details/index.html +++ b/codbex-payments/gen/codbex-payments/ui/EmployeePayment/EmployeePayment/main-details/index.html @@ -73,28 +73,28 @@
- {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_OURPARTYIBAN' | t }}
- + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_OURPARTYIBAN)'} }}">
- {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_COUNTERPARTYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_COUNTERPARTYIBAN' | t }}
+ +
+ {{ 'codbex-payments:codbex-payments-model.t.EMPLOYEEPAYMENT_PAYMENTMETHOD' | t }} +
+
+ + + + +
+ diff --git a/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-filter/controller.js b/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-filter/controller.js index 499b400..3d5537d 100644 --- a/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-filter/controller.js +++ b/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-filter/controller.js @@ -64,8 +64,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale']).controlle const condition = { propertyName: 'Valor', operator: 'LE', value: entity.ValorTo }; filter.$filter.conditions.push(condition); } - if (entity.CompanyIBAN) { - const condition = { propertyName: 'CompanyIBAN', operator: 'LIKE', value: `%${entity.CompanyIBAN}%` }; + if (entity.OurPartyIBAN) { + const condition = { propertyName: 'OurPartyIBAN', operator: 'LIKE', value: `%${entity.OurPartyIBAN}%` }; filter.$filter.conditions.push(condition); } if (entity.CounterpartyIBAN) { diff --git a/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-filter/index.html b/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-filter/index.html index b6c72a7..92f771a 100644 --- a/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-filter/index.html +++ b/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-filter/index.html @@ -75,17 +75,17 @@
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN' | t }}
- - + + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN)'} }}">
diff --git a/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-window/index.html b/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-window/index.html index 83258ec..0749e89 100644 --- a/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-window/index.html +++ b/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/dialog-window/index.html @@ -54,28 +54,28 @@
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN' | t }}
- + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN)'} }}">
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COUNTERPARTYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COUNTERPARTYIBAN' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_AMOUNT' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_AMOUNT' | t }}
@@ -132,13 +132,13 @@
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_CURRENCY' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_CURRENCY' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTDIRECTION' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTDIRECTION' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTTYPE' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTTYPE' | t }}
{{next.Valor | date: "dd/MMM/yyyy"}} | - {{next.CompanyIBAN}} | + {{next.OurPartyIBAN}} | {{next.CounterpartyIBAN}} | {{next.CounterpartyName}} | {{next.Amount}} | diff --git a/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/main-details/index.html b/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/main-details/index.html index d60c2c6..f5a1442 100644 --- a/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/main-details/index.html +++ b/codbex-payments/gen/codbex-payments/ui/PaymentRecord/PaymentRecord/main-details/index.html @@ -52,28 +52,28 @@
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN' | t }}
- + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN)'} }}">
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COUNTERPARTYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COUNTERPARTYIBAN' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_AMOUNT' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_AMOUNT' | t }}
@@ -130,13 +130,13 @@
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_CURRENCY' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_CURRENCY' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTDIRECTION' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTDIRECTION' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTTYPE' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTTYPE' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN' | t }}
- - + + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN)'} }}">
diff --git a/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-print/controller.js b/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-print/controller.js index bc57e32..90b4588 100644 --- a/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-print/controller.js +++ b/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-print/controller.js @@ -36,8 +36,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer const condition = { propertyName: 'Valor', operator: 'LE', value: entity.ValorTo }; filter.$filter.conditions.push(condition); } - if (entity.CompanyIBAN) { - const condition = { propertyName: 'CompanyIBAN', operator: 'LIKE', value: `%${entity.CompanyIBAN}%` }; + if (entity.OurPartyIBAN) { + const condition = { propertyName: 'OurPartyIBAN', operator: 'LIKE', value: `%${entity.OurPartyIBAN}%` }; filter.$filter.conditions.push(condition); } if (entity.CounterpartyIBAN) { diff --git a/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-print/index.html b/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-print/index.html index 1b842c8..a9b0493 100644 --- a/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-print/index.html +++ b/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-print/index.html @@ -22,7 +22,7 @@ {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_DATE' | t:'Date' }} {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_VALOR' | t:'Valor' }} - {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COMPANYIBAN' | t:'CompanyIBAN' }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN' | t:'OurPartyIBAN' }} {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COUNTERPARTYIBAN' | t:'CounterpartyIBAN' }} {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COUNTERPARTYNAME' | t:'CounterpartyName' }} {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_AMOUNT' | t:'Amount' }} @@ -50,7 +50,7 @@ - {{next.CompanyIBAN}} + {{next.OurPartyIBAN}} {{next.CounterpartyIBAN}} {{next.CounterpartyName}} {{next.Amount}} diff --git a/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-window/index.html b/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-window/index.html index 49e914d..8c22be1 100644 --- a/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-window/index.html +++ b/codbex-payments/gen/codbex-payments/ui/Reports/PaymentRecord/dialog-window/index.html @@ -45,27 +45,27 @@
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN' | t }}
- + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN)'} }}">
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COUNTERPARTYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COUNTERPARTYIBAN' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_AMOUNT' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_AMOUNT' | t }}
@@ -105,12 +105,12 @@
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_CURRENCY' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_CURRENCY' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTDIRECTION' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTDIRECTION' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTTYPE' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_PAYMENTTYPE' | t }}
{{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_DATE' | t:'Date' }} {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_VALOR' | t:'Valor' }} - {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COMPANYIBAN' | t:'CompanyIBAN' }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_OURPARTYIBAN' | t:'OurPartyIBAN' }} {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COUNTERPARTYIBAN' | t:'CounterpartyIBAN' }} {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_COUNTERPARTYNAME' | t:'CounterpartyName' }} {{ 'codbex-payments:codbex-payments-model.t.PAYMENTRECORD_AMOUNT' | t:'Amount' }} @@ -56,7 +56,7 @@ - {{next.CompanyIBAN}} + {{next.OurPartyIBAN}} {{next.CounterpartyIBAN}} {{next.CounterpartyName}} {{next.Amount}} diff --git a/codbex-payments/gen/codbex-payments/ui/Settings/PaymentType/dialog-window/index.html b/codbex-payments/gen/codbex-payments/ui/Settings/PaymentType/dialog-window/index.html index e0fce33..afeb1a6 100644 --- a/codbex-payments/gen/codbex-payments/ui/Settings/PaymentType/dialog-window/index.html +++ b/codbex-payments/gen/codbex-payments/ui/Settings/PaymentType/dialog-window/index.html @@ -20,7 +20,7 @@
- {{ 'codbex-payments:codbex-payments-model.t.PAYMENTTYPE_NAME' | t }} + {{ 'codbex-payments:codbex-payments-model.t.PAYMENTTYPE_NAME' | t }}
- {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_OURPARTYIBAN' | t }}
- - + + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_OURPARTYIBAN)'} }}">
@@ -267,6 +267,22 @@
+ +
+ {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_PAYMENTMETHOD' | t }} +
+
+ + + + +
+ diff --git a/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/dialog-window/index.html b/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/dialog-window/index.html index 92976b3..bcbe4c4 100644 --- a/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/dialog-window/index.html +++ b/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/dialog-window/index.html @@ -71,28 +71,28 @@
- {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_OURPARTYIBAN' | t }}
- + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_OURPARTYIBAN)'} }}">
- {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_COUNTERPARTYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_COUNTERPARTYIBAN' | t }}
+ +
+ {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_PAYMENTMETHOD' | t }} +
+
+ + + + +
+ diff --git a/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/index.html b/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/index.html index f235e32..15c6588 100644 --- a/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/index.html +++ b/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/index.html @@ -42,7 +42,7 @@ {{next.Date | date: "dd/MMM/yyyy"}} | {{next.Valor | date: "dd/MMM/yyyy"}} | - {{next.CompanyIBAN}} | + {{next.OurPartyIBAN}} | {{next.CounterpartyIBAN}} | {{next.CounterpartyName}} | {{next.Amount}} | @@ -52,7 +52,8 @@ {{optionsCompanyValue(next.Company)}} | {{next.Name}} | {{next.UUID}} | - {{next.Reference}} + {{next.Reference}} | + {{next.PaymentMethod}} diff --git a/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/main-details/index.html b/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/main-details/index.html index 1b56224..6400207 100644 --- a/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/main-details/index.html +++ b/codbex-payments/gen/codbex-payments/ui/SupplierPayment/SupplierPayment/main-details/index.html @@ -73,28 +73,28 @@
- {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_COMPANYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_OURPARTYIBAN' | t }}
- + placeholder="{{ 'codbex-payments:codbex-payments-model.messages.inputEnter' | t:{'name':'$t(codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_OURPARTYIBAN)'} }}">
- {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_COUNTERPARTYIBAN' | t }} + {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_COUNTERPARTYIBAN' | t }}
+ +
+ {{ 'codbex-payments:codbex-payments-model.t.SUPPLIERPAYMENT_PAYMENTMETHOD' | t }} +
+
+ + + + +
+ diff --git a/codbex-payments/translations/en-US/codbex-payments.model.json b/codbex-payments/translations/en-US/codbex-payments.model.json index 83c6602..3cc6272 100644 --- a/codbex-payments/translations/en-US/codbex-payments.model.json +++ b/codbex-payments/translations/en-US/codbex-payments.model.json @@ -71,7 +71,7 @@ "CUSTOMERPAYMENT_CUSTOMER": "Customer", "CUSTOMERPAYMENT_DATE": "Date", "CUSTOMERPAYMENT_VALOR": "Valor", - "CUSTOMERPAYMENT_COMPANYIBAN": "CompanyIBAN", + "CUSTOMERPAYMENT_OURPARTYIBAN": "OurPartyIBAN", "CUSTOMERPAYMENT_COUNTERPARTYIBAN": "CounterpartyIBAN", "CUSTOMERPAYMENT_COUNTERPARTYNAME": "CounterpartyName", "CUSTOMERPAYMENT_AMOUNT": "Amount", @@ -88,7 +88,7 @@ "SUPPLIERPAYMENT_SUPPLIER": "Supplier", "SUPPLIERPAYMENT_DATE": "Date", "SUPPLIERPAYMENT_VALOR": "Valor", - "SUPPLIERPAYMENT_COMPANYIBAN": "CompanyIBAN", + "SUPPLIERPAYMENT_OURPARTYIBAN": "OurPartyIBAN", "SUPPLIERPAYMENT_COUNTERPARTYIBAN": "CounterpartyIBAN", "SUPPLIERPAYMENT_COUNTERPARTYNAME": "CounterpartyName", "SUPPLIERPAYMENT_AMOUNT": "Amount", @@ -99,12 +99,13 @@ "SUPPLIERPAYMENT_NAME": "Name", "SUPPLIERPAYMENT_UUID": "UUID", "SUPPLIERPAYMENT_REFERENCE": "Reference", + "SUPPLIERPAYMENT_PAYMENTMETHOD": "PaymentMethod", "EMPLOYEEPAYMENT": "EmployeePayment", "EMPLOYEEPAYMENT_ID": "Id", "EMPLOYEEPAYMENT_EMPLOYEE": "Employee", "EMPLOYEEPAYMENT_DATE": "Date", "EMPLOYEEPAYMENT_VALOR": "Valor", - "EMPLOYEEPAYMENT_COMPANYIBAN": "CompanyIBAN", + "EMPLOYEEPAYMENT_OURPARTYIBAN": "OurPartyIBAN", "EMPLOYEEPAYMENT_COUNTERPARTYIBAN": "CounterpartyIBAN", "EMPLOYEEPAYMENT_COUNTERPARTYNAME": "CounterpartyName", "EMPLOYEEPAYMENT_AMOUNT": "Amount", @@ -115,11 +116,12 @@ "EMPLOYEEPAYMENT_NAME": "Name", "EMPLOYEEPAYMENT_UUID": "UUID", "EMPLOYEEPAYMENT_REFERENCE": "Reference", + "EMPLOYEEPAYMENT_PAYMENTMETHOD": "PaymentMethod", "PAYMENTRECORD": "PaymentRecord", "PAYMENTRECORD_ID": "Id", "PAYMENTRECORD_DATE": "Date", "PAYMENTRECORD_VALOR": "Valor", - "PAYMENTRECORD_COMPANYIBAN": "CompanyIBAN", + "PAYMENTRECORD_OURPARTYIBAN": "OurPartyIBAN", "PAYMENTRECORD_COUNTERPARTYIBAN": "CounterpartyIBAN", "PAYMENTRECORD_COUNTERPARTYNAME": "CounterpartyName", "PAYMENTRECORD_AMOUNT": "Amount",