From 87c545c68958d462dfb2ec9dba8c6bac0c5c12db Mon Sep 17 00:00:00 2001 From: "b.boterman@htm.nl" Date: Mon, 14 Oct 2024 12:03:28 +0200 Subject: [PATCH 1/3] OVPAY-982 - Added 'isCredit' to CRUD API's. --- src/openapi/contracts/contracts-crud.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/openapi/contracts/contracts-crud.yaml b/src/openapi/contracts/contracts-crud.yaml index ac961e4..1125bfc 100644 --- a/src/openapi/contracts/contracts-crud.yaml +++ b/src/openapi/contracts/contracts-crud.yaml @@ -216,6 +216,7 @@ paths: "created": "2024-06-02 15:01:00.000", "updated": "2024-06-02 15:01:00.000", "state": "invoice_created", + "isCredit": false, }, { "contractInvoiceId": "1c345237-4d84-47f0-93c2-7b94338e3355", @@ -224,6 +225,7 @@ paths: "created": "2024-07-02 15:01:00.000", "updated": "2024-07-02 15:01:00.000", "state": "invoice_created", + "isCredit": false, }, ], "contractVersions": @@ -273,6 +275,7 @@ paths: "created": "2024-06-02 15:01:00.000", "updated": "2024-06-02 15:01:00.000", "state": "invoice_created", + "isCredit": false, }, { "contractInvoiceId": "1c345237-4d84-47f0-93c2-7b94338e3355", @@ -281,6 +284,7 @@ paths: "created": "2024-07-02 15:01:00.000", "updated": "2024-07-02 15:01:00.000", "state": "invoice_created", + "isCredit": false, }, ], "contractVersions": @@ -401,6 +405,7 @@ paths: "updated": "2024-07-02 15:01:00.000", "state": "invoice_created", "data": "{json}", + "isCredit": false, }, ], }, @@ -568,6 +573,7 @@ paths: "updated": "2024-07-02 15:01:00.000", "state": "invoice_sent", "data": "{json}", + "isCredit": false, }, { "contractInvoiceId": "dadff658-4ff5-4eb8-b516-492f1f6c6245", @@ -577,6 +583,7 @@ paths: "updated": "2024-08-02 15:01:00.000", "state": "invoice_created", "data": "{json}", + "isCredit": false, }, ], } @@ -600,6 +607,7 @@ paths: "updated": "2024-07-02 15:01:00.000", "state": "invoice_created", "data": "{json}", + "isCredit": false, }, } responses: @@ -684,6 +692,13 @@ paths: example: created required: false description: Invoice state. + - in: query + name: isCredit + schema: + type: boolean + example: true + required: false + description: Whether the invoice is a credit invoice. responses: "200": description: OK @@ -704,6 +719,7 @@ paths: "updated": "2024-06-02 15:01:00.000", "state": "invoice_created", "data": "{json}", + "isCredit": false, }, { "contractId": "a7452e22-3894-40cc-87d6-869370a92277", @@ -714,6 +730,7 @@ paths: "updated": "2024-08-02 15:01:00.000", "state": "invoice_created", "data": "{json}", + "isCredit": false, }, ], } @@ -1049,6 +1066,9 @@ components: type: string format: json example: { json } + isCredit: + type: boolean + example: true ContractStatus: type: object properties: From 0ce44a5616787199d6c10be60db704fa7d3758ee Mon Sep 17 00:00:00 2001 From: Max Martens Date: Thu, 17 Oct 2024 12:24:29 +0200 Subject: [PATCH 2/3] Fix typo validTo -> validUntil --- src/openapi/fiko/fikoreference-crud.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/openapi/fiko/fikoreference-crud.yaml b/src/openapi/fiko/fikoreference-crud.yaml index 516519a..52969ac 100644 --- a/src/openapi/fiko/fikoreference-crud.yaml +++ b/src/openapi/fiko/fikoreference-crud.yaml @@ -26,8 +26,8 @@ paths: summary: Get a list of all possible values of the "TaxMetadata" reference table. Mainly used for populating dropdown lists (in PMT for example). description: |- Get a list of all possible values of the `TaxMetadata` reference table. Mainly used for populating dropdown lists (in PMT for example).\ - The attributes `validFrom` and `validTo` are not yet present in the FIKO v1 datamodel, but are already included in this resourcemodel; to prevent rework in the near future.\ - For now, for `validFrom`, the value will always be returned as `2024-01-01T00:00:00.000+00:00` and for `validTo` it will always be `null`. + The attributes `validFrom` and `validUntil` are not yet present in the FIKO v1 datamodel, but are already included in this resourcemodel; to prevent rework in the near future.\ + For now, for `validFrom`, the value will always be returned as `2024-01-01T00:00:00.000+00:00` and for `validUntil` it will always be `null`. responses: '200': description: OK @@ -47,7 +47,7 @@ paths: "taxPercentageAmount": 21, "description": "BTW VERKOOP HOOG 21%", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validTo": null + "validUntil": null }, { "taxMetadataId": "47C8972E-A730-4032-9BDA-AF0A5BCB2C85", @@ -55,7 +55,7 @@ paths: "taxPercentageAmount": 9, "description": "BTW VERKOOP LAAG 9%", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validTo": null + "validUntil": null }, { "taxMetadataId": "AC20A838-C81B-4652-96EA-F6E79E696E9C", @@ -63,7 +63,7 @@ paths: "taxPercentageAmount": 0, "description": "BTW VERKOOP NUL", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validTo": null + "validUntil": null } ] } @@ -78,7 +78,7 @@ paths: "taxPercentageAmount": 21, "description": "BTW VERKOOP HOOG 21%", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validTo": null + "validUntil": null }, { "taxMetadataId": "47C8972E-A730-4032-9BDA-AF0A5BCB2C85", @@ -86,7 +86,7 @@ paths: "taxPercentageAmount": 9, "description": "BTW VERKOOP LAAG 9%", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validTo": null + "validUntil": null }, { "taxMetadataId": "AC20A838-C81B-4652-96EA-F6E79E696E9C", @@ -94,7 +94,7 @@ paths: "taxPercentageAmount": 0, "description": "BTW VERKOOP NUL", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validTo": null + "validUntil": null }, { "TBD": "TBD" @@ -106,7 +106,7 @@ paths: "TBD": "TBD" } ] - } + } '400': description: '400' content: From 2621c6e18004537edbf638c212bc43f05ae45b87 Mon Sep 17 00:00:00 2001 From: Max Martens Date: Thu, 17 Oct 2024 12:50:19 +0200 Subject: [PATCH 3/3] Revert "Fix typo validTo -> validUntil" This reverts commit 0ce44a5616787199d6c10be60db704fa7d3758ee. --- src/openapi/fiko/fikoreference-crud.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/openapi/fiko/fikoreference-crud.yaml b/src/openapi/fiko/fikoreference-crud.yaml index 52969ac..516519a 100644 --- a/src/openapi/fiko/fikoreference-crud.yaml +++ b/src/openapi/fiko/fikoreference-crud.yaml @@ -26,8 +26,8 @@ paths: summary: Get a list of all possible values of the "TaxMetadata" reference table. Mainly used for populating dropdown lists (in PMT for example). description: |- Get a list of all possible values of the `TaxMetadata` reference table. Mainly used for populating dropdown lists (in PMT for example).\ - The attributes `validFrom` and `validUntil` are not yet present in the FIKO v1 datamodel, but are already included in this resourcemodel; to prevent rework in the near future.\ - For now, for `validFrom`, the value will always be returned as `2024-01-01T00:00:00.000+00:00` and for `validUntil` it will always be `null`. + The attributes `validFrom` and `validTo` are not yet present in the FIKO v1 datamodel, but are already included in this resourcemodel; to prevent rework in the near future.\ + For now, for `validFrom`, the value will always be returned as `2024-01-01T00:00:00.000+00:00` and for `validTo` it will always be `null`. responses: '200': description: OK @@ -47,7 +47,7 @@ paths: "taxPercentageAmount": 21, "description": "BTW VERKOOP HOOG 21%", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validUntil": null + "validTo": null }, { "taxMetadataId": "47C8972E-A730-4032-9BDA-AF0A5BCB2C85", @@ -55,7 +55,7 @@ paths: "taxPercentageAmount": 9, "description": "BTW VERKOOP LAAG 9%", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validUntil": null + "validTo": null }, { "taxMetadataId": "AC20A838-C81B-4652-96EA-F6E79E696E9C", @@ -63,7 +63,7 @@ paths: "taxPercentageAmount": 0, "description": "BTW VERKOOP NUL", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validUntil": null + "validTo": null } ] } @@ -78,7 +78,7 @@ paths: "taxPercentageAmount": 21, "description": "BTW VERKOOP HOOG 21%", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validUntil": null + "validTo": null }, { "taxMetadataId": "47C8972E-A730-4032-9BDA-AF0A5BCB2C85", @@ -86,7 +86,7 @@ paths: "taxPercentageAmount": 9, "description": "BTW VERKOOP LAAG 9%", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validUntil": null + "validTo": null }, { "taxMetadataId": "AC20A838-C81B-4652-96EA-F6E79E696E9C", @@ -94,7 +94,7 @@ paths: "taxPercentageAmount": 0, "description": "BTW VERKOOP NUL", "validFrom": "2024-01-01T00:00:00.000+00:00", - "validUntil": null + "validTo": null }, { "TBD": "TBD" @@ -106,7 +106,7 @@ paths: "TBD": "TBD" } ] - } + } '400': description: '400' content: