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.

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

πŸš€ Update staging #1160

Merged
merged 15 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f9dfdb0
Revert "Revert "MP-7072 Last login user attribute""
yoan-myparcel Jan 8, 2025
f5a48c5
:sparkles: add optional address property to Return and ReturnMethod s…
yoerriwalstra Jan 8, 2025
42b0d28
:fire: remove not needed required properties. Properties are already …
yoerriwalstra Jan 8, 2025
264bf21
:sparkles: make property address required in ReturnResponse
yoerriwalstra Jan 8, 2025
11c84e4
:sparkles: Changed last_login to last_active + added new filter optio…
daniel-myparcel Jan 9, 2025
6eb9341
Merge pull request #1149 from MyParcelCOM/revert-1148-revert-1147-fea…
yoan-myparcel Jan 10, 2025
8058a06
:lady_beetle: removed the last_active field from UserResponse.json re…
daniel-myparcel Jan 10, 2025
9606230
Merge pull request #1152 from MyParcelCOM/bugfix/last_active-should-n…
yoan-myparcel Jan 10, 2025
39aeb7d
Merge pull request #1153 from MyParcelCOM/feature/manifest-document-type
yoan-myparcel Jan 14, 2025
28628fa
Merge pull request #1156 from MyParcelCOM/bugfix/patch-service-rate-p…
yoan-myparcel Jan 16, 2025
6e66da5
Merge pull request #1150 from MyParcelCOM/feature/MP-7080-add-address…
M4tini Jan 17, 2025
2075503
:sparkles: add description to return method address
yoerriwalstra Jan 20, 2025
6ef9b4e
Merge pull request #1158 from MyParcelCOM/return-method-address-descr…
M4tini Jan 21, 2025
5df10d8
:lady_beetle: rename ReturnOrder.addres to ReturnOrder.return_address
yoerriwalstra Jan 21, 2025
f60bfad
Merge pull request #1159 from MyParcelCOM/rename-return-order-propert…
M4tini Jan 21, 2025
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
11 changes: 1 addition & 10 deletions specification/paths/Returns-v1-returns.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,16 +178,7 @@
"order_reference",
"items",
"consumer_address"
],
"properties": {
"consumer_address": {
"required": [
"street_1",
"city",
"country_code"
]
}
}
]
},
"relationships": {
"required": [
Expand Down
30 changes: 30 additions & 0 deletions specification/paths/Users.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,36 @@
"schema": {
"type": "string"
}
},
{
"$ref": "#/components/parameters/query-filter-created_at-date_from"
},
{
"$ref": "#/components/parameters/query-filter-created_at-date_to"
},
{
"name": "filter[last_active_before]",
"in": "query",
"description": "Date string in ISO 8601 format or unix timestamp. Only resources created before this date will be in the response.",
"schema": {
"type": [
"string",
"number"
]
}
},
{
"name": "filter[status]",
"in": "query",
"description": "The status of the user.",
"schema": {
"type": "string",
"enum": [
"active",
"blocked",
"pending"
]
}
}
],
"responses": {
Expand Down
17 changes: 17 additions & 0 deletions specification/schemas/return-methods/ReturnMethod.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,23 @@
"example": "NL"
}
},
"address": {
"allOf": [
{
"$ref": "#/components/schemas/BaseAddress"
},
{
"required": [
"first_name",
"last_name",
"street_1",
"city",
"country_code"
],
"description": "The destination address for the return order. By default, this will be the shop's return address."
}
]
},
"created_at": {
"$ref": "#/components/schemas/Timestamp"
}
Expand Down
20 changes: 19 additions & 1 deletion specification/schemas/returns/Return.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,23 @@
"maxLength": 255,
"example": "#0001-my-order-reference"
},
"return_address": {
"allOf": [
{
"$ref": "#/components/schemas/BaseAddress"
},
{
"required": [
"first_name",
"last_name",
"street_1",
"city",
"country_code"
],
"description": "The destination address of the return. Defaults to the shop's return address."
}
]
},
"consumer_address": {
"allOf": [
{
Expand All @@ -29,7 +46,8 @@
"city",
"country_code",
"email"
]
],
"description": "The address of the consumer."
}
]
},
Expand Down
1 change: 1 addition & 0 deletions specification/schemas/returns/ReturnResponse.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"attributes": {
"required": [
"order_reference",
"return_address",
"consumer_address",
"has_preferred_outcome_refund",
"has_preferred_outcome_exchange",
Expand Down
3 changes: 3 additions & 0 deletions specification/schemas/users/User.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
},
"created_at": {
"$ref": "#/components/schemas/Timestamp"
},
"last_active": {
"$ref": "#/components/schemas/Timestamp"
}
}
}
Expand Down
Loading