Skip to content

[BillingRP] Added rebill details for invoice #10580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 31, 2020
Merged

[BillingRP] Added rebill details for invoice #10580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
14223df
Added rebill details for invoice
Aug 25, 2020
1002c5b
Fixed Prettier Check failures
Aug 25, 2020
7230a6d
Fixed model validation errors
Aug 25, 2020
b6887b7
Fixed model validation error
Aug 25, 2020
7d21cc7
Added readonly property to document type and rebill details
Aug 25, 2020
a5522df
Updated examples
Aug 29, 2020
ab6e3ef
Setting readonly property on rebillDetails
Aug 31, 2020
496a7b7
Fixed prettier-check error
Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 73 additions & 1 deletion specification/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/billing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,6 +1064,9 @@
"x-ms-examples": {
"BillingAccountInvoicesList": {
"$ref": "./examples/BillingAccountInvoicesList.json"
},
"BillingAccountInvoicesListWithRebillDetails": {
"$ref": "./examples/BillingAccountInvoicesListWithRebillDetails.json"
}
},
"operationId": "Invoices_ListByBillingAccount",
Expand Down Expand Up @@ -1120,6 +1123,9 @@
"x-ms-examples": {
"InvoicesListByBillingProfile": {
"$ref": "./examples/InvoicesListByBillingProfile.json"
},
"InvoicesListByBillingProfileWithRebillDetails": {
"$ref": "./examples/InvoicesListByBillingProfileWithRebillDetails.json"
}
},
"operationId": "Invoices_ListByBillingProfile",
Expand Down Expand Up @@ -1179,6 +1185,15 @@
"x-ms-examples": {
"Invoice": {
"$ref": "./examples/Invoice.json"
},
"InvoiceWithRebillDetails": {
"$ref": "./examples/InvoiceWithRebillDetails.json"
},
"VoidInvoice": {
"$ref": "./examples/VoidInvoice.json"
},
"CreditNote": {
"$ref": "./examples/CreditNote.json"
}
},
"operationId": "Invoices_Get",
Expand Down Expand Up @@ -4704,7 +4719,8 @@
"enum": [
"Due",
"OverDue",
"Paid"
"Paid",
"Void"
],
"readOnly": true,
"x-ms-enum": {
Expand Down Expand Up @@ -4814,6 +4830,38 @@
"$ref": "#/definitions/PaymentProperties"
}
},
"rebillDetails": {
"description": "Rebill details for an invoice.",
"type": "object",
"readOnly": true,
"additionalProperties": {
"type": "object",
"$ref": "#/definitions/RebillDetails"
}
},
"documentType": {
"description": "The type of the document.",
"type": "string",
"enum": [
"Invoice",
"CreditNote"
],
"readOnly": true,
"x-ms-enum": {
"name": "InvoiceDocumentType",
"modelAsString": true
}
},
"billedDocumentId": {
"description": "The Id of the active invoice which is originally billed after this invoice was voided. This field is applicable to the void invoices only.",
"type": "string",
"readOnly": true
},
"creditForDocumentId": {
"description": "The Id of the invoice which got voided and this credit note was issued as a result. This field is applicable to the credit notes only.",
"type": "string",
"readOnly": true
},
"subscriptionId": {
"description": "The ID of the subscription for which the invoice is generated.",
"type": "string",
Expand Down Expand Up @@ -4861,6 +4909,30 @@
}
}
},
"RebillDetails": {
"description": "The rebill details of an invoice.",
"properties": {
"creditNoteDocumentId": {
"description": "The ID of credit note.",
"type": "string",
"readOnly": true
},
"invoiceDocumentId": {
"description": "The ID of invoice.",
"type": "string",
"readOnly": true
},
"rebillDetails": {
"description": "Rebill details for an invoice.",
"type": "object",
"readOnly": true,
"additionalProperties": {
"type": "object",
"$ref": "#/definitions/RebillDetails"
}
}
}
},
"Document": {
"description": "The properties of a document.",
"properties": {
Expand Down
2 changes: 2 additions & 0 deletions ...urce-manager/Microsoft.Billing/stable/2020-05-01/examples/BillingAccountInvoicesList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
"billingProfileDisplayName": "Contoso Operations Billing",
"purchaseOrderNumber": "123456",
"documentType": "Invoice",
"documents": [
{
"kind": "Invoice",
Expand Down Expand Up @@ -122,6 +123,7 @@
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
"billingProfileDisplayName": "Contoso Operations Billing",
"purchaseOrderNumber": "123456",
"documentType": "Invoice",
"documents": [
{
"kind": "TaxReceipt",
Expand Down
161 changes: 161 additions & 0 deletions ...osoft.Billing/stable/2020-05-01/examples/BillingAccountInvoicesListWithRebillDetails.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
{
"parameters": {
"api-version": "2020-05-01",
"billingAccountName": "{billingAccountName}",
"periodStartDate": "2018-01-01",
"periodEndDate": "2018-06-30"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/I000003",
"name": "I000003",
"type": "Microsoft.Billing/billingAccounts/invoices",
"properties": {
"dueDate": "2018-01-16T17:32:28Z",
"invoiceDate": "2018-01-01T17:32:28Z",
"status": "Due",
"amountDue": {
"currency": "USD",
"value": 8.53
},
"billedAmount": {
"currency": "USD",
"value": 33.99
},
"azurePrepaymentApplied": {
"currency": "USD",
"value": 25.46
},
"creditAmount": {
"currency": "USD",
"value": 1.00
},
"freeAzureCreditApplied": {
"currency": "USD",
"value": 0.00
},
"subTotal": {
"currency": "USD",
"value": 33.99
},
"taxAmount": {
"currency": "USD",
"value": 0.00
},
"totalAmount": {
"currency": "USD",
"value": 7.53
},
"invoicePeriodStartDate": "2018-01-01T17:32:28Z",
"invoicePeriodEndDate": "2018-01-15T17:32:28Z",
"isMonthlyInvoice": false,
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
"billingProfileDisplayName": "Contoso Operations Billing",
"purchaseOrderNumber": "123456",
"documentType": "Invoice",
"documents": [
{
"kind": "Invoice",
"url": "https://microsoft.com/invoice.pdf",
"source": "DRS"
}
],
"payments": [
{
"date": "2018-01-14T17:32:28Z",
"paymentType": "credited",
"amount": {
"currency": "USD",
"value": 1.00
},
"paymentMethodFamily": "CreditCard",
"paymentMethodType": "visa"
}
],
"rebillDetails": {
"creditNoteDocumentId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/CreditNote2",
"invoiceDocumentId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/I000002",
"rebillDetails": {
"creditNoteDocumentId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/CreditNote1",
"invoiceDocumentId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/I000001",
"rebillDetails": null
}
}
}
},
{
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/1383724",
"name": "1383724",
"type": "Microsoft.Billing/billingAccounts/invoices",
"properties": {
"dueDate": "2018-03-01T17:32:28Z",
"invoiceDate": "2018-02-01T17:32:28Z",
"status": "PastDue",
"amountDue": {
"currency": "USD",
"value": 16.53
},
"billedAmount": {
"currency": "USD",
"value": 33.99
},
"azurePrepaymentApplied": {
"currency": "USD",
"value": 15.46
},
"creditAmount": {
"currency": "USD",
"value": 2.00
},
"freeAzureCreditApplied": {
"currency": "USD",
"value": 0.00
},
"subTotal": {
"currency": "USD",
"value": 33.99
},
"taxAmount": {
"currency": "USD",
"value": 0.00
},
"totalAmount": {
"currency": "USD",
"value": 16.53
},
"invoicePeriodStartDate": "2018-02-01T17:32:28Z",
"invoicePeriodEndDate": "2018-02-28T17:32:28Z",
"isMonthlyInvoice": true,
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
"billingProfileDisplayName": "Contoso Operations Billing",
"purchaseOrderNumber": "123456",
"documentType": "Invoice",
"documents": [
{
"kind": "TaxReceipt",
"url": "https://microsoft.com/taxreceipt.pdf",
"source": "DRS"
}
],
"payments": [
{
"date": "2018-01-14T17:32:28Z",
"paymentType": "credited",
"amount": {
"currency": "USD",
"value": 2.00
},
"paymentMethodFamily": "CreditCard",
"paymentMethodType": "visa"
}
]
}
}
]
}
}
}
}
85 changes: 85 additions & 0 deletions ...ion/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/CreditNote.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{
"parameters": {
"api-version": "2020-05-01",
"billingAccountName": "{billingAccountName}",
"invoiceName": "{invoiceName}"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/{invoiceName}",
"name": "{invoiceName}",
"type": "Microsoft.Billing/billingAccounts/invoices",
"properties": {
"dueDate": "2018-01-16T17:32:28Z",
"invoiceDate": "2018-01-01T17:32:28Z",
"status": "Paid",
"amountDue": {
"currency": "USD",
"value": 16.53
},
"billedAmount": {
"currency": "USD",
"value": 33.99
},
"azurePrepaymentApplied": {
"currency": "USD",
"value": 15.46
},
"creditAmount": {
"currency": "USD",
"value": 2.00
},
"freeAzureCreditApplied": {
"currency": "USD",
"value": 0.00
},
"subTotal": {
"currency": "USD",
"value": 33.99
},
"taxAmount": {
"currency": "USD",
"value": 0.00
},
"totalAmount": {
"currency": "USD",
"value": 16.53
},
"invoicePeriodStartDate": "2018-01-01T17:32:28Z",
"invoicePeriodEndDate": "2018-01-15T17:32:28Z",
"isMonthlyInvoice": false,
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
"billingProfileDisplayName": "Contoso Operations Billing",
"purchaseOrderNumber": "123456",
"documentType": "CreditNote",
"creditForDocumentId": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/I000001",
"documents": [
{
"kind": "Invoice",
"url": "https://microsoft.com/invoice.pdf",
"source": "DRS"
},
{
"kind": "TaxReceipt",
"url": "https://microsoft.com/taxDoc.pdf",
"source": "DRS"
}
],
"payments": [
{
"date": "2018-01-14T17:32:28Z",
"paymentType": "credited",
"amount": {
"currency": "USD",
"value": 2.00
},
"paymentMethodFamily": "CreditCard",
"paymentMethodType": "visa"
}
]
}
}
}
}
}
3 changes: 2 additions & 1 deletion ...cation/billing/resource-manager/Microsoft.Billing/stable/2020-05-01/examples/Invoice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"responses": {
"200": {
"body": {
"id": "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/{invoiceName}",
"id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/{invoiceName}",
"name": "{invoiceName}",
"type": "Microsoft.Billing/billingAccounts/invoices",
"properties": {
Expand Down Expand Up @@ -52,6 +52,7 @@
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
"billingProfileDisplayName": "Contoso Operations Billing",
"purchaseOrderNumber": "123456",
"documentType": "Invoice",
"documents": [
{
"kind": "Invoice",
Expand Down
Loading