Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7c0e18681b | ||
|
|
895ef8be52 | ||
|
|
ccd3610c76 | ||
|
|
090b2afb63 | ||
|
|
823386edf2 | ||
|
|
5ecf131061 | ||
|
|
dfbb93f438 | ||
|
|
b0c133ba40 | ||
|
|
680a155294 | ||
|
|
26e2c8b9a7 | ||
|
|
b26dd5bbee | ||
|
|
9ea138003c | ||
|
|
5d62c8ec14 | ||
|
|
2e284d9667 | ||
|
|
7ffcf3f235 | ||
|
|
ad2eb19325 | ||
|
|
99b0a24d48 | ||
|
|
e5867813ab | ||
|
|
b0e1210f34 | ||
|
|
049b02835b | ||
|
|
6cf4ae89e3 | ||
|
|
8a6ca3b2eb | ||
|
|
25051ee802 |
@@ -4,6 +4,7 @@
|
||||
- [x] Product category tree
|
||||
- [x] Category characteristics list
|
||||
- [x] Characteristics value directory
|
||||
- [x] Search characteristics value directory
|
||||
|
||||
## Uploading and updating products
|
||||
- [x] Create or update a product
|
||||
|
||||
11
client.go
11
client.go
@@ -37,17 +37,20 @@ func NewMockClient(handler http.HandlerFunc) *Client {
|
||||
}
|
||||
|
||||
func (c Client) newRequest(ctx context.Context, method string, uri string, body interface{}) (*http.Request, error) {
|
||||
var err error
|
||||
var bodyJson []byte
|
||||
|
||||
// Set default values for empty fields if `default` tag is present
|
||||
// And body is not nil
|
||||
if body != nil {
|
||||
if err := getDefaultValues(reflect.ValueOf(body)); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
bodyJson, err := json.Marshal(body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
bodyJson, err = json.Marshal(body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
uri, err = url.JoinPath(c.baseUrl, uri)
|
||||
|
||||
42
core.go
42
core.go
@@ -5,6 +5,7 @@ import (
|
||||
"net/http"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
@@ -162,3 +163,44 @@ func TimeFromString(t *testing.T, format, datetime string) time.Time {
|
||||
}
|
||||
return dt
|
||||
}
|
||||
|
||||
const ShortDateLayout = "2006-01-02"
|
||||
|
||||
// Do not use this structure for responses
|
||||
// as there are no ways to unmarshal to any layout
|
||||
// and leave nil if json field is null
|
||||
type TimeFormat struct {
|
||||
time.Time
|
||||
layout string
|
||||
}
|
||||
|
||||
func NewTimeFormat(t time.Time, layout string) *TimeFormat {
|
||||
return &TimeFormat{
|
||||
Time: t,
|
||||
layout: layout,
|
||||
}
|
||||
}
|
||||
|
||||
func newTimeLayout(layout string) *TimeFormat {
|
||||
return &TimeFormat{
|
||||
layout: layout,
|
||||
}
|
||||
}
|
||||
|
||||
func (rd *TimeFormat) UnmarshalJSON(b []byte) error {
|
||||
var err error
|
||||
|
||||
s := strings.Trim(string(b), `"`) // remove quotes
|
||||
|
||||
// Added for extra accuracy
|
||||
// encoding/json won't invoke this method if field is null
|
||||
if s == "null" {
|
||||
return nil
|
||||
}
|
||||
rd.Time, err = time.Parse(rd.layout, s)
|
||||
return err
|
||||
}
|
||||
|
||||
func (rd *TimeFormat) MarshalJSON() ([]byte, error) {
|
||||
return []byte(fmt.Sprintf(`%q`, rd.Time.Format(rd.layout))), nil
|
||||
}
|
||||
|
||||
96
core_test.go
96
core_test.go
@@ -1,8 +1,10 @@
|
||||
package core
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"reflect"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
@@ -54,3 +56,97 @@ func TestDefaultValues(t *testing.T) {
|
||||
assert.Equal(t, "empty_string", req.OptionalStructure.EmptyField)
|
||||
assert.Equal(t, (*DefaultStructure)(nil), req.EmptyOptionalStructure)
|
||||
}
|
||||
|
||||
func TestTimeFormat(t *testing.T) {
|
||||
t.Run("Time Format Marshalling", func(t *testing.T) {
|
||||
tests := []struct {
|
||||
ft *TimeFormat
|
||||
layout string
|
||||
expectedJSON string
|
||||
diff time.Duration
|
||||
}{
|
||||
{
|
||||
ft: NewTimeFormat(time.Date(2024, 4, 30, 15, 42, 12, 55, time.FixedZone("Test Zone", 0)), ShortDateLayout),
|
||||
layout: ShortDateLayout,
|
||||
expectedJSON: `"2024-04-30"`,
|
||||
diff: time.Hour * 24,
|
||||
},
|
||||
{
|
||||
ft: NewTimeFormat(time.Date(2024, 4, 30, 0, 0, 0, 0, time.FixedZone("Test Zone", 0)), ShortDateLayout),
|
||||
layout: ShortDateLayout,
|
||||
expectedJSON: `"2024-04-30"`,
|
||||
diff: time.Hour * 24,
|
||||
},
|
||||
{
|
||||
ft: NewTimeFormat(time.Time{}, ShortDateLayout),
|
||||
layout: ShortDateLayout,
|
||||
expectedJSON: `"0001-01-01"`,
|
||||
diff: time.Hour * 24,
|
||||
},
|
||||
{
|
||||
ft: nil,
|
||||
layout: ShortDateLayout,
|
||||
expectedJSON: `null`,
|
||||
diff: time.Hour * 24,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
marshaled, err := json.Marshal(tc.ft)
|
||||
assert.Equal(t, nil, err)
|
||||
assert.Equal(t, tc.expectedJSON, string(marshaled))
|
||||
|
||||
unmarshaled := newTimeLayout(tc.layout)
|
||||
err = json.Unmarshal(marshaled, unmarshaled)
|
||||
assert.Equal(t, nil, err)
|
||||
|
||||
if tc.ft != nil {
|
||||
diffedTime := tc.ft.Add(-tc.diff)
|
||||
assert.Equal(t, true, diffedTime.Before(unmarshaled.Time) || diffedTime.Equal(unmarshaled.Time))
|
||||
assert.Equal(t, true, tc.ft.After(unmarshaled.Time) || tc.ft.Equal(unmarshaled.Time))
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("Time Format in structure Marshalling", func(t *testing.T) {
|
||||
type test struct {
|
||||
Date *TimeFormat `json:"date"`
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
structure *test
|
||||
layout string
|
||||
expectedJSON string
|
||||
diff time.Duration
|
||||
}{
|
||||
{
|
||||
structure: &test{Date: NewTimeFormat(time.Date(2024, 4, 30, 5, 4, 7, 20, time.FixedZone("Test Zone", 0)), ShortDateLayout)},
|
||||
layout: ShortDateLayout,
|
||||
expectedJSON: `{"date":"2024-04-30"}`,
|
||||
diff: time.Hour * 24,
|
||||
},
|
||||
{
|
||||
structure: &test{Date: nil},
|
||||
layout: ShortDateLayout,
|
||||
expectedJSON: `{"date":null}`,
|
||||
diff: time.Hour * 24,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
marshaled, err := json.Marshal(tc.structure)
|
||||
assert.Equal(t, nil, err)
|
||||
assert.Equal(t, tc.expectedJSON, string(marshaled))
|
||||
|
||||
unmarshaled := &test{Date: newTimeLayout(tc.layout)}
|
||||
err = json.Unmarshal(marshaled, unmarshaled)
|
||||
assert.Equal(t, nil, err)
|
||||
|
||||
if tc.structure != nil && tc.structure.Date != nil {
|
||||
diffedTime := tc.structure.Date.Add(-tc.diff)
|
||||
assert.Equal(t, true, diffedTime.Before(unmarshaled.Date.Time) || diffedTime.Equal(unmarshaled.Date.Time))
|
||||
assert.Equal(t, true, tc.structure.Date.After(unmarshaled.Date.Time) || tc.structure.Date.Equal(unmarshaled.Date.Time))
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ package ozon
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
core "github.com/diphantxm/ozon-api-client"
|
||||
)
|
||||
@@ -14,10 +13,10 @@ type Analytics struct {
|
||||
|
||||
type GetAnalyticsDataParams struct {
|
||||
// Date from which the data will be in the report
|
||||
DateFrom time.Time `json:"date_from"`
|
||||
DateFrom *core.TimeFormat `json:"date_from"`
|
||||
|
||||
// Date up to which the data will be in the report
|
||||
DateTo time.Time `json:"date_to"`
|
||||
DateTo *core.TimeFormat `json:"date_to"`
|
||||
|
||||
// Items Enum: "unknownDimension" "sku" "spu" "day" "week" "month" "year" "category1" "category2" "category3" "category4" "brand" "modelID"
|
||||
// Data grouping available to all sellers:
|
||||
@@ -164,7 +163,7 @@ type GetStocksOnWarehousesParams struct {
|
||||
// Number of elements that will be skipped in the response. For example, if `offset=10`, the response will start with the 11th element found
|
||||
Offset int64 `json:"offset"`
|
||||
|
||||
// Warehouse type filter:
|
||||
// Warehouse type filter
|
||||
WarehouseType WarehouseType `json:"warehouse_type" default:"ALL"`
|
||||
}
|
||||
|
||||
@@ -201,6 +200,9 @@ type GetStocksOnWarehousesResultRow struct {
|
||||
|
||||
// Name of the warehouse where the products are stored
|
||||
WarehouseName string `json:"warehouse_name"`
|
||||
|
||||
// Number of days the stock will last based on your average daily sales
|
||||
IDC float64 `json:"idc"`
|
||||
}
|
||||
|
||||
// Report on stocks and products movement at Ozon warehouses
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"net/http"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
core "github.com/diphantxm/ozon-api-client"
|
||||
)
|
||||
@@ -22,8 +23,8 @@ func TestGetAnalyticsData(t *testing.T) {
|
||||
http.StatusOK,
|
||||
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||
&GetAnalyticsDataParams{
|
||||
DateFrom: core.TimeFromString(t, "2006-01-02", "2020-09-01"),
|
||||
DateTo: core.TimeFromString(t, "2006-01-02", "2021-10-15"),
|
||||
DateFrom: core.NewTimeFormat(time.Now().Add(time.Duration(30)*24*time.Hour), core.ShortDateLayout),
|
||||
DateTo: core.NewTimeFormat(time.Now(), core.ShortDateLayout),
|
||||
Dimension: []GetAnalyticsDataDimension{SKUDimension, DayDimension},
|
||||
Metrics: []GetAnalyticsDataFilterMetric{HistViewPDP},
|
||||
Sort: []GetAnalyticsDataSort{
|
||||
|
||||
@@ -113,15 +113,15 @@ type ListCancellationsParams struct {
|
||||
|
||||
type ListCancellationsFilter struct {
|
||||
// Filter by cancellation initiator
|
||||
CancellationInitiator []string `json:"cancellation_initiator"`
|
||||
CancellationInitiator []string `json:"cancellation_initiator,omitempty"`
|
||||
|
||||
// Filter by shipment number.
|
||||
//
|
||||
// Optional parameter. You can pass several values here
|
||||
PostingNumber string `json:"posting_number"`
|
||||
PostingNumber string `json:"posting_number,omitempty"`
|
||||
|
||||
// Filter by cancellation request status
|
||||
State string `json:"state"`
|
||||
State string `json:"state,omitempty"`
|
||||
}
|
||||
|
||||
type ListCancellationWith struct {
|
||||
|
||||
@@ -224,3 +224,63 @@ func (c *Categories) AttributesDictionary(ctx context.Context, params *GetAttrib
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
type SearchAttributeDictionaryParams struct {
|
||||
// Characteristics identifier
|
||||
AttributeId int64 `json:"attribute_id"`
|
||||
|
||||
// Category identifier
|
||||
DescriptionCategoryId int64 `json:"description_category_id"`
|
||||
|
||||
// The value to be searched for
|
||||
// - minimum—2 characters
|
||||
Value string `json:"value"`
|
||||
|
||||
// Number of values in the response:
|
||||
//
|
||||
// - maximum—100,
|
||||
// - minimum—1.
|
||||
Limit int64 `json:"limit,omitempty"`
|
||||
|
||||
// Product type identifier
|
||||
TypeId int64 `json:"type_id"`
|
||||
}
|
||||
|
||||
type SearchAttributeDictionaryResponse struct {
|
||||
core.CommonResponse
|
||||
|
||||
// Characteristic values
|
||||
Result []SearchAttributeDictionaryResult `json:"result"`
|
||||
}
|
||||
|
||||
type SearchAttributeDictionaryResult struct {
|
||||
// Characteristic value identifier
|
||||
Id int64 `json:"id"`
|
||||
|
||||
// Additional description
|
||||
Info string `json:"info"`
|
||||
|
||||
// Image link
|
||||
Picture string `json:"picture"`
|
||||
|
||||
// Product characteristic value
|
||||
Value string `json:"value"`
|
||||
}
|
||||
|
||||
// Returns found characteristics value directory.
|
||||
//
|
||||
// To check if an attribute has a nested directory,
|
||||
// use the `/v1/description-category/attribute` method.
|
||||
func (c *Categories) SearchAttributesDictionary(ctx context.Context, params *SearchAttributeDictionaryParams) (*SearchAttributeDictionaryResponse, error) {
|
||||
url := "/v1/description-category/attribute/values/search"
|
||||
|
||||
resp := &SearchAttributeDictionaryResponse{}
|
||||
|
||||
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
response.CopyCommonResponse(&resp.CommonResponse)
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
@@ -203,3 +203,71 @@ func TestGetAttributeDictionary(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestSearchAttributeDictionary(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
tests := []struct {
|
||||
statusCode int
|
||||
headers map[string]string
|
||||
params *SearchAttributeDictionaryParams
|
||||
response string
|
||||
}{
|
||||
// Test Ok
|
||||
{
|
||||
http.StatusOK,
|
||||
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||
&SearchAttributeDictionaryParams{
|
||||
AttributeId: 123456,
|
||||
DescriptionCategoryId: 12,
|
||||
Value: "34",
|
||||
Limit: 5,
|
||||
TypeId: 6,
|
||||
},
|
||||
`{
|
||||
"has_next": true,
|
||||
"result": [
|
||||
{
|
||||
"id": 0,
|
||||
"info": "string",
|
||||
"picture": "string",
|
||||
"value": "string"
|
||||
}
|
||||
]
|
||||
}`,
|
||||
},
|
||||
// Test No Client-Id or Api-Key
|
||||
{
|
||||
http.StatusUnauthorized,
|
||||
map[string]string{},
|
||||
&SearchAttributeDictionaryParams{},
|
||||
`{
|
||||
"code": 16,
|
||||
"message": "Client-Id and Api-Key headers are required"
|
||||
}`,
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||
|
||||
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||
resp, err := c.Categories().SearchAttributesDictionary(ctx, test.params)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
continue
|
||||
}
|
||||
|
||||
compareJsonResponse(t, test.response, &GetAttributeDictionaryResponse{})
|
||||
|
||||
if resp.StatusCode != test.statusCode {
|
||||
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||
}
|
||||
|
||||
if resp.StatusCode == http.StatusOK {
|
||||
if len(resp.Result) > int(test.params.Limit) {
|
||||
t.Errorf("Length of response result is bigger than limit")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ type ListChatsResponse struct {
|
||||
core.CommonResponse
|
||||
|
||||
// Chats data
|
||||
Chats []ListChatsChat `json:"chats"`
|
||||
Chats []ListChatsChatData `json:"chats"`
|
||||
|
||||
// Total number of chats
|
||||
TotalChatsCount int64 `json:"total_chats_count"`
|
||||
@@ -48,20 +48,6 @@ type ListChatsResponse struct {
|
||||
TotalUnreadCount int64 `json:"total_unread_count"`
|
||||
}
|
||||
|
||||
type ListChatsChat struct {
|
||||
// Chat data
|
||||
Chat ListChatsChatData `json:"chat"`
|
||||
|
||||
// Identifier of the first unread chat message
|
||||
FirstUnreadMessageId string `json:"first_unread_message_id"`
|
||||
|
||||
// Identifier of the last message in the chat
|
||||
LastMessageId string `json:"last_message_id"`
|
||||
|
||||
// Number of unread messages in the chat
|
||||
UnreadCount int64 `json:"unread_count"`
|
||||
}
|
||||
|
||||
type ListChatsChatData struct {
|
||||
// Chat identifier
|
||||
ChatId string `json:"chat_id"`
|
||||
@@ -79,6 +65,15 @@ type ListChatsChatData struct {
|
||||
|
||||
// Chat creation date
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
|
||||
// Identifier of the first unread chat message
|
||||
FirstUnreadMessageId uint64 `json:"first_unread_message_id"`
|
||||
|
||||
// Identifier of the last message in the chat
|
||||
LastMessageId uint64 `json:"last_message_id"`
|
||||
|
||||
// Number of unread messages in the chat
|
||||
UnreadCount int64 `json:"unread_count"`
|
||||
}
|
||||
|
||||
// Returns information about chats by specified filters
|
||||
@@ -386,7 +381,7 @@ func (c Chats) Create(ctx context.Context, params *CreateNewChatParams) (*Create
|
||||
|
||||
type MarkAsReadParams struct {
|
||||
// Chat identifier
|
||||
Chatid string `json:"chat_id"`
|
||||
ChatId string `json:"chat_id"`
|
||||
|
||||
// Message identifier
|
||||
FromMessageId uint64 `json:"from_message_id"`
|
||||
|
||||
@@ -32,15 +32,13 @@ func TestListChats(t *testing.T) {
|
||||
`{
|
||||
"chats": [
|
||||
{
|
||||
"chat": {
|
||||
"created_at": "2022-07-22T08:07:19.581Z",
|
||||
"chat_id": "5e767w03-b400-4y1b-a841-75319ca8a5c8",
|
||||
"chat_status": "Opened",
|
||||
"chat_type": "Seller_Support"
|
||||
},
|
||||
"first_unread_message_id": "3000000000118021931",
|
||||
"last_message_id": "30000000001280042740",
|
||||
"unread_count": 1
|
||||
"chat_id": "5e767w03-b400-4y1b-a841-75319ca8a5c8",
|
||||
"chat_status": "Opened",
|
||||
"chat_type": "Seller_Support",
|
||||
"created_at": "2022-07-22T08:07:19.581Z",
|
||||
"unread_count": 1,
|
||||
"last_message_id": 3000000000128004274,
|
||||
"first_unread_message_id": 3000000000118021931
|
||||
}
|
||||
],
|
||||
"total_chats_count": 25,
|
||||
@@ -77,10 +75,10 @@ func TestListChats(t *testing.T) {
|
||||
|
||||
if resp.StatusCode == http.StatusOK {
|
||||
if len(resp.Chats) > 0 {
|
||||
if resp.Chats[0].Chat.ChatStatus == "" {
|
||||
if resp.Chats[0].ChatStatus == "" {
|
||||
t.Errorf("Chat status cannot be empty")
|
||||
}
|
||||
if resp.Chats[0].Chat.ChatType == "" {
|
||||
if resp.Chats[0].ChatType == "" {
|
||||
t.Errorf("Chat type cannot be empty")
|
||||
}
|
||||
}
|
||||
@@ -400,7 +398,7 @@ func TestMarkAsRead(t *testing.T) {
|
||||
http.StatusOK,
|
||||
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||
&MarkAsReadParams{
|
||||
Chatid: "99feb3fc-a474-469f-95d5-268b470cc607",
|
||||
ChatId: "99feb3fc-a474-469f-95d5-268b470cc607",
|
||||
FromMessageId: 3000000000118032000,
|
||||
},
|
||||
`{
|
||||
|
||||
177
ozon/common.go
177
ozon/common.go
@@ -1,6 +1,8 @@
|
||||
package ozon
|
||||
|
||||
import "time"
|
||||
import (
|
||||
"time"
|
||||
)
|
||||
|
||||
const (
|
||||
testTimeout = 5 * time.Second
|
||||
@@ -91,16 +93,16 @@ const (
|
||||
Purchased ListDiscountRequestsStatus = "PURCHASED"
|
||||
)
|
||||
|
||||
type WorkingDay string
|
||||
type WorkingDay int
|
||||
|
||||
const (
|
||||
Mon WorkingDay = "1"
|
||||
Tue WorkingDay = "2"
|
||||
Wed WorkingDay = "3"
|
||||
Thu WorkingDay = "4"
|
||||
Fri WorkingDay = "5"
|
||||
Sat WorkingDay = "6"
|
||||
Sun WorkingDay = "7"
|
||||
Mon WorkingDay = 1
|
||||
Tue WorkingDay = 2
|
||||
Wed WorkingDay = 3
|
||||
Thu WorkingDay = 4
|
||||
Fri WorkingDay = 5
|
||||
Sat WorkingDay = 6
|
||||
Sun WorkingDay = 7
|
||||
)
|
||||
|
||||
type GetAnalyticsDataDimension string
|
||||
@@ -124,24 +126,6 @@ const (
|
||||
type SupplyRequestState string
|
||||
|
||||
const (
|
||||
// request draft. Only for supplies via vDC
|
||||
Draft SupplyRequestState = "DRAFT"
|
||||
|
||||
// selecting supply options. Only for supplies via vDC
|
||||
SupplyVariantsArranging SupplyRequestState = "SUPPLY_VARIANTS_ARRANGING"
|
||||
|
||||
// no supply options, the request is archived. Only for supplies via vDC
|
||||
HasNoSupplyVariantsArchive SupplyRequestState = "HAS_NO_SUPPLY_VARIANTS_ARCHIVE"
|
||||
|
||||
// no supply options. Only for supplies via vDC
|
||||
HasNoSupplyVariantsNew SupplyRequestState = "HAS_NO_SUPPLY_VARIANTS_NEW"
|
||||
|
||||
// supply being approved. Only for supplies via vDC
|
||||
SupplyVariantsConfirmation SupplyRequestState = "SUPPLY_VARIANTS_CONFIRMATION"
|
||||
|
||||
// time reservation
|
||||
TimeslotBooking SupplyRequestState = "TIMESLOT_BOOKING"
|
||||
|
||||
// filling in the data
|
||||
DATA_FILLING SupplyRequestState = "DATA_FILLING"
|
||||
|
||||
@@ -461,11 +445,14 @@ const (
|
||||
type GetFBSReturnsFilterStatus string
|
||||
|
||||
const (
|
||||
Moving GetFBSReturnsFilterStatus = "moving"
|
||||
ReturnedToSeller GetFBSReturnsFilterStatus = "returned_to_seller"
|
||||
WaitingForSeller GetFBSReturnsFilterStatus = "waiting_for_seller"
|
||||
AcceptedFromCustomer GetFBSReturnsFilterStatus = "accepted_from_customer"
|
||||
CancelledWithCompensation GetFBSReturnsFilterStatus = "cancelled_with_compensation"
|
||||
ReadyForShipment GetFBSReturnsFilterStatus = "ready_for_shipment"
|
||||
Disposing GetFBSReturnsFilterStatus = "disposing"
|
||||
Disposed GetFBSReturnsFilterStatus = "disposed"
|
||||
)
|
||||
|
||||
type GetFBOReturnsFilterStatus string
|
||||
@@ -684,3 +671,139 @@ const (
|
||||
// Check is failed
|
||||
MandatoryMarkStatusFailed MandatoryMarkStatus = "failed"
|
||||
)
|
||||
|
||||
type GetCarriageStatus string
|
||||
|
||||
const (
|
||||
// acceptance in progress
|
||||
GetCarriageStatusReceived GetCarriageStatus = "received"
|
||||
|
||||
// closed after acceptance
|
||||
GetCarriageStatusClosed GetCarriageStatus = "closed"
|
||||
|
||||
GetCarriageStatusSended GetCarriageStatus = "sended"
|
||||
|
||||
GetCarriageStatusCancelled GetCarriageStatus = "cancelled"
|
||||
)
|
||||
|
||||
type TransactionOperationService string
|
||||
|
||||
const (
|
||||
// return of unclaimed products from the customer to the warehouse
|
||||
TransactionNotDelivered TransactionOperationService = "MarketplaceNotDeliveredCostItem"
|
||||
|
||||
// return from the customer to the warehouse after delivery
|
||||
TransactionReturnAfterDelivery TransactionOperationService = "TransactionOperationServiceNotDelivered"
|
||||
|
||||
// product delivery to the customer
|
||||
TransactionDelivery TransactionOperationService = "MarketplaceDeliveryCostItem"
|
||||
|
||||
// purchasing reviews on the platform
|
||||
TransactionSaleReviews TransactionOperationService = "MarketplaceSaleReviewsItem"
|
||||
|
||||
// products delivery to the Ozon warehouse (cross docking)
|
||||
TransactionItemAdForSupplierLogistic TransactionOperationService = "ItemAdvertisementForSupplierLogistic"
|
||||
|
||||
// product placement service
|
||||
TransactionServiceStorageItem TransactionOperationService = "OperationMarketplaceServiceStorage"
|
||||
|
||||
// products promotion
|
||||
TransactionMarketingActionCost TransactionOperationService = "MarketplaceMarketingActionCostItem"
|
||||
|
||||
// promotion and selling on an instalment plan
|
||||
TransactionServiceItemInstallment TransactionOperationService = "MarketplaceServiceItemInstallment"
|
||||
|
||||
// mandatory products labeling
|
||||
TransactionServiceMarkingItems TransactionOperationService = "MarketplaceServiceItemMarkingItems"
|
||||
|
||||
// flexible payment schedule
|
||||
TransactionServiceFlexiblePaymentSchedule TransactionOperationService = "MarketplaceServiceItemFlexiblePaymentSchedule"
|
||||
|
||||
// picking up products for removal by the seller
|
||||
TransactionServiceReturnFromStock TransactionOperationService = "MarketplaceServiceItemReturnFromStock"
|
||||
|
||||
// forwarding trade
|
||||
TransactionItemAdForSupplierLogisticSeller TransactionOperationService = "ItemAdvertisementForSupplierLogisticSeller"
|
||||
|
||||
// last mile
|
||||
TransactionServiceDeliveryToCustomer TransactionOperationService = "MarketplaceServiceItemDelivToCustomer"
|
||||
|
||||
// pipeline
|
||||
TransactionServiceDirectFlowTrans TransactionOperationService = "MarketplaceServiceItemDirectFlowTrans"
|
||||
|
||||
// shipment processing
|
||||
TransactionServiceDropoffFF TransactionOperationService = "MarketplaceServiceItemDropoffFF"
|
||||
|
||||
// shipment processing
|
||||
TransactionServiceDropoffPVZ TransactionOperationService = "MarketplaceServiceItemDropoffPVZ"
|
||||
|
||||
// shipment processing
|
||||
TransactionServiceDropoffSC TransactionOperationService = "MarketplaceServiceItemDropoffSC"
|
||||
|
||||
// order packaging
|
||||
TransactionServiceFulfillment TransactionOperationService = "MarketplaceServiceItemFulfillment"
|
||||
|
||||
// picking products up by car from the seller's address (Pick-up)
|
||||
TransactionServicePickup TransactionOperationService = "MarketplaceServiceItemPickup"
|
||||
|
||||
// return processing
|
||||
TransactionServiceReturnAfterDelivToCustomer TransactionOperationService = "MarketplaceServiceItemReturnAfterDelivToCustomer"
|
||||
|
||||
// reverse pipeline
|
||||
TransactionServiceReturnFlowTrans TransactionOperationService = "MarketplaceServiceItemReturnFlowTrans"
|
||||
|
||||
// cancellation processing
|
||||
TransactionServiceReturnNotDelivToCustomer TransactionOperationService = "MarketplaceServiceItemReturnNotDelivToCustomer"
|
||||
|
||||
// unredeemed order processing
|
||||
TransactionServiceReturnPartGoodsCustomer TransactionOperationService = "MarketplaceServiceItemReturnPartGoodsCustomer"
|
||||
|
||||
// acquiring payment
|
||||
TransactionRedistributionOfAcquiringOperation TransactionOperationService = "MarketplaceRedistributionOfAcquiringOperation"
|
||||
|
||||
// FBS return short-term placement
|
||||
TransactionServiceAtPickupPointFBS TransactionOperationService = "MarketplaceReturnStorageServiceAtThePickupPointFbsItem"
|
||||
|
||||
// FBS return long-term placement
|
||||
TransactionServiceInWarehouseFBS TransactionOperationService = "MarketplaceReturnStorageServiceInTheWarehouseFbsItem"
|
||||
|
||||
// bulky products delivery
|
||||
TransactionServiceDeliveryKGT TransactionOperationService = "MarketplaceServiceItemDeliveryKGT"
|
||||
|
||||
// logistics
|
||||
TransactionServiceDirectFlowLogistic TransactionOperationService = "MarketplaceServiceItemDirectFlowLogistic"
|
||||
|
||||
// reverse logistics
|
||||
TransactionServiceReturnFlowLogistic TransactionOperationService = "MarketplaceServiceItemReturnFlowLogistic"
|
||||
|
||||
// "Seller's Bonus" promotion service
|
||||
TransactionServicePremiumCashbackIndPoints TransactionOperationService = "MarketplaceServicePremiumCashbackIndividualPoints"
|
||||
|
||||
// Premium promotion service, fixed commission
|
||||
TransactionServicePremiumPromotion TransactionOperationService = "MarketplaceServicePremiumPromotion"
|
||||
|
||||
// withholding for product shortage
|
||||
TransactionServiceWithHoldingForUndeliverableGoods TransactionOperationService = "OperationMarketplaceWithHoldingForUndeliverableGoods"
|
||||
|
||||
// drop-off service at the pick-up point
|
||||
TransactionServiceDropoffPPZ TransactionOperationService = "MarketplaceServiceItemDropoffPPZ"
|
||||
|
||||
// reissue of returns at the pick-up point
|
||||
TransactionServiceRedistributionReturnsPVZ TransactionOperationService = "MarketplaceServiceItemRedistributionReturnsPVZ"
|
||||
|
||||
// Agregator 3PL Globalagency service tariffication
|
||||
TransactionServiceAgencyFeeAggregator3PLGlobal TransactionOperationService = "OperationMarketplaceAgencyFeeAggregator3PLGlobal "
|
||||
)
|
||||
|
||||
type PaymentTypeGroupName string
|
||||
|
||||
const (
|
||||
PaymentTypeGroupByCardOnline PaymentTypeGroupName = "by card online"
|
||||
PaymentTypeGroupOzonCard PaymentTypeGroupName = "Ozon Card"
|
||||
PaymentTypeGroupOzonCardAtCheckout PaymentTypeGroupName = "Ozon Card at checkout"
|
||||
PaymentTypeGroupBySavedBankCardUponPickup PaymentTypeGroupName = "by saved bank card upon pick-up"
|
||||
PaymentTypeGroupFasterPaymentSystem PaymentTypeGroupName = "Faster payment system"
|
||||
PaymentTypeGroupOzonInstallment PaymentTypeGroupName = "Ozon Installment"
|
||||
PaymentTypeGroupPaymentToCurrentAccount PaymentTypeGroupName = "payment to current account"
|
||||
PaymentTypeGroupSberpay PaymentTypeGroupName = "Sberpay"
|
||||
)
|
||||
|
||||
10
ozon/fbo.go
10
ozon/fbo.go
@@ -14,7 +14,7 @@ type FBO struct {
|
||||
|
||||
type GetFBOShipmentsListParams struct {
|
||||
// Sorting direction
|
||||
Direction string `json:"dir,omitempty"`
|
||||
Direction Order `json:"dir,omitempty"`
|
||||
|
||||
// Shipment search filter
|
||||
Filter GetFBOShipmentsListFilter `json:"filter"`
|
||||
@@ -35,13 +35,13 @@ type GetFBOShipmentsListParams struct {
|
||||
// Shipment search filter
|
||||
type GetFBOShipmentsListFilter struct {
|
||||
// Period start in YYYY-MM-DD format
|
||||
Since time.Time `json:"since"`
|
||||
Since *core.TimeFormat `json:"since,omitempty"`
|
||||
|
||||
// Shipment status
|
||||
Status string `json:"status"`
|
||||
Status string `json:"status,omitempty"`
|
||||
|
||||
// Period end in YYYY-MM-DD format
|
||||
To time.Time `json:"to"`
|
||||
To *core.TimeFormat `json:"to,omitempty"`
|
||||
}
|
||||
|
||||
// Additional fields to add to the response
|
||||
@@ -116,7 +116,7 @@ type GetFBOShipmentsListResultAnalyticsData struct {
|
||||
IsPremium bool `json:"is_premium"`
|
||||
|
||||
// Payment method
|
||||
PaymentTypeGroupName string `json:"payment_type_group_name"`
|
||||
PaymentTypeGroupName PaymentTypeGroupName `json:"payment_type_group_name"`
|
||||
|
||||
// Delivery region
|
||||
Region string `json:"region"`
|
||||
|
||||
@@ -24,9 +24,9 @@ func TestGetFBOShipmentsList(t *testing.T) {
|
||||
&GetFBOShipmentsListParams{
|
||||
Direction: "ASC",
|
||||
Filter: GetFBOShipmentsListFilter{
|
||||
Since: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-01T00:00:00.000Z"),
|
||||
Since: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-01T00:00:00.000Z"), "2006-01-02T15:04:05Z"),
|
||||
Status: "awaiting_packaging",
|
||||
To: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-17T10:44:12.828Z"),
|
||||
To: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-17T10:44:12.828Z"), "2006-01-02T15:04:05Z"),
|
||||
},
|
||||
Limit: 5,
|
||||
Offset: 0,
|
||||
|
||||
55
ozon/fbs.go
55
ozon/fbs.go
@@ -37,18 +37,18 @@ type ListUnprocessedShipmentsFilter struct {
|
||||
// Filter by the time by which the seller should pack the order. Period start.
|
||||
//
|
||||
// Format: YYYY-MM-DDThh: mm:ss. mcsZ. Example: 2020-03-18T07:34:50.359 Z
|
||||
CutoffFrom time.Time `json:"cutoff_from"`
|
||||
CutoffFrom *core.TimeFormat `json:"cutoff_from,omitempty"`
|
||||
|
||||
// Filter by the time by which the seller should pack the order. Period end.
|
||||
//
|
||||
// Format: YYYY-MM-DDThh: mm:ss. mcsZ. Example: 2020-03-18T07:34:50.359 Z
|
||||
CutoffTo time.Time `json:"cutoff_to"`
|
||||
CutoffTo *core.TimeFormat `json:"cutoff_to,omitempty"`
|
||||
|
||||
// Minimum date when shipment should be handed over for delivery
|
||||
DeliveringDateFrom time.Time `json:"delivering_date_from"`
|
||||
DeliveringDateFrom *core.TimeFormat `json:"delivering_date_from,omitempty"`
|
||||
|
||||
// Maximum date when shipment should be handed over for delivery
|
||||
DeliveringDateTo time.Time `json:"delivering_date_to"`
|
||||
DeliveringDateTo *core.TimeFormat `json:"delivering_date_to,omitempty"`
|
||||
|
||||
// Delivery method identifier
|
||||
DeliveryMethodId []int64 `json:"delivery_method_id"`
|
||||
@@ -58,7 +58,7 @@ type ListUnprocessedShipmentsFilter struct {
|
||||
// Default value is all.
|
||||
//
|
||||
// The FBP scheme is available only for sellers from China
|
||||
FBPFilter FBPFilter `json:"fbpFilter"`
|
||||
FBPFilter FBPFilter `json:"fbpFilter" default:"all"`
|
||||
|
||||
// Delivery service identifier
|
||||
ProviderId []int64 `json:"provider_id"`
|
||||
@@ -213,7 +213,7 @@ type FBSPostingAnalyticsData struct {
|
||||
IsPremium bool `json:"is_premium"`
|
||||
|
||||
// Payment method
|
||||
PaymentTypeGroupName string `json:"payment_type_group_name"`
|
||||
PaymentTypeGroupName PaymentTypeGroupName `json:"payment_type_group_name"`
|
||||
|
||||
// Delivery region
|
||||
Region string `json:"region"`
|
||||
@@ -350,9 +350,6 @@ type FBSCustomer struct {
|
||||
// Delivery address details
|
||||
Address FBSCustomerAddress `json:"address"`
|
||||
|
||||
// Customer e-mail
|
||||
CustomerEmail string `json:"customer_email"`
|
||||
|
||||
// Customer identifier
|
||||
CustomerId int64 `json:"customer_id"`
|
||||
|
||||
@@ -361,7 +358,7 @@ type FBSCustomer struct {
|
||||
|
||||
// Customer phone number.
|
||||
//
|
||||
// Returns an empty string
|
||||
// Returns an empty string ""
|
||||
Phone string `json:"phone"`
|
||||
}
|
||||
|
||||
@@ -452,6 +449,8 @@ type FinancialDataProduct struct {
|
||||
CommissionsCurrencyCode string `json:"commissions_currency_code"`
|
||||
|
||||
// Services
|
||||
//
|
||||
// Deprecated: The parameter is outdated. To get information on accruals, use the `ListTransactions` method
|
||||
ItemServices MarketplaceServices `json:"item_services"`
|
||||
|
||||
// Currency of your prices. It matches the currency set in the personal account settings
|
||||
@@ -511,7 +510,7 @@ func (c FBS) ListUnprocessedShipments(ctx context.Context, params *ListUnprocess
|
||||
|
||||
type GetFBSShipmentsListParams struct {
|
||||
// Sorting direction
|
||||
Direction string `json:"dir,omitempty"`
|
||||
Direction Order `json:"dir,omitempty"`
|
||||
|
||||
// Filter
|
||||
Filter GetFBSShipmentsListFilter `json:"filter"`
|
||||
@@ -532,12 +531,12 @@ type GetFBSShipmentsListFilter struct {
|
||||
// Delivery method identifier
|
||||
DeliveryMethodId []int64 `json:"delivery_method_id"`
|
||||
|
||||
// Filter for shipments delivered from partner warehouse (FBP). You can pass one of the following values:
|
||||
// Filter for shipments delivered from partner warehouse (FBP)
|
||||
//
|
||||
// Default value is all.
|
||||
//
|
||||
// The FBP scheme is available only for sellers from China
|
||||
FBPFilter FBPFilter `json:"fbpFilter"`
|
||||
FBPFilter FBPFilter `json:"fbpFilter" default:"all"`
|
||||
|
||||
// Order identifier
|
||||
OrderId int64 `json:"order_id"`
|
||||
@@ -564,6 +563,13 @@ type GetFBSShipmentsListFilter struct {
|
||||
|
||||
// Warehouse identifier
|
||||
WarehouseId []int64 `json:"warehouse_id"`
|
||||
|
||||
LastChangedStatusDate GetFBSShipmentsListFilterLastChangeDate `json:"last_changed_status_date"`
|
||||
}
|
||||
|
||||
type GetFBSShipmentsListFilterLastChangeDate struct {
|
||||
From time.Time `json:"from"`
|
||||
To time.Time `json:"to"`
|
||||
}
|
||||
|
||||
type GetFBSShipmentsListWith struct {
|
||||
@@ -1007,7 +1013,9 @@ type GetShipmentDataByIdentifierResultAddressee struct {
|
||||
// Recipient name
|
||||
Name string `json:"name"`
|
||||
|
||||
// Recipient phone number
|
||||
// Recipient phone number.
|
||||
//
|
||||
// Returns an empty string ""
|
||||
Phone string `json:"phone"`
|
||||
}
|
||||
|
||||
@@ -1062,6 +1070,8 @@ type GetShipmentDataByIdentifierResultCourier struct {
|
||||
Name string `json:"name"`
|
||||
|
||||
// Courier's phone number
|
||||
//
|
||||
// Returns an empty string ""
|
||||
Phone string `json:"phone"`
|
||||
}
|
||||
|
||||
@@ -1672,15 +1682,25 @@ type CreateTaskForGeneratingLabelResponse struct {
|
||||
}
|
||||
|
||||
type CreateTaskForGeneratingLabelResult struct {
|
||||
Tasks []CreateTaskForGeneratingLabelTask `json:"tasks"`
|
||||
}
|
||||
|
||||
type CreateTaskForGeneratingLabelTask struct {
|
||||
// Task identifier for labeling generation
|
||||
TaskId int64 `json:"task_id"`
|
||||
|
||||
// Type of label generation task:
|
||||
//
|
||||
// big_label — for a regular label,
|
||||
// small_label — for a small label
|
||||
TaskType string `json:"task_type"`
|
||||
}
|
||||
|
||||
// Method for creating a task for asynchronous labeling generation.
|
||||
//
|
||||
// To get labels created as a result of the method, use the /v1/posting/fbs/package-label/get method
|
||||
func (c FBS) CreateTaskForGeneratingLabel(ctx context.Context, params *CreateTaskForGeneratingLabelParams) (*CreateTaskForGeneratingLabelResponse, error) {
|
||||
url := "/v1/posting/fbs/package-label/create"
|
||||
url := "/v2/posting/fbs/package-label/create"
|
||||
|
||||
resp := &CreateTaskForGeneratingLabelResponse{}
|
||||
|
||||
@@ -2100,7 +2120,8 @@ type PartialPackOrderAdditionalData struct {
|
||||
// The primary unassembled shipment will contain some of the products
|
||||
// that weren't passed to the request.
|
||||
//
|
||||
// Default status of created shipments is awaiting_deliver.
|
||||
// Default status of created shipments is awaiting_packaging,
|
||||
// which indicates that the shipment is awaiting assembly.
|
||||
//
|
||||
// The status of the original shipment will only change
|
||||
// when the split shipments status changes
|
||||
@@ -2962,7 +2983,7 @@ type GetCarriageResponse struct {
|
||||
RetryCount int32 `json:"retry_count"`
|
||||
|
||||
// Freight status
|
||||
Status string `json:"status"`
|
||||
Status GetCarriageStatus `json:"status"`
|
||||
|
||||
// Delivery method identifier
|
||||
TPLProviderId int64 `json:"tpl_provider_id"`
|
||||
|
||||
@@ -24,8 +24,8 @@ func TestListUnprocessedShipments(t *testing.T) {
|
||||
&ListUnprocessedShipmentsParams{
|
||||
Direction: "ASC",
|
||||
Filter: ListUnprocessedShipmentsFilter{
|
||||
CutoffFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-08-24T14:15:22Z"),
|
||||
CutoffTo: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-08-31T14:15:22Z"),
|
||||
CutoffFrom: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-08-24T14:15:22Z"), "2006-01-02T15:04:05Z"),
|
||||
CutoffTo: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-08-31T14:15:22Z"), "2006-01-02T15:04:05Z"),
|
||||
Status: "awaiting_packaging",
|
||||
},
|
||||
Limit: 100,
|
||||
@@ -564,6 +564,7 @@ func TestGetShipmentDataByIdentifier(t *testing.T) {
|
||||
"order_id": 438764970,
|
||||
"order_number": "57195475-0050",
|
||||
"status": "awaiting_packaging",
|
||||
"substatus": "posting_awaiting_passport_data",
|
||||
"delivery_method": {
|
||||
"id": 18114520187000,
|
||||
"name": "Ozon Логистика самостоятельно, Москва",
|
||||
@@ -1278,7 +1279,16 @@ func TestCreateTaskForGeneratingLabel(t *testing.T) {
|
||||
},
|
||||
`{
|
||||
"result": {
|
||||
"task_id": 5819327210249
|
||||
"tasks": [
|
||||
{
|
||||
"task_id": 5819327210248,
|
||||
"task_type": "big_label"
|
||||
},
|
||||
{
|
||||
"task_id": 5819327210249,
|
||||
"task_type": "small_label"
|
||||
}
|
||||
]
|
||||
}
|
||||
}`,
|
||||
},
|
||||
@@ -1310,7 +1320,7 @@ func TestCreateTaskForGeneratingLabel(t *testing.T) {
|
||||
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||
}
|
||||
if resp.StatusCode == http.StatusOK {
|
||||
if resp.Result.TaskId == 0 {
|
||||
if len(resp.Result.Tasks) != 0 && resp.Result.Tasks[0].TaskId == 0 {
|
||||
t.Errorf("Task id cannot be 0")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -382,7 +382,7 @@ type ListTransactionsResultOperationPosting struct {
|
||||
|
||||
type ListTransactionsResultOperationService struct {
|
||||
// Service name
|
||||
Name string `json:"name"`
|
||||
Name TransactionOperationService `json:"name"`
|
||||
|
||||
// Price
|
||||
Price float64 `json:"price"`
|
||||
|
||||
@@ -16,11 +16,11 @@ type CreateUpdateProformaLinkParams struct {
|
||||
// Shipment number
|
||||
PostingNumber string `json:"posting_number"`
|
||||
|
||||
// Proforma invoice link
|
||||
// Invoice link. Use the `v1/invoice/file/upload` method to create a link
|
||||
URL string `json:"url"`
|
||||
|
||||
// Invoice HS-code. Pass a number up to 12 characters long
|
||||
HSCode string `json:"hs_code"`
|
||||
// Product HS-codes
|
||||
HSCodes []CreateUpdateProformaLinkHSCode `json:"hs_codes"`
|
||||
|
||||
// Invoice date
|
||||
Date time.Time `json:"date"`
|
||||
@@ -28,13 +28,21 @@ type CreateUpdateProformaLinkParams struct {
|
||||
// Invoice number. The number can contain letters and digits, maximum length is 50 characters
|
||||
Number string `json:"number"`
|
||||
|
||||
// Cost stated in the invoice. The fractional part is separated by decimal point, up to two digits after the decimal poin
|
||||
// Cost stated in the invoice. The fractional part is separated by decimal point, up to two digits after the decimal point
|
||||
Price float64 `json:"price"`
|
||||
|
||||
// Invoice currency
|
||||
PriceCurrency InvoiceCurrency `json:"price_currency" default:"USD"`
|
||||
}
|
||||
|
||||
type CreateUpdateProformaLinkHSCode struct {
|
||||
// Product HS code
|
||||
Code string `json:"code"`
|
||||
|
||||
// Product identifier in the Ozon system, SKU
|
||||
SKU string `json:"sku"`
|
||||
}
|
||||
|
||||
type CreateUpdateProformaLinkResponse struct {
|
||||
core.CommonResponse
|
||||
|
||||
@@ -42,9 +50,9 @@ type CreateUpdateProformaLinkResponse struct {
|
||||
Result bool `json:"result"`
|
||||
}
|
||||
|
||||
// Create or edit proforma invoice link for VAT refund to Turkey sellers
|
||||
// Create or edit an invoice for VAT refund to Turkey sellers
|
||||
func (c Invoices) CreateUpdate(ctx context.Context, params *CreateUpdateProformaLinkParams) (*CreateUpdateProformaLinkResponse, error) {
|
||||
url := "/v1/invoice/create-or-update"
|
||||
url := "/v2/invoice/create-or-update"
|
||||
|
||||
resp := &CreateUpdateProformaLinkResponse{}
|
||||
|
||||
@@ -70,13 +78,32 @@ type GetProformaLinkResponse struct {
|
||||
}
|
||||
|
||||
type GetProformaLinkResult struct {
|
||||
// Proforma invoice link
|
||||
// Invoice uploading date
|
||||
Date time.Time `json:"date"`
|
||||
|
||||
// Invoice link
|
||||
FileURL string `json:"file_url"`
|
||||
|
||||
// Product HS-codes
|
||||
HSCodes []CreateUpdateProformaLinkHSCode `json:"hs_codes"`
|
||||
|
||||
// Invoice number
|
||||
Number string `json:"number"`
|
||||
|
||||
// Cost stated in the invoice.
|
||||
// The fractional part is separated by decimal point,
|
||||
// up to two digits after the decimal point.
|
||||
//
|
||||
// Example: 199.99
|
||||
Price float64 `json:"price"`
|
||||
|
||||
// Invoice currency
|
||||
PriceCurrency InvoiceCurrency `json:"price_currency"`
|
||||
}
|
||||
|
||||
// Get a proforma invoice link
|
||||
func (c Invoices) Get(ctx context.Context, params *GetProformaLinkParams) (*GetProformaLinkResponse, error) {
|
||||
url := "/v1/invoice/get"
|
||||
url := "/v2/invoice/get"
|
||||
|
||||
resp := &GetProformaLinkResponse{}
|
||||
|
||||
@@ -114,3 +141,33 @@ func (c Invoices) Delete(ctx context.Context, params *DeleteProformaLinkParams)
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
type UploadInvoiceParams struct {
|
||||
// Base64 encoded invoice
|
||||
Content string `json:"base64_content"`
|
||||
|
||||
// Shipment number
|
||||
PostingNumber string `json:"posting_number"`
|
||||
}
|
||||
|
||||
type UploadInvoiceResponse struct {
|
||||
core.CommonResponse
|
||||
|
||||
// Link to invoice
|
||||
URL string `json:"url"`
|
||||
}
|
||||
|
||||
// Available file types: JPEG and PDF. Maximum file size: 10 MB
|
||||
func (c Invoices) Upload(ctx context.Context, params *UploadInvoiceParams) (*UploadInvoiceResponse, error) {
|
||||
url := "/v1/invoice/file/upload"
|
||||
|
||||
resp := &UploadInvoiceResponse{}
|
||||
|
||||
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
response.CopyCommonResponse(&resp.CommonResponse)
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
@@ -24,7 +24,16 @@ func TestCreateUpdateProformaLink(t *testing.T) {
|
||||
&CreateUpdateProformaLinkParams{
|
||||
PostingNumber: "33920146-0252-1",
|
||||
URL: "https://cdn.ozone.ru/s3/ozon-disk-api/techdoc/seller-api/earsivfatura_1690960445.pdf",
|
||||
HSCode: "2134322",
|
||||
HSCodes: []CreateUpdateProformaLinkHSCode{
|
||||
{
|
||||
Code: "534758761999",
|
||||
SKU: "SKU123",
|
||||
},
|
||||
{
|
||||
Code: "534758761000",
|
||||
SKU: "SKU456",
|
||||
},
|
||||
},
|
||||
Date: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2023-08-01T12:08:44.342Z"),
|
||||
Number: "424fdsf234",
|
||||
Price: 234.34,
|
||||
@@ -82,7 +91,17 @@ func TestGetProformaLink(t *testing.T) {
|
||||
},
|
||||
`{
|
||||
"result": {
|
||||
"file_url": "string"
|
||||
"date": "2019-08-24T14:15:22Z",
|
||||
"file_url": "string",
|
||||
"hs_codes": [
|
||||
{
|
||||
"code": "string",
|
||||
"sku": "string"
|
||||
}
|
||||
],
|
||||
"number": "string",
|
||||
"price": 0,
|
||||
"price_currency": "string"
|
||||
}
|
||||
}`,
|
||||
},
|
||||
@@ -165,3 +184,54 @@ func TestDeleteProformaLink(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestUploadInvoice(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
tests := []struct {
|
||||
statusCode int
|
||||
headers map[string]string
|
||||
params *UploadInvoiceParams
|
||||
response string
|
||||
}{
|
||||
// Test Ok
|
||||
{
|
||||
http.StatusOK,
|
||||
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||
&UploadInvoiceParams{
|
||||
PostingNumber: "posting number",
|
||||
Content: "content",
|
||||
},
|
||||
`{
|
||||
"url": "string"
|
||||
}`,
|
||||
},
|
||||
// Test No Client-Id or Api-Key
|
||||
{
|
||||
http.StatusUnauthorized,
|
||||
map[string]string{},
|
||||
&UploadInvoiceParams{},
|
||||
`{
|
||||
"code": 16,
|
||||
"message": "Client-Id and Api-Key headers are required"
|
||||
}`,
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
c := NewMockClient(core.NewMockHttpHandler(test.statusCode, test.response, test.headers))
|
||||
|
||||
ctx, _ := context.WithTimeout(context.Background(), testTimeout)
|
||||
resp, err := c.Invoices().Upload(ctx, test.params)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
continue
|
||||
}
|
||||
|
||||
compareJsonResponse(t, test.response, &UploadInvoiceResponse{})
|
||||
|
||||
if resp.StatusCode != test.statusCode {
|
||||
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,10 +27,10 @@ type GetStocksInfoParams struct {
|
||||
|
||||
type GetStocksInfoFilter struct {
|
||||
// Filter by the offer_id parameter. It is possible to pass a list of values
|
||||
OfferId string `json:"offer_id,omitempty"`
|
||||
OfferId []string `json:"offer_id,omitempty"`
|
||||
|
||||
// Filter by the product_id parameter. It is possible to pass a list of values
|
||||
ProductId int64 `json:"product_id,omitempty"`
|
||||
ProductId []int64 `json:"product_id,omitempty"`
|
||||
|
||||
// Filter by product visibility
|
||||
Visibility string `json:"visibility,omitempty"`
|
||||
@@ -99,13 +99,13 @@ func (c Products) GetStocksInfo(ctx context.Context, params *GetStocksInfoParams
|
||||
|
||||
type GetProductDetailsParams struct {
|
||||
// Product identifier in the seller's system
|
||||
OfferId string `json:"offer_id"`
|
||||
OfferId string `json:"offer_id,omitempty"`
|
||||
|
||||
// Product identifier
|
||||
ProductId int64 `json:"product_id"`
|
||||
ProductId int64 `json:"product_id,omitempty"`
|
||||
|
||||
// Product identifier in the Ozon system, SKU
|
||||
SKU int64 `json:"sku"`
|
||||
SKU int64 `json:"sku,omitempty"`
|
||||
}
|
||||
|
||||
type GetProductDetailsResponse struct {
|
||||
@@ -151,7 +151,7 @@ type ProductDetails struct {
|
||||
// SKU of the product that is sold from the seller's warehouse (FBS and rFBS)
|
||||
FBSSKU int64 `json:"fbs_sku,omitempty"`
|
||||
|
||||
// Document generation task number
|
||||
// Product identifier
|
||||
Id int64 `json:"id"`
|
||||
|
||||
// An array of links to images. The images in the array are arranged in the order of their arrangement on the site. If the `primary_image` parameter is not specified, the first image in the list is the main one for the product
|
||||
@@ -212,9 +212,6 @@ type ProductDetails struct {
|
||||
// Price before discounts. Displayed strikethrough on the product description page
|
||||
OldPrice string `json:"old_price"`
|
||||
|
||||
// Price for customers with an Ozon Premium subscription
|
||||
PremiumPrice string `json:"premium_price"`
|
||||
|
||||
// Product price including discounts. This value is shown on the product description page
|
||||
Price string `json:"price"`
|
||||
|
||||
@@ -249,6 +246,12 @@ type ProductDetails struct {
|
||||
|
||||
// Product volume weight
|
||||
VolumeWeight float64 `json:"volume_weight"`
|
||||
|
||||
// 'true' if the item is archived manually.
|
||||
IsArchived bool `json:"is_archived"`
|
||||
|
||||
// 'true' if the item is archived automatically.
|
||||
IsArchivedAuto bool `json:"is_autoarchived"`
|
||||
}
|
||||
|
||||
type ProductDetailCommission struct {
|
||||
@@ -712,9 +715,7 @@ type UpdatePricesResultError struct {
|
||||
|
||||
// Allows you to change a price of one or more products.
|
||||
// You can change prices for 1000 products in one request.
|
||||
// To reset old_price or premium_price set these parameters to 0.
|
||||
//
|
||||
// A new price must differ from the old one by at least 5%.
|
||||
// To reset old_price, set 0 for this parameter
|
||||
func (c Products) UpdatePrices(ctx context.Context, params *UpdatePricesParams) (*UpdatePricesResponse, error) {
|
||||
url := "/v1/product/import/prices"
|
||||
|
||||
@@ -746,6 +747,9 @@ type CreateOrUpdateProductItem struct {
|
||||
// Category identifier
|
||||
DescriptionCategoryId int64 `json:"description_category_id"`
|
||||
|
||||
// New category identifier. Specify it if you want to change the current product category
|
||||
NewDescriptinoCategoryId int64 `json:"new_description_category_id"`
|
||||
|
||||
// Marketing color.
|
||||
//
|
||||
// Pass the link to the image in the public cloud storage. The image format is JPG
|
||||
@@ -808,9 +812,6 @@ type CreateOrUpdateProductItem struct {
|
||||
// List of PDF files
|
||||
PDFList []CreateOrUpdateProductPDF `json:"pdf_list"`
|
||||
|
||||
// Price for customers with an Ozon Premium subscription
|
||||
PremiumPrice string `json:"premium_price"`
|
||||
|
||||
// Product price including discounts. This value is shown on the product description card.
|
||||
// If there are no discounts on the product, specify the old_price value
|
||||
Price string `json:"price"`
|
||||
@@ -890,6 +891,7 @@ type CreateOrUpdateProductResult struct {
|
||||
}
|
||||
|
||||
// This method allows you to create products and update their details
|
||||
// More info: https://docs.ozon.ru/api/seller/en/#operation/ProductAPI_ImportProductsV3
|
||||
func (c Products) CreateOrUpdateProduct(ctx context.Context, params *CreateOrUpdateProductParams) (*CreateOrUpdateProductResponse, error) {
|
||||
url := "/v3/product/import"
|
||||
|
||||
@@ -1132,9 +1134,6 @@ type CreateProductsByOzonIDItem struct {
|
||||
// The fractional part is separated by decimal point, up to two digits after the decimal point
|
||||
OldPrice string `json:"old_price"`
|
||||
|
||||
// Price for customers with an Ozon Premium subscription
|
||||
PremiumPrice string `json:"premium_price"`
|
||||
|
||||
// Product price including discounts. This value is shown on the product description page.
|
||||
// If there are no discounts, pass the old_price value in this parameter
|
||||
Price string `json:"price"`
|
||||
@@ -1235,7 +1234,7 @@ type ProductInfoResultPicture struct {
|
||||
//
|
||||
// If you called the `/v1/product/pictures/info` method, one of the statuses will appear:
|
||||
// - uploaded — image uploaded;
|
||||
// - failed — image was not uploaded
|
||||
// - pending — image was not uploaded
|
||||
State string `json:"state"`
|
||||
|
||||
// The link to the image in the public cloud storage. The image format is JPG or PNG
|
||||
@@ -1803,7 +1802,7 @@ type ListGeoRestrictionsRestriction struct {
|
||||
OrderNumber int64 `json:"order_number"`
|
||||
}
|
||||
|
||||
// Get a list of geo-restrictions for services
|
||||
// Deprecated: Get a list of geo-restrictions for services
|
||||
func (c Products) ListGeoRestrictions(ctx context.Context, params *ListGeoRestrictionsParams) (*ListGeoRestrictionsResponse, error) {
|
||||
url := "/v1/products/geo-restrictions-catalog-by-filter"
|
||||
|
||||
@@ -2069,9 +2068,6 @@ type GetProductPriceInfoResultItemPrice struct {
|
||||
// Price before discounts. Displayed strikethrough on the product description page
|
||||
OldPrice string `json:"old_price"`
|
||||
|
||||
// Price for customers with an Ozon Premium subscription
|
||||
PremiumPrice string `json:"premium_price"`
|
||||
|
||||
// Product price including discounts. This value is shown on the product description page
|
||||
Price string `json:"price"`
|
||||
|
||||
@@ -2388,9 +2384,11 @@ type GetRelatedSKUsError struct {
|
||||
Message string `json:"message"`
|
||||
}
|
||||
|
||||
// You can pass any SKU in the request, even a deleted one.
|
||||
// Method for getting a single SKU based on the old SKU FBS and SKU FBO identifiers.
|
||||
// The response will contain all SKUs related to the passed ones.
|
||||
//
|
||||
// The method can handle any SKU, even hidden or deleted.
|
||||
//
|
||||
// In one request, you can pass up to 200 SKUs.
|
||||
func (c Products) GetRelatedSKUs(ctx context.Context, params *GetRelatedSKUsParams) (*GetRelatedSKUsResponse, error) {
|
||||
url := "/v1/product/related-sku/get"
|
||||
|
||||
@@ -26,8 +26,8 @@ func TestGetStocksInfo(t *testing.T) {
|
||||
Limit: 100,
|
||||
LastId: "",
|
||||
Filter: GetStocksInfoFilter{
|
||||
OfferId: "136834",
|
||||
ProductId: 214887921,
|
||||
OfferId: []string{"136834"},
|
||||
ProductId: []int64{214887921},
|
||||
Visibility: "ALL",
|
||||
},
|
||||
},
|
||||
@@ -145,7 +145,6 @@ func TestGetProductDetails(t *testing.T) {
|
||||
"marketing_price": "",
|
||||
"min_price": "",
|
||||
"old_price": "",
|
||||
"premium_price": "",
|
||||
"price": "590.0000",
|
||||
"sources": [
|
||||
{
|
||||
@@ -252,7 +251,9 @@ func TestGetProductDetails(t *testing.T) {
|
||||
}
|
||||
],
|
||||
"state_updated_at": "2021-10-21T15:48:03.927309Z"
|
||||
}
|
||||
},
|
||||
"is_archived": false,
|
||||
"is_autoarchived": false
|
||||
}
|
||||
}`,
|
||||
},
|
||||
@@ -684,7 +685,6 @@ func TestCreateOrUpdateProduct(t *testing.T) {
|
||||
Name: "Комплект защитных плёнок для X3 NFC. Темный хлопок",
|
||||
OfferId: "143210608",
|
||||
OldPrice: "1100",
|
||||
PremiumPrice: "900",
|
||||
Price: "1000",
|
||||
VAT: "0.1",
|
||||
Weight: 100,
|
||||
@@ -1152,7 +1152,6 @@ func TestCreateProductByOzonID(t *testing.T) {
|
||||
OfferId: "91132",
|
||||
OldPrice: "2590",
|
||||
Price: "2300",
|
||||
PremiumPrice: "2200",
|
||||
CurrencyCode: "RUB",
|
||||
SKU: 298789742,
|
||||
VAT: "0.1",
|
||||
@@ -1392,7 +1391,6 @@ func TestListProductsByIDs(t *testing.T) {
|
||||
"marketing_price": "",
|
||||
"min_price": "",
|
||||
"old_price": "1000.0000",
|
||||
"premium_price": "590.0000",
|
||||
"price": "690.0000",
|
||||
"sources": [
|
||||
{
|
||||
@@ -1468,7 +1466,6 @@ func TestListProductsByIDs(t *testing.T) {
|
||||
"marketing_price": "",
|
||||
"min_price": "",
|
||||
"old_price": "12200.0000",
|
||||
"premium_price": "5490.0000",
|
||||
"price": "6100.0000",
|
||||
"sources": [
|
||||
{
|
||||
@@ -2353,7 +2350,6 @@ func TestGetProductPriceInfo(t *testing.T) {
|
||||
"currency_code": "RUB",
|
||||
"price": "499.0000",
|
||||
"old_price": "579.0000",
|
||||
"premium_price": "",
|
||||
"retail_price": "",
|
||||
"vat": "0.200000",
|
||||
"min_ozon_price": "",
|
||||
|
||||
@@ -98,7 +98,7 @@ type AddProductToPromotionParams struct {
|
||||
|
||||
type AddProductToPromotionProduct struct {
|
||||
// Product identifier
|
||||
ProductId float64 `json:"produt_id"`
|
||||
ProductId float64 `json:"product_id"`
|
||||
|
||||
// Promotional product price
|
||||
ActionPrice float64 `json:"action_price"`
|
||||
@@ -136,7 +136,7 @@ func (c Promotions) AddToPromotion(ctx context.Context, params *AddProductToProm
|
||||
|
||||
resp := &AddProductToPromotionResponse{}
|
||||
|
||||
response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
|
||||
response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -526,10 +526,10 @@ type GetShipmentReportFilter struct {
|
||||
OfferId string `json:"offer_id"`
|
||||
|
||||
// Order processing start date and time
|
||||
ProcessedAtFrom time.Time `json:"processed_at_from"`
|
||||
ProcessedAtFrom *core.TimeFormat `json:"processed_at_from,omitempty"`
|
||||
|
||||
// Time when the order appeared in your personal account
|
||||
ProcessedAtTo time.Time `json:"processed_at_to"`
|
||||
ProcessedAtTo *core.TimeFormat `json:"processed_at_to,omitempty"`
|
||||
|
||||
// Product identifier in the Ozon system, SKU
|
||||
SKU []int64 `json:"sku"`
|
||||
|
||||
@@ -437,8 +437,8 @@ func TestGetShipmentReport(t *testing.T) {
|
||||
&GetShipmentReportParams{
|
||||
Filter: &GetShipmentReportFilter{
|
||||
DeliverySchema: []string{"fbs", "fbo", "crossborder"},
|
||||
ProcessedAtFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-02T17:10:54.861Z"),
|
||||
ProcessedAtTo: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-02T17:10:54.861Z"),
|
||||
ProcessedAtFrom: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-02T17:10:54.861Z"), "2006-01-02T15:04:05Z"),
|
||||
ProcessedAtTo: core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-02T17:10:54.861Z"), "2006-01-02T15:04:05Z"),
|
||||
},
|
||||
},
|
||||
`{
|
||||
|
||||
@@ -187,7 +187,7 @@ type GetFBSReturnResultReturn struct {
|
||||
// ID of the warehouse the product is being transported to
|
||||
PlaceId int64 `json:"place_id"`
|
||||
|
||||
// Name of the warehouse the product is being transported to
|
||||
// Intermediate return point
|
||||
MovingToPlaceName string `json:"moving_to_place_name"`
|
||||
|
||||
// Delivery cost
|
||||
@@ -204,7 +204,7 @@ type GetFBSReturnResultReturn struct {
|
||||
// Product price without commission
|
||||
PriceWithoutCommission float64 `json:"price_without_commission"`
|
||||
|
||||
// Product identifier
|
||||
// Product identifier — SKU
|
||||
ProductId int64 `json:"product_id"`
|
||||
|
||||
// Product name
|
||||
|
||||
@@ -377,6 +377,7 @@ type GetCompetitorPriceResult struct {
|
||||
StrategyCompetitorProductURL string `json:"strategy_competitor_product_url"`
|
||||
}
|
||||
|
||||
// If you add a product to your pricing strategy, the method returns you the price and a link to the competitor's product
|
||||
func (c Strategies) GetCompetitorPrice(ctx context.Context, params *GetCompetitorPriceParams) (*GetCompetitorPriceResponse, error) {
|
||||
url := "/v1/pricing-strategy/product/info"
|
||||
|
||||
|
||||
@@ -21,27 +21,37 @@ func TestGetListOfWarehouses(t *testing.T) {
|
||||
http.StatusOK,
|
||||
map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
|
||||
`{
|
||||
"result": [
|
||||
{
|
||||
"warehouse_id": 15588127982000,
|
||||
"name": "Proffi (Панорама Групп)",
|
||||
"is_rfbs": false
|
||||
},
|
||||
{
|
||||
"warehouse_id": 22142605386000,
|
||||
"name": "Склад на производственной",
|
||||
"is_rfbs": true
|
||||
},
|
||||
{
|
||||
"warehouse_id": 22208673494000,
|
||||
"name": "Тест 37349",
|
||||
"is_rfbs": true
|
||||
},
|
||||
{
|
||||
"warehouse_id": 22240462819000,
|
||||
"name": "Тест12",
|
||||
"is_rfbs": true
|
||||
}
|
||||
"result": [
|
||||
{
|
||||
"warehouse_id": 1020000177886000,
|
||||
"name": "This is a test",
|
||||
"is_rfbs": false,
|
||||
"has_entrusted_acceptance": false,
|
||||
"first_mile_type": {
|
||||
"dropoff_point_id": "",
|
||||
"dropoff_timeslot_id": 0,
|
||||
"first_mile_is_changing": false,
|
||||
"first_mile_type": ""
|
||||
},
|
||||
"is_kgt": false,
|
||||
"can_print_act_in_advance": false,
|
||||
"min_working_days": 5,
|
||||
"is_karantin": false,
|
||||
"has_postings_limit": false,
|
||||
"postings_limit": -1,
|
||||
"working_days": [
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4,
|
||||
5,
|
||||
6,
|
||||
7
|
||||
],
|
||||
"min_postings_limit": 10,
|
||||
"is_timetable_editable": true,
|
||||
"status": "disabled"
|
||||
}
|
||||
]
|
||||
}`,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user