Skip to content
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

[BillingRP] Correcting the API response as per the actual implementation. Removing LineOfCredit API from 2019 version, it was never supported. #8290

Merged
merged 4 commits into from
Feb 5, 2020
Merged

[BillingRP] Correcting the API response as per the actual implementation. Removing LineOfCredit API from 2019 version, it was never supported. #8290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7bb239
Added missing fields and corrected enum values as per actual implemen…
asarkar84 Jan 30, 2020
3c346ab
Merge remote-tracking branch 'upstream/master' into ansar/invoices
asarkar84 Feb 4, 2020
91bb453
Removing unsupported LineOfCredit API
asarkar84 Feb 4, 2020
fbe8275
Delete IncreaseLineOfCreditBySubscription.json
asarkar84 Feb 4, 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
161 changes: 13 additions & 148 deletions ...cation/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4592,102 +4592,6 @@
}
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingAccounts/default/lineOfCredit/default": {
"get": {
"tags": [
"LineOfCredits"
],
"x-ms-examples": {
"LineOfCreditBySubscription": {
"$ref": "./examples/LineOfCreditBySubscription.json"
}
},
"operationId": "LineOfCredits_Get",
"description": "Get the current line of credit.",
"parameters": [
{
"$ref": "#/parameters/apiVersionParameter"
},
{
"$ref": "#/parameters/subscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "OK. The request has succeeded.",
"schema": {
"$ref": "#/definitions/LineOfCredit"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
}
}
}
},
"put": {
"tags": [
"LineOfCredits"
],
"operationId": "LineOfCredits_Update",
"x-ms-long-running-operation": true,
"x-ms-long-running-operation-options": {
"final-state-via": "location"
},
"x-ms-examples": {
"IncreaseLineOfCreditBySubscription": {
"$ref": "./examples/IncreaseLineOfCreditBySubscription.json"
}
},
"description": "Increase the current line of credit.",
"parameters": [
{
"$ref": "#/parameters/apiVersionParameter"
},
{
"$ref": "#/parameters/subscriptionIdParameter"
},
{
"name": "parameters",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/LineOfCredit"
},
"description": "Parameters supplied to the increase line of credit operation."
}
],
"responses": {
"200": {
"description": "OK. The request has succeeded.",
"schema": {
"$ref": "#/definitions/LineOfCredit"
}
},
"202": {
"description": "Accepted. Line of credit increase is in progress.",
"headers": {
"Location": {
"description": "Location URI to poll for result.",
"type": "string"
},
"Retry-After": {
"description": "Recommends the retryable time after receiving this.",
"type": "integer"
}
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
}
}
}
}
}
},
"definitions": {
Expand Down Expand Up @@ -5833,6 +5737,11 @@
"description": "The date this billing instruction is no longer in effect.",
"type": "string",
"format": "date-time"
},
"creationDate": {
"description": "The date this billing instruction was created.",
"type": "string",
"format": "date-time"
}
}
},
Expand Down Expand Up @@ -6281,10 +6190,9 @@
"description": "Invoice status.",
"type": "string",
"enum": [
"PastDue",
"Due",
"Paid",
"Void"
"OverDue",
"Paid"
],
"readOnly": true,
"x-ms-enum": {
Expand Down Expand Up @@ -6357,6 +6265,11 @@
"items": {
"$ref": "#/definitions/PaymentProperties"
}
},
"subscriptionId": {
"description": "The subscription id this invoice belongs to.",
"type": "string",
"readOnly": true
}
}
},
Expand Down Expand Up @@ -6409,7 +6322,7 @@
"enum": [
"Invoice",
"VoidNote",
"Receipt",
"TaxReceipt",
"CreditNote"
],
"readOnly": true,
Expand Down Expand Up @@ -7606,54 +7519,6 @@
}
}
},
"LineOfCredit": {
"description": "Line of credit resource.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {
"properties": {
"description": "A line of credit.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/LineOfCreditProperties"
}
}
},
"LineOfCreditProperties": {
"description": "The properties of the line of credit.",
"properties": {
"creditLimit": {
"description": "The current credit limit.",
"$ref": "#/definitions/Amount",
"readOnly": false
},
"reason": {
"description": "The reason for the line of credit status when not approved.",
"type": "string",
"readOnly": true
},
"remainingBalance": {
"description": "Remaining balance.",
"$ref": "#/definitions/Amount",
"readOnly": true
},
"status": {
"description": "The line of credit status.",
"type": "string",
"enum": [
"Approved",
"Rejected"
],
"x-ms-enum": {
"name": "status",
"modelAsString": true
}
}
}
},
"Action": {
"description": "the action the caller allowed to do",
"type": "string",
Expand Down
7 changes: 4 additions & 3 deletions ...ger/Microsoft.Billing/preview/2019-10-01-preview/examples/BillingSubscriptionInvoice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"properties": {
"dueDate": "2018-03-01T17:32:28Z",
"invoiceDate": "2018-02-01T17:32:28Z",
"status": "PastDue",
"status": "Paid",
"amountDue": {
"currency": "USD",
"value": 2000.00
Expand Down Expand Up @@ -46,9 +46,10 @@
"paymentMethodFamily": "CreditCard",
"paymentMethodType": "visa"
}
]
],
"subscriptionId": "55000000-0000-0000-0000-000000000011"
}
}
}
}
}
}
8 changes: 5 additions & 3 deletions ...icrosoft.Billing/preview/2019-10-01-preview/examples/BillingSubscriptionInvoicesList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"invoicePeriodStartDate": "2018-01-01T17:32:28Z",
"invoicePeriodEndDate": "2018-01-15T17:32:28Z",
"invoiceType": "AzureServices",
"purchaseOrderNumber": "123456"
"purchaseOrderNumber": "123456",
"subscriptionId": "55000000-0000-0000-0000-000000000011"
}
},
{
Expand All @@ -35,7 +36,7 @@
"properties": {
"dueDate": "2018-03-01T17:32:28Z",
"invoiceDate": "2018-02-01T17:32:28Z",
"status": "PastDue",
"status": "Paid",
"amountDue": {
"currency": "USD",
"value": 2000.00
Expand Down Expand Up @@ -67,7 +68,8 @@
"paymentMethodFamily": "CreditCard",
"paymentMethodType": "visa"
}
]
],
"subscriptionId": "55000000-0000-0000-0000-000000000011"
}
}
]
Expand Down
41 changes: 0 additions & 41 deletions ...osoft.Billing/preview/2019-10-01-preview/examples/IncreaseLineOfCreditBySubscription.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...r/Microsoft.Billing/preview/2019-10-01-preview/examples/InvoicesListByBillingProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"properties": {
"dueDate": "2018-03-01T17:32:28Z",
"invoiceDate": "2018-01-01T17:32:28Z",
"status": "PastDue",
"status": "Due",
"amountDue": {
"currency": "USD",
"value": 2000.00
Expand Down
27 changes: 0 additions & 27 deletions ...ger/Microsoft.Billing/preview/2019-10-01-preview/examples/LineOfCreditBySubscription.json
View file
Open in desktop

This file was deleted.