Skip to content

BillingRP - Adding new fields to transactions API #8232

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
allenjzhang merged 5 commits into from
Jan 30, 2020
Merged

BillingRP - Adding new fields to transactions API #8232

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
609e7a1
Adding new fields to transactions API
asarkar84 Jan 25, 2020
e6177df
Merge remote-tracking branch 'upstream/master' into ansar/transactions
asarkar84 Jan 27, 2020
680ef78
Updated the field description
asarkar84 Jan 29, 2020
7d6b456
Merge remote-tracking branch 'upstream/master' into ansar/transactions
asarkar84 Jan 29, 2020
5259473
Updated few descriptions
asarkar84 Jan 30, 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
72 changes: 72 additions & 0 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 @@ -6938,6 +6938,78 @@
"description": "The subscription name.",
"type": "string",
"readOnly": true
},
"azureCreditApplied": {
"description": "The amount of azure credits that are automatically applied to this transaction.",
"readOnly": true,
"$ref": "#/definitions/Amount"
},
"billingCurrency": {
"description": "The ISO 4217 code for the currency in which this transaction is billed.",
"type": "string",
"readOnly": true
},
"discount": {
"description": "The percentage of discount (if any) applied to this transaction.",
"type": "number",
"readOnly": true
},
"effectivePrice": {
"description": "The price of the product after applying any discounts.",
"readOnly": true,
"$ref": "#/definitions/Amount"
},
"exchangeRate": {
"description": "The exchange rate used to convert the amounts in billing currency.",
"type": "number",
"readOnly": true
},
"marketPrice": {
"description": "The price of the product before applying any discounts.",
"readOnly": true,
"$ref": "#/definitions/Amount"
},
"pricingCurrency": {
"description": "The ISO 4217 code for the currency in which the product is priced.",
"type": "string",
"readOnly": true
},
"servicePeriodStartDate": {
"description": "The service period start date.",
"type": "string",
"format": "date-time",
"readOnly": true
},
"servicePeriodEndDate": {
"description": "The service period end date.",
"type": "string",
"format": "date-time",
"readOnly": true
},
"subTotal": {
"description": "The pre-tax amount for the transaction.",
"readOnly": true,
"$ref": "#/definitions/Amount"
},
"tax": {
"description": "The tax applied to the transaction.",
"readOnly": true,
"$ref": "#/definitions/Amount"
},
"unitOfMeasure": {
"description": "The unit of measure used to bill for the service. For example, compute services are billed per hour.",
"type": "string",
"readOnly": true
},
"units": {
"description": "The number of units used.",
"type": "number",
"readOnly": true
},
"unitType": {
"description": "The description for the unit of measure.",
"type": "string",
"readOnly": true
}
}
},
Expand Down
32 changes: 31 additions & 1 deletion ...g/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/Transaction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,37 @@
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}",
"invoiceSectionDisplayName": "Contoso operations invoiceSection",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
"billingProfileDisplayName": "Contoso operations billing"
"billingProfileDisplayName": "Contoso operations billing",
"azureCreditApplied": {
"currency": "USD",
"value": 2000.00
},
"billingCurrency": "USD",
"discount": 0.1,
"effectivePrice": {
"currency": "USD",
"value": 10.00
},
"exchangeRate": 1,
"marketPrice": {
"currency": "USD",
"value": 20.00
},
"pricingCurrency": "USD",
"quantity": 1,
"servicePeriodStartDate": "2018-05-01T00:00:00Z",
"servicePeriodEndDate": "2018-09-30T00:00:00Z",
"subTotal": {
"currency": "USD",
"value": 4500.00
},
"tax": {
"currency": "USD",
"value": 500.00
},
"unitOfMeasure": "1 Minute",
"units": 11.25,
"unitType": "1 Runtime Minute"
}
}
}
Expand Down
64 changes: 62 additions & 2 deletions ...crosoft.Billing/preview/2019-10-01-preview/examples/TransactionsListByBillingAccount.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,37 @@
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoiceSections/22000000-0000-0000-0000-000000000000",
"invoiceSectionDisplayName": "Contoso operations invoiceSection",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
"billingProfileDisplayName": "Contoso operations billing"
"billingProfileDisplayName": "Contoso operations billing",
"azureCreditApplied": {
"currency": "USD",
"value": 2000.00
},
"billingCurrency": "USD",
"discount": 0.1,
"effectivePrice": {
"currency": "USD",
"value": 10.00
},
"exchangeRate": 1,
"marketPrice": {
"currency": "USD",
"value": 20.00
},
"pricingCurrency": "USD",
"quantity": 1,
"servicePeriodStartDate": "2018-05-01T00:00:00Z",
"servicePeriodEndDate": "2018-09-30T00:00:00Z",
"subTotal": {
"currency": "USD",
"value": 4500.00
},
"tax": {
"currency": "USD",
"value": 500.00
},
"unitOfMeasure": "1 Minute",
"units": 11.25,
"unitType": "1 Runtime Minute"
}
},
{
Expand All @@ -52,7 +82,37 @@
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000/invoiceSections/22000000-0000-0000-0000-000000000000",
"invoiceSectionDisplayName": "Contoso operations invoiceSection",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/11000000-0000-0000-0000-000000000000",
"billingProfileDisplayName": "Contoso operations billing"
"billingProfileDisplayName": "Contoso operations billing",
"azureCreditApplied": {
"currency": "USD",
"value": 20.00
},
"billingCurrency": "USD",
"discount": 0.1,
"effectivePrice": {
"currency": "USD",
"value": 10.00
},
"exchangeRate": 1,
"marketPrice": {
"currency": "USD",
"value": 20.00
},
"pricingCurrency": "USD",
"quantity": 1,
"servicePeriodStartDate": "2018-05-01T00:00:00Z",
"servicePeriodEndDate": "2018-09-30T00:00:00Z",
"subTotal": {
"currency": "USD",
"value": 45.00
},
"tax": {
"currency": "USD",
"value": 5.00
},
"unitOfMeasure": "1 Minute",
"units": 1.25,
"unitType": "1 Runtime Minute"
}
}
]
Expand Down
64 changes: 62 additions & 2 deletions ...crosoft.Billing/preview/2019-10-01-preview/examples/TransactionsListByBillingProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,37 @@
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/22000000-0000-0000-0000-000000000000",
"invoiceSectionDisplayName": "Contoso operations invoiceSection",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
"billingProfileDisplayName": "Contoso operations billing"
"billingProfileDisplayName": "Contoso operations billing",
"azureCreditApplied": {
"currency": "USD",
"value": 2000.00
},
"billingCurrency": "USD",
"discount": 0.1,
"effectivePrice": {
"currency": "USD",
"value": 10.00
},
"exchangeRate": 1,
"marketPrice": {
"currency": "USD",
"value": 20.00
},
"pricingCurrency": "USD",
"quantity": 1,
"servicePeriodStartDate": "2018-05-01T00:00:00Z",
"servicePeriodEndDate": "2018-09-30T00:00:00Z",
"subTotal": {
"currency": "USD",
"value": 4500.00
},
"tax": {
"currency": "USD",
"value": 500.00
},
"unitOfMeasure": "1 Minute",
"units": 11.25,
"unitType": "1 Runtime Minute"
}
},
{
Expand All @@ -53,7 +83,37 @@
"invoiceSectionId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/22000000-0000-0000-0000-000000000000",
"invoiceSectionDisplayName": "Contoso operations invoiceSection",
"billingProfileId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}",
"billingProfileDisplayName": "Contoso operations billing"
"billingProfileDisplayName": "Contoso operations billing",
"azureCreditApplied": {
"currency": "USD",
"value": 20.00
},
"billingCurrency": "USD",
"discount": 0.1,
"effectivePrice": {
"currency": "USD",
"value": 10.00
},
"exchangeRate": 1,
"marketPrice": {
"currency": "USD",
"value": 20.00
},
"pricingCurrency": "USD",
"quantity": 1,
"servicePeriodStartDate": "2018-05-01T00:00:00Z",
"servicePeriodEndDate": "2018-09-30T00:00:00Z",
"subTotal": {
"currency": "USD",
"value": 45.00
},
"tax": {
"currency": "USD",
"value": 5.00
},
"unitOfMeasure": "1 Minute",
"units": 1.25,
"unitType": "1 Runtime Minute"
}
}
]
Expand Down
64 changes: 62 additions & 2 deletions ...ger/Microsoft.Billing/preview/2019-10-01-preview/examples/TransactionsListByCustomer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,37 @@
"value": 5000.00
},
"customerId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}",
"customerDisplayName": "Contoso operations customer"
"customerDisplayName": "Contoso operations customer",
"azureCreditApplied": {
"currency": "USD",
"value": 2000.00
},
"billingCurrency": "USD",
"discount": 0.1,
"effectivePrice": {
"currency": "USD",
"value": 10.00
},
"exchangeRate": 1,
"marketPrice": {
"currency": "USD",
"value": 20.00
},
"pricingCurrency": "USD",
"quantity": 1,
"servicePeriodStartDate": "2018-05-01T00:00:00Z",
"servicePeriodEndDate": "2018-09-30T00:00:00Z",
"subTotal": {
"currency": "USD",
"value": 4500.00
},
"tax": {
"currency": "USD",
"value": 500.00
},
"unitOfMeasure": "1 Minute",
"units": 11.25,
"unitType": "1 Runtime Minute"
}
},
{
Expand All @@ -49,7 +79,37 @@
"value": 50.00
},
"customerId": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}",
"customerDisplayName": "Contoso operations customer"
"customerDisplayName": "Contoso operations customer",
"azureCreditApplied": {
"currency": "USD",
"value": 20.00
},
"billingCurrency": "USD",
"discount": 0.1,
"effectivePrice": {
"currency": "USD",
"value": 10.00
},
"exchangeRate": 1,
"marketPrice": {
"currency": "USD",
"value": 20.00
},
"pricingCurrency": "USD",
"quantity": 1,
"servicePeriodStartDate": "2018-05-01T00:00:00Z",
"servicePeriodEndDate": "2018-09-30T00:00:00Z",
"subTotal": {
"currency": "USD",
"value": 45.00
},
"tax": {
"currency": "USD",
"value": 5.00
},
"unitOfMeasure": "1 Minute",
"units": 1.25,
"unitType": "1 Runtime Minute"
}
}
]
Expand Down
Loading