Skip to content

Commit 83ffc3c

Browse files
author
Wick
committed
Fixing merge error
2 parents 8b3c6ec + 202abec commit 83ffc3c

50 files changed

Lines changed: 203 additions & 1672 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/workspace.xml‎

Lines changed: 104 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/.vuepress/config.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const moment = require('moment');
99
const sidebar = require('./nav/sidebars.js');
1010
// console.log('Sidebar Rest: ', sidebar.rest());
1111

12-
console.log('Sidebar Guides: ', sidebar.guides());
12+
// console.log('Sidebar Guides: ', sidebar.guides());
1313
// console.log('Sidebar: ', sidebar.bar());
1414

1515
module.exports = (ctx) => ({
@@ -130,8 +130,8 @@ module.exports = (ctx) => ({
130130
nav: require('./nav/top/mainNav.js'),
131131
sidebar: {
132132
'/api/reference/rest/': sidebar.rest(),
133-
'/api/guides/': sidebar.guides(),
134-
'/': sidebar.support(),
133+
// '/api/guides/': sidebar.guides(),
134+
// '/': sidebar.support(),
135135
},
136136
},
137137
/**
@@ -197,20 +197,20 @@ module.exports = (ctx) => ({
197197
'redirect-frontmatter',
198198
'img-lazy',
199199
],
200-
extraWatchFiles: [
201-
// Navigation
202-
'.vuepress/nav/top/mainNav.js',
203-
// Sidebars
204-
'.vuepress/nav/sidebars.js',
205-
'.vuepress/nav/left/guides.js',
206-
'.vuepress/nav/left/rest/rest.js',
207-
'.vuepress/nav/left/rest/v1/summary.js',
208-
'.vuepress/nav/left/rest/v1/resources.js',
209-
'.vuepress/nav/left/rest/v1/models/models.js',
210-
'.vuepress/nav/left/rest/v1/reference/merchant.js',
211-
'.vuepress/nav/left/rest/v1/reference/oauth2.js',
212-
'.vuepress/nav/left/rest/v1/reference/users.js',
213-
// Plugins
214-
'.vuepress/plugins/getOpenAPI.js',
215-
],
200+
// extraWatchFiles: [
201+
// // Navigation
202+
// '.vuepress/nav/top/mainNav.js',
203+
// // Sidebars
204+
// '.vuepress/nav/sidebars.js',
205+
// '.vuepress/nav/left/guides.js',
206+
// '.vuepress/nav/left/rest/rest.js',
207+
// '.vuepress/nav/left/rest/v1/summary.js',
208+
// '.vuepress/nav/left/rest/v1/resources.js',
209+
// '.vuepress/nav/left/rest/v1/models/models.js',
210+
// '.vuepress/nav/left/rest/v1/reference/merchant.js',
211+
// '.vuepress/nav/left/rest/v1/reference/oauth2.js',
212+
// '.vuepress/nav/left/rest/v1/reference/users.js',
213+
// // Plugins
214+
// '.vuepress/plugins/getOpenAPI.js',
215+
// ],
216216
});

‎docs/.vuepress/nav/left/guides.js‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,13 @@ const introduction = {
1818
collapsable: false,
1919
sidebarDepth: 0,
2020
children: [
21-
['/api/guides/introduction/a-note-on-settle-api-users.md', 'A Note on Settle API Users'],
22-
['/api/guides/introduction/attachments.md','Attachments'],
23-
['/api/guides/introduction/authentication.md','Authentication'],
24-
['/api/guides/introduction/callbacks.md','Callbacks'],
25-
['/api/guides/introduction/error-responses.md','Error Responses'],
26-
['/api/guides/introduction/interacting.md','Interacting'],
27-
['/api/guides/introduction/ledgers.md','Ledgers'],
28-
['/api/guides/introduction/media-type.md','Media Types'],
29-
['/api/guides/introduction/payment-flows.md','Payment Flows'],
30-
['/api/guides/introduction/permission-requests.md','Permission Requests'],
31-
['/api/guides/introduction/qr-acceptance.md','QR Acceptance'],
32-
['/api/guides/introduction/resiliency.md','Resiliency'],
33-
['/api/guides/introduction/sandbox-environment.md','Sandbox Enviroment #1'],
34-
['/api/guides/introduction/settle-sandbox-environment.md',' Sandbox Enviroment #2'],
35-
['/api/guides/introduction/settlements.md','Settlements'],
36-
['/api/guides/introduction/versioning.md','Verioning'],
21+
'/api/guides/introduction/interacting',
22+
'/api/guides/introduction/callbacks',
23+
'/api/guides/introduction/error-responses',
24+
'/api/guides/introduction/media-type',
25+
'/api/guides/introduction/a-note-on-settle-api-users',
26+
'/api/guides/introduction/versioning',
27+
['/api/guides/introduction/resiliency', 'Resiliency'],
3728
],
3829
};
3930

‎docs/.vuepress/nav/left/rest/v1/reference/merchant.js‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,36 +144,39 @@ function merchant_settlement() {
144144
sidebarDepth: 0,
145145
children: [
146146
['/api/reference/rest/v1/merchant.settlement/', 'Overview'],
147+
[`/api/reference/rest/v1/merchant.settlement/list`, 'list'],
147148
['/api/reference/rest/v1/merchant.settlement/get', 'get'],
148149
],
149150
};
150151
}
151152

152-
function merchant_settlement_account() {
153+
function merchant_settlement_latest() {
153154
return {
154-
title: 'merchant.settlement.account', // required
155+
title: 'merchant.settlement.latest', // required
155156
collapsable: true,
156157
sidebarDepth: 0,
157158
children: [
158-
['/api/reference/rest/v1/merchant.settlement.account/', 'Overview'],
159-
['/api/reference/rest/v1/merchant.settlement.account/get', 'get'],
160-
['/api/reference/rest/v1/merchant.settlement.account/update', 'update'],
159+
['/api/reference/rest/v1/merchant.settlement.latest/', 'Overview'],
160+
['/api/reference/rest/v1/merchant.settlement.latest/get', 'get'],
161161
],
162162
};
163163
}
164164

165-
function merchant_settlement_latest() {
165+
function merchant_settlement_account() {
166166
return {
167-
title: 'merchant.settlement.latest', // required
167+
title: 'merchant.settlement.account', // required
168168
collapsable: true,
169169
sidebarDepth: 0,
170170
children: [
171-
['/api/reference/rest/v1/merchant.settlement.latest/', 'Overview'],
172-
['/api/reference/rest/v1/merchant.settlement.latest/get', 'get'],
171+
['/api/reference/rest/v1/merchant.settlement.account/', 'Overview'],
172+
['/api/reference/rest/v1/merchant.settlement.account/get', 'get'],
173+
['/api/reference/rest/v1/merchant.settlement.account/update', 'update'],
173174
],
174175
};
175176
}
176177

178+
179+
177180
function merchant_settlement_report() {
178181
return {
179182
title: 'merchant.settlement.report', // required

‎docs/.vuepress/nav/left/rest/v1/resources.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const {
1111
merchant_profile,
1212
merchant_sales_summary,
1313
merchant_settlement,
14-
merchant_settlement_account,
1514
merchant_settlement_latest,
15+
merchant_settlement_account,
1616
merchant_settlement_report,
1717
merchant_shortlink,
1818
merchant_ssp_users,
@@ -57,8 +57,8 @@ function merchantGroup() {
5757
merchant_profile,
5858
merchant_sales_summary,
5959
merchant_settlement,
60-
merchant_settlement_account,
6160
merchant_settlement_latest,
61+
merchant_settlement_account,
6262
merchant_settlement_report,
6363
merchant_shortlink,
6464
// merchant_ssp_users,

‎docs/.vuepress/nav/sidebars.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@
88
// } = require('./left/rest/rest.js');
99

1010
const rest = require('./left/rest/rest.js');
11-
const guides = require('./left/guides.js');
12-
const support = require('./left/support.js');
11+
// const guides = require('./left/guides.js');
12+
// const support = require('./left/support.js');
1313

1414

1515
const sidebar_rest = () => {
1616
return rest;
1717
}
1818

19-
const sidebar_guides = () => {
20-
return guides;
21-
}
22-
23-
const sidebar_support = () => {
24-
return support;
25-
}
19+
// const sidebar_guides = () => {
20+
// return guides;
21+
// }
22+
//
23+
// const sidebar_support = () => {
24+
// return support;
25+
// }
2626

2727
exports.rest = sidebar_rest;
28-
exports.guides = sidebar_guides;
29-
exports.support = sidebar_support;
28+
// exports.guides = sidebar_guides;
29+
// exports.support = sidebar_support;

‎docs/.vuepress/nav/top/mainNav.js‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
module.exports = [{
2-
text: 'Home',
3-
link: '/',
4-
},
5-
{
6-
text: 'Guides',
7-
link: '/api/guides/',
8-
},
1+
module.exports = [
2+
// {
3+
// text: 'Home',
4+
// link: '/',
5+
// },
6+
// {
7+
// text: 'Guides',
8+
// link: '/api/guides/',
9+
// },
910
{
1011
text: 'Reference',
1112
link: '/api/reference/rest/v1/',
@@ -16,6 +17,10 @@ module.exports = [{
1617
// },
1718
{
1819
text: 'Support',
19-
link: '/api/support/',
20-
}
21-
]
20+
link: 'https://support.settle.eu/hc/en-150/categories/4406888724625-Settle-for-Developers',
21+
},
22+
// {
23+
// text: 'Support',
24+
// link: '/api/support/',
25+
// }
26+
]

‎docs/.vuepress/theme/components/PageResourceOverview.vue‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,21 @@
77
<router-link :to="'#rest-resource'" class="header-anchor"
88
>#</router-link
99
>
10-
REST Resource
10+
REST Resource: <span class="FiraCode">{{ $frontmatter.schema }}</span>
1111
</h2>
12-
<div class="md-api_reference_FiraCode">
13-
<h3>{{ $frontmatter.schema }}</h3>
14-
<p></p>
15-
</div>
16-
<h3 id="resource">
12+
13+
<h2 id="resource">
1714
<router-link :to="'#resource'" class="header-anchor">#</router-link>
1815
Resource
19-
</h3>
16+
</h2>
2017
<div v-if="$frontmatter.resourceDesc === true">
2118
<Content slot-key="resource" :hasDescription="true" />
2219
</div>
2320
<div v-else>
2421
<p>There is no persistent data associated with this resource.</p>
2522
</div>
2623

27-
<!-- <Content /> -->
24+
<!-- <Content />-->
2825
<h2 id="http-request">
2926
<router-link :to="'#http-request'" class="header-anchor">#</router-link>
3027
HTTP Requests

‎docs/api/guides/best-practices/introduction.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎docs/api/guides/index.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)