Skip to content

Commit 2fb970b

Browse files
sangeet-joy-twsangeet-joy-tw
authored
Merge branch 'master' into feature/prism-changes-ruby
2 parents 93c9752 + 58c1a05 commit 2fb970b

File tree

18 files changed

+65
-30
lines changed

18 files changed

+65
-30
lines changed

‎Gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
xero-ruby (11.2.0)
4+
xero-ruby (11.3.0)
55
faraday (>= 2.0, < 3.0)
66
json (~> 2.1, >= 2.1.0)
77
json-jwt (~> 1.16, >= 1.16.3)

‎docs/accounting/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6220,7 +6220,7 @@
62206220
"OrganisationRole" : {
62216221
"type" : "string",
62226222
"description" : "User role that defines permissions in Xero and via API (READONLY, INVOICEONLY, STANDARD, FINANCIALADVISER, etc)",
6223-
"enum" : [ "READONLY", "INVOICEONLY", "STANDARD", "FINANCIALADVISER", "MANAGEDCLIENT", "CASHBOOKCLIENT", "UNKNOWN" ]
6223+
"enum" : [ "READONLY", "INVOICEONLY", "STANDARD", "FINANCIALADVISER", "MANAGEDCLIENT", "CASHBOOKCLIENT", "UNKNOWN", "REMOVED" ]
62246224
}
62256225
},
62266226
"description" : "",
@@ -6339,7 +6339,7 @@
63396339
<nav id="scrollingNav">
63406340
<ul class="sidenav nav nav-list">
63416341
<li class="nav-header" data-group="Accounting"><strong>SDK: </strong><span id='sdk-name'></span></li>
6342-
<li class="nav-header" data-group="Accounting"><strong>VSN: </strong>11.2.0</li>
6342+
<li class="nav-header" data-group="Accounting"><strong>VSN: </strong>11.3.0</li>
63436343
<li class="nav-header" data-group="Accounting"><a href="#api-Accounting">Methods</a></li>
63446344
<li data-group="Accounting" data-name="createAccount" class="">
63456345
<a href="#api-Accounting-createAccount">createAccount</a>

‎docs/app_store/Product.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
77
**id** | **String** | The unique identifier for the product | [optional]
88
**name** | **String** | The name of the product | [optional]
99
**seat_unit** | **String** | The unit of the per seat product. e.g. \&quot;user\&quot;, \&quot;organisation\&quot;, \&quot;SMS\&quot;, etc | [optional]
10-
**type** | **String** | The pricing model of the product: * FIXED: Customers are charged a fixed amount for each billing period * PER_SEAT: Customers are charged based on the number of units they purchase * METERED: Customers are charged per use of this product | [optional]
10+
**type** | **String** | The pricing model of the product: * FIXED: Customers are charged a fixed amount for each billing period * PER_SEAT: Customers are charged based on the number of units they purchase * METERED: Customers are charged per use of this product * SIMPLE: Customers are charged on a fixed amount for each billing period with an optional add-on feature | [optional]
1111
**usage_unit** | **String** | The unit of the usage product. e.g. \&quot;user\&quot;, \&quot;minutes\&quot;, \&quot;SMS\&quot;, etc | [optional]
1212

1313
## Code Sample

‎docs/app_store/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -976,8 +976,8 @@
976976
},
977977
"type" : {
978978
"type" : "string",
979-
"description" : "The pricing model of the product:\n* FIXED: Customers are charged a fixed amount for each billing period\n* PER_SEAT: Customers are charged based on the number of units they purchase\n* METERED: Customers are charged per use of this product\n",
980-
"enum" : [ "FIXED", "PER_SEAT", "METERED" ]
979+
"description" : "The pricing model of the product:\n* FIXED: Customers are charged a fixed amount for each billing period\n* PER_SEAT: Customers are charged based on the number of units they purchase\n* METERED: Customers are charged per use of this product\n* SIMPLE: Customers are charged on a fixed amount for each billing period with an optional add-on feature\n",
980+
"enum" : [ "FIXED", "PER_SEAT", "METERED", "SIMPLE" ]
981981
},
982982
"usageUnit" : {
983983
"type" : "string",
@@ -1241,7 +1241,7 @@
12411241
<nav id="scrollingNav">
12421242
<ul class="sidenav nav nav-list">
12431243
<li class="nav-header" data-group="AppStore"><strong>SDK: </strong><span id='sdk-name'></span></li>
1244-
<li class="nav-header" data-group="AppStore"><strong>VSN: </strong>11.2.0</li>
1244+
<li class="nav-header" data-group="AppStore"><strong>VSN: </strong>11.3.0</li>
12451245
<li class="nav-header" data-group="AppStore"><a href="#api-AppStore">Methods</a></li>
12461246
<li data-group="AppStore" data-name="getSubscription" class="">
12471247
<a href="#api-AppStore-getSubscription">getSubscription</a>

‎docs/assets/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1390,7 +1390,7 @@
13901390
<nav id="scrollingNav">
13911391
<ul class="sidenav nav nav-list">
13921392
<li class="nav-header" data-group="Asset"><strong>SDK: </strong><span id='sdk-name'></span></li>
1393-
<li class="nav-header" data-group="Asset"><strong>VSN: </strong>11.2.0</li>
1393+
<li class="nav-header" data-group="Asset"><strong>VSN: </strong>11.3.0</li>
13941394
<li class="nav-header" data-group="Asset"><a href="#api-Asset">Methods</a></li>
13951395
<li data-group="Asset" data-name="createAsset" class="">
13961396
<a href="#api-Asset-createAsset">createAsset</a>

‎docs/files/FilesApi.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,9 @@ opts = {
745745

746746
page: 2, # Integer | number of records to skip for pagination
747747

748-
sort: 'CreatedDateUTC DESC' # String | values to sort by
748+
sort: 'CreatedDateUTC', # String | values to sort by
749+
750+
direction: 'ASC' # String | sort direction
749751
}
750752

751753
begin
@@ -766,6 +768,7 @@ Name | Type | Description | Notes
766768
**pagesize** | **Integer**| pass an optional page size value | [optional]
767769
**page** | **Integer**| number of records to skip for pagination | [optional]
768770
**sort** | **String**| values to sort by | [optional]
771+
**direction** | **String**| sort direction | [optional]
769772

770773
### Return type
771774

‎docs/files/index.html‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,7 @@
11701170
<nav id="scrollingNav">
11711171
<ul class="sidenav nav nav-list">
11721172
<li class="nav-header" data-group="Files"><strong>SDK: </strong><span id='sdk-name'></span></li>
1173-
<li class="nav-header" data-group="Files"><strong>VSN: </strong>11.2.0</li>
1173+
<li class="nav-header" data-group="Files"><strong>VSN: </strong>11.3.0</li>
11741174
<li class="nav-header" data-group="Files"><a href="#api-Files">Methods</a></li>
11751175
<li data-group="Files" data-name="createFileAssociation" class="">
11761176
<a href="#api-Files-createFileAssociation">createFileAssociation</a>
@@ -2625,10 +2625,11 @@ <h3>Usage and SDK Samples</h3>
26252625
xero_tenant_id = 'YOUR_XERO_TENANT_ID'
26262626
pagesize = 50
26272627
page = 2
2628-
sort = 'CreatedDateUTC DESC'
2628+
sort = 'CreatedDateUTC'
2629+
direction = 'ASC'
26292630

26302631
begin
2631-
response = xero_client.accounting_api.get_files(xero_tenant_id, pagesize, page, sort)
2632+
response = xero_client.accounting_api.get_files(xero_tenant_id, pagesize, page, sort, direction)
26322633
return response
26332634
rescue XeroRuby::ApiError => e
26342635
puts "Exception when calling get_files: #{e}"
@@ -2745,6 +2746,26 @@ <h2>Parameters</h2>
27452746
</div>
27462747
</div>
27472748
</td>
2749+
</tr>
2750+
2751+
<tr><td style="width:150px;">direction</td>
2752+
<td>
2753+
2754+
2755+
<div id="d2e199_getFiles_direction">
2756+
<div class="json-schema-view">
2757+
<div class="primitive">
2758+
<span class="type">
2759+
String
2760+
</span>
2761+
2762+
<div class="inner description marked">
2763+
sort direction
2764+
</div>
2765+
</div>
2766+
</div>
2767+
</div>
2768+
</td>
27482769
</tr>
27492770

27502771
</table>

‎docs/finance/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2716,7 +2716,7 @@
27162716
<nav id="scrollingNav">
27172717
<ul class="sidenav nav nav-list">
27182718
<li class="nav-header" data-group="Finance"><strong>SDK: </strong><span id='sdk-name'></span></li>
2719-
<li class="nav-header" data-group="Finance"><strong>VSN: </strong>11.2.0</li>
2719+
<li class="nav-header" data-group="Finance"><strong>VSN: </strong>11.3.0</li>
27202720
<li class="nav-header" data-group="Finance"><a href="#api-Finance">Methods</a></li>
27212721
<li data-group="Finance" data-name="getAccountingActivityAccountUsage" class="">
27222722
<a href="#api-Finance-getAccountingActivityAccountUsage">getAccountingActivityAccountUsage</a>

‎docs/payroll_au/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3412,7 +3412,7 @@
34123412
<nav id="scrollingNav">
34133413
<ul class="sidenav nav nav-list">
34143414
<li class="nav-header" data-group="PayrollAu"><strong>SDK: </strong><span id='sdk-name'></span></li>
3415-
<li class="nav-header" data-group="PayrollAu"><strong>VSN: </strong>11.2.0</li>
3415+
<li class="nav-header" data-group="PayrollAu"><strong>VSN: </strong>11.3.0</li>
34163416
<li class="nav-header" data-group="PayrollAu"><a href="#api-PayrollAu">Methods</a></li>
34173417
<li data-group="PayrollAu" data-name="approveLeaveApplication" class="">
34183418
<a href="#api-PayrollAu-approveLeaveApplication">approveLeaveApplication</a>

‎docs/payroll_nz/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4087,7 +4087,7 @@
40874087
<nav id="scrollingNav">
40884088
<ul class="sidenav nav nav-list">
40894089
<li class="nav-header" data-group="PayrollNz"><strong>SDK: </strong><span id='sdk-name'></span></li>
4090-
<li class="nav-header" data-group="PayrollNz"><strong>VSN: </strong>11.2.0</li>
4090+
<li class="nav-header" data-group="PayrollNz"><strong>VSN: </strong>11.3.0</li>
40914091
<li class="nav-header" data-group="PayrollNz"><a href="#api-PayrollNz">Methods</a></li>
40924092
<li data-group="PayrollNz" data-name="approveTimesheet" class="">
40934093
<a href="#api-PayrollNz-approveTimesheet">approveTimesheet</a>

0 commit comments

Comments
 (0)