Update December 3, 2024

New method for getting product turnovers

.github/workflows/tests.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.19'
+          go-version: '1.20'
       - name: Setup
         run: |
           go install github.com/mattn/goveralls@latest

ENDPOINTS.md

@@ -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

README.md

@@ -23,6 +23,7 @@ A simple example on how to use this library:
 package main
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"net/http"
@@ -33,11 +34,14 @@ import (
 func main() {
 	// Create a client with your Client-Id and Api-Key
 	// [Documentation]: https://docs.ozon.ru/api/seller/en/#tag/Auth
-	client := ozon.NewClient("my-client-id", "my-api-key")
+	opts := []ozon.ClientOption{
+		ozon.WithAPIKey("api-key"),
+		ozon.WithClientId("client-id"),
+	}
+	c := ozon.NewClient(opts...)
 
 	// Send request with parameters
-	ctx, _ := context.WithTimeout(context.Background(), testTimeout)
+	resp, err := client.Products().GetProductDetails(context.Background(), &ozon.GetProductDetailsParams{
-resp, err := client.Products().GetProductDetails(&ozon.GetProductDetailsParams{
 		ProductId: 123456789,
 	})
 	if err != nil || resp.StatusCode != http.StatusOK {

client.go

@@ -7,6 +7,8 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
+	"reflect"
 )
 
 type HttpClient interface {
@@ -34,14 +36,28 @@ func NewMockClient(handler http.HandlerFunc) *Client {
 	}
 }
 
-func (c Client) newRequest(ctx context.Context, method string, url string, body interface{}) (*http.Request, error) {
+func (c Client) newRequest(ctx context.Context, method string, uri string, body interface{}) (*http.Request, error) {
-	bodyJson, err := json.Marshal(body)
+	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
+		}
+	}
+
+	uri, err = url.JoinPath(c.baseUrl, uri)
 	if err != nil {
 		return nil, err
 	}
-
+	req, err := http.NewRequestWithContext(ctx, method, uri, bytes.NewBuffer(bodyJson))
-	url = c.baseUrl + url
-	req, err := http.NewRequestWithContext(ctx, method, url, bytes.NewBuffer(bodyJson))
 	if err != nil {
 		return nil, err
 	}
@@ -58,11 +74,6 @@ func (c Client) Request(ctx context.Context, method string, path string, req, re
 	if err != nil {
 		return nil, err
 	}
-	rawQuery, err := buildRawQuery(httpReq, req)
-	if err != nil {
-		return nil, err
-	}
-	httpReq.URL.RawQuery = rawQuery
 
 	httpResp, err := c.client.Do(httpReq)
 	if err != nil {

core.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"net/http"
 	"reflect"
+	"strconv"
+	"strings"
 	"testing"
 	"time"
 )
@@ -32,51 +34,103 @@ func (r Response) CopyCommonResponse(rhs *CommonResponse) {
 	rhs.Message = r.Message
 }
 
-func getDefaultValues(v interface{}) (map[string]string, error) {
+func getDefaultValues(v reflect.Value) error {
-	isNil, err := isZero(v)
+	vValue := v.Elem()
-	if err != nil {
+	vType := vValue.Type()
-		return make(map[string]string), err
-	}
-
-	if isNil {
-		return make(map[string]string), nil
-	}
-
-	out := make(map[string]string)
-
-	vType := reflect.TypeOf(v).Elem()
-	vValue := reflect.ValueOf(v).Elem()
 
 	for i := 0; i < vType.NumField(); i++ {
 		field := vType.Field(i)
-		tag := field.Tag.Get("json")
-		defaultValue := field.Tag.Get("default")
 
-		if field.Type.Kind() == reflect.Slice {
+		switch field.Type.Kind() {
-			// Attach any slices as query params
+		case reflect.Slice:
-			fieldVal := vValue.Field(i)
+			for j := 0; j < vValue.Field(i).Len(); j++ {
-			for j := 0; j < fieldVal.Len(); j++ {
+				// skip if slice type is primitive
-				out[tag] = fmt.Sprintf("%v", fieldVal.Index(j))
+				if vValue.Field(i).Index(j).Kind() != reflect.Struct {
-			}
-		} else {
-			// Add any scalar values as query params
-			fieldVal := fmt.Sprintf("%v", vValue.Field(i))
-
-			// If no value was set by the user, use the default
-			// value specified in the struct tag.
-			if fieldVal == "" || fieldVal == "0" {
-				if defaultValue == "" {
 					continue
 				}
 
-				fieldVal = defaultValue
+				// Attach any slices as query params
+				err := getDefaultValues(vValue.Field(i).Index(j).Addr())
+				if err != nil {
+					return err
+				}
+			}
+		case reflect.String:
+			isNil, err := isZero(vValue.Field(i).Addr())
+			if err != nil {
+				return err
+			}
+			if !isNil {
+				continue
 			}
 
-			out[tag] = fmt.Sprintf("%v", fieldVal)
+			defaultValue, ok := field.Tag.Lookup("default")
+			if !ok {
+				continue
+			}
+
+			vValue.Field(i).SetString(defaultValue)
+		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+			isNil, err := isZero(vValue.Field(i).Addr())
+			if err != nil {
+				return err
+			}
+			if !isNil {
+				continue
+			}
+
+			defaultValue, ok := field.Tag.Lookup("default")
+			if !ok {
+				continue
+			}
+			defaultValueInt, err := strconv.Atoi(defaultValue)
+			if err != nil {
+				return err
+			}
+
+			vValue.Field(i).SetInt(int64(defaultValueInt))
+		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+			isNil, err := isZero(vValue.Field(i).Addr())
+			if err != nil {
+				return err
+			}
+			if !isNil {
+				continue
+			}
+
+			defaultValue, ok := field.Tag.Lookup("default")
+			if !ok {
+				continue
+			}
+			defaultValueUint, err := strconv.ParseUint(defaultValue, 10, 64)
+			if err != nil {
+				return err
+			}
+
+			vValue.Field(i).SetUint(uint64(defaultValueUint))
+		case reflect.Struct:
+			err := getDefaultValues(vValue.Field(i).Addr())
+			if err != nil {
+				return err
+			}
+		case reflect.Ptr:
+			isNil, err := isZero(vValue.Field(i).Addr())
+			if err != nil {
+				return err
+			}
+			if isNil {
+				continue
+			}
+
+			if err := getDefaultValues(vValue.Field(i)); err != nil {
+				return err
+			}
+		default:
+			continue
 		}
 	}
 
-	return out, nil
+	return nil
 }
 
 func buildRawQuery(req *http.Request, v interface{}) (string, error) {
@@ -86,23 +140,20 @@ func buildRawQuery(req *http.Request, v interface{}) (string, error) {
 		return query.Encode(), nil
 	}
 
-	values, err := getDefaultValues(v)
+	err := getDefaultValues(reflect.ValueOf(v))
 	if err != nil {
 		return "", err
 	}
-	for k, v := range values {
-		query.Add(k, v)
-	}
 
 	return query.Encode(), nil
 }
 
-func isZero(v interface{}) (bool, error) {
+func isZero(v reflect.Value) (bool, error) {
-	t := reflect.TypeOf(v)
+	t := v.Elem().Type()
 	if !t.Comparable() {
 		return false, fmt.Errorf("type is not comparable: %v", t)
 	}
-	return v == reflect.Zero(t).Interface(), nil
+	return reflect.Zero(t).Equal(v.Elem()), nil
 }
 
 func TimeFromString(t *testing.T, format, datetime string) time.Time {
@@ -112,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
+}

core_test.go

@@ -1,34 +1,152 @@
 package core
 
 import (
-	"log"
+	"encoding/json"
+	"reflect"
 	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
-type TestTagDefaultValueStruct struct {
+type DefaultStructure struct {
-	TestString string `json:"test_string" default:"something"`
+	EmptyField string `json:"empty_field" default:"empty_string"`
-	TestNumber int    `json:"test_number" default:"12"`
+	Field      string `json:"field" default:"string"`
 }
 
-func TestTagDefaultValue(t *testing.T) {
+type DefaultRequest struct {
-	testStruct := &TestTagDefaultValueStruct{}
+	Field                  int                `json:"field" default:"100"`
+	EmptyField             int                `json:"empty_field" default:"14"`
+	Structure              DefaultStructure   `json:"structure"`
+	Slice                  []DefaultStructure `json:"slice"`
+	OptionalStructure      *DefaultStructure  `json:"optional_structure"`
+	EmptyOptionalStructure *DefaultStructure  `json:"empty_optional_structure"`
+}
 
-	values, err := getDefaultValues(testStruct)
+func TestDefaultValues(t *testing.T) {
-	if err != nil {
+	req := &DefaultRequest{
-		log.Fatalf("error when getting default values from tags: %s", err)
+		Field: 50,
+		Structure: DefaultStructure{
+			Field: "something",
+		},
+		Slice: []DefaultStructure{
+			{
+				Field: "something",
+			},
+			{
+				Field: "something",
+			},
+		},
+		OptionalStructure: &DefaultStructure{
+			Field: "something",
+		},
 	}
+	err := getDefaultValues(reflect.ValueOf(req))
+	assert.Nil(t, err)
 
-	expected := map[string]string{
+	assert.Equal(t, 50, req.Field)
-		"test_string": "something",
+	assert.Equal(t, 14, req.EmptyField)
-		"test_number": "12",
+	assert.Equal(t, "something", req.Structure.Field)
-	}
+	assert.Equal(t, "empty_string", req.Structure.EmptyField)
+	assert.Equal(t, "something", req.Slice[0].Field)
+	assert.Equal(t, "something", req.Slice[1].Field)
+	assert.Equal(t, "empty_string", req.Slice[1].EmptyField)
+	assert.Equal(t, "empty_string", req.Slice[1].EmptyField)
+	assert.Equal(t, "something", req.OptionalStructure.Field)
+	assert.Equal(t, "empty_string", req.OptionalStructure.EmptyField)
+	assert.Equal(t, (*DefaultStructure)(nil), req.EmptyOptionalStructure)
+}
 
-	if len(values) != len(expected) {
+func TestTimeFormat(t *testing.T) {
-		log.Fatalf("expected equal length of values and expected: expected: %d, got: %d", len(expected), len(values))
+	t.Run("Time Format Marshalling", func(t *testing.T) {
-	}
+		tests := []struct {
-	for expKey, expValue := range expected {
+			ft           *TimeFormat
-		if expValue != values[expKey] {
+			layout       string
-			log.Fatalf("not equal values for key %s", expKey)
+			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))
+			}
+		}
+	})
 }

go.mod

@@ -1,3 +1,11 @@
 module github.com/diphantxm/ozon-api-client
 
-go 1.18
+go 1.20
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -0,0 +1,17 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

ozon/analytics.go

@@ -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:
@@ -126,7 +125,7 @@ type GetAnalyticsDataResultData struct {
 }
 
 type GetAnalyticsDataResultDimension struct {
-	// Identifier
+	// Product SKU
 	Id string `json:"id"`
 
 	// Name
@@ -164,8 +163,8 @@ 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"`
+	WarehouseType WarehouseType `json:"warehouse_type" default:"ALL"`
 }
 
 type GetStocksOnWarehousesResponse struct {
@@ -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
@@ -217,3 +219,124 @@ func (c Analytics) GetStocksOnWarehouses(ctx context.Context, params *GetStocksO
 
 	return resp, nil
 }
+
+type GetProductTurnoverParams struct {
+	// Number of values in the response
+	Limit int64 `json:"limit"`
+
+	// Number of elements to skip in the response.
+	//
+	// For example, if offset = 10, the response starts with the 11th element found
+	Offset int32 `json:"offset"`
+
+	// Product identifiers in the Ozon system, SKU
+	SKU []string `json:"sku"`
+}
+
+type GetProductTurnoverResponse struct {
+	core.CommonResponse
+
+	// Products
+	Items []ProductTurnoverItem `json:"items"`
+}
+
+type ProductTurnoverItem struct {
+	// Average daily number of product items sold over the last 60 days
+	Ads float64 `json:"ads"`
+
+	// Product stock, pcs
+	CurrentStock int64 `json:"current_stock"`
+
+	// Number of days the stock will last based on your average daily sales
+	IDC float64 `json:"idc"`
+
+	// Product stock level
+	IDCGrade string `json:"idc_grade"`
+}
+
+// Use the method to get the product turnover rate and the number of days the current stock will last.
+//
+// If you request a list of products by sku, the limit and offset parameters are optional.
+func (c Analytics) GetProductTurnover(ctx context.Context, params *GetProductTurnoverParams) (*GetProductTurnoverResponse, error) {
+	url := "/v1/analytics/turnover/stocks"
+
+	resp := &GetProductTurnoverResponse{}
+
+	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
+}
+
+type GetStockManagementParams struct {
+	// GetStockManagementFilter
+	Filter GetStockManagementFilter `json:"filter"`
+
+	// Number of values in the response
+	Limit int32 `json:"limit,omitempty"`
+
+	// Number of elements to skip in the response
+	Offset int32 `json:"offset,omitempty"`
+}
+
+type GetStockManagementFilter struct {
+	// Product identifiers in the Ozon system, SKU
+	SKUs []string `json:"skus"`
+
+	// The type of item in stock
+	StockTypes string `json:"stock_types"`
+
+	// Warehouse identifiers
+	WarehouseIds []string `json:"warehouse_ids"`
+}
+
+type GetStockManagementResponse struct {
+	core.CommonResponse
+
+	// Products
+	Items []StockItem `json:"items"`
+}
+
+type StockItem struct {
+	// Stock of defective products, pcs
+	DefectCount int64 `json:"defect_stock_count"`
+
+	// Stock of near-expired products, pcs
+	ExpiringCount int64 `json:"expiring_stock_count"`
+
+	// Product name
+	ProductName string `json:"name"`
+
+	// Product identifier in the seller's system
+	OfferId string `json:"offer_id"`
+
+	// Product identifier in the Ozon system, SKU
+	SKU int64 `json:"sku"`
+
+	// Stock of valid products
+	ValidCount int64 `json:"valid_stock_count"`
+
+	// Stock of products that waiting for documents
+	WaitingDocsCount int64 `json:"waitingdocs_stock_count"`
+
+	// Warehouse name
+	WarehouseName string `json:"warehouse_name"`
+}
+
+// Use the method to find out how many product items are left in stock
+func (c Analytics) Stock(ctx context.Context, params *GetStockManagementParams) (*GetStockManagementResponse, error) {
+	url := "/v1/analytics/manage/stocks"
+
+	resp := &GetStockManagementResponse{}
+
+	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
+}

ozon/analytics_test.go

@@ -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"),
+				DateFrom:  core.NewTimeFormat(time.Now().Add(time.Duration(30)*24*time.Hour), core.ShortDateLayout),
-				DateTo:    core.TimeFromString(t, "2006-01-02", "2021-10-15"),
+				DateTo:    core.NewTimeFormat(time.Now(), core.ShortDateLayout),
 				Dimension: []GetAnalyticsDataDimension{SKUDimension, DayDimension},
 				Metrics:   []GetAnalyticsDataFilterMetric{HistViewPDP},
 				Sort: []GetAnalyticsDataSort{
@@ -144,3 +145,135 @@ func TestGetStocksOnWarehouses(t *testing.T) {
 		}
 	}
 }
+
+func TestGetProductTurnover(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetProductTurnoverParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetProductTurnoverParams{
+				Limit: 1,
+				SKU:   []string{"string"},
+			},
+			`{
+				"items": [
+				  {
+					"ads": 0,
+					"current_stock": 0,
+					"idc": 0,
+					"idc_grade": "GRADES_NONE"
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetProductTurnoverParams{},
+			`{
+				"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.Analytics().GetProductTurnover(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetProductTurnoverResponse{})
+
+		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.Items) > int(test.params.Limit) {
+				t.Errorf("Length of items is bigger than limit")
+			}
+		}
+	}
+}
+
+func TestGetStock(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetStockManagementParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetStockManagementParams{
+				Limit:  1,
+				Offset: 0,
+				Filter: GetStockManagementFilter{
+					StockTypes: "STOCK_TYPE_VALID",
+					SKUs: []string{
+						"string",
+					},
+				},
+			},
+			`{
+				"items": [
+				  {
+					"defect_stock_count": 0,
+					"expiring_stock_count": 0,
+					"name": "string",
+					"offer_id": "string",
+					"sku": 0,
+					"valid_stock_count": 0,
+					"waitingdocs_stock_count": 0,
+					"warehouse_name": "string"
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetStockManagementParams{},
+			`{
+				"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.Analytics().Stock(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetStockManagementResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}

ozon/cancellations.go

@@ -41,7 +41,7 @@ type CancellationInfo struct {
 	CancellationReasonMessage string `json:"cancellation_reason_message"`
 
 	// Delivery service integration type
-	TPLIntegrationType string `json:"tpl_integration_type"`
+	TPLIntegrationType TPLIntegrationType `json:"tpl_integration_type"`
 
 	// Cancellation request status
 	State CancellationInfoState `json:"state"`
@@ -83,7 +83,7 @@ type CancellationInfoState struct {
 
 // Method for getting information about a rFBS cancellation request
 func (c Cancellations) GetInfo(ctx context.Context, params *GetCancellationInfoParams) (*GetCancellationInfoResponse, error) {
-	url := "/v1/delivery-method/list"
+	url := "/v1/conditional-cancellation/get"
 
 	resp := &GetCancellationInfoResponse{}
 
@@ -98,30 +98,30 @@ func (c Cancellations) GetInfo(ctx context.Context, params *GetCancellationInfoP
 
 type ListCancellationsParams struct {
 	// Filters
-	Filter ListCancellationsFilter `json:"filter"`
+	Filter *ListCancellationsFilter `json:"filter,omitempty"`
 
 	// Number of cancellation requests in the response
-	Limit int32 `json:"limit"`
+	Limit int32 `json:"limit,omitempty"`
 
 	// 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 int32 `json:"offset"`
+	Offset int32 `json:"offset,omitempty"`
 
 	// Additional information
-	With ListCancellationWith `json:"with"`
+	With *ListCancellationWith `json:"with,omitempty"`
 }
 
 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 {
@@ -173,7 +173,7 @@ type ApproveRejectCancellationsParams struct {
 	CancellationId int64 `json:"cancellation_id"`
 
 	// Comment
-	Comment string `json:"comment"`
+	Comment string `json:"comment,omitempty"`
 }
 
 type ApproveRejectCancellationsResponse struct {

ozon/cancellations_test.go

@@ -98,13 +98,13 @@ func TestListCancellations(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&ListCancellationsParams{
-				Filter: ListCancellationsFilter{
+				Filter: &ListCancellationsFilter{
 					CancellationInitiator: []string{"CLIENT"},
 					State:                 "ALL",
 				},
 				Limit:  2,
 				Offset: 0,
-				With: ListCancellationWith{
+				With: &ListCancellationWith{
 					Counters: true,
 				},
 			},

ozon/categories.go

@@ -13,7 +13,7 @@ type Categories struct {
 
 type GetProductTreeParams struct {
 	// Response language
-	Language Language `json:"language"`
+	Language Language `json:"language,omitempty"`
 }
 
 type GetProductTreeResponse struct {
@@ -25,7 +25,7 @@ type GetProductTreeResponse struct {
 
 type GetProductTreeResult struct {
 	// Category identifier
-	CategoryId int64 `json:"category_id"`
+	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// Category name
 	CategoryName string `json:"category_name"`
@@ -64,10 +64,10 @@ func (c *Categories) Tree(ctx context.Context, params *GetProductTreeParams) (*G
 
 type GetCategoryAttributesParams struct {
 	// Category identifier
-	CategoryId int64 `json:"category_id"`
+	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// Response language
-	Language Language `json:"language"`
+	Language Language `json:"language,omitempty"`
 
 	// Product type identifier
 	TypeId int64 `json:"type_id"`
@@ -81,6 +81,12 @@ type GetCategoryAttributesResponse struct {
 }
 
 type GetCategoryAttributesResult struct {
+	// Indication that the dictionary attribute values depend on the category:
+	//
+	// 	true — the attribute has its own set of values for each category.
+	// 	false — the attribute has the same set of values for all categories
+	CategoryDependent bool `json:"category_dependent"`
+
 	// Characteristic description
 	Description string `json:"description"`
 
@@ -123,6 +129,12 @@ type GetCategoryAttributesResult struct {
 
 	// Characteristic type
 	Type string `json:"type"`
+
+	// Complex attribute identifier
+	AttributeComplexId int64 `json:"attribute_complex_id"`
+
+	// Maximum number of values for attribute
+	MaxValueCount int64 `json:"max_value_count"`
 }
 
 // Getting characteristics for specified product category and type.
@@ -149,10 +161,10 @@ type GetAttributeDictionaryParams struct {
 	AttributeId int64 `json:"attribute_id"`
 
 	// Category identifier
-	CategoryId int64 `json:"category_id"`
+	DescriptionCategoryId int64 `json:"description_category_id"`
 
 	// Response language
-	Language Language `json:"language"`
+	Language Language `json:"language,omitempty"`
 
 	// Identifier of the directory to start the response with.
 	// If `last_value_id` is 10, the response will contain directories starting from the 11th
@@ -162,7 +174,7 @@ type GetAttributeDictionaryParams struct {
 	//
 	// 	- maximum—5000,
 	// 	- minimum—1.
-	Limit int64 `json:"limit"`
+	Limit int64 `json:"limit,omitempty"`
 
 	// Product type identifier
 	TypeId int64 `json:"type_id"`
@@ -200,7 +212,7 @@ type GetAttributeDictionaryResult struct {
 // To check if an attribute has a nested directory,
 // use the `/v1/description-category/attribute` method.
 func (c *Categories) AttributesDictionary(ctx context.Context, params *GetAttributeDictionaryParams) (*GetAttributeDictionaryResponse, error) {
-	url := "/v1/description-category/attribute"
+	url := "/v1/description-category/attribute/values"
 
 	resp := &GetAttributeDictionaryResponse{}
 
@@ -212,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
+}

ozon/categories_test.go

@@ -27,7 +27,7 @@ func TestGetProductTree(t *testing.T) {
 			`{
 				"result": [
 				  {
-					"category_id": 0,
+					"description_category_id": 0,
 					"category_name": "string",
 					"children": [],
 					"disabled": true,
@@ -81,13 +81,14 @@ func TestGetCategoryAttributes(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetCategoryAttributesParams{
-				CategoryId: 12345,
+				DescriptionCategoryId: 12345,
-				Language:   English,
+				Language:              English,
-				TypeId:     2,
+				TypeId:                2,
 			},
 			`{
 				"result": [
 				  {
+					"category_dependent": true,
 					"description": "string",
 					"dictionary_id": 0,
 					"group_id": 0,
@@ -97,7 +98,9 @@ func TestGetCategoryAttributes(t *testing.T) {
 					"is_collection": true,
 					"is_required": true,
 					"name": "string",
-					"type": "string"
+					"type": "string",
+					"attribute_complex_id": 0,
+					"max_value_count": 0
 				  }
 				]
 			}`,
@@ -146,12 +149,12 @@ func TestGetAttributeDictionary(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetAttributeDictionaryParams{
-				AttributeId: 123456,
+				AttributeId:           123456,
-				CategoryId:  12,
+				DescriptionCategoryId: 12,
-				Language:    English,
+				Language:              English,
-				LastValueId: 1,
+				LastValueId:           1,
-				Limit:       5,
+				Limit:                 5,
-				TypeId:      6,
+				TypeId:                6,
 			},
 			`{
 				"has_next": true,
@@ -200,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")
+			}
+		}
+	}
+}

ozon/certificates.go

@@ -121,7 +121,7 @@ type ListOfCertifiedCategoriesResultCert struct {
 
 // List of certified categories
 func (c Certificates) ListOfCertifiedCategories(ctx context.Context, params *ListOfCertifiedCategoriesParams) (*ListOfCertifiedCategoriesResponse, error) {
-	url := "/v1/product/certificate/types"
+	url := "/v1/product/certification/list"
 
 	resp := &ListOfCertifiedCategoriesResponse{}
 

ozon/chats.go

@@ -14,14 +14,14 @@ type Chats struct {
 
 type ListChatsParams struct {
 	// Chats filter
-	Filter ListChatsFilter `json:"filter"`
+	Filter *ListChatsFilter `json:"filter,omitempty"`
 
-	// Number of values in the response. Default value is 1
+	// Number of values in the response. The default value is 30. The maximum value is 1000
-	Limit int64 `json:"limit" default:"1"`
+	Limit int64 `json:"limit" default:"30"`
 
 	// 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"`
+	Offset int64 `json:"offset,omitempty"`
 }
 
 type ListChatsFilter struct {
@@ -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
@@ -173,7 +168,7 @@ type ChatHistoryParams struct {
 	// Default value is the last visible message
 	FromMessageId string `json:"from_message_id"`
 
-	// Number of messages in the response. The default value is 50
+	// Number of messages in the response. The default value is 50. The maximum value is 1000
 	Limit int64 `json:"limit" default:"50"`
 }
 
@@ -217,7 +212,7 @@ type ChatHistoryMessageUser struct {
 	Type string `json:"type"`
 }
 
-// Chat history
+// Returns the history of chat messages. By default messages are shown from newest to oldest.
 func (c Chats) History(ctx context.Context, params *ChatHistoryParams) (*ChatHistoryResponse, error) {
 	url := "/v2/chat/history"
 
@@ -240,7 +235,7 @@ type UpdateChatParams struct {
 	FromMessageId uint64 `json:"from_message_id"`
 
 	// Number of messages in the response
-	Limit int64 `json:"limit"`
+	Limit int64 `json:"limit,omitempty"`
 }
 
 type UpdateChatResponse struct {
@@ -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"`

ozon/chats_test.go

@@ -22,7 +22,7 @@ func TestListChats(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&ListChatsParams{
-				Filter: ListChatsFilter{
+				Filter: &ListChatsFilter{
 					ChatStatus: "Opened",
 					UnreadOnly: true,
 				},
@@ -32,15 +32,13 @@ func TestListChats(t *testing.T) {
 			`{
 				"chats": [
 				  {
-					"chat": {
+            "chat_id": "5e767w03-b400-4y1b-a841-75319ca8a5c8",
-					  "created_at": "2022-07-22T08:07:19.581Z",
+            "chat_status": "Opened",
-					  "chat_id": "5e767w03-b400-4y1b-a841-75319ca8a5c8",
+            "chat_type": "Seller_Support",
-					  "chat_status": "Opened",
+            "created_at": "2022-07-22T08:07:19.581Z",
-					  "chat_type": "Seller_Support"
+            "unread_count": 1,
-					},
+            "last_message_id": 3000000000128004274,
-					"first_unread_message_id": "3000000000118021931",
+            "first_unread_message_id": 3000000000118021931
-					"last_message_id": "30000000001280042740",
-					"unread_count": 1
 				  }
 				],
 				"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,
 			},
 			`{

ozon/clusters.go

@@ -0,0 +1,74 @@
+package ozon
+
+import (
+	"context"
+	"net/http"
+
+	core "github.com/diphantxm/ozon-api-client"
+)
+
+type Clusters struct {
+	client *core.Client
+}
+
+type ListClustersParams struct {
+	// Clusters identifiers
+	ClusterIds []string `json:"cluster_ids"`
+
+	// Cluster type
+	ClusterType string `json:"cluster_type"`
+}
+
+type ListClustersResponse struct {
+	core.CommonResponse
+
+	// Cluster details
+	Clusters []Cluster `json:"clusters"`
+}
+
+type Cluster struct {
+	// Cluster identifier
+	Id int64 `json:"id"`
+
+	// Cluster warehouse details
+	LogisticClusters []LogisticCluster `json:"logistic_clusters"`
+
+	// Cluster name
+	Name string `json:"name"`
+
+	// Cluster type
+	Type string `json:"type"`
+}
+
+type LogisticCluster struct {
+	// Warehouse status
+	IsArchived bool `json:"is_archived"`
+
+	// Warehouses
+	Warehouses []LogisticClusterWarehouse `json:"warehouses"`
+}
+
+type LogisticClusterWarehouse struct {
+	// Warehouse name
+	Name string `json:"name"`
+
+	// Warehouse type
+	Type string `json:"type"`
+
+	// Warehouse identifier
+	Id int64 `json:"warehouse_id"`
+}
+
+func (c Clusters) List(ctx context.Context, params *ListClustersParams) (*ListClustersResponse, error) {
+	url := "/v1/cluster/list"
+
+	resp := &ListClustersResponse{}
+
+	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
+}

ozon/clusters_test.go

@@ -0,0 +1,78 @@
+package ozon
+
+import (
+	"context"
+	"net/http"
+	"testing"
+
+	core "github.com/diphantxm/ozon-api-client"
+)
+
+func TestListClusters(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *ListClustersParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&ListClustersParams{
+				ClusterIds:  []string{"string"},
+				ClusterType: "CLUSTER_TYPE_UNKNOWN",
+			},
+			`{
+				"clusters": [
+				  {
+					"id": 0,
+					"logistic_clusters": [
+					  {
+						"is_archived": true,
+						"warehouses": [
+						  {
+							"name": "string",
+							"type": "FULL_FILLMENT",
+							"warehouse_id": 0
+						  }
+						]
+					  }
+					],
+					"name": "string",
+					"type": "CLUSTER_TYPE_UNKNOWN"
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&ListClustersParams{},
+			`{
+				"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.Clusters().List(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &ListClustersResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}

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"
+	Mon WorkingDay = 1
-	Tue WorkingDay = "2"
+	Tue WorkingDay = 2
-	Wed WorkingDay = "3"
+	Wed WorkingDay = 3
-	Thu WorkingDay = "4"
+	Thu WorkingDay = 4
-	Fri WorkingDay = "5"
+	Fri WorkingDay = 5
-	Sat WorkingDay = "6"
+	Sat WorkingDay = 6
-	Sun WorkingDay = "7"
+	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"
 
@@ -312,6 +296,9 @@ const (
 
 	// delivery by the seller
 	NonIntegratedTPLType TPLIntegrationType = "non_integrated"
+
+	// Russian Post delivery scheme
+	HybrydTPLType TPLIntegrationType = "hybryd"
 )
 
 type DetailsDeliveryItemName string
@@ -346,7 +333,7 @@ const (
 	ServiceProcessingIdentifiedSurplus          DetailsServiceItemName = "MarketplaceServiceProcessingIdentifiedSurplus"
 	ServiceProcessingIdentifiedDiscrepancies    DetailsServiceItemName = "MarketplaceServiceProcessingIdentifiedDiscrepancies"
 	ServiceItemInternetSiteAdvertising          DetailsServiceItemName = "MarketplaceServiceItemInternetSiteAdvertising"
-	ServiceItemPremiumSubscribtion              DetailsServiceItemName = "MarketplaceServiceItemPremiumSubscribtion"
+	ServiceItemPremiumSubscribtion              DetailsServiceItemName = "MarketplaceServiceItemSubscribtionPremium"
 	AgencyFeeAggregator3PLGlobalItem            DetailsServiceItemName = "MarketplaceAgencyFeeAggregator3PLGlobalItem"
 )
 
@@ -458,18 +445,25 @@ 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"
+	ArrivedForResale          GetFBSReturnsFilterStatus = "arrived_for_resale"
+	MovingToResale            GetFBSReturnsFilterStatus = "moving_to_resale"
 )
 
 type GetFBOReturnsFilterStatus string
 
 const (
-	GetFBOReturnsFilterStatusReturnedToOzon GetFBOReturnsFilterStatus = "ReturnedToOzon"
+	GetFBOReturnsFilterStatusCreated                   GetFBOReturnsFilterStatus = "Created"
-	GetFBOReturnsFilterStatusCancelled      GetFBOReturnsFilterStatus = "Cancelled"
+	GetFBOReturnsFilterStatusReturnedToOzon            GetFBOReturnsFilterStatus = "ReturnedToOzon"
+	GetFBOReturnsFilterStatusCancelled                 GetFBOReturnsFilterStatus = "Cancelled"
+	GetFBOReturnsFilterStatusCancelledWithCompensation GetFBOReturnsFilterStatus = "CancelledWithCompensation"
 )
 
 type GetFBOReturnsReturnStatus string
@@ -567,6 +561,12 @@ const (
 
 	// financial report
 	ReportTypeSellerFinance ReportType = "SELLER_FINANCE"
+
+	// report on sales to legal entities
+	ReportTypeDocB2BSales ReportType = "DOCUMENT_B2B_SALES"
+
+	// settlement report
+	ReportTypeMutualSettlement ReportType = "MUTUAL_SETTLEMENT"
 )
 
 type ReportInfoStatus string
@@ -679,3 +679,247 @@ 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"
+
+	TransactionServiceStarsMembership TransactionOperationService = "ItemAgentServiceStarsMembership"
+
+	// 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"
+)
+
+type VisualStatus string
+
+const (
+	// dispute with the customer has been opened
+	VisualStatusDisputeOpened VisualStatus = "DisputeOpened"
+
+	// pending with the seller
+	VisualStatusOnSellerApproval VisualStatus = "OnSellerApproval"
+
+	// at the pick-up point
+	VisualStatusArrivedAtReturnPlace VisualStatus = "ArrivedAtReturnPlace"
+
+	// pending clarification by the seller
+	VisualStatusOnSellerClarification VisualStatus = "OnSellerClarification"
+
+	// pending clarification by the seller after partial compensation
+	VisualStatusOnSellerClarificationPartial VisualStatus = "OnSellerClarificationAfterPartialCompensation"
+
+	// partial compensation offered
+	VisualStatusOfferedPartial VisualStatus = "OfferedPartialCompensation"
+
+	// refund approved
+	VisualStatusReturnMoneyApproved VisualStatus = "ReturnMoneyApproved"
+
+	// partial compensation provided
+	VisualStatusPartialReturned VisualStatus = "PartialCompensationReturned"
+
+	// refund rejected, dispute isn't opened
+	VisualStatusCancelledDisputeNotOpen VisualStatus = "CancelledDisputeNotOpen"
+
+	// request rejected
+	VisualStatusRejected VisualStatus = "Rejected"
+
+	// request rejected by Ozon
+	VisualStatusCrmRejected VisualStatus = "CrmRejected"
+
+	// request canceled
+	VisualStatusCancelled VisualStatus = "Cancelled"
+
+	// request approved by the seller
+	VisualStatusApproved VisualStatus = "Approved"
+
+	// request approved by Ozon
+	VisualStatusApprovedByOzon VisualStatus = "ApprovedByOzon"
+
+	// seller received the return
+	VisualStatusReceivedBySeller VisualStatus = "ReceivedBySeller"
+
+	// return is on its way to the seller
+	VisualStatusMovingToSeller VisualStatus = "MovingToSeller"
+
+	// seller received the refund
+	VisualStatusReturnCompensated VisualStatus = "ReturnCompensated"
+
+	// courier is taking the return to the seller
+	VisualStatusReturningByCourier VisualStatus = "ReturningByCourier"
+
+	// on disposal
+	VisualStatusUtilizing VisualStatus = "Utilizing"
+
+	// disposed of
+	VisualStatusUtilized VisualStatus = "Utilized"
+
+	// customer received full refund
+	VisualStatusMoneyReturned VisualStatus = "MoneyReturned"
+
+	// partial refund has been approved
+	VisualStatusPartialInProcess VisualStatus = "PartialCompensationInProcess"
+
+	// seller opened a dispute
+	VisualStatusDisputeYouOpened VisualStatus = "DisputeYouOpened"
+
+	// compensation rejected
+	VisualStatusCompensationRejected VisualStatus = "CompensationRejected"
+
+	// support request sent
+	VisualStatusDisputeOpening VisualStatus = "DisputeOpening"
+
+	// awaiting your decision on compensation
+	VisualStatusCompensationOffered VisualStatus = "CompensationOffered"
+
+	// awaiting compensation
+	VisualStatusWaitingCompensation VisualStatus = "WaitingCompensation"
+
+	// an error occurred when sending the support request
+	VisualStatusSendingError VisualStatus = "SendingError"
+
+	// decision period has expired
+	VisualStatusCompensationRejectedBySla VisualStatus = "CompensationRejectedBySla"
+
+	// seller has refused compensation
+	VisualStatusCompensationRejectedBySeller VisualStatus = "CompensationRejectedBySeller"
+
+	// on the way to the Ozon warehouse
+	VisualStatusMovingToOzon VisualStatus = "MovingToOzon"
+
+	// arrived at the Ozon warehouse
+	VisualStatusReturnedToOzon VisualStatus = "ReturnedToOzon"
+
+	// quick refund
+	VisualStatusMoneyReturnedBySystem VisualStatus = "MoneyReturnedBySystem"
+
+	// awaiting shipping
+	VisualStatusWaitingShipment VisualStatus = "WaitingShipment"
+)

ozon/fbo.go

@@ -14,7 +14,7 @@ type FBO struct {
 
 type GetFBOShipmentsListParams struct {
 	// Sorting direction
-	Direction string `json:"dir"`
+	Direction Order `json:"dir,omitempty"`
 
 	// Shipment search filter
 	Filter GetFBOShipmentsListFilter `json:"filter"`
@@ -23,25 +23,25 @@ type GetFBOShipmentsListParams struct {
 	Limit int64 `json:"limit"`
 
 	// 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"`
+	Offset int64 `json:"offset,omitempty"`
 
 	// true if the address transliteration from Cyrillic to Latin is enabled
-	Translit bool `json:"translit"`
+	Translit bool `json:"translit,omitempty"`
 
 	// Additional fields to add to the response
-	With GetFBOShipmentsListWith `json:"with"`
+	With *GetFBOShipmentsListWith `json:"with,omitempty"`
 }
 
 // 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
@@ -101,9 +101,6 @@ type GetFBOShipmentsListResultAdditionalData struct {
 }
 
 type GetFBOShipmentsListResultAnalyticsData struct {
-	// Delivery city
-	City string `json:"city"`
-
 	// Delivery method
 	DeliveryType string `json:"delivery_type"`
 
@@ -116,10 +113,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"`
 
 	// Warehouse identifier
 	WarehouseId int64 `json:"warehouse_id"`
@@ -185,10 +179,10 @@ type GetShipmentDetailsParams struct {
 	PostingNumber string `json:"posting_number"`
 
 	// true if the address transliteration from Cyrillic to Latin is enabled
-	Translit bool `json:"translit"`
+	Translit bool `json:"translit,omitempty"`
 
 	// Additional fields to add to the response
-	With GetShipmentDetailsWith `json:"with"`
+	With *GetShipmentDetailsWith `json:"with,omitempty"`
 }
 
 type GetShipmentDetailsWith struct {
@@ -247,9 +241,6 @@ type GetShipmentDetailsResultAdditionalData struct {
 }
 
 type GetShipmentDetailsResultAnalyticsData struct {
-	// Delivery city
-	City string `json:"city"`
-
 	// Delivery method
 	DeliveryType string `json:"delivery_type"`
 
@@ -264,9 +255,6 @@ type GetShipmentDetailsResultAnalyticsData struct {
 	// Payment method
 	PaymentTypeGroupName string `json:"payment_type_group_name"`
 
-	// Delivery region
-	Region string `json:"region"`
-
 	// Warehouse identifier
 	WarehouseId int64 `json:"warehouse_id"`
 
@@ -290,108 +278,38 @@ func (c FBO) GetShipmentDetails(ctx context.Context, params *GetShipmentDetailsP
 }
 
 type ListSupplyRequestsParams struct {
-	// Number of the page returned in the request
+	// Filter
-	Page int32 `json:"page"`
+	Filter *ListSupplyRequestsFilter `json:"filter"`
 
-	// Number of elements on the page
+	// Customizing the display of the requests list
-	PageSize int32 `json:"page_size"`
+	Paging *ListSupplyRequestsPaging `json:"paging"`
+}
 
-	// Filter on status of a supply by request
+type ListSupplyRequestsFilter struct {
-	States []SupplyRequestState `json:"states"`
+	States []string `json:"states"`
+}
+
+type ListSupplyRequestsPaging struct {
+	// Supply number from which the list of requests will start
+	FromOrderId int64 `json:"from_supply_order_id"`
+
+	// Number of requests in the response
+	Limit int32 `json:"limit"`
 }
 
 type ListSupplyRequestsResponse struct {
 	core.CommonResponse
 
-	// Indicates that the response contains not the entire array of supply requests:
+	// Supply request identifier you last requested
-	//   - true — make a new request with a different page and page_size values to get information on the remaining requests;
+	LastSupplyOrderId int64 `json:"last_supply_order_id"`
-	//   - false — the entire array of requests for the filter specified in the request was returned in the response
-	HasNext bool `json:"has_next"`
-
-	// Supply requests list
-	SupplyOrders []SupplyRequestCommonResponse `json:"supply_orders"`
-
-	// Total requests number
-	TotalSupplyOrdersCount int32 `json:"total_supply_orders_count"`
-}
-
-type SupplyRequestCommonResponse struct {
-	// Supply request creation date
-	CreatedAt string `json:"created_at"`
-
-	// Local time supply interval
-	LocalTimeslot SupplyRequestCommonResponseLocalTimeslot `json:"local_timeslot"`
-
-	// Date from which you want to bring the supply to the warehouse. Only for supplies via vDC
-	PreferredSupplyDateFrom string `json:"preferred_supply_date_from"`
-
-	// Date by which you want to bring the supply to the warehouse. Only for supplies via vDC
-	PreferredSupplyDateTo string `json:"preferred_supply_date_to"`
-
-	// Your own warehouse from which you'll take the products to the supply warehouse.
-	// Only for supplies via vDC
-	SellerWarehouse SupplyRequestSellerWarehouse `json:"seller_warehouse"`
-
-	// Status of a supply by request
-	State string `json:"state"`
 
 	// Supply request identifier
-	SupplyOrderId int64 `json:"supply_order_id"`
+	SupplyOrderId []string `json:"supply_order_id"`
-
-	// Supply request number
-	SupplyOrderNumber string `json:"supply_order_number"`
-
-	// Supply warehouse
-	SupplyWarehouse SupplyRequestCommonResponseSupplyWarehouse `json:"supply_warehouse"`
-
-	// time_left_to_prepare_supply
-	TimeLeftToPrepareSupply int64 `json:"time_left_to_prepare_supply"`
-
-	// Time in seconds left to select the supply option. Only for supplies via vDC
-	TimeLeftToSelectSupplyVariant int64 `json:"time_left_to_select_supply_variant"`
-
-	// total_items_count
-	TotalItemsCount int32 `json:"total_items_count"`
-
-	// Total number of items in the request
-	TotalQuantity int32 `json:"total_quantity"`
 }
 
-type SupplyRequestSellerWarehouse struct {
+// Requests with supply to a specific warehouse and through a virtual distribution center (vDC) are taken into account
-	// Warehouse address
-	Address string `json:"address"`
-
-	// Warehouse name
-	Name string `json:"name"`
-
-	// Warehouse identifier
-	WarehouseId int64 `json:"warehouse_id"`
-}
-
-type SupplyRequestCommonResponseLocalTimeslot struct {
-	// Interval start
-	From string `json:"from"`
-
-	// Interval end
-	To string `json:"to"`
-}
-
-type SupplyRequestCommonResponseSupplyWarehouse struct {
-	// Warehouse address
-	Address string `json:"address"`
-
-	// Warehouse name
-	Name string `json:"name"`
-
-	// Warehouse identifier
-	WarehouseId int64 `json:"warehouse_id"`
-}
-
-// Method for getting a list of supply requests to the Ozon warehouse.
-// Requests with supply both to a specific warehouse and via a virtual
-// distribution center (vDC) are taken into account
 func (c FBO) ListSupplyRequests(ctx context.Context, params *ListSupplyRequestsParams) (*ListSupplyRequestsResponse, error) {
-	url := "/v1/supply-order/list"
+	url := "/v2/supply-order/list"
 
 	resp := &ListSupplyRequestsResponse{}
 
@@ -405,17 +323,111 @@ func (c FBO) ListSupplyRequests(ctx context.Context, params *ListSupplyRequestsP
 }
 
 type GetSupplyRequestInfoParams struct {
-	// Supply request identifier
+	// Supply request identifier in the Ozon system
-	SupplyOrderId int64 `json:"supply_order_id"`
+	OrderIds []string `json:"order_ids"`
 }
 
 type GetSupplyRequestInfoResponse struct {
 	core.CommonResponse
 
-	SupplyRequestCommonResponse
+	// Supply request details
+	Orders []SupplyOrder `json:"orders"`
 
-	// Driver and car information
+	// Warehouse details
-	VehicleInfo GetSupplyRequestInfoVehicle `json:"vehicle_info"`
+	Warehouses []SupplyWarehouse `json:"warehouses"`
+}
+
+type SupplyOrder struct {
+	// Date of supply request creation
+	CreationDate string `json:"creation_date"`
+
+	// Request source
+	CreationFlow string `json:"creation_flow"`
+
+	// Time remaining in seconds to fill in the supply details. Only for requests from the vDC
+	DataFillingDeadline time.Time `json:"data_filling_deadline_utc"`
+
+	// Supply warehouse identifier
+	DropoffWarehouseId int64 `json:"dropoff_warehouse_id"`
+
+	// Filter by supply status
+	State string `json:"state"`
+
+	// Supply request contents
+	Supplies []Supply `json:"supplies"`
+
+	// Supply request identifier
+	Id int64 `json:"supply_order_id"`
+
+	// Request number
+	OrderNumber string `json:"supply_order_number"`
+
+	// Supply time slot
+	Timeslot []SupplyTimeslot `json:"timeslot"`
+
+	// Driver and vehicle details
+	Vehicle []SupplyVehicle `json:"vehicle"`
+}
+
+type Supply struct {
+	// Supply contents identifier. Used in the /v1/supply-order/bundle method
+	BundleId string `json:"bundle_id"`
+
+	// Storage warehouse identifier
+	StorageWarehouseId int64 `json:"storage_warehouse_id"`
+
+	// Supply identifier
+	Id int64 `json:"supply_id"`
+}
+
+type SupplyTimeslot struct {
+	// Reason why you can't select the supply time slot
+	Reasons []string `json:"can_not_set_reasons"`
+
+	// true, if you can select or edit the supply time slot
+	CanSet bool `json:"can_set"`
+
+	// true, if the characteristic is required
+	IsRequired bool `json:"is_required"`
+
+	Value SupplyTimeslotValue `json:"value"`
+}
+
+type SupplyVehicle struct {
+	// Reason why you can't select the supply time slot
+	Reasons []string `json:"can_not_set_reasons"`
+
+	// true, if you can select or edit the supply time slot
+	CanSet bool `json:"can_set"`
+
+	// true, if the characteristic is required
+	IsRequired bool `json:"is_required"`
+
+	Value []GetSupplyRequestInfoVehicle `json:"value"`
+}
+
+type SupplyTimeslotValue struct {
+	// Supply time slot in local time
+	Timeslot []SupplyTimeslotValueTimeslot `json:"timeslot"`
+
+	// Time zone
+	Timezone []SupplyTimeslotValueTimezone `json:"timezone_info"`
+}
+
+type SupplyTimeslotValueTimeslot struct {
+	// Supply time slot start
+	From time.Time `json:"from"`
+
+	// Supply time slot end
+	To time.Time `json:"to"`
+}
+
+type SupplyTimeslotValueTimezone struct {
+	// Time zone name
+	Name string `json:"iana_name"`
+
+	// Time zone offset from UTC-0 in seconds
+	Offset string `json:"offset"`
 }
 
 type GetSupplyRequestInfoVehicle struct {
@@ -432,11 +444,22 @@ type GetSupplyRequestInfoVehicle struct {
 	VehicleNumber string `json:"vehicle_number"`
 }
 
+type SupplyWarehouse struct {
+	// Warehouse address
+	Address string `json:"address"`
+
+	// Warehouse name
+	Name string `json:"name"`
+
+	// Warehouse identifier
+	Id int64 `json:"warehouse_id"`
+}
+
 // Method for getting detailed information on a supply request.
 // Requests with supply both to a specific warehouse and via a
 // virtual distribution center (vDC) are taken into account
 func (c FBO) GetSupplyRequestInfo(ctx context.Context, params *GetSupplyRequestInfoParams) (*GetSupplyRequestInfoResponse, error) {
-	url := "/v1/supply-order/get"
+	url := "/v2/supply-order/get"
 
 	resp := &GetSupplyRequestInfoResponse{}
 
@@ -563,3 +586,555 @@ func (c FBO) GetWarehouseWorkload(ctx context.Context) (*GetWarehouseWorkloadRes
 
 	return resp, nil
 }
+
+type GetSupplyOrdersByStatusParams struct {
+}
+
+type GetSupplyOrdersByStatusResponse struct {
+	core.CommonResponse
+
+	Items []SupplyOrdersByStatus `json:"items"`
+}
+
+type SupplyOrdersByStatus struct {
+	// Number of supply requests in this status
+	Count int32 `json:"count"`
+
+	// Supply status
+	OrderState string `json:"order_state"`
+}
+
+// Returns the number of supply requests in a specific status.
+func (c FBO) GetSupplyOrdersByStatus(ctx context.Context) (*GetSupplyOrdersByStatusResponse, error) {
+	url := "/v1/supply-order/status/counter"
+
+	resp := &GetSupplyOrdersByStatusResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodGet, url, &GetSupplyOrdersByStatusParams{}, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetSupplyTimeslotsParams struct {
+	// Supply request identifier
+	SupplyOrderId int64 `json:"supply_order_id"`
+}
+
+type GetSupplyTimeslotsResponse struct {
+	core.CommonResponse
+
+	// Supply time slot
+	Timeslots []SupplyTimeslotValueTimeslot `json:"timeslots"`
+
+	// Time zone
+	Timezones []SupplyTimeslotValueTimezone `json:"timezone"`
+}
+
+func (c FBO) GetSupplyTimeslots(ctx context.Context, params *GetSupplyTimeslotsParams) (*GetSupplyTimeslotsResponse, error) {
+	url := "/v1/supply-order/timeslot/get"
+
+	resp := &GetSupplyTimeslotsResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type UpdateSupplyTimeslotParams struct {
+	// Supply request identifier
+	SupplyOrderId int64 `json:"supply_order_id"`
+
+	// Supply time slot details
+	Timeslot SupplyTimeslotValueTimeslot `json:"timeslot"`
+}
+
+type UpdateSupplyTimeslotResponse struct {
+	core.CommonResponse
+
+	// Possible errors
+	Errors []string `json:"errors"`
+
+	// Operation identifier
+	OperationId string `json:"operation_id"`
+}
+
+func (c FBO) UpdateSupplyTimeslot(ctx context.Context, params *UpdateSupplyTimeslotParams) (*UpdateSupplyTimeslotResponse, error) {
+	url := "/v1/supply-order/timeslot/update"
+
+	resp := &UpdateSupplyTimeslotResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetSupplyTimeslotStatusParams struct {
+	// Operation identifier
+	OperationId string `json:"operation_id"`
+}
+
+type GetSupplyTimeslotStatusResponse struct {
+	core.CommonResponse
+
+	// Possible errors
+	Errors []string `json:"errors"`
+
+	// Data status
+	Status string `json:"status"`
+}
+
+func (c FBO) GetSupplyTimeslotStatus(ctx context.Context, params *GetSupplyTimeslotStatusParams) (*GetSupplyTimeslotStatusResponse, error) {
+	url := "/v1/supply-order/timeslot/status"
+
+	resp := &GetSupplyTimeslotStatusResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type CreatePassParams struct {
+	// Supply request identifier
+	SupplyOrderId int64 `json:"supply_order_id"`
+
+	// Driver and car information
+	Vehicle GetSupplyRequestInfoVehicle `json:"vehicle"`
+}
+
+type CreatePassResponse struct {
+	core.CommonResponse
+
+	// Possible errors
+	Errors []string `json:"error_reasons"`
+
+	// Operation identifier
+	OperationId string `json:"operation_id"`
+}
+
+func (c FBO) CreatePass(ctx context.Context, params *CreatePassParams) (*CreatePassResponse, error) {
+	url := "/v1/supply-order/pass/create"
+
+	resp := &CreatePassResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetPassParams struct {
+	// Operation identifier
+	OperationId string `json:"operation_id"`
+}
+
+type GetPassResponse struct {
+	core.CommonResponse
+
+	// Possible errors
+	Errors []string `json:"errors"`
+
+	// Status of driver and vehicle data entry
+	Result string `json:"result"`
+}
+
+func (c FBO) GetPass(ctx context.Context, params *GetPassParams) (*GetPassResponse, error) {
+	url := "/v1/supply-order/pass/status"
+
+	resp := &GetPassResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetSupplyContentParams struct {
+	// Identifiers of supply contents. Minimum is 1, maximum is 1000. You can get them using the /v2/supply-order/get method
+	BundleIds []string `json:"bundle_ids"`
+
+	// true, to sort in ascending order
+	IsAsc bool `json:"is_asc"`
+
+	// Identifier of the last value on the page
+	LastId string `json:"last_id"`
+
+	// Number of values on the page. Minimum is 1, maximum is 1000
+	Limit int32 `json:"limit"`
+
+	// Search query, for example: by name, article code, or SKU
+	Query string `json:"query"`
+
+	// Sorting by parameters
+	SortField string `json:"sort_field"`
+}
+
+type GetSupplyContentResponse struct {
+	core.CommonResponse
+
+	// List of products in the supply request
+	Items []SupplyContentItem `json:"items"`
+
+	// Quantity of products in the request
+	TotalCount int32 `json:"total_count"`
+
+	// Indication that the response hasn't returned all products
+	HasNext bool `json:"has_next"`
+
+	// Identifier of the last value on the page
+	LastId string `json:"last_id"`
+}
+
+type SupplyContentItem struct {
+	// Link to product image
+	IconPath string `json:"icon_path"`
+
+	// Product identifier in the Ozon system, SKU
+	SKU int64 `json:"sku"`
+
+	// Product name
+	Name string `json:"name"`
+
+	// Product items quantity
+	Quantity int32 `json:"quantity"`
+
+	// Barcode
+	Barcode string `json:"barcode"`
+
+	// Product identifier
+	ProductId int64 `json:"product_id"`
+
+	// Quantity of products in one package
+	Quant int32 `json:"quant"`
+
+	// true if the quantity of products in one package can be edited
+	IsQuantEditable bool `json:"is_quant_editable"`
+
+	// Volume of products in liters
+	VolumeInLiters float64 `json:"volume_in_litres"`
+
+	// Volume of all products in liters
+	TotalVolumeInLiters float64 `json:"total_volume_in_litres"`
+
+	// Product article code
+	ContractorItemCode string `json:"contractor_item_code"`
+
+	// Super product label
+	SFBOAttribute string `json:"sfbo_attribute"`
+
+	// Type of wrapper
+	ShipmentType string `json:"shipment_type"`
+}
+
+func (c FBO) GetSupplyContent(ctx context.Context, params *GetSupplyContentParams) (*GetSupplyContentResponse, error) {
+	url := "/v1/supply-order/bundle"
+
+	resp := &GetSupplyContentResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type CreateSupplyDraftParams struct {
+	// Clusters identifiers
+	ClusterIds []string `json:"cluster_ids"`
+
+	// Shipping point identifier: pick-up point or sorting center. Only for the type = CREATE_TYPE_CROSSDOCK supply type.
+	DropoffWarehouseId int64 `json:"drop_off_point_warehouse_id"`
+
+	// Products
+	Items []CreateSupplyDraftItem `json:"items"`
+
+	// Supply type
+	Type string `json:"type"`
+}
+
+type CreateSupplyDraftItem struct {
+	// Product quantity
+	Quantity int32 `json:"quantity"`
+
+	// Product identifier
+	SKU int64 `json:"sku"`
+}
+
+type CreateSupplyDraftResponse struct {
+	core.CommonResponse
+
+	// Identifier of the supply request draft
+	OperationId string `json:"operation_id"`
+}
+
+// Create a direct or cross-docking supply request draft and specify the products to supply.
+//
+// You can leave feedback on this method in the comments section to the discussion in the Ozon for dev community
+func (c FBO) CreateSupplyDraft(ctx context.Context, params *CreateSupplyDraftParams) (*CreateSupplyDraftResponse, error) {
+	url := "/v1/draft/create"
+
+	resp := &CreateSupplyDraftResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetSupplyDraftInfoParams struct {
+	// Identifier of the supply request draft
+	OperationId string `json:"operation_id"`
+}
+
+type GetSupplyDraftInfoResponse struct {
+	core.CommonResponse
+
+	// Clusters
+	Clusters []SupplyDraftCluster `json:"clusters"`
+
+	// Identifier of the supply request draft
+	DraftId int64 `json:"draft_id"`
+
+	// Errors
+	Errors []GetSupplyDraftInfoError `json:"errors"`
+
+	// Creation status of the supply request draft
+	Status string `json:"status"`
+}
+
+type SupplyDraftCluster struct {
+	// Cluster identifier
+	Id int64 `json:"cluster_id"`
+
+	// Cluster name
+	Name string `json:"cluster_name"`
+
+	// Warehouses
+	Warehouses []SupplyDraftWarehouse `json:"warehouses"`
+}
+
+type SupplyDraftWarehouse struct {
+	// Warehouse address
+	Address string `json:"address"`
+
+	// Product list bundle
+	BundleIds []SupplyDraftWarehouseBundle `json:"bundle_ids"`
+
+	// Warehouse name
+	Name string `json:"name"`
+
+	// Bundle of products that don't come in a shipment
+	RestrictedBundleId string `json:"restricted_bundle_id"`
+
+	// Warehouse availability
+	Status SupplyDraftWarehouseStatus `json:"status"`
+
+	// Supply warehouses
+	SupplyWarehouse SupplyWarehouse `json:"supply_warehouse"`
+
+	// Warehouse rank in the cluster
+	TotalRank int32 `json:"total_rank"`
+
+	// Warehouse rating
+	TotalScore float64 `json:"total_score"`
+
+	// Estimated delivery time
+	//
+	// Nullable
+	TravelTimeDays *int64 `json:"travel_time_days"`
+
+	// Warehouse identifier
+	Id int64 `json:"warehouse_id"`
+}
+
+type SupplyDraftWarehouseBundle struct {
+	// Bundle identifier
+	Id string `json:"bundle_id"`
+
+	// Indicates that the UTD is to be passed
+	IsDocless bool `json:"is_docless"`
+}
+
+type SupplyDraftWarehouseStatus struct {
+	// Reason why the warehouse isn't available
+	InvalidReason string `json:"invalid_reason"`
+
+	// Warehouse availability
+	IsAvailable bool `json:"is_available"`
+
+	// Warehouse status
+	State string `json:"state"`
+}
+
+type GetSupplyDraftInfoError struct {
+	// Possible errors
+	Message string `json:"error_message"`
+
+	// Validation errors
+	ItemsValidation []GetSupplyDraftInfoValidationError `json:"items_validation"`
+
+	// Unknown clusters identifiers
+	UnknownClusterIds []string `json:"unknown_cluster_ids"`
+}
+
+type GetSupplyDraftInfoValidationError struct {
+	// Error reasons
+	Reasons []string `json:"reasons"`
+
+	// Product identifier in the Ozon system, SKU
+	SKU int64 `json:"sku"`
+}
+
+func (c FBO) GetSupplyDraftInfo(ctx context.Context, params *GetSupplyDraftInfoParams) (*GetSupplyDraftInfoResponse, error) {
+	url := "/v1/draft/create/info"
+
+	resp := &GetSupplyDraftInfoResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type CreateSupplyFromDraftParams struct {
+	// Identifier of the supply request draft
+	DraftId int64 `json:"draft_id"`
+
+	// Supply time slot
+	Timeslot CreateSupplyFromDraftTimeslot `json:"timeslot"`
+
+	// Shipping warehouse identifier
+	WarehouseId int64 `json:"warehouse_id"`
+}
+
+type CreateSupplyFromDraftTimeslot struct {
+	// Supply time slot start date
+	FromInTimezone time.Time `json:"from_in_timezone"`
+
+	// Supply time slot end date
+	ToInTimezone time.Time `json:"to_in_timezone"`
+}
+
+type CreateSupplyFromDraftResponse struct {
+	core.CommonResponse
+
+	// Supply request identifier
+	OperationId string `json:"operation_id"`
+}
+
+func (c FBO) CreateSupplyFromDraft(ctx context.Context, params *CreateSupplyFromDraftParams) (*CreateSupplyFromDraftResponse, error) {
+	url := "/v1/draft/supply/create"
+
+	resp := &CreateSupplyFromDraftResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetDraftTimeslotsParams struct {
+	// Start date of the available supply time slots period
+	DateFrom time.Time `json:"date_from"`
+
+	// End date of the available supply time slots period
+	//
+	// The maximum period is 28 days from the current date
+	DateTo time.Time `json:"date_to"`
+
+	// Identifier of the supply request draft
+	DraftId int64 `json:"draft_id"`
+
+	// The warehouses identifiers for which supply time slots are required
+	WarehouseIds []string `json:"warehouse_ids"`
+}
+
+type GetDraftTimeslotsResponse struct {
+	core.CommonResponse
+
+	// Warehouses supply time slots
+	DropoffWarehouseTimeslots []DraftTimeslot `json:"drop_off_warehouse_timeslots"`
+
+	// Start date of the necessary period
+	RequestedDateFrom time.Time `json:"requested_date_from"`
+
+	// End date of the necessary period
+	RequestedDateTo time.Time `json:"requested_date_to"`
+}
+
+type DraftTimeslot struct {
+	// Current time in the warehouse time zone
+	CurrentTimeInTimezone time.Time `json:"current_time_in_timezone"`
+
+	// Supply time slots by dates
+	Days []DraftTimeslotDay `json:"days"`
+
+	// Warehouse identifier
+	DropoffWarehouseId int64 `json:"drop_off_warehouse_id"`
+
+	// Warehouse time zone
+	WarehouseTimezone string `json:"warehouse_timezone"`
+}
+
+type DraftTimeslotDay struct {
+	// Supply time slots date
+	DateInTimezone time.Time `json:"date_in_timezone"`
+
+	// Supply time slots details
+	Timeslots []DraftTimeslotDayTimeslot `json:"timeslots"`
+}
+
+type DraftTimeslotDayTimeslot struct {
+	// Supply time slot start date
+	FromInTimezone time.Time `json:"from_in_timezone"`
+
+	// Supply time slot end date
+	ToInTimezone time.Time `json:"to_in_timezone"`
+}
+
+// Available supply time slots at final shipping warehouses
+func (c FBO) GetDraftTimeslots(ctx context.Context, params *GetDraftTimeslotsParams) (*GetDraftTimeslotsResponse, error) {
+	url := "/v1/draft/timeslot/info"
+
+	resp := &GetDraftTimeslotsResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodGet, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}

ozon/fbo_test.go

@@ -24,14 +24,14 @@ 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,
 				Translit: true,
-				With: GetFBOShipmentsListWith{
+				With: &GetFBOShipmentsListWith{
 					AnalyticsData: true,
 					FinancialData: true,
 				},
@@ -58,8 +58,6 @@ func TestGetFBOShipmentsList(t *testing.T) {
 					  }
 					],
 					"analytics_data": {
-					  "region": "РОСТОВСКАЯ ОБЛАСТЬ",
-					  "city": "Ростов-на-Дону",
 					  "delivery_type": "PVZ",
 					  "is_premium": false,
 					  "payment_type_group_name": "Карты оплаты",
@@ -165,7 +163,7 @@ func TestGetShipmentDetails(t *testing.T) {
 			&GetShipmentDetailsParams{
 				PostingNumber: "50520644-0012-7",
 				Translit:      true,
-				With: GetShipmentDetailsWith{
+				With: &GetShipmentDetailsWith{
 					AnalyticsData: true,
 					FinancialData: true,
 				},
@@ -191,8 +189,6 @@ func TestGetShipmentDetails(t *testing.T) {
 					}
 				  ],
 				  "analytics_data": {
-					"region": "МОСКВА",
-					"city": "Москва",
 					"delivery_type": "Courier",
 					"is_premium": false,
 					"payment_type_group_name": "Карты оплаты",
@@ -301,36 +297,19 @@ func TestListSupplyRequests(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&ListSupplyRequestsParams{
-				Page:     0,
+				Filter: &ListSupplyRequestsFilter{
-				PageSize: 0,
+					States: []string{"ORDER_STATE_DATA_FILLING"},
-				States:   []SupplyRequestState{AcceptanceAtStorageWarehouse},
+				},
+				Paging: &ListSupplyRequestsPaging{
+					FromOrderId: 0,
+					Limit:       0,
+				},
 			},
 			`{
-				"has_next": true,
+				"last_supply_order_id": 0,
-				"supply_orders": [
+				"supply_order_id": [
-				  {
+				  "string"
-					"created_at": "string",
+				]
-					"local_timeslot": {
-					  "from": "string",
-					  "to": "string"
-					},
-					"preferred_supply_date_from": "string",
-					"preferred_supply_date_to": "string",
-					"state": "string",
-					"supply_order_id": 0,
-					"supply_order_number": "string",
-					"supply_warehouse": {
-					  "address": "string",
-					  "name": "string",
-					  "warehouse_id": 0
-					},
-					"time_left_to_prepare_supply": 0,
-					"time_left_to_select_supply_variant": 0,
-					"total_items_count": 0,
-					"total_quantity": 0
-				  }
-				],
-				"total_supply_orders_count": 0
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -377,39 +356,74 @@ func TestGetSupplyRequestInfo(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetSupplyRequestInfoParams{
-				SupplyOrderId: 0,
+				OrderIds: []string{"string"},
 			},
 			`{
-				"created_at": "string",
+				"orders": [
-				"local_timeslot": {
+				  {
-				  "from": "string",
+					"creation_date": "string",
-				  "to": "string"
+					"creation_flow": "string",
-				},
+					"data_filling_deadline_utc": "2019-08-24T14:15:22Z",
-				"preferred_supply_date_from": "string",
+					"dropoff_warehouse_id": 0,
-				"preferred_supply_date_to": "string",
+					"state": "ORDER_STATE_UNSPECIFIED",
-				"seller_warehouse": {
+					"supplies": [
-				  "address": "string",
+					  {
-				  "name": "string",
+						"bundle_id": "string",
-				  "warehouse_id": 0
+						"storage_warehouse_id": 0,
-				},
+						"supply_id": 0
-				"state": "string",
+					  }
-				"supply_order_id": 0,
+					],
-				"supply_order_number": "string",
+					"supply_order_id": 0,
-				"supply_warehouse": {
+					"supply_order_number": "string",
-				  "address": "string",
+					"timeslot": [
-				  "name": "string",
+					  {
-				  "warehouse_id": 0
+						"can_not_set_reasons": [
-				},
+						  "string"
-				"time_left_to_prepare_supply": 0,
+						],
-				"time_left_to_select_supply_variant": 0,
+						"can_set": true,
-				"total_items_count": 0,
+						"is_required": true,
-				"total_quantity": 0,
+						"value": {
-				"vehicle_info": {
+						  "timeslot": [
-				  "driver_name": "string",
+							{
-				  "driver_phone": "string",
+							  "from": "2019-08-24T14:15:22Z",
-				  "vehicle_model": "string",
+							  "to": "2019-08-24T14:15:22Z"
-				  "vehicle_number": "string"
+							}
-				}
+						  ],
+						  "timezone_info": [
+							{
+							  "iana_name": "string",
+							  "offset": "string"
+							}
+						  ]
+						}
+					  }
+					],
+					"vehicle": [
+					  {
+						"can_not_set_reasons": [
+						  "string"
+						],
+						"can_set": true,
+						"is_required": true,
+						"value": [
+						  {
+							"driver_name": "string",
+							"driver_phone": "string",
+							"vehicle_model": "string",
+							"vehicle_number": "string"
+						  }
+						]
+					  }
+					]
+				  }
+				],
+				"warehouses": [
+				  {
+					"address": "string",
+					"name": "string",
+					"warehouse_id": 0
+				  }
+				]
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -565,3 +579,694 @@ func TestGetWarehouseWorkload(t *testing.T) {
 		}
 	}
 }
+
+func TestGetSupplyOrdersByStatus(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			`{
+				"items": [
+				  {
+					"count": 0,
+					"order_state": "ORDER_STATE_UNSPECIFIED"
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			`{
+				"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.FBO().GetSupplyOrdersByStatus(ctx)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetSupplyOrdersByStatusResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetSupplyTimeslots(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetSupplyTimeslotsParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetSupplyTimeslotsParams{
+				SupplyOrderId: 0,
+			},
+			`{
+				"timeslots": [
+				  {
+					"from": "2019-08-24T14:15:22Z",
+					"to": "2019-08-24T14:15:22Z"
+				  }
+				],
+				"timezone": [
+				  {
+					"iana_name": "string",
+					"offset": "string"
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetSupplyTimeslotsParams{},
+			`{
+				"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.FBO().GetSupplyTimeslots(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetSupplyTimeslotsResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestUpdateSupplyTimeslot(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *UpdateSupplyTimeslotParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&UpdateSupplyTimeslotParams{
+				SupplyOrderId: 0,
+				Timeslot: SupplyTimeslotValueTimeslot{
+					From: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+					To:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+				},
+			},
+			`{
+				"errors": [
+				  "UPDATE_TIMESLOT_ERROR_UNSPECIFIED"
+				],
+				"operation_id": "string"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&UpdateSupplyTimeslotParams{},
+			`{
+				"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.FBO().UpdateSupplyTimeslot(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &UpdateSupplyTimeslotResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetSupplyTimeslotStatus(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetSupplyTimeslotStatusParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetSupplyTimeslotStatusParams{
+				OperationId: "string",
+			},
+			`{
+				"errors": [
+				  "UPDATE_TIMESLOT_ERROR_UNSPECIFIED"
+				],
+				"status": "STATUS_UNSPECIFIED"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetSupplyTimeslotStatusParams{},
+			`{
+				"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.FBO().GetSupplyTimeslotStatus(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetSupplyTimeslotStatusResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestCreatePass(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *CreatePassParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&CreatePassParams{
+				SupplyOrderId: 123,
+				Vehicle: GetSupplyRequestInfoVehicle{
+					DriverName:    "string",
+					DriverPhone:   "string",
+					VehicleModel:  "string",
+					VehicleNumber: "string",
+				},
+			},
+			`{
+				"error_reasons": [
+				  "SET_VEHICLE_ERROR_UNSPECIFIED"
+				],
+				"operation_id": "string"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&CreatePassParams{},
+			`{
+				"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.FBO().CreatePass(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &CreatePassResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetPass(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetPassParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetPassParams{
+				OperationId: "string",
+			},
+			`{
+				"errors": [
+				  "SET_VEHICLE_ERROR_UNSPECIFIED"
+				],
+				"result": "Unknown"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetPassParams{},
+			`{
+				"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.FBO().GetPass(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetPassResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetSupplyContent(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetSupplyContentParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetSupplyContentParams{
+				BundleIds: []string{"string"},
+				IsAsc:     true,
+				Limit:     0,
+				Query:     "string",
+				SortField: "UNSPECIFIED",
+			},
+			`{
+				"items": [
+				  {
+					"icon_path": "string",
+					"sku": 0,
+					"name": "string",
+					"quantity": 0,
+					"barcode": "string",
+					"product_id": 0,
+					"quant": 0,
+					"is_quant_editable": true,
+					"volume_in_litres": 0,
+					"total_volume_in_litres": 0,
+					"contractor_item_code": "string",
+					"sfbo_attribute": "ITEM_SFBO_ATTRIBUTE_UNSPECIFIED",
+					"shipment_type": "BUNDLE_ITEM_SHIPMENT_TYPE_UNSPECIFIED"
+				  }
+				],
+				"total_count": 0,
+				"has_next": true,
+				"last_id": "string"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetSupplyContentParams{},
+			`{
+				"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.FBO().GetSupplyContent(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetSupplyContentResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestCreateSupplyDraft(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *CreateSupplyDraftParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&CreateSupplyDraftParams{
+				ClusterIds:         []string{"string"},
+				DropoffWarehouseId: 0,
+				Items: []CreateSupplyDraftItem{
+					{
+						Quantity: 1,
+						SKU:      11,
+					},
+				},
+				Type: "CREATE_TYPE_CROSSDOCK",
+			},
+			`{
+				"operation_id": "string"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&CreateSupplyDraftParams{},
+			`{
+				"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.FBO().CreateSupplyDraft(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &CreateSupplyDraftResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetSupplyDraftInfo(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetSupplyDraftInfoParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetSupplyDraftInfoParams{
+				OperationId: "string",
+			},
+			`{
+				"clusters": [
+				  {
+					"cluster_id": 0,
+					"cluster_name": "string",
+					"warehouses": [
+					  {
+						"address": "string",
+						"bundle_ids": [
+						  {
+							"bundle_id": "string",
+							"is_docless": true
+						  }
+						],
+						"name": "string",
+						"restricted_bundle_id": "string",
+						"status": {
+						  "invalid_reason": "WAREHOUSE_SCORING_INVALID_REASON_UNSPECIFIED",
+						  "is_available": true,
+						  "state": "WAREHOUSE_SCORING_STATUS_FULL_AVAILABLE"
+						},
+						"supply_warehouse": {
+						  "address": "string",
+						  "name": "string",
+						  "warehouse_id": 0
+						},
+						"total_rank": 0,
+						"total_score": 0,
+						"travel_time_days": 0,
+						"warehouse_id": 0
+					  }
+					]
+				  }
+				],
+				"draft_id": 0,
+				"errors": [
+				  {
+					"error_message": "string",
+					"items_validation": [
+					  {
+						"reasons": [
+						  "string"
+						],
+						"sku": 0
+					  }
+					],
+					"unknown_cluster_ids": [
+					  "string"
+					]
+				  }
+				],
+				"status": "CALCULATION_STATUS_FAILED"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetSupplyDraftInfoParams{},
+			`{
+				"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.FBO().GetSupplyDraftInfo(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetSupplyDraftInfoResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestCreateSupplyFromDraft(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *CreateSupplyFromDraftParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&CreateSupplyFromDraftParams{
+				DraftId: 11,
+				Timeslot: CreateSupplyFromDraftTimeslot{
+					FromInTimezone: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+					ToInTimezone:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+				},
+				WarehouseId: 45,
+			},
+			`{
+				"operation_id": "string"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&CreateSupplyFromDraftParams{},
+			`{
+				"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.FBO().CreateSupplyFromDraft(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &CreateSupplyFromDraftResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetDraftTimeslots(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetDraftTimeslotsParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetDraftTimeslotsParams{
+				DraftId:      123,
+				DateFrom:     core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+				DateTo:       core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+				WarehouseIds: []string{"ddd456"},
+			},
+			`{
+				"drop_off_warehouse_timeslots": [
+				  {
+					"current_time_in_timezone": "2019-08-24T14:15:22Z",
+					"days": [
+					  {
+						"date_in_timezone": "2019-08-24T14:15:22Z",
+						"timeslots": [
+						  {
+							"from_in_timezone": "2019-08-24T14:15:22Z",
+							"to_in_timezone": "2019-08-24T14:15:22Z"
+						  }
+						]
+					  }
+					],
+					"drop_off_warehouse_id": 0,
+					"warehouse_timezone": "string"
+				  }
+				],
+				"requested_date_from": "2019-08-24T14:15:22Z",
+				"requested_date_to": "2019-08-24T14:15:22Z"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetDraftTimeslotsParams{},
+			`{
+				"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.FBO().GetDraftTimeslots(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetDraftTimeslotsResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}

ozon/fbs.go

@@ -14,7 +14,7 @@ type FBS struct {
 
 type ListUnprocessedShipmentsParams struct {
 	// Sorting direction
-	Direction Order `json:"dir"`
+	Direction Order `json:"dir,omitempty"`
 
 	// Request filter
 	Filter ListUnprocessedShipmentsFilter `json:"filter"`
@@ -27,38 +27,43 @@ type ListUnprocessedShipmentsParams 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"`
+	Offset int64 `json:"offset,omitempty"`
 
 	// Additional fields that should be added to the response
-	With ListUnprocessedShipmentsWith `json:"with"`
+	With *ListUnprocessedShipmentsWith `json:"with,omitempty"`
 }
 
 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"`
 
+	// Specify true to get only MOQ shipments.
+	//
+	// The default value is false, the response contains all shipments
+	IsQuantum bool `json:"is_quantum"`
+
 	// Filter for shipments delivered from partner warehouse (FBP). You can pass one of the following values:
 	//
 	// 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"`
@@ -106,6 +111,9 @@ type FBSPosting struct {
 	// Analytics data
 	AnalyticsData FBSPostingAnalyticsData `json:"analytics_data"`
 
+	// Available actions and shipment information
+	AvailableActions []string `json:"available_actions"`
+
 	// Shipment barcodes
 	Barcodes FBSBarcode `json:"barcodes"`
 
@@ -174,10 +182,48 @@ type FBSPosting struct {
 	Substatus string `json:"substatus"`
 
 	// Type of integration with the delivery service
-	TPLIntegrationType string `json:"tpl_integration_type"`
+	TPLIntegrationType TPLIntegrationType `json:"tpl_integration_type"`
 
 	// Shipment tracking number
 	TrackingNumber string `json:"tracking_number"`
+
+	// Details on shipping rate
+	Tariffication []FBSPostingTariffication `json:"tariffication"`
+
+	// Economy product identifier
+	QuantumId int64 `json:"quantum_id"`
+}
+
+type FBSPostingTariffication struct {
+	// Current shipping rate as a percentage
+	CurrentTariffRate float64 `json:"current_tariff_rate"`
+
+	// Type of shipping rate adjustment: discount or surcharge
+	CurrentTariffType string `json:"current_tariff_type"`
+
+	// Current amount of discount or surcharge
+	CurrentTariffCharge string `json:"current_tariff_charge"`
+
+	// Currency of the amount
+	CurrencyTariffCurrencyCode string `json:"current_tariff_charge_currency_code"`
+
+	// Percentage by which the shipping rate is adjusted
+	// after the time specified in the next_tariff_starts_at parameter
+	NextTariffRate float64 `json:"next_tariff_rate"`
+
+	// The adjustment type applied to the shipping rate
+	// after the time specified in the next_tariff_starts_at parameter:
+	// discount or surcharge
+	NextTariffType string `json:"next_tariff_type"`
+
+	// Discount or surcharge amount applied during the next shipping rate adjustment step
+	NextTariffCharge string `json:"next_tariff_charge"`
+
+	// Date and time when the new shipping rate is applied
+	NextTariffStartsAt time.Time `json:"next_tariff_starts_at"`
+
+	// New shipping rate currency
+	NextTariffCurrencyCode string `json:"next_tariff_charge_currency_code"`
 }
 
 type FBSPostingAddressee struct {
@@ -191,7 +237,7 @@ type FBSPostingAddressee struct {
 }
 
 type FBSPostingAnalyticsData struct {
-	// Delivery city
+	// Delivery city. Only for rFBS shipments
 	City string `json:"city"`
 
 	// Delivery start date and time
@@ -213,9 +259,9 @@ 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
+	// Delivery region. Only for rFBS shipments
 	Region string `json:"region"`
 
 	// Delivery service
@@ -350,9 +396,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 +404,7 @@ type FBSCustomer struct {
 
 	// Customer phone number.
 	//
-	// Returns an empty string
+	// Returns an empty string ""
 	Phone string `json:"phone"`
 }
 
@@ -452,6 +495,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,9 +556,9 @@ func (c FBS) ListUnprocessedShipments(ctx context.Context, params *ListUnprocess
 
 type GetFBSShipmentsListParams struct {
 	// Sorting direction
-	Direction string `json:"direction"`
+	Direction Order `json:"dir,omitempty"`
 
-	//Filter
+	// Filter
 	Filter GetFBSShipmentsListFilter `json:"filter"`
 
 	// Number of shipments in the response:
@@ -522,26 +567,31 @@ type GetFBSShipmentsListParams struct {
 	Limit int64 `json:"limit"`
 
 	// 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"`
+	Offset int64 `json:"offset,omitempty"`
 
 	// Additional fields that should be added to the response
-	With GetFBSShipmentsListWith `json:"with"`
+	With *GetFBSShipmentsListWith `json:"with,omitempty"`
 }
 
 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"`
 
+	// Specify true to get only MOQ shipments.
+	//
+	// The default value is false, the response contains all shipments
+	IsQuantum bool `json:"is_quantum"`
+
 	// Delivery service identifier
 	ProviderId []int64 `json:"provider_id"`
 
@@ -564,6 +614,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 {
@@ -625,7 +682,7 @@ type PackOrderParams struct {
 	PostingNumber string `json:"posting_number"`
 
 	// Additional information
-	With PackOrderWith `json:"with"`
+	With *PackOrderWith `json:"with,omitempty"`
 }
 
 type PackOrderPackage struct {
@@ -865,7 +922,7 @@ type GetShipmentDataByIdentifierParams struct {
 	PostingNumber string `json:"posting_number"`
 
 	// Additional fields that should be added to the response
-	With GetShipmentDataByIdentifierWith `json:"with"`
+	With *GetShipmentDataByIdentifierWith `json:"with,omitempty"`
 }
 
 type GetShipmentDataByIdentifierWith struct {
@@ -906,6 +963,9 @@ type GetShipmentDataByIdentifierResult struct {
 	// Analytics data
 	AnalyticsData GetShipmentDataByIdentifierResultAnalyticsData `json:"analytics_data"`
 
+	// Available actions and shipment information
+	AvailableActions []string `json:"available_actions"`
+
 	// Shipment barcodes
 	Barcodes FBSBarcode `json:"barcodes"`
 
@@ -993,6 +1053,9 @@ type GetShipmentDataByIdentifierResult struct {
 
 	// Shipment tracking number
 	TrackingNumber string `json:"tracking_number"`
+
+	// Details on shipping rate
+	Tariffication []FBSPostingTariffication `json:"tariffication"`
 }
 
 type GetShipmentDataByIdentifierResultAdditionalData struct {
@@ -1007,12 +1070,14 @@ type GetShipmentDataByIdentifierResultAddressee struct {
 	// Recipient name
 	Name string `json:"name"`
 
-	// Recipient phone number
+	// Recipient phone number.
+	//
+	// Returns an empty string ""
 	Phone string `json:"phone"`
 }
 
 type GetShipmentDataByIdentifierResultAnalyticsData struct {
-	// Delivery city
+	// Delivery city. Only for rFBS shipments
 	City string `json:"city"`
 
 	// Delivery start date and time
@@ -1035,7 +1100,7 @@ type GetShipmentDataByIdentifierResultAnalyticsData struct {
 	// Payment method
 	PaymentTypeGroupName string `json:"payment_type_group_name"`
 
-	// Delivery region
+	// Delivery region. Only for rFBS shipments
 	Region string `json:"region"`
 
 	// Delivery service
@@ -1062,6 +1127,8 @@ type GetShipmentDataByIdentifierResultCourier struct {
 	Name string `json:"name"`
 
 	// Courier's phone number
+	//
+	// Returns an empty string ""
 	Phone string `json:"phone"`
 }
 
@@ -1672,15 +1739,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{}
 
@@ -1750,18 +1827,76 @@ func (c FBS) GetDropOffPointRestrictions(ctx context.Context, params *GetDropOff
 }
 
 type CheckProductItemsDataParams struct {
+	// Quantity of boxes the product is packed in
+	MultiBoxQuantity int32 `json:"multi_box_qty"`
+
 	// Shipment number
 	PostingNumber string `json:"posting_number"`
 
-	Products CheckProductItemsDataProduct `json:"products"`
+	// Product list
+	Products []CheckProductItemsDataProduct `json:"products"`
 }
 
 type CheckProductItemsDataProduct struct {
 	// Product items data
-	Exemplars []FBSProductExemplar `json:"exemplars"`
+	Exemplars []CheckProductItemsDataProductExemplar `json:"exemplars"`
 
-	// SKU, FBS product identifier in the Ozon system
+	// Indication that you need to pass the сustoms cargo declaration
+	// (CCD) number for the product and shipment
+	IsGTDNeeded bool `json:"is_gtd_needed"`
+
+	// Indication that you need to pass the "Chestny ZNAK" labeling
+	IsMandatoryMarkNeeded bool `json:"is_mandatory_mark_needed"`
+
+	// Indication that you need to pass the product batch registration number
+	IsRNPTNeeded bool `json:"is_rnpt_needed"`
+
+	// Product ID
 	ProductId int64 `json:"product_id"`
+
+	// Items quantity
+	Quantity int32 `json:"quantity"`
+}
+
+type CheckProductItemsDataProductExemplar struct {
+	// Item identifier
+	ExemplarId int64 `json:"exemplar_id"`
+
+	// Customs cargo declaration (CCD) number
+	GTD string `json:"gtd"`
+
+	// Сustoms cargo declaration (CCD) check status
+	GTDCheckStatus string `json:"gtd_check_status"`
+
+	// Сustoms cargo declaration (CCD) check error codes
+	GTDErrorCodes []string `json:"gtd_error_codes"`
+
+	// Indication that the customs cargo declaration (CCD) number isn't specified
+	IsGTDAbsent bool `json:"is_gtd_absent"`
+
+	// "Chestny ZNAK" labeling check status
+	MandatoryMarkCheckStatus MandatoryMarkStatus `json:"mandatory_mark_check_status"`
+
+	// "Chestny ZNAK" labeling check error codes
+	MandatoryMarkErrorCodes []string `json:"mandatory_mark_error_codes"`
+
+	// Indication that the product batch registration number isn't specified
+	IsRNPTAbsent bool `json:"is_rnpt_absent"`
+
+	// Mandatory "Chestny ZNAK" labeling
+	MandatoryMark string `json:"mandatory_mark"`
+
+	// Product batch registration number
+	RNPT string `json:"rnpt"`
+
+	// Product batch registration number check status
+	RNPTCheckStatus string `json:"rnpt_check_status"`
+
+	// Product batch registration number check error codes
+	RNPTErrorCodes []string `json:"rnpt_error_codes"`
+
+	// Unique identifier of charges of the jewelry
+	JWUIN string `json:"jw_uin"`
 }
 
 type CheckProductItemsDataResponse struct {
@@ -1772,22 +1907,38 @@ type CheckProductItemsDataResponse struct {
 }
 
 // Asynchronous method:
-//   - for checking the availability of product items in the “Chestny ZNAK” labeling system
-//   - for saving product items data
 //
-// To get the checks results, use the `/v4/fbs/posting/product/exemplar/status method`
+//	for checking the availability of product items in the “Chestny ZNAK” labeling system;
+//	for saving product items data.
 //
-// If necessary, specify the number of the cargo customs declaration in the gtd parameter. If it is missing, pass the value `is_gtd_absent` = true
+// To get the checks results,
+// use the /v4/fbs/posting/product/exemplar/status method.
+// To get data about created items,
+// use the /v5/fbs/fbs/posting/product/exemplar/create-or-get method.
 //
-// If you have multiple identical products in a shipment, specify one `product_id` and `exemplars` array for each product in the shipment
+// If necessary, specify the number of the cargo customs declaration
+// in the gtd parameter. If it is missing,
+// pass the value is_gtd_absent = true.
 //
-// # Always pass a complete set of product items data
+// If you have multiple identical products in a shipment,
+// specify one product_id and exemplars array for each product in the shipment.
+//
+// Always pass a complete set of product items data.
 //
 // For example, you have 10 product items in your system.
-// You have passed them for checking and saving. Then they added another 60 product items to your system.
+// You've passed them for checking and saving.
-// When you pass product items for checking and saving again, pass all of them: both old and newly added
+// Then you added another 60 product items to your system.
+// When you pass product items for checking and saving again,
+// pass all of them: both old and newly added.
+//
+// Unlike /v4/fbs/posting/product/exemplar/set,
+// you can pass more item information in the request.
+//
+// The 200 response code doesn't guarantee that instance data has been received.
+// It indicates that a task for adding the information has been created.
+// To check the task status, use the /v4/fbs/posting/product/exemplar/status method.
 func (c FBS) CheckProductItemsData(ctx context.Context, params *CheckProductItemsDataParams) (*CheckProductItemsDataResponse, error) {
-	url := "/v4/fbs/posting/product/exemplar/set"
+	url := "/v5/fbs/posting/product/exemplar/set"
 
 	resp := &CheckProductItemsDataResponse{}
 
@@ -1996,8 +2147,8 @@ type PartialPackOrderParams struct {
 }
 
 type PartialPackOrderProduct struct {
-	// Data array on product items
+	// Product item identifiers
-	ExemplarInfo []FBSProductExemplar `json:"exemplar_info"`
+	ExemplarIds []string `json:"exemplarIds"`
 
 	// FBS product identifier in the Ozon system, SKU
 	ProductId int64 `json:"product_id"`
@@ -2009,11 +2160,8 @@ type PartialPackOrderProduct struct {
 type PartialPackOrderResponse struct {
 	core.CommonResponse
 
-	// Additional data about shipments
+	// Shipments numbers formed after packaging
-	AdditionalData []PartialPackOrderAdditionalData `json:"additional_data"`
+	Result string `json:"result"`
-
-	// Identifiers of shipments that were created after package
-	Result []string `json:"result"`
 }
 
 type PartialPackOrderAdditionalData struct {
@@ -2024,12 +2172,18 @@ type PartialPackOrderAdditionalData struct {
 	Products []PostingProduct `json:"products"`
 }
 
-// If you pass to the request a part of the products from the shipment, the primary shipment will split into two parts.
+// If you pass some of the shipped products through the request,
-// The primary unassembled shipment will contain some of the products that were not passed to the request.
+// the primary shipment will split into two parts.
+// The primary unassembled shipment will contain some of the products
+// that weren't passed to the request.
 //
-// The status of the original shipment will only change when the split shipments status changes
+// 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
 func (c FBS) PartialPackOrder(ctx context.Context, params *PartialPackOrderParams) (*PartialPackOrderResponse, error) {
-	url := "/v3/posting/fbs/ship/package"
+	url := "/v4/posting/fbs/ship/package"
 
 	resp := &PartialPackOrderResponse{}
 
@@ -2091,6 +2245,12 @@ type AvailableFreightsListResult struct {
 	// Number of already packaged shipments
 	MandatoryPackagedCount int32 `json:"mandatory_packaged_count"`
 
+	// Recommended local time of shipping to the pick-up point
+	RecommendedTimeLocal string `json:"recommended_time_local"`
+
+	// Time zone offset of the recommended shipping time from UTC-0 in minutes
+	RecommendedTimeUTCOffset int32 `json:"recommended_time_utc_offset_in_minutes"`
+
 	// Delivery service icon link
 	TPLProviderIconURL string `json:"tpl_provider_icon_url"`
 
@@ -2428,20 +2588,11 @@ type CancelSendingResponse struct {
 
 // Use this method if you cannot send some of the products from the shipment.
 //
-// If you are using the rFBS scheme, you have the following cancellation reason identifiers (`cancel_reason_id`) available:
+// To get the cancel_reason_id cancellation reason identifiers
-//
+// when working with the FBS or rFBS schemes,
-// 352—product is out of stock;
+// use the /v2/posting/fbs/cancel-reason/list method.
-// 400—only defective products left;
-// 401—cancellation from arbitration;
-// 402—other reason;
-// 665—the customer did not pick the order;
-// 666—delivery is not available in the region;
-// 667—order was lost by the delivery service.
-// The last 4 reasons are available for shipments in the "Delivering" and "Courier on the way" statuses.
 //
 // You can't cancel presumably delivered orders.
-//
-// If `cancel_reason_id` parameter value is 402, fill the `cancel_reason_message` field.
 func (c FBS) CancelSending(ctx context.Context, params *CancelSendingParams) (*CancelSendingResponse, error) {
 	url := "/v2/posting/fbs/product/cancel"
 
@@ -2791,3 +2942,295 @@ func (c FBS) GetActPDF(ctx context.Context, params *GetActPDFParams) (*GetActPDF
 
 	return resp, nil
 }
+
+type CreateOrGetProductExemplarParams struct {
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+}
+
+type CreateOrGetProductExemplarResponse struct {
+	core.CommonResponse
+
+	// Quantity of boxes the product is packed in
+	MultiBoxQuantity int32 `json:"multi_box_qty"`
+
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+
+	// Product list
+	Products []CheckProductItemsDataProduct `json:"products"`
+}
+
+// Method returns the created items data passed in the `/v5/fbs/posting/product/exemplar/set` method.
+//
+// Use this method to get the `exemplar_id`
+func (c FBS) CreateOrGetProductExemplar(ctx context.Context, params *CreateOrGetProductExemplarParams) (*CreateOrGetProductExemplarResponse, error) {
+	url := "/v5/fbs/posting/product/exemplar/create-or-get"
+
+	resp := &CreateOrGetProductExemplarResponse{}
+
+	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
+}
+
+type GetCarriageParams struct {
+	CarriageId int64 `json:"carriage_id"`
+}
+
+type GetCarriageResponse struct {
+	core.CommonResponse
+
+	// Acceptance certificate type for FBS sellers
+	ActType string `json:"act_type"`
+
+	// Pass identifiers for the freight
+	ArrivalPassIds []string `json:"arrival_pass_ids"`
+
+	// List of available actions on the freight
+	AvailableActions []string `json:"available_actions"`
+
+	// Cancel availability
+	CancelAvailability GetCarriageCancelAvailability `json:"cancel_availability"`
+
+	// Freight identifier
+	CarriageId int64 `json:"carriage_id"`
+
+	// Company identifier
+	CompanyId int64 `json:"company_id"`
+
+	// Number of package units
+	ContainersCount int32 `json:"containers_count"`
+
+	// Date and time of freight creation
+	CreatedAt time.Time `json:"created_at"`
+
+	// Delivery method identifier
+	DeliveryMethodId int64 `json:"delivery_method_id"`
+
+	// Shipping date
+	DepartureDate string `json:"departure_date"`
+
+	// First mile type
+	FirstMileType string `json:"first_mile_type"`
+
+	// true if there are shipments subject to shipping that are not in the current freight
+	HasPostingsForNextCarriage bool `json:"has_postings_for_next_carriage"`
+
+	// Delivery service integration type
+	IntegrationType string `json:"integration_type"`
+
+	// true if you already printed shipping labels
+	IsContainerLabelPrinted bool `json:"is_container_label_printed"`
+
+	// true if the freight is partial
+	IsPartial bool `json:"is_partial"`
+
+	// Serial number of the partial freight
+	PartialNum int64 `json:"partial_num"`
+
+	// The number of retries to create a freight
+	RetryCount int32 `json:"retry_count"`
+
+	// Freight status
+	Status GetCarriageStatus `json:"status"`
+
+	// Delivery method identifier
+	TPLProviderId int64 `json:"tpl_provider_id"`
+
+	// Date and time when the freight was last updated
+	UpdatedAt time.Time `json:"updated_at"`
+
+	// Warehouse identifier
+	WarehouseId int64 `json:"warehouse_id"`
+}
+
+type GetCarriageCancelAvailability struct {
+	// true if the freight can be cancelled
+	IsCancelAvailable bool `json:"is_cancel_available"`
+
+	// Reason why freight can't be cancelled
+	Reason string `json:"reason"`
+}
+
+func (c FBS) GetCarriage(ctx context.Context, params *GetCarriageParams) (*GetCarriageResponse, error) {
+	url := "/v1/carriage/get"
+
+	resp := &GetCarriageResponse{}
+
+	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
+}
+
+type GetCancellationReasonsResponse struct {
+	core.CommonResponse
+
+	// Method result
+	Result []GetCancellationReasonsResult `json:"result"`
+}
+
+type GetCancellationReasonsResult struct {
+	// Cancellation reasons identifier
+	Id int64 `json:"id"`
+
+	// Shipment cancellation result. true if the request is available for cancellation
+	IsAvailableForCancellation bool `json:"is_available_for_cancellation"`
+
+	// Category name
+	Title string `json:"title"`
+
+	// Shipment cancellation initiator
+	TypeId string `json:"type_id"`
+}
+
+func (c FBS) GetCancellationReasons(ctx context.Context) (*GetCancellationReasonsResponse, error) {
+	url := "/v1/posting/fbo/cancel-reason/list"
+
+	resp := &GetCancellationReasonsResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type SetShippingDateParams struct {
+	// New shipping date
+	NewCutoffDate time.Time `json:"new_cutoff_date"`
+
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+}
+
+type SetShippingDateResponse struct {
+	core.CommonResponse
+
+	// true if the new date is set
+	Result bool `json:"result"`
+}
+
+func (c FBS) SetShippingDate(ctx context.Context, params *SetShippingDateParams) (*SetShippingDateResponse, error) {
+	url := "/v1/posting/cutoff/set"
+
+	resp := &SetShippingDateResponse{}
+
+	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
+}
+
+type SplitOrderParams struct {
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+
+	// Shipments list the order will be split into. You can split one order per one request
+	Postings []SplitOrderParamPosting `json:"postings"`
+}
+
+type SplitOrderParamPosting struct {
+	Products []SplitOrderPostingProduct `json:"products"`
+}
+
+type SplitOrderResponse struct {
+	core.CommonResponse
+
+	// Original shipment details
+	ParentPosting SplitOrderPosting `json:"parent_posting"`
+
+	// List of shipments the order was split into
+	Postings []SplitOrderPosting `json:"postings"`
+}
+
+type SplitOrderPosting struct {
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+
+	// List of products in the shipment
+	Products []SplitOrderPostingProduct `json:"products"`
+}
+
+type SplitOrderPostingProduct struct {
+	// FBS product identifier in the Ozon system, SKU
+	ProductId int64 `json:"product_id"`
+
+	// Product quantity
+	Quantity int64 `json:"quantity"`
+}
+
+func (c FBS) SplitOrder(ctx context.Context, params *SplitOrderParams) (*SplitOrderResponse, error) {
+	url := "/v1/posting/fbs/split"
+
+	resp := &SplitOrderResponse{}
+
+	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
+}
+
+type ListUnpaidProductsParams struct {
+	// Cursor for the next data sample
+	Cursor string `json:"cursor"`
+
+	// Number of values in the response
+	Limit int32 `json:"limit,omitempty"`
+}
+
+type ListUnpaidProductsResponse struct {
+	core.CommonResponse
+
+	Products []UnpaidProduct `json:"products"`
+
+	// Cursor for the next data sample
+	Cursor string `json:"cursor"`
+}
+
+type UnpaidProduct struct {
+	// Product identifier
+	ProductId int64 `json:"product_id"`
+
+	// Product identifier in the seller's system
+	OfferId string `json:"offer_id"`
+
+	// Product quantity, pcs
+	Quantity int32 `json:"quantity"`
+
+	// Product name
+	Name string `json:"name"`
+
+	// Link to product image
+	ImageURL string `json:"image_url"`
+}
+
+func (c FBS) ListUnpaidProducts(ctx context.Context, params *ListUnpaidProductsParams) (*ListUnpaidProductsResponse, error) {
+	url := "/v1/posting/unpaid-legal/product/list"
+
+	resp := &ListUnpaidProductsResponse{}
+
+	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
+}

ozon/fbs_test.go

@@ -24,12 +24,12 @@ func TestListUnprocessedShipments(t *testing.T) {
 			&ListUnprocessedShipmentsParams{
 				Direction: "ASC",
 				Filter: ListUnprocessedShipmentsFilter{
-					CutoffFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-08-24T14: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.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-08-31T14:15:22Z"),
+					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,
-				With: ListUnprocessedShipmentsWith{
+				With: &ListUnprocessedShipmentsWith{
 					AnalyticsData: true,
 					Barcodes:      true,
 					FinancialData: true,
@@ -66,6 +66,7 @@ func TestListUnprocessedShipments(t *testing.T) {
 						"cancellation_initiator": ""
 					  },
 					  "customer": null,
+					  "quantum_id": 0,
 					  "products": [
 						{
 						  "currency_code": "RUB",
@@ -146,7 +147,20 @@ func TestListUnprocessedShipments(t *testing.T) {
 					  "requirements": {
 						"products_requiring_gtd": [],
 						"products_requiring_country": []
-					  }
+					  },
+					  "tariffication": [
+						{
+						  "current_tariff_rate": 0,
+						  "current_tariff_type": "",
+						  "current_tariff_charge": "",
+						  "current_tariff_charge_currency_code": "",
+						  "next_tariff_rate": 0,
+						  "next_tariff_type": "",
+						  "next_tariff_charge": "",
+						  "next_tariff_starts_at": "2023-11-13T08:05:57.657Z",
+						  "next_tariff_charge_currency_code": ""
+						}
+					  ]
 					}
 				  ],
 				  "count": 55
@@ -210,7 +224,7 @@ func TestGetFBSShipmentsList(t *testing.T) {
 				},
 				Limit:  0,
 				Offset: 0,
-				With: GetFBSShipmentsListWith{
+				With: &GetFBSShipmentsListWith{
 					AnalyticsData: true,
 					FinancialData: true,
 					Translit:      true,
@@ -264,11 +278,25 @@ func TestGetFBSShipmentsList(t *testing.T) {
 					  "analytics_data": null,
 					  "financial_data": null,
 					  "is_express": false,
+					  "quantum_id": 0,
 					  "requirements": {
 						"products_requiring_gtd": [],
 						"products_requiring_country": [],
 						"products_requiring_mandatory_mark": []
-					  }
+					  },
+					  "tariffication": [
+						{
+						  "current_tariff_rate": 0,
+						  "current_tariff_type": "",
+						  "current_tariff_charge": "",
+						  "current_tariff_charge_currency_code": "",
+						  "next_tariff_rate": 0,
+						  "next_tariff_type": "",
+						  "next_tariff_charge": "",
+						  "next_tariff_starts_at": "2023-11-13T08:05:57.657Z",
+						  "next_tariff_charge_currency_code": ""
+						}
+					  ]
 					}
 				  ],
 				  "has_next": true
@@ -330,7 +358,7 @@ func TestPackOrder(t *testing.T) {
 					},
 				},
 				PostingNumber: "89491381-0072-1",
-				With: PackOrderWith{
+				With: &PackOrderWith{
 					AdditionalData: true,
 				},
 			},
@@ -556,7 +584,7 @@ func TestGetShipmentDataByIdentifier(t *testing.T) {
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetShipmentDataByIdentifierParams{
 				PostingNumber: "57195475-0050-3",
-				With:          GetShipmentDataByIdentifierWith{},
+				With:          &GetShipmentDataByIdentifierWith{},
 			},
 			`{
 				"result": {
@@ -564,6 +592,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 Логистика самостоятельно, Москва",
@@ -615,7 +644,20 @@ func TestGetShipmentDataByIdentifier(t *testing.T) {
 					"products_requiring_gtd": [],
 					"products_requiring_country": []
 				  },
-				  "product_exemplars": null
+				  "product_exemplars": null,
+				  "tariffication": [
+					{
+					  "current_tariff_rate": 0,
+					  "current_tariff_type": "",
+					  "current_tariff_charge": "",
+					  "current_tariff_charge_currency_code": "",
+					  "next_tariff_rate": 0,
+					  "next_tariff_type": "",
+					  "next_tariff_charge": "",
+					  "next_tariff_starts_at": "2023-11-13T08:05:57.657Z",
+					  "next_tariff_charge_currency_code": ""
+					}
+				  ]
 				}
 			}`,
 		},
@@ -1278,7 +1320,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 +1361,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")
 			}
 		}
@@ -1395,15 +1446,27 @@ func TestCheckProductItemsData(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&CheckProductItemsDataParams{
-				PostingNumber: "48173252-0034-4",
+				MultiBoxQuantity: 0,
-				Products: CheckProductItemsDataProduct{
+				PostingNumber:    "1234",
-					Exemplars: []FBSProductExemplar{
+				Products: []CheckProductItemsDataProduct{
-						{
+					{
-							IsGTDAbsest:   true,
+						Exemplars: []CheckProductItemsDataProductExemplar{
-							MandatoryMark: "010290000151642731tVMohkbfFgunB",
+							{
+								ExemplarId:    1,
+								GTD:           "string",
+								IsGTDAbsent:   true,
+								IsRNPTAbsent:  true,
+								MandatoryMark: "string",
+								RNPT:          "string",
+								JWUIN:         "string",
+							},
 						},
+						IsGTDNeeded:           true,
+						IsMandatoryMarkNeeded: true,
+						IsRNPTNeeded:          true,
+						ProductId:             22,
+						Quantity:              11,
 					},
-					ProductId: 476925391,
 				},
 			},
 			`{
@@ -1784,22 +1847,15 @@ func TestPartialPackOrder(t *testing.T) {
 				PostingNumber: "48173252-0034-4",
 				Products: []PartialPackOrderProduct{
 					{
-						ExemplarInfo: []FBSProductExemplar{
+						ExemplarIds: []string{"string"},
-							{
+						ProductId:   247508873,
-								MandatoryMark: "mark",
+						Quantity:    1,
-								GTD:           "gtd",
-								IsGTDAbsest:   true,
-							},
-						},
-						ProductId: 247508873,
-						Quantity:  1,
 					},
 				},
 			},
-			`{
+			`
-				"result": [
+			{
-				  "48173252-0034-9"
+				"result": "48173252-0034-9"
-				]
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -1868,6 +1924,8 @@ func TestAvailableFreightsList(t *testing.T) {
 					"has_entrusted_acceptance": true,
 					"mandatory_postings_count": 0,
 					"mandatory_packaged_count": 0,
+					"recommended_time_local": "string",
+					"recommended_time_utc_offset_in_minutes": 0,
 					"tpl_provider_icon_url": "string",
 					"tpl_provider_name": "string",
 					"warehouse_city": "string",
@@ -2843,3 +2901,414 @@ func TestGetActPDF(t *testing.T) {
 		}
 	}
 }
+
+func TestCreateOrGetProductExemplar(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *CreateOrGetProductExemplarParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&CreateOrGetProductExemplarParams{
+				PostingNumber: "string",
+			},
+			`{
+				"multi_box_qty": 0,
+				"posting_number": "string",
+				"products": [
+				  {
+					"exemplars": [
+					  {
+						"exemplar_id": 0,
+						"gtd": "string",
+						"is_gtd_absent": true,
+						"is_rnpt_absent": true,
+						"mandatory_mark": "string",
+						"rnpt": "string",
+						"jw_uin": "string"
+					  }
+					],
+					"is_gtd_needed": true,
+					"is_mandatory_mark_needed": true,
+					"is_rnpt_needed": true,
+					"product_id": 0,
+					"quantity": 0
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&CreateOrGetProductExemplarParams{},
+			`{
+				"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.FBS().CreateOrGetProductExemplar(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &CreateOrGetProductExemplarResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetCarriage(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetCarriageParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetCarriageParams{
+				CarriageId: 15,
+			},
+			`{
+				"act_type": "string",
+				"arrival_pass_ids": [
+				  "string"
+				],
+				"available_actions": [
+				  "string"
+				],
+				"cancel_availability": {
+				  "is_cancel_available": true,
+				  "reason": "string"
+				},
+				"carriage_id": 15,
+				"company_id": 0,
+				"containers_count": 0,
+				"created_at": "2019-08-24T14:15:22Z",
+				"delivery_method_id": 0,
+				"departure_date": "string",
+				"first_mile_type": "string",
+				"has_postings_for_next_carriage": true,
+				"integration_type": "string",
+				"is_container_label_printed": true,
+				"is_partial": true,
+				"partial_num": 0,
+				"retry_count": 0,
+				"status": "string",
+				"tpl_provider_id": 0,
+				"updated_at": "2019-08-24T14:15:22Z",
+				"warehouse_id": 0
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetCarriageParams{},
+			`{
+				"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.FBS().GetCarriage(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetCarriageResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+
+		if resp.CarriageId != test.params.CarriageId {
+			t.Errorf("carriage id in request and response should be equal")
+		}
+	}
+}
+
+func TestGetCancellationReasons(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			`{
+				"result": [
+				  {
+					"id": 352,
+					"title": "The products ran out at the seller's warehouse",
+					"type_id": "seller",
+					"is_available_for_cancellation": true
+				  },
+				  {
+					"id": 401,
+					"title": "Seller rejects arbitration",
+					"type_id": "seller",
+					"is_available_for_cancellation": false
+				  },
+				  {
+					"id": 402,
+					"title": "Other (seller's fault)",
+					"type_id": "seller",
+					"is_available_for_cancellation": true
+				  },
+				  {
+					"id": 666,
+					"title": "Return from the delivery service: there is no delivery to the specified region",
+					"type_id": "seller",
+					"is_available_for_cancellation": false
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			`{
+				"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.FBS().GetCancellationReasons(ctx)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetCancellationReasonsResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestSetShippingDate(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *SetShippingDateParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&SetShippingDateParams{
+				NewCutoffDate: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+			},
+			`{
+				"result": true
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&SetShippingDateParams{},
+			`{
+				"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.FBS().SetShippingDate(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &SetShippingDateResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestSplitOrder(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *SplitOrderParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&SplitOrderParams{
+				PostingNumber: "string",
+				Postings: []SplitOrderParamPosting{
+					{
+						Products: []SplitOrderPostingProduct{
+							{
+								ProductId: 1,
+								Quantity:  1,
+							},
+						},
+					},
+				},
+			},
+			`{
+				"parent_posting": {
+				  "posting_number": "string",
+				  "products": [
+					{
+					  "product_id": 0,
+					  "quantity": 0
+					}
+				  ]
+				},
+				"postings": [
+				  {
+					"posting_number": "string",
+					"products": [
+					  {
+						"product_id": 0,
+						"quantity": 0
+					  }
+					]
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&SplitOrderParams{},
+			`{
+				"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.FBS().SplitOrder(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &SplitOrderResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestListUnpaidProducts(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *ListUnpaidProductsParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&ListUnpaidProductsParams{
+				Cursor: "hCGiPPopcBFMgMErdzaCEpzQfinuPyEhUoSmBMADuoFAhBjXeA==",
+				Limit:  1000,
+			},
+			`{
+				"products": [
+				  {
+					"product_id": 145123054,
+					"offer_id": "10032",
+					"quantity": 1,
+					"name": "Телевизор LG",
+					"image_url": "https://cdn1.ozon.ru/multimedia/10741275.jpg"
+				  }
+				],
+				"cursor": "hCGiPPopcBFMgMErdzaCEpzQfinuPyEhUoSmBMADuoFAhBjXeA=="
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&ListUnpaidProductsParams{},
+			`{
+				"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.FBS().ListUnpaidProducts(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &ListUnpaidProductsResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}

ozon/finance.go

@@ -13,8 +13,11 @@ type Finance struct {
 }
 
 type ReportOnSoldProductsParams struct {
-	// Time period in the `YYYY-MM` format
+	// Month
-	Date string `json:"date"`
+	Month int32 `json:"month"`
+
+	// Year
+	Year int32 `json:"year"`
 }
 
 type ReportOnSoldProductsResponse struct {
@@ -34,7 +37,7 @@ type ReportonSoldProductsResult struct {
 
 type ReportOnSoldProductsResultHeader struct {
 	// Report ID
-	Id string `json:"num"`
+	Id string `json:"number"`
 
 	// Report generation date
 	DocDate string `json:"doc_date"`
@@ -43,10 +46,10 @@ type ReportOnSoldProductsResultHeader struct {
 	ContractDate string `json:"contract_date"`
 
 	// Offer agreement number
-	ContractNum string `json:"contract_num"`
+	ContractNum string `json:"contract_number"`
 
 	// Currency of your prices
-	CurrencyCode string `json:"currency_code"`
+	CurrencySysName string `json:"currency_sys_name"`
 
 	// Amount to accrue
 	DocAmount float64 `json:"doc_amount"`
@@ -64,13 +67,13 @@ type ReportOnSoldProductsResultHeader struct {
 	PayerName string `json:"payer_name"`
 
 	// Recipient's TIN
-	RecipientINN string `json:"rcv_inn"`
+	RecipientINN string `json:"receiver_inn"`
 
 	// Recipient's Tax Registration Reason Code (KPP)
-	RecipientKPP string `json:"rcv_kpp"`
+	RecipientKPP string `json:"receiver_kpp"`
 
 	// Recipient's name
-	RecipientName string `json:"rcv_name"`
+	RecipientName string `json:"receiver_name"`
 
 	// Period start in the report
 	StartDate string `json:"start_date"`
@@ -81,13 +84,28 @@ type ReportOnSoldProductsResultHeader struct {
 
 type ReportOnSoldProductsResultRow struct {
 	// Row number
-	RowNumber int32 `json:"row_number"`
+	RowNumber int32 `json:"rowNumber"`
 
-	// Product ID
+	// Product Information
-	ProductId int64 `json:"product_id"`
+	Item ReturnOnSoldProduct `json:"item"`
 
+	// Commission including the quantity of products, discounts and extra charges.
+	// Ozon compensates it for the returned products
+	ReturnCommission ReturnCommission `json:"return_commission"`
+
+	// Percentage of sales commission by category
+	CommissionRatio float64 `json:"commission_ratio"`
+
+	// Delivery fee
+	DeliveryCommission ReturnCommission `json:"delivery_commission"`
+
+	// Seller's discounted price
+	SellerPricePerInstance float64 `json:"seller_price_per_instance"`
+}
+
+type ReturnOnSoldProduct struct {
 	// Product name
-	ProductName string `json:"product_name"`
+	ProductName string `json:"name"`
 
 	// Product barcode
 	Barcode string `json:"barcode"`
@@ -95,58 +113,39 @@ type ReportOnSoldProductsResultRow struct {
 	// Product identifier in the seller's system
 	OfferId string `json:"offer_id"`
 
-	// Sales commission by category
+	SKU int64 `json:"sku"`
-	CommissionPercent float64 `json:"commission_percent"`
+}
 
-	// Seller's price with their discount
+type ReturnCommission struct {
-	Price float64 `json:"price"`
+	// Amount
+	Amount float64 `json:"amount"`
 
-	// Selling price: the price at which the customer purchased the product. For sold products
+	// Points for discounts
-	PriceSale float64 `json:"price_sale"`
+	Bonus float64 `json:"bonus"`
-
-	// Sold for amount.
-	//
-	// Sold products cost considering the quantity and regional coefficients. Calculation is made by the sale_amount price
-	SaleAmount float64 `json:"sale_amount"`
 
 	// Commission for sold products, including discounts and extra charges
-	SaleCommission float64 `json:"sale_commission"`
+	Commission float64 `json:"commission"`
 
-	// Extra charge at the expense of Ozon.
+	// Additional payment at the expense of Ozon
-	//
+	Compensation float64 `json:"compensation"`
-	// Amount that Ozon will compensate the seller if the Ozon discount is greater than or equal to the sales commission
-	SaleDiscount float64 `json:"sale_discount"`
 
-	// Total accrual for the products sold.
+	// Price per item
-	//
+	PricePerInstance float64 `json:"price_per_instance"`
-	// Amount after deduction of sales commission, application of discounts and extra charges
-	SalePriceSeller float64 `json:"sale_price_seller"`
 
-	// Quantity of products sold at the price_sale price
+	// Product quantity
-	SaleQuantity int32 `json:"sale_qty"`
+	Quantity int32 `json:"quantity"`
 
-	// Price at which the customer purchased the product. For returned products
+	// Ozon referral fee
-	ReturnSale float64 `json:"return_sale"`
+	StandardFee float64 `json:"standard_fee"`
 
-	// Cost of returned products, taking into account the quantity and regional coefficients.
+	// Payouts on partner loyalty mechanics: green prices
-	// Calculation is carried out at the return_sale price
+	BankCoinvestment float64 `json:"bank_coinvestment"`
-	ReturnAmount float64 `json:"return_amount"`
 
-	// Commission including the quantity of products, discounts and extra charges.
+	// Payouts on partner loyalty mechanics: stars
-	// Ozon compensates it for the returned products
+	Stars float64 `json:"stars"`
-	ReturnCommission float64 `json:"return_commission"`
 
-	// Extra charge at the expense of Ozon.
+	// Total accrual
-	//
+	Total float64 `json:"total"`
-	// Amount of the discount at the expense of Ozon on returned products.
-	// Ozon will compensate it to the seller if the Ozon discount is greater than or equal to the sales commission
-	ReturnDiscount float64 `json:"return_discount"`
-
-	// Amount charged to the seller for returned products after deducing sales commissions, applying discounts and extra charges
-	ReturnPriceSeller float64 `json:"return_price_seller"`
-
-	// Quantity of returned products
-	ReturnQuantity int32 `json:"return_qty"`
 }
 
 // Returns information on products sold and returned within a month. Canceled or non-purchased products are not included.
@@ -382,7 +381,7 @@ type ListTransactionsResultOperationPosting struct {
 
 type ListTransactionsResultOperationService struct {
 	// Service name
-	Name string `json:"name"`
+	Name TransactionOperationService `json:"name"`
 
 	// Price
 	Price float64 `json:"price"`
@@ -404,3 +403,57 @@ func (c Finance) ListTransactions(ctx context.Context, params *ListTransactionsP
 
 	return resp, nil
 }
+
+type GetReportParams struct {
+	// Time period in the YYYY-MM format
+	Date string `json:"date"`
+
+	// Response language
+	Language string `json:"language"`
+}
+
+type ReportResponse struct {
+	core.CommonResponse
+
+	// Method result
+	Result ReportResult `json:"result"`
+}
+
+type ReportResult struct {
+	// Unique report identifier
+	Code string `json:"code"`
+}
+
+// Use the method to get mutual settlements report.
+// Matches the Finance → Documents → Analytical reports → Mutual
+// settlements report section in your personal account.
+func (c Finance) MutualSettlements(ctx context.Context, params *GetReportParams) (*ReportResponse, error) {
+	url := "/v1/finance/mutual-settlement"
+
+	resp := &ReportResponse{}
+
+	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
+}
+
+// Use the method to get sales to legal entities report.
+// Matches the Finance → Documents → Legal
+// entities sales register section in your personal account.
+func (c Finance) SalesToLegalEntities(ctx context.Context, params *GetReportParams) (*ReportResponse, error) {
+	url := "/v1/finance/mutual-settlement"
+
+	resp := &ReportResponse{}
+
+	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
+}

ozon/finance_test.go

@@ -23,52 +23,67 @@ func TestReportOnSoldProducts(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&ReportOnSoldProductsParams{
-				Date: "2022-09",
+				Month: 9,
+				Year:  2022,
 			},
 			`{
-                "result": {
+				"result": {
-                    "header": {
+				  "header": {
-                        "doc_date": "2022-09-22",
+					"contract_date": "string",
-                        "num": "string",
+					"contract_number": "string",
-                        "start_date": "2022-09-02",
+					"currency_sys_name": "string",
-                        "stop_date": "2022-09-22",
+					"doc_amount": 0,
-                        "contract_date": "2022-09-02",
+					"doc_date": "string",
-                        "contract_num": "string",
+					"number": "string",
-                        "payer_name": "string",
+					"payer_inn": "string",
-                        "payer_inn": "string",
+					"payer_kpp": "string",
-                        "payer_kpp": "string",
+					"payer_name": "string",
-                        "rcv_name": "string",
+					"receiver_inn": "string",
-                        "rcv_inn": "string",
+					"receiver_kpp": "string",
-                        "rcv_kpp": "string",
+					"receiver_name": "string",
-                        "doc_amount": 1,
+					"start_date": "string",
-                        "vat_amount": 1,
+					"stop_date": "string",
-                        "currency_code": "string"
+					"vat_amount": 0
-                    },
+				  },
-                    "rows": [
+				  "rows": [
-                    {
+					{
-                        "row_number": 0,
+					  "commission_ratio": 0,
-                        "product_id": 0,
+					  "delivery_commission": {
-                        "product_name": "string",
+						"amount": 0,
-                        "offer_id": "string",
+						"bonus": 0,
-                        "barcode": "string",
+						"commission": 0,
-                        "price": 0,
+						"compensation": 0,
-                        "commission_percent": 0,
+						"price_per_instance": 0,
-                        "price_sale": 0,
+						"quantity": 0,
-                        "sale_qty": 0,
+						"standard_fee": 0,
-                        "sale_amount": 0,
+						"bank_coinvestment": 0,
-                        "sale_discount": 0,
+						"stars": 0,
-                        "sale_commission": 0,
+						"total": 0
-                        "sale_price_seller": 0,
+					  },
-                        "return_sale": 0,
+					  "item": {
-                        "return_qty": 0,
+						"barcode": "string",
-                        "return_amount": 0,
+						"name": "string",
-                        "return_discount": 0,
+						"offer_id": "string",
-                        "return_commission": 0,
+						"sku": 0
-                        "return_price_seller": 0
+					  },
-                    }
+					  "return_commission": {
-                    ]
+						"amount": 0,
-                }
+						"bonus": 0,
-            }`,
+						"commission": 0,
+						"compensation": 0,
+						"price_per_instance": 0,
+						"quantity": 0,
+						"standard_fee": 0,
+						"bank_coinvestment": 0,
+						"stars": 0,
+						"total": 0
+					  },
+					  "rowNumber": 0,
+					  "seller_price_per_instance": 0
+					}
+				  ]
+				}
+			}`,
 			"",
 		},
 		// Test No Client-Id or Api-Key
@@ -271,3 +286,127 @@ func TestListTransactions(t *testing.T) {
 		}
 	}
 }
+
+func TestMutualSettlements(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode   int
+		headers      map[string]string
+		params       *GetReportParams
+		response     string
+		errorMessage string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetReportParams{
+				Date:     "2024-08",
+				Language: "DEFAULT",
+			},
+			`{
+				"result": {
+				  "code": "string"
+				}
+			}`,
+			"",
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetReportParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+			"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.Finance().MutualSettlements(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &ReportResponse{})
+
+		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 resp.Message != test.errorMessage {
+				t.Errorf("got wrong error message: got: %s, expected: %s", resp.Message, test.errorMessage)
+			}
+		}
+	}
+}
+
+func TestSalesToLegalEntities(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode   int
+		headers      map[string]string
+		params       *GetReportParams
+		response     string
+		errorMessage string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetReportParams{
+				Date:     "2024-08",
+				Language: "DEFAULT",
+			},
+			`{
+				"result": {
+				  "code": "string"
+				}
+			}`,
+			"",
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetReportParams{},
+			`{
+				"code": 16,
+				"message": "Client-Id and Api-Key headers are required"
+			}`,
+			"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.Finance().SalesToLegalEntities(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &ReportResponse{})
+
+		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 resp.Message != test.errorMessage {
+				t.Errorf("got wrong error message: got: %s, expected: %s", resp.Message, test.errorMessage)
+			}
+		}
+	}
+}

ozon/invoices.go

@@ -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
+	// Product HS-codes
-	HSCode string `json:"hs_code"`
+	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
+}

ozon/invoices_test.go

@@ -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)
+		}
+	}
+}

ozon/ozon.go

@@ -10,6 +10,15 @@ const (
 	DefaultAPIBaseUrl = "https://api-seller.ozon.ru"
 )
 
+type ClientOptions struct {
+	client core.HttpClient
+
+	baseUri string
+
+	apiKey   string
+	clientId string
+}
+
 type Client struct {
 	client *core.Client
 
@@ -32,6 +41,9 @@ type Client struct {
 	certificates  *Certificates
 	strategies    *Strategies
 	barcodes      *Barcodes
+	passes        *Passes
+	clusters      *Clusters
+	quants        *Quants
 }
 
 func (c Client) Analytics() *Analytics {
@@ -110,10 +122,58 @@ func (c Client) Barcodes() *Barcodes {
 	return c.barcodes
 }
 
-func NewClient(httpClient core.HttpClient, clientId, apiKey string) *Client {
+func (c Client) Passes() *Passes {
-	coreClient := core.NewClient(httpClient, DefaultAPIBaseUrl, map[string]string{
+	return c.passes
-		"Client-Id": clientId,
+}
-		"Api-Key":   apiKey,
+
+func (c Client) Clusters() *Clusters {
+	return c.clusters
+}
+
+func (c Client) Quants() *Quants {
+	return c.quants
+}
+
+type ClientOption func(c *ClientOptions)
+
+func WithHttpClient(httpClient core.HttpClient) ClientOption {
+	return func(c *ClientOptions) {
+		c.client = httpClient
+	}
+}
+
+func WithURI(uri string) ClientOption {
+	return func(c *ClientOptions) {
+		c.baseUri = uri
+	}
+}
+
+func WithClientId(clientId string) ClientOption {
+	return func(c *ClientOptions) {
+		c.clientId = clientId
+	}
+}
+
+func WithAPIKey(apiKey string) ClientOption {
+	return func(c *ClientOptions) {
+		c.apiKey = apiKey
+	}
+}
+
+func NewClient(opts ...ClientOption) *Client {
+	// default values
+	options := &ClientOptions{
+		client:  http.DefaultClient,
+		baseUri: DefaultAPIBaseUrl,
+	}
+
+	for _, opt := range opts {
+		opt(options)
+	}
+
+	coreClient := core.NewClient(options.client, options.baseUri, map[string]string{
+		"Client-Id": options.clientId,
+		"Api-Key":   options.apiKey,
 	})
 
 	return &Client{
@@ -137,6 +197,9 @@ func NewClient(httpClient core.HttpClient, clientId, apiKey string) *Client {
 		certificates:  &Certificates{client: coreClient},
 		strategies:    &Strategies{client: coreClient},
 		barcodes:      &Barcodes{client: coreClient},
+		passes:        &Passes{client: coreClient},
+		clusters:      &Clusters{client: coreClient},
+		quants:        &Quants{client: coreClient},
 	}
 }
 
@@ -164,5 +227,8 @@ func NewMockClient(handler http.HandlerFunc) *Client {
 		certificates:  &Certificates{client: coreClient},
 		strategies:    &Strategies{client: coreClient},
 		barcodes:      &Barcodes{client: coreClient},
+		passes:        &Passes{client: coreClient},
+		clusters:      &Clusters{client: coreClient},
+		quants:        &Quants{client: coreClient},
 	}
 }

ozon/ozon_test.go

@@ -0,0 +1,27 @@
+package ozon
+
+import (
+	"net/http"
+	"testing"
+)
+
+const (
+	apiKey   = "some_key"
+	clientId = "some_client_id"
+)
+
+func TestNewClient(t *testing.T) {
+	client := NewClient(
+		WithAPIKey(apiKey),
+		WithClientId(clientId),
+		WithURI(DefaultAPIBaseUrl),
+		WithHttpClient(http.DefaultClient),
+	)
+
+	if client.client.Options["Api-Key"] != apiKey {
+		t.Errorf("expected api key: %s, but got: %s", apiKey, client.client.Options["Api-Key"])
+	}
+	if client.client.Options["Client-Id"] != clientId {
+		t.Errorf("expected client id: %s, but got: %s", clientId, client.client.Options["Client-Id"])
+	}
+}

ozon/pass.go

@@ -0,0 +1,302 @@
+package ozon
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	core "github.com/diphantxm/ozon-api-client"
+)
+
+type Passes struct {
+	client *core.Client
+}
+
+type ListPassesParams struct {
+	// Cursor for the next data sample
+	Cursor string `json:"curson"`
+
+	// Filters
+	Filter ListPassesFilter `json:"filter"`
+
+	// Limit on number of entries in a reply. Default value is 1000. Maximum value is 1000
+	Limit int32 `json:"limit"`
+}
+
+type ListPassesFilter struct {
+	// Filter by pass identifier
+	ArrivalPassIds []string `json:"arrival_pass_ids"`
+
+	// Filter by purpose of arrival:
+	//
+	// FBS_DELIVERY—delivery.
+	// FBS_RETURN—take out returns.
+	// If the parameter isn't specified, both purposes are considered.
+	//
+	// The specified purpose must be in the list of reasons for passes
+	ArrivalReason string `json:"arrival_reason"`
+
+	// Filter by drop-off points identifier
+	DropoffPointIds []int64 `json:"dropoff_point_ids"`
+
+	// true to get only active pass requests
+	OnlyActivePasses bool `json:"only_active_passes"`
+
+	// Filter by seller's warehouses identifier
+	WarehouseIds []int64 `json:"warehouse_ids"`
+}
+
+type ListPassesResponse struct {
+	core.CommonResponse
+
+	// List of passes
+	ArrivalPasses []ListPassesArrivalPass `json:"arrival_passes"`
+
+	// Cursor for the next data sample. If the parameter is empty, there is no more data
+	Cursor string `json:"cursor"`
+}
+
+type ListPassesArrivalPass struct {
+	// Pass identifier
+	ArrivalPassId int64 `json:"arrival_pass_id"`
+
+	// Arrival purpose
+	ArrivalReasons []string `json:"arrival_reasons"`
+
+	// Date and time of arrival in UTC format
+	ArrivalTime time.Time `json:"arrival_time"`
+
+	// Driver full name
+	DriverName string `json:"driver_name"`
+
+	// Driver phone number
+	DriverPhone string `json:"driver_phone"`
+
+	// Drop-off point identifier
+	DropoffPointId int64 `json:"dropoff_point_id"`
+
+	// true if the request is active
+	IsActive bool `json:"is_active"`
+
+	// Car license plate
+	VehicleLicensePlate string `json:"vehicle_license_plate"`
+
+	// Car model
+	VehicleModel string `json:"vehicle_model"`
+
+	// Warehouse identifier
+	WarehouseId int64 `json:"warehouse_id"`
+}
+
+func (c Passes) List(ctx context.Context, params *ListPassesParams) (*ListPassesResponse, error) {
+	url := "/v1/pass/list"
+
+	resp := &ListPassesResponse{}
+
+	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
+}
+
+type CreateCarriageParams struct {
+	// List of passes
+	ArrivalPasses []CarriageArrivalPass `json:"arrival_passes"`
+
+	// Freight identifier
+	CarriageId int64 `json:"carriage_id"`
+}
+
+type CarriageArrivalPass struct {
+	// Driver full name
+	DriverName string `json:"driver_name"`
+
+	// Driver phone number
+	DriverPhone string `json:"driver_phone"`
+
+	// Car license plate
+	VehicleLicensePlate string `json:"vehicle_license_plate"`
+
+	// Car model
+	VehicleModel string `json:"vehicle_model"`
+
+	// true if you will export returns. Default is false
+	WithReturns bool `json:"with_returns"`
+}
+
+type CreateCarriageResponse struct {
+	core.CommonResponse
+
+	// Pass identifiers
+	ArrivalPassIds []string `json:"arrival_pass_ids"`
+}
+
+func (c Passes) CreateCarriage(ctx context.Context, params *CreateCarriageParams) (*CreateCarriageResponse, error) {
+	url := "/v1/carriage/pass/create"
+
+	resp := &CreateCarriageResponse{}
+
+	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
+}
+
+type UpdateCarriageParams struct {
+	ArrivalPasses []UpdateCarriageArrivalPass `json:"arrival_passes"`
+
+	CarriageId int64 `json:"carriage_id"`
+}
+
+type UpdateCarriageArrivalPass struct {
+	CarriageArrivalPass
+
+	Id int64 `json:"id"`
+}
+
+type UpdateCarriageResponse struct {
+	core.CommonResponse
+}
+
+func (c Passes) UpdateCarriage(ctx context.Context, params *UpdateCarriageParams) (*UpdateCarriageResponse, error) {
+	url := "/v1/carriage/pass/update"
+
+	resp := &UpdateCarriageResponse{}
+
+	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
+}
+
+type DeleteCarriageParams struct {
+	// Pass identifiers
+	ArrivalPassIds []int64 `json:"arrival_pass_ids"`
+
+	// Freight identifier
+	CarriageId int64 `json:"carriage_id"`
+}
+
+type DeleteCarriageResponse struct {
+	core.CommonResponse
+}
+
+func (c Passes) DeleteCarriage(ctx context.Context, params *DeleteCarriageParams) (*DeleteCarriageResponse, error) {
+	url := "/v1/carriage/pass/delete"
+
+	resp := &DeleteCarriageResponse{}
+
+	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
+}
+
+type CreateReturnParams struct {
+	// Array of passes
+	ArrivalPasses []ReturnArrivalPass `json:"arrival_passes"`
+}
+
+type ReturnArrivalPass struct {
+	// Date and time of arrival in UTC format. At that time, the pass will become valid
+	ArrivalTime time.Time `json:"arrival_time"`
+
+	// Driver full name
+	DriverName string `json:"driver_name"`
+
+	// Driver phone number
+	DriverPhone string `json:"driver_phone"`
+
+	// Car license plate
+	VehicleLicensePlate string `json:"vehicle_license_plate"`
+
+	// Car model
+	VehicleModel string `json:"vehicle_model"`
+
+	// Drop-off point identifier for which the pass is issued
+	DropoffPointId int64 `json:"dropoff_point_id"`
+
+	// Warehouse identifier
+	WarehouseId int64 `json:"warehouse_id"`
+}
+
+type CreateReturnResponse struct {
+	core.CommonResponse
+
+	// Pass identifiers
+	ArrivalPassIds []string `json:"arrival_pass_ids"`
+}
+
+func (c Passes) CreateReturn(ctx context.Context, params *CreateReturnParams) (*CreateReturnResponse, error) {
+	url := "/v1/return/pass/create"
+
+	resp := &CreateReturnResponse{}
+
+	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
+}
+
+type UpdateReturnParams struct {
+	ArrivalPasses []ReturnArrivalPass `json:"arrival_passes"`
+}
+
+type UpdateReturnResponse struct {
+	core.CommonResponse
+
+	// Pass identifiers
+	ArrivalPassIds []string `json:"arrival_pass_ids"`
+}
+
+func (c Passes) UpdateReturn(ctx context.Context, params *UpdateReturnParams) (*UpdateReturnResponse, error) {
+	url := "/v1/return/pass/update"
+
+	resp := &UpdateReturnResponse{}
+
+	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
+}
+
+type DeleteReturnParams struct {
+	// Pass identifiers
+	ArrivalPassIds []int64 `json:"arrival_pass_ids"`
+}
+
+type DeleteReturnResponse struct {
+	core.CommonResponse
+}
+
+func (c Passes) DeleteReturn(ctx context.Context, params *DeleteReturnParams) (*DeleteReturnResponse, error) {
+	url := "/v1/return/pass/delete"
+
+	resp := &DeleteReturnResponse{}
+
+	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
+}

ozon/pass_test.go

@@ -0,0 +1,431 @@
+package ozon
+
+import (
+	"context"
+	"net/http"
+	"testing"
+	"time"
+
+	core "github.com/diphantxm/ozon-api-client"
+)
+
+func TestListPasses(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *ListPassesParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&ListPassesParams{
+				Cursor: "",
+				Filter: ListPassesFilter{
+					ArrivalPassIds:   []string{"string"},
+					ArrivalReason:    "string",
+					DropoffPointIds:  []int64{123},
+					OnlyActivePasses: true,
+					WarehouseIds:     []int64{456},
+				},
+			},
+			`{
+				"arrival_passes": [
+				  {
+					"arrival_pass_id": 0,
+					"arrival_reasons": [
+					  "string"
+					],
+					"arrival_time": "2019-08-24T14:15:22Z",
+					"driver_name": "string",
+					"driver_phone": "string",
+					"dropoff_point_id": 123,
+					"is_active": true,
+					"vehicle_license_plate": "string",
+					"vehicle_model": "string",
+					"warehouse_id": 456
+				  }
+				],
+				"cursor": "string"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&ListPassesParams{},
+			`{
+				"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.Passes().List(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &ListPassesResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+
+		if len(resp.ArrivalPasses) != 0 {
+			if resp.ArrivalPasses[0].WarehouseId != test.params.Filter.WarehouseIds[0] {
+				t.Errorf("warehouse id in request and response should be equal")
+			}
+
+			if resp.ArrivalPasses[0].DropoffPointId != test.params.Filter.DropoffPointIds[0] {
+				t.Errorf("dropoff point id in request and response should be equal")
+			}
+		}
+	}
+}
+
+func TestCreateArrivalPass(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *CreateCarriageParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&CreateCarriageParams{
+				ArrivalPasses: []CarriageArrivalPass{
+					{
+						DriverName:          "string",
+						DriverPhone:         "string",
+						VehicleLicensePlate: "string",
+						VehicleModel:        "string",
+						WithReturns:         true,
+					},
+				},
+				CarriageId: 14,
+			},
+			`{
+				"arrival_pass_ids": [
+				  "154"
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&CreateCarriageParams{},
+			`{
+				"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.Passes().CreateCarriage(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &CreateCarriageResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestUpdateArrivalPass(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *UpdateCarriageParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&UpdateCarriageParams{
+				ArrivalPasses: []UpdateCarriageArrivalPass{
+					{
+						Id: 11,
+						CarriageArrivalPass: CarriageArrivalPass{
+							DriverName:          "string",
+							DriverPhone:         "string",
+							VehicleLicensePlate: "string",
+							VehicleModel:        "string",
+							WithReturns:         true,
+						},
+					},
+				},
+				CarriageId: 14,
+			},
+			`{}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&UpdateCarriageParams{},
+			`{
+				"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.Passes().UpdateCarriage(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &UpdateCarriageResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestDeleteArrivalPass(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *DeleteCarriageParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&DeleteCarriageParams{
+				ArrivalPassIds: []int64{123},
+				CarriageId:     14,
+			},
+			`{}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&DeleteCarriageParams{},
+			`{
+				"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.Passes().DeleteCarriage(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &DeleteCarriageResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestCreateReturn(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *CreateReturnParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&CreateReturnParams{
+				ArrivalPasses: []ReturnArrivalPass{
+					{
+						ArrivalTime:         time.Now(),
+						DriverName:          "string",
+						DriverPhone:         "string",
+						VehicleLicensePlate: "string",
+						VehicleModel:        "string",
+						DropoffPointId:      11,
+						WarehouseId:         5,
+					},
+				},
+			},
+			`{
+				"arrival_pass_ids": [
+				  "1111"
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&CreateReturnParams{},
+			`{
+				"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.Passes().CreateReturn(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &CreateReturnResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestUpdateReturn(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *UpdateReturnParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&UpdateReturnParams{
+				ArrivalPasses: []ReturnArrivalPass{
+					{
+						ArrivalTime:         time.Now(),
+						DriverName:          "string",
+						DriverPhone:         "string",
+						VehicleLicensePlate: "string",
+						VehicleModel:        "string",
+						DropoffPointId:      11,
+						WarehouseId:         5,
+					},
+				},
+			},
+			`{}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&UpdateReturnParams{},
+			`{
+				"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.Passes().UpdateReturn(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &UpdateReturnResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestDeleteReturn(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *DeleteReturnParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&DeleteReturnParams{
+				ArrivalPassIds: []int64{456},
+			},
+			`{}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&DeleteReturnParams{},
+			`{
+				"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.Passes().DeleteReturn(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &DeleteReturnResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}

ozon/products.go

@@ -27,13 +27,13 @@ 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"`
+	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"`
+	ProductId []int64 `json:"product_id,omitempty"`
 
 	// Filter by product visibility
-	Visibility string `json:"visibility"`
+	Visibility string `json:"visibility,omitempty"`
 }
 
 type GetStocksInfoResponse struct {
@@ -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 {
@@ -130,6 +130,9 @@ type ProductDetails struct {
 	// Category identifier
 	DescriptionCategoryId int64 `json:"description_category_id"`
 
+	// Product type identifier
+	TypeId int64 `json:"type_id"`
+
 	// Marketing color
 	ColorImage string `json:"color_image"`
 
@@ -142,7 +145,13 @@ type ProductDetails struct {
 	// Product SKU
 	SKU int64 `json:"sku"`
 
-	// Document generation task number
+	// SKU of the product that is sold from the Ozon warehouse (FBO)
+	FBOSKU int64 `json:"fbo_sku,omitempty"`
+
+	// SKU of the product that is sold from the seller's warehouse (FBS and rFBS)
+	FBSSKU int64 `json:"fbs_sku,omitempty"`
+
+	// 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
@@ -203,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"`
 
@@ -217,9 +223,6 @@ type ProductDetails struct {
 	// Use PriceIndexes instead
 	PriceIndex string `json:"price_index"`
 
-	// Product price suggested by the system based on similar offers
-	RecommendedPrice string `json:"recommended_price"`
-
 	// Product state description
 	Status ProductDetailStatus `json:"status"`
 
@@ -243,15 +246,18 @@ 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 {
 	// Delivery cost
 	DeliveryAmount float64 `json:"deliveryAmount"`
 
-	// Minimum commission fee
-	MinValue float64 `json:"minValue"`
-
 	// Commission percentage
 	Percent float64 `json:"percent"`
 
@@ -519,6 +525,14 @@ type UpdateQuantityStockProductsStock struct {
 	// Product identifier
 	ProductId int64 `json:"product_id"`
 
+	// Use parameter if the regular and economy products have the same article code—offer_id = quant_id. To update quantity of the:
+	//
+	// 	- regular product, pass the 1 value;
+	// 	- economy product, pass the size of its MOQ.
+	//
+	// If the regular and economy products have different article codes, don't specify the parameter.
+	QuantSize int64 `json:"quant_size"`
+
 	// Quantity
 	Stock int64 `json:"stock"`
 
@@ -543,6 +557,12 @@ type UpdateQuantityStockProductsResult struct {
 	// Product identifier
 	ProductId int64 `json:"product_id"`
 
+	// Shows the quantity of which product type you are updating:
+	//
+	// 	- 1, if you are updating the stock of a regular product
+	// 	- MOQ size, if you are updating the stock of economy product
+	QuantSize int64 `json:"quant_size"`
+
 	// If the request was completed successfully and the stocks are updated — true
 	Updated bool `json:"updated"`
 
@@ -680,6 +700,14 @@ type UpdatePricesPrice struct {
 
 	// Product identifier
 	ProductId int64 `json:"product_id"`
+
+	// Use parameter if the regular and economy products have the same article code—offer_id = quant_id. To update price of the:
+	//
+	// 	- regular product, pass the 1 value;
+	// 	- economy product, pass the size of its MOQ.
+	//
+	// If the regular and economy products have different article codes, don't specify the parameter.
+	QuantSize int64 `json:"quant_size"`
 }
 
 type UpdatePricesResponse struct {
@@ -708,10 +736,8 @@ type UpdatePricesResultError struct {
 }
 
 // Allows you to change a price of one or more products.
-// You can change prices for 1000 products in one request.
+// The price of each product can be updated no more than 10 times per hour.
-// To reset old_price or premium_price set these parameters to 0.
+// To reset old_price, set 0 for this parameter.
-//
-// A new price must differ from the old one by at least 5%.
 func (c Products) UpdatePrices(ctx context.Context, params *UpdatePricesParams) (*UpdatePricesResponse, error) {
 	url := "/v1/product/import/prices"
 
@@ -743,6 +769,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
@@ -805,9 +834,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"`
@@ -818,6 +844,12 @@ type CreateOrUpdateProductItem struct {
 	//   - IS_NO_CODE_SERVICE
 	ServiceType string `json:"service_type" default:"IS_CODE_SERVICE"`
 
+	// Product type identifier.
+	// You can get values from the type_id parameter in the `/v1/description-category/tree` method response.
+	// When filling this parameter in,
+	// you can leave out the attributes attribute if it has the `id:8229` parameter
+	TypeId int64 `json:"type_id"`
+
 	// VAT rate for the product:
 	//   - 0 — not subject to VAT,
 	//   - 0.1 — 10%,
@@ -853,7 +885,7 @@ type CreateOrUpdateAttribute struct {
 
 type CreateOrUpdateAttributeValue struct {
 	// Directory identifier
-	DictionaryValueId int64 `json:"dictrionary_value_id"`
+	DictionaryValueId int64 `json:"dictionary_value_id"`
 
 	// Value from the directory
 	Value string `json:"value"`
@@ -887,8 +919,9 @@ 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 := "/v2/product/import"
+	url := "/v3/product/import"
 
 	resp := &CreateOrUpdateProductResponse{}
 
@@ -953,6 +986,10 @@ type GetListOfProductsResultItem struct {
 	ProductId int64 `json:"product_id"`
 }
 
+// When using the filter by offer_id or product_id identifier, other parameters are not required.
+// Only one identifiers group can be used at a time, not more than 1000 products.
+//
+// If you do not use identifiers for display, specify limit and last_id in subsequent requests.
 func (c Products) GetListOfProducts(ctx context.Context, params *GetListOfProductsParams) (*GetListOfProductsResponse, error) {
 	url := "/v2/product/list"
 
@@ -1129,9 +1166,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"`
@@ -1166,9 +1200,11 @@ type CreateProductByOzonIDResult struct {
 	UnmatchedSKUList []int64 `json:"unmatched_sku_list"`
 }
 
-// Creates a product by the specified Ozon ID. The number of products is unlimited.
+// The method creates a copy of the product description page with the specified SKU.
 //
-// It's not possible to update products using Ozon ID
+// You cannot create a copy if the seller has prohibited the copying of their PDPs.
+//
+// It's not possible to update products using SKU.
 func (c Products) CreateProductByOzonID(ctx context.Context, params *CreateProductByOzonIDParams) (*CreateProductByOzonIDResponse, error) {
 	url := "/v1/product/import-by-sku"
 
@@ -1232,7 +1268,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
@@ -1347,10 +1383,10 @@ type GetDescriptionOfProductParams struct {
 	Limit int64 `json:"limit"`
 
 	// The parameter by which the products will be sorted
-	SortBy string `json:"sort_by"`
+	SortBy string `json:"sort_by,omitempty"`
 
 	// Sorting direction
-	SortDirection string `json:"sort_direction"`
+	SortDirection string `json:"sort_dir,omitempty"`
 }
 
 type GetDescriptionOfProductFilter struct {
@@ -1410,9 +1446,6 @@ type GetDescriptionOfProductResult struct {
 	// Product characteristic identifier
 	Id int64 `json:"id"`
 
-	// Identifier for subsequent batch loading of images
-	ImageGroupId string `json:"image_group_id"`
-
 	// Array of links to product images
 	Images []GetDescriptionOfProductResultImage `json:"images"`
 
@@ -1428,6 +1461,9 @@ type GetDescriptionOfProductResult struct {
 	// Array of PDF files
 	PDFList []GetDescriptionOfProductResultPDF `json:"pdf_list"`
 
+	// Product type identifier
+	TypeId int64 `json:"type_id"`
+
 	// Weight of product in the package
 	Weight int32 `json:"weight"`
 
@@ -1522,6 +1558,92 @@ func (c Products) GetDescriptionOfProduct(ctx context.Context, params *GetDescri
 	return resp, nil
 }
 
+type GetDescriptionOfProductsFilter struct {
+	ProductId  []string `json:"product_id,omitempty"`
+	OfferId    []string `json:"offer_id,omitempty"`
+	Sku        []string `json:"sku,omitempty"`
+	Visibility string   `json:"visibility,omitempty"`
+}
+
+type GetDescriptionOfProductsParams struct {
+	Filter        GetDescriptionOfProductsFilter `json:"filter"`
+	LastId        string                         `json:"last_id,omitempty"`
+	Limit         int64                          `json:"limit,omitempty"`
+	SortBy        string                         `json:"sort_by,omitempty"`
+	SortDirection string                         `json:"sort_dir,omitempty"`
+}
+
+type GetDescriptionOfProductsResponse struct {
+	core.CommonResponse
+
+	Result []GetDescriptionOfProductsResult `json:"result"`
+	Total  int32                            `json:"total"`
+	LastId string                           `json:"last_id"`
+}
+
+type GetDescriptionOfProductsResult struct {
+	Id                    int64  `json:"id"`
+	Barcode               string `json:"barcode"`
+	Name                  string `json:"name"`
+	OfferId               string `json:"offer_id"`
+	Height                int32  `json:"height"`
+	Depth                 int32  `json:"depth"`
+	Width                 int32  `json:"width"`
+	DimensionUnit         string `json:"dimension_unit"`
+	Weight                int32  `json:"weight"`
+	WeightUnit            string `json:"weight_unit"`
+	DescriptionCategoryId int64  `json:"description_category_id"`
+	TypeId                int64  `json:"type_id"`
+	PrimaryImage          string `json:"primary_image"`
+
+	// new "model_info" structure
+	ModelInfo *ModelInfo `json:"model_info,omitempty"`
+
+	Images  []string `json:"images"`
+	PDFList []string `json:"pdf_list"`
+
+	Attributes        []GetDescriptionOfProductsAttribute        `json:"attributes"`
+	ComplexAttributes []GetDescriptionOfProductsComplexAttribute `json:"complex_attributes"`
+	ColorImage        string                                     `json:"color_image"`
+}
+
+type ModelInfo struct {
+	ModelId int64 `json:"model_id"`
+	Count   int64 `json:"count"`
+}
+
+type GetDescriptionOfProductsAttribute struct {
+	Id        int64                                    `json:"id"`
+	ComplexId int64                                    `json:"complex_id"`
+	Values    []GetDescriptionOfProductsAttributeValue `json:"values"`
+}
+
+type GetDescriptionOfProductsAttributeValue struct {
+	DictionaryValueId int64  `json:"dictionary_value_id"`
+	Value             string `json:"value"`
+}
+
+type GetDescriptionOfProductsComplexAttribute struct {
+	Id        int64                                    `json:"id,omitempty"`
+	ComplexId int64                                    `json:"complex_id,omitempty"`
+	Values    []GetDescriptionOfProductsAttributeValue `json:"values,omitempty"`
+}
+
+// /v4/product/info/attributes
+func (c Products) GetDescriptionOfProducts(ctx context.Context, params *GetDescriptionOfProductsParams) (*GetDescriptionOfProductsResponse, error) {
+	url := "/v4/product/info/attributes"
+
+	resp := &GetDescriptionOfProductsResponse{}
+
+	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
+}
+
 type GetProductDescriptionParams struct {
 	// Product identifier in the seller's system
 	OfferId string `json:"offer_id"`
@@ -1609,7 +1731,7 @@ func (c Products) GetProductRangeLimit(ctx context.Context) (*GetProductRangeLim
 
 	resp := &GetProductRangeLimitResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, &struct{}{}, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -1754,67 +1876,6 @@ func (c Products) RemoveProductWithoutSKU(ctx context.Context, params *RemovePro
 	return resp, nil
 }
 
-type ListGeoRestrictionsParams struct {
-	// Filter. To get all geo-restrictions, leave names blank and specify true in the only_visible parameter
-	Filter ListGeoRestrictionsFilter `json:"filter"`
-
-	// Order number of geo-restriction from which to output data in the response.
-	//
-	// If you specify 23 in this parameter, the first item in the restrictions list will output order_number = 24.
-	// If you want to get all geo-restrictions, pass 0 in this parameter
-	LastOrderNumber int64 `json:"last_order_number"`
-
-	// Number of items in the response
-	Limit int64 `json:"limit"`
-}
-
-type ListGeoRestrictionsFilter struct {
-	// List with city names
-	Names []string `json:"names"`
-
-	// Value visibility. We recommend always passing true in this parameter
-	OnlyVisible bool `json:"only_visible"`
-}
-
-type ListGeoRestrictionsResponse struct {
-	core.CommonResponse
-
-	// Restrictions
-	Restrictions []ListGeoRestrictionsRestriction `json:"restrictions"`
-}
-
-type ListGeoRestrictionsRestriction struct {
-	// Geo-restriction identifier
-	Id string `json:"id"`
-
-	// Item visibility
-	IsVisible bool `json:"is_visible"`
-
-	// City name
-	Name string `json:"name"`
-
-	// Geo-restriction order number.
-	//
-	// If you specify 23 in the last_order_number parameter in the request,
-	// the first item in the restrictions list will have order_number = 24
-	OrderNumber int64 `json:"order_number"`
-}
-
-// 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"
-
-	resp := &ListGeoRestrictionsResponse{}
-
-	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
-}
-
 type UploadActivationCodesParams struct {
 	// Digital activation codes
 	DigitalCodes []string `json:"digital_codes"`
@@ -1918,7 +1979,7 @@ type GetProductPriceInfoResponse struct {
 
 type GetProductPriceInfoResult struct {
 	// Products list
-	Items []GetPRoductPriceInfoResultItem `json:"items"`
+	Items []GetProductPriceInfoResultItem `json:"items"`
 
 	// Identifier of the last value on page. Leave this field blank in the first request.
 	//
@@ -1929,7 +1990,7 @@ type GetProductPriceInfoResult struct {
 	Total int32 `json:"total"`
 }
 
-type GetPRoductPriceInfoResultItem struct {
+type GetProductPriceInfoResultItem struct {
 	// Maximum acquiring fee
 	Acquiring int32 `json:"acquiring"`
 
@@ -1937,7 +1998,7 @@ type GetPRoductPriceInfoResultItem struct {
 	Commissions GetProductPriceInfoResultItemCommission `json:"commissions"`
 
 	// Promotions information
-	MarketingActions []GetProductPriceInfoResultItemMarketingActions `json:"marketing_actions"`
+	MarketingActions *GetProductPriceInfoResultItemMarketingActions `json:"marketing_actions"`
 
 	// Seller product identifier
 	OfferId string `json:"offer_id"`
@@ -2066,15 +2127,9 @@ 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"`
 
-	// Product price suggested by the system based on similar offers
-	RecommendedPrice string `json:"recommended_price"`
-
 	// Retailer price
 	RetailPrice string `json:"retail_price"`
 
@@ -2388,9 +2443,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"
@@ -2405,3 +2462,183 @@ func (c Products) GetRelatedSKUs(ctx context.Context, params *GetRelatedSKUsPara
 
 	return resp, nil
 }
+
+type GetEconomyInfoParams struct {
+	// List of MOQs with products
+	QuantCode []string `json:"quant_code"`
+}
+
+type GetEconomyInfoResponse struct {
+	core.CommonResponse
+
+	// Economy products
+	Items []EconomyInfoItem `json:"items"`
+}
+
+type EconomyInfoItem struct {
+	// Product identifier in the seller's system
+	OfferId string `json:"offer_id"`
+
+	// Product identifier
+	ProductId int64 `json:"product_id"`
+
+	// MOQ information
+	QuantInfo EconomyInfoItemQuants `json:"quant_info"`
+}
+
+type EconomyInfoItemQuants struct {
+	Quants []EconomyInfoItemQuant `json:"quants"`
+}
+
+type EconomyInfoItemQuant struct {
+	// Barcodes information
+	BarcodesExtended []EconomyInfoItemQuantBarcode `json:"barcodes_extended"`
+
+	// Dimensions
+	Dimensions DimensionsMM `json:"dimensions"`
+
+	// Marketing prices
+	MarketingPrice EconomyInfoItemQuantMarketingPrice `json:"marketing_price"`
+
+	// Minimum price specified by the seller
+	MinPrice string `json:"min_price"`
+
+	// The strikethrough price specified by the seller
+	OldPrice string `json:"old_price"`
+
+	// The selling price specified by the seller
+	Price string `json:"price"`
+
+	// Economy product identifier
+	QuantCode string `json:"quant_code"`
+
+	// MOQ size
+	QuantSize int64 `json:"quant_sice"`
+
+	// Product delivery type
+	ShipmentType string `json:"shipment_type"`
+
+	// Product SKU
+	SKU int64 `json:"sku"`
+
+	// Statuses descriptions
+	Statuses EconomyInfoItemQuantStatus `json:"statuses"`
+}
+
+type EconomyInfoItemQuantBarcode struct {
+	// Barcode
+	Barcode string `json:"barcode"`
+
+	// Error when receiving the barcode
+	Error string `json:"error"`
+
+	// Barcode status
+	Status string `json:"status"`
+}
+
+type DimensionsMM struct {
+	// Depth, mm
+	Depth int64 `json:"depth"`
+
+	// Height, mm
+	Height int64 `json:"height"`
+
+	// Weight, g
+	Weight int64 `json:"weight"`
+
+	// Width, mm
+	Width int64 `json:"width"`
+}
+
+type EconomyInfoItemQuantMarketingPrice struct {
+	// Selling price
+	Price string `json:"price"`
+
+	// Price specified by the seller
+	SellerPrice string `json:"seller_price"`
+}
+
+type EconomyInfoItemQuantStatus struct {
+	// Status description
+	StateDescription string `json:"state_description"`
+
+	// Status name
+	StateName string `json:"state_name"`
+
+	// System name of the status
+	StateSysName string `json:"state_sys_name"`
+
+	// Tooltip with current product status details
+	StateTooltip string `json:"state_tooltip"`
+}
+
+func (c Products) EconomyInfo(ctx context.Context, params *GetEconomyInfoParams) (*GetEconomyInfoResponse, error) {
+	url := "/v1/product/quant/info"
+
+	resp := &GetEconomyInfoResponse{}
+
+	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
+}
+
+type ListEconomyProductsParams struct {
+	// Cursor for the next data sample
+	Cursor string `json:"cursor"`
+
+	// Maximum number of values in the response
+	Limit int64 `json:"limit"`
+
+	// Filter by product visibility
+	Visibility string `json:"visibility"`
+}
+
+type ListEconomyProductsResponse struct {
+	core.CommonResponse
+
+	// Cursor for the next data sample
+	Cursor string `json:"cursor"`
+
+	// Economy products
+	Products []EconomyProduct `json:"products"`
+
+	// Leftover stock in all warehouses
+	TotalItems int32 `json:"total_items"`
+}
+
+type EconomyProduct struct {
+	// Product identifier in the seller's system
+	OfferId string `json:"offer_id"`
+
+	// Product identifier
+	ProductId int64 `json:"product_id"`
+
+	// Product MOQs list
+	Quants []EconomyProductQuant `json:"quants"`
+}
+
+type EconomyProductQuant struct {
+	// MOQ identifier
+	QuantCode string `json:"quant_code"`
+
+	// MOQ size
+	QuantSize int64 `json:"quant_size"`
+}
+
+func (c Products) ListEconomy(ctx context.Context, params *ListEconomyProductsParams) (*ListEconomyProductsResponse, error) {
+	url := "/v1/product/quant/list"
+
+	resp := &ListEconomyProductsResponse{}
+
+	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
+}

ozon/products_test.go

@@ -26,8 +26,8 @@ func TestGetStocksInfo(t *testing.T) {
 				Limit:  100,
 				LastId: "",
 				Filter: GetStocksInfoFilter{
-					OfferId:    "136834",
+					OfferId:    []string{"136834"},
-					ProductId:  214887921,
+					ProductId:  []int64{214887921},
 					Visibility: "ALL",
 				},
 			},
@@ -127,7 +127,7 @@ func TestGetProductDetails(t *testing.T) {
 					"7533900005"
 				  ],
 				  "buybox_price": "",
-				  "description_category_id": 17038062,
+				  "type_id": 0,
 				  "created_at": "2021-10-21T15:48:03.529178Z",
 				  "images": [
 					"https://cdn1.ozone.ru/s3/multimedia-5/6088931525.jpg",
@@ -141,12 +141,11 @@ func TestGetProductDetails(t *testing.T) {
 					"reserved": 0
 				  },
 				  "currency_code": "RUB",
+				  "description_category_id": 12,
 				  "marketing_price": "",
 				  "min_price": "",
 				  "old_price": "",
-				  "premium_price": "",
 				  "price": "590.0000",
-				  "recommended_price": "",
 				  "sources": [
 					{
 					  "is_enabled": true,
@@ -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",
@@ -1378,6 +1377,7 @@ func TestListProductsByIDs(t *testing.T) {
 					  ],
 					  "buybox_price": "",
 					  "description_category_id": 93726157,
+					  "type_id": 0,
 					  "created_at": "2021-06-03T03:40:05.871465Z",
 					  "images": [],
 					  "has_discounted_item": true,
@@ -1391,9 +1391,7 @@ func TestListProductsByIDs(t *testing.T) {
 					  "marketing_price": "",
 					  "min_price": "",
 					  "old_price": "1000.0000",
-					  "premium_price": "590.0000",
 					  "price": "690.0000",
-					  "recommended_price": "",
 					  "sources": [
 						{
 						  "is_enabled": true,
@@ -1420,7 +1418,24 @@ func TestListProductsByIDs(t *testing.T) {
 						"active_product": false,
 						"reasons": {}
 					  },
-					  "price_index": "0.00",
+					  "price_indexes": {
+						"external_index_data": {
+						  "minimal_price": "string",
+						  "minimal_price_currency": "string",
+						  "price_index_value": 0
+						},
+						"ozon_index_data": {
+						  "minimal_price": "string",
+						  "minimal_price_currency": "string",
+						  "price_index_value": 0
+						},
+						"price_index": "WITHOUT_INDEX",
+						"self_marketplaces_index_data": {
+						  "minimal_price": "string",
+						  "minimal_price_currency": "string",
+						  "price_index_value": 0
+						}
+					  },
 					  "images360": [],
 					  "is_kgt": false,
 					  "color_image": "",
@@ -1451,9 +1466,7 @@ func TestListProductsByIDs(t *testing.T) {
 					  "marketing_price": "",
 					  "min_price": "",
 					  "old_price": "12200.0000",
-					  "premium_price": "5490.0000",
 					  "price": "6100.0000",
-					  "recommended_price": "",
 					  "sources": [
 						{
 						  "is_enabled": true,
@@ -1598,7 +1611,6 @@ func TestGetDescriptionOfProduct(t *testing.T) {
 						"index": 2
 					  }
 					],
-					"image_group_id": "",
 					"images360": [],
 					"pdf_list": [],
 					"attributes": [
@@ -1777,6 +1789,113 @@ func TestGetDescriptionOfProduct(t *testing.T) {
 	}
 }
 
+func TestGetDescriptionOfProductV4(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetDescriptionOfProductsParams
+		response   string
+	}{
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetDescriptionOfProductsParams{
+				Filter: GetDescriptionOfProductsFilter{
+					ProductId:  []string{"330186294"},
+					Visibility: "ALL",
+				},
+				Limit:         100,
+				SortDirection: "ASC",
+			},
+			`{
+				"result": [
+				  {
+					"id": 330186294,
+					"barcode": "OZN653473453",
+					"name": "PC ЮКОМС Ryzen 7 5700G ...",
+					"offer_id": "ju-cas2-r5700g-bl",
+					"height": 360,
+					"depth": 420,
+					"width": 220,
+					"dimension_unit": "mm",
+					"weight": 4500,
+					"weight_unit": "g",
+					"description_category_id": 17028619,
+					"type_id": 91476,
+					"primary_image": "https://cdn1.ozone.ru/s3/multimedia-1-3/7084786431.jpg",
+					"model_info": {
+					  "model_id": 379410772,
+					  "count": 126
+					},
+					"images": [
+					  "https://cdn1.ozone.ru/s3/multimedia-1-0/7084786428.jpg",
+					  "https://cdn1.ozone.ru/s3/multimedia-1-k/7084786304.jpg"
+					],
+					"pdf_list": [],
+					"attributes": [
+					  {
+						"id": 85,
+						"complex_id": 0,
+						"values": [
+						  {
+							"dictionary_value_id": 971195426,
+							"value": "ЮКОМС"
+						  }
+						]
+					  }
+					],
+					"complex_attributes": [],
+					"color_image": ""
+				  }
+				],
+				"total": 1,
+				"last_id": ""
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetDescriptionOfProductsParams{},
+			`{
+				"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, cancel := context.WithTimeout(context.Background(), testTimeout)
+		defer cancel()
+
+		resp, err := c.Products().GetDescriptionOfProducts(ctx, test.params)
+		if err != nil {
+			t.Errorf("unexpected error: %v", err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetDescriptionOfProductsResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("wrong status code: got: %d, want: %d", resp.StatusCode, test.statusCode)
+		}
+
+		if test.statusCode == http.StatusOK {
+			if len(resp.Result) == 0 {
+				t.Error("expected non-empty result in success case")
+			}
+		}
+	}
+}
+
 func TestGetProductDescription(t *testing.T) {
 	t.Parallel()
 
@@ -2128,79 +2247,6 @@ func TestRemoveProductWithoutSKU(t *testing.T) {
 	}
 }
 
-func TestListGeoRestrictions(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *ListGeoRestrictionsParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&ListGeoRestrictionsParams{
-				Filter: ListGeoRestrictionsFilter{
-					OnlyVisible: true,
-				},
-				LastOrderNumber: 0,
-				Limit:           3,
-			},
-			`{
-				"restrictions": [
-				  {
-					"id": "world",
-					"name": "Весь Мир",
-					"is_visible": true,
-					"order_number": 1
-				  },
-				  {
-					"id": "42fb1c32-0cfe-5c96-9fb5-7f8e8449f28c",
-					"name": "Все города РФ",
-					"is_visible": true,
-					"order_number": 2
-				  },
-				  {
-					"id": "moscow",
-					"name": "Москва",
-					"is_visible": true,
-					"order_number": 3
-				  }
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&ListGeoRestrictionsParams{},
-			`{
-				"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.Products().ListGeoRestrictions(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &ListGeoRestrictionsResponse{})
-
-		if resp.StatusCode != test.statusCode {
-			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
-		}
-	}
-}
-
 func TestUploadActivationCodes(t *testing.T) {
 	t.Parallel()
 
@@ -2337,8 +2383,6 @@ func TestGetProductPriceInfo(t *testing.T) {
 						"currency_code": "RUB",
 						"price": "499.0000",
 						"old_price": "579.0000",
-						"premium_price": "",
-						"recommended_price": "",
 						"retail_price": "",
 						"vat": "0.200000",
 						"min_ozon_price": "",
@@ -2749,3 +2793,159 @@ func TestGetRelatedSKUs(t *testing.T) {
 		}
 	}
 }
+
+func TestEconomyInfo(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetEconomyInfoParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetEconomyInfoParams{
+				QuantCode: []string{"321", "322"},
+			},
+			`{
+				"items": [
+				  {
+					"offer_id": "string",
+					"product_id": 0,
+					"quant_info": {
+					  "quants": [
+						{
+						  "barcodes_extended": [
+							{
+							  "barcode": "string",
+							  "error": "string",
+							  "status": "string"
+							}
+						  ],
+						  "dimensions": {
+							"depth": 0,
+							"height": 0,
+							"weight": 0,
+							"width": 0
+						  },
+						  "marketing_price": {
+							"price": "string",
+							"seller_price": "string"
+						  },
+						  "min_price": "string",
+						  "old_price": "string",
+						  "price": "string",
+						  "quant_code": "string",
+						  "quant_sice": 0,
+						  "shipment_type": "string",
+						  "sku": 0,
+						  "statuses": {
+							"state_description": "string",
+							"state_name": "string",
+							"state_sys_name": "string",
+							"state_tooltip": "string"
+						  }
+						}
+					  ]
+					}
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetEconomyInfoParams{},
+			`{
+				"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.Products().EconomyInfo(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+
+		compareJsonResponse(t, test.response, &GetEconomyInfoResponse{})
+	}
+}
+
+func TestListEconomy(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *ListEconomyProductsParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&ListEconomyProductsParams{
+				Cursor:     "string",
+				Limit:      10,
+				Visibility: "ALL",
+			},
+			`{
+				"cursor": "string",
+				"products": [
+				  {
+					"offer_id": "string",
+					"product_id": 0,
+					"quants": [
+					  {
+						"quant_code": "string",
+						"quant_size": 0
+					  }
+					]
+				  }
+				],
+				"total_items": 0
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&ListEconomyProductsParams{},
+			`{
+				"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.Products().ListEconomy(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+
+		compareJsonResponse(t, test.response, &ListEconomyProductsResponse{})
+	}
+}

ozon/promotions.go

@@ -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
 	}
@@ -154,7 +154,7 @@ type ProductsAvailableForPromotionParams 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 float64 `json:"offset"`
+	Offset float64 `json:"offset,omitempty"`
 }
 
 type ProductsAvailableForPromotionResponse struct {
@@ -218,7 +218,7 @@ type ProductsInPromotionParams struct {
 	Limit float64 `json:"limit"`
 
 	// 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 float64 `json:"offset"`
+	Offset float64 `json:"offset,omitempty"`
 }
 
 type ProductsInPromotionResponse struct {
@@ -355,7 +355,7 @@ type ProductsAvailableForHotSalePromotionParams struct {
 	Limit float64 `json:"limit"`
 
 	// 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 float64 `json:"offset"`
+	Offset float64 `json:"offset,omitempty"`
 }
 
 type ProductsAvailableForHotSalePromotionResponse struct {

ozon/quants.go

@@ -0,0 +1,356 @@
+package ozon
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	core "github.com/diphantxm/ozon-api-client"
+)
+
+type Quants struct {
+	client *core.Client
+}
+
+type ListQuantsParams struct {
+	// Cursor for the next data sample
+	Cursor string `json:"cursor"`
+
+	// Filter
+	Filter ListQuantsFilter `json:"filter"`
+
+	// Maximum number of values in the response
+	Limit int32 `json:"limit"`
+
+	// Parameter by which products will be sorted
+	Sort string `json:"sort"`
+
+	// Sorting direction
+	SortDir string `json:"sort_dir"`
+}
+
+type ListQuantsFilter struct {
+	// MOQ creation period
+	CreatedAt *ListQuantsFilterTime `json:"created_at"`
+
+	// Time for MOQ assembly
+	Cutoff *ListQuantsFilterTime `json:"cutoff"`
+
+	// Destination point identifier
+	DestinationPlaceId int64 `json:"destination_place_id"`
+
+	// MOQ inventory identifiers
+	InvQuantIds []string `json:"inv_quants_ids"`
+
+	// Product identifier in the seller's system
+	OfferId string `json:"offer_id"`
+
+	// Product name
+	SKUName string `json:"sku_name"`
+
+	// MOQ statuses
+	Statuses []string `json:"statuses"`
+
+	// Warehouse identifier
+	WarehouseId int64 `json:"warehouse_id"`
+}
+
+type ListQuantsFilterTime struct {
+	// Start date
+	From string `json:"from"`
+
+	// End date
+	To string `json:"to"`
+}
+
+type ListQuantsResponse struct {
+	core.CommonResponse
+
+	Result ListQuantsResult `json:"result"`
+}
+
+type ListQuantsResult struct {
+	// Cursor for the next data sample
+	Cursor string `json:"cursor"`
+
+	// Indication that the response returned only a part of characteristic values
+	HasNext bool `json:"has_next"`
+
+	// MOQs list
+	Quants []Quant `json:"quants"`
+}
+
+type Quant struct {
+	// List of available actions with MOQ
+	AvailableActions []string `json:"available_actions"`
+
+	// Date until which the leftover stock amount must be specified
+	AwaitingStockDueDate string `json:"awaiting_stock_due_date"`
+
+	// MOQ cancellation reason
+	CancelReason `json:"cancel_reason"`
+
+	// Seller company identifier
+	CompanyId int64 `json:"company_id"`
+
+	// MOQ creation date
+	CreatedAt string `json:"created_at"`
+
+	// Current number of shipments in the MOQ
+	CurrentPostingsCount int64 `json:"current_postings_count"`
+
+	// Time until which the MOQ must be assembled
+	Cutoff string `json:"cutoff"`
+
+	// Delivery method name
+	DeliveryMethod string `json:"delivery_method_name"`
+
+	// Destination point identifier
+	DestinationPlaceId int64 `json:"destination_place_id"`
+
+	// Destination point name
+	DestinationPlaceName string `json:"destination_place_name"`
+
+	// MOQ filling percentage
+	FillingPercent float32 `json:"filling_percent"`
+
+	// Date when the shipments start to get canceled if the MOQ is not reserved
+	FirstPostingCancellationDate string `json:"first_posting_cancellation_date"`
+
+	// MOQ identifier in Ozon system
+	Id int64 `json:"id"`
+
+	// MOQ inventory identifier
+	InvQuantId int64 `json:"inv_quant_id"`
+
+	// Date of the last MOQ status change
+	LastStatusChangeAt string `json:"last_status_change_at"`
+
+	// Product identifier in the seller's system
+	OfferId string `json:"offer_id"`
+
+	// Total cost of products in the MOQ
+	ProductsPrice float32 `json:"products_price"`
+
+	// Start date of MOQ filling
+	QuantumStartDate string `json:"quantum_start_date"`
+
+	// Product SKU
+	SKU int64 `json:"sku"`
+
+	// Product name
+	SKUName string `json:"sku_name"`
+
+	// MOQ statuses
+	Status string `json:"status"`
+
+	// Required number of products in the MOQ
+	TargetPostingsCount int64 `json:"target_postings_count"`
+
+	// Delivery service name
+	TPLProviderName string `json:"tpl_provider_name"`
+
+	// MOQ type: box or pallet
+	Type string `json:"type"`
+
+	// Seller warehouse identifier
+	WarehouseId int64 `json:"warehouse_id"`
+
+	// Seller warehouse name
+	WarehouseName string `json:"warehouse_name"`
+}
+
+type CancelReason struct {
+	// Identifier of MOQ cancellation reason
+	Id int64 `json:"cancel_reason_id"`
+
+	// Cancellation reason name
+	Name string `json:"cancel_reason_name"`
+
+	// Cancellation initiator
+	Responsible string `json:"responsible"`
+}
+
+// You can leave feedback on this method in the comments section to the discussion in the Ozon for dev community.
+func (q Quants) List(ctx context.Context, params *ListQuantsParams) (*ListQuantsResponse, error) {
+	url := "/v1/quant/list"
+
+	resp := &ListQuantsResponse{}
+
+	response, err := q.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetQuantParams struct {
+	// MOQ inventory identifier
+	QuantId int64 `json:"inv_quant_id"`
+}
+
+type GetQuantResponse struct {
+	core.CommonResponse
+
+	// MOQ information
+	Result []GetQuantResult `json:"result"`
+}
+
+type GetQuantResult struct {
+	// Available actions
+	AvailableActions []string `json:"available_actions"`
+
+	// Date until which the leftover stock amount must be specified
+	AwaitingStockDueDate time.Time `json:"awaiting_stock_due_date"`
+
+	// Shipment cancellation reason
+	CancelReason CancelReason `json:"cancel_reason"`
+
+	// Current number of shipments in the MOQ
+	CurrentPostingsCount int64 `json:"current_postings_count"`
+
+	// Time until which the MOQ must be assembled
+	Cutoff time.Time `json:"cutoff"`
+
+	// Delivery method name
+	DeliveryMethodName string `json:"delivery_method_name"`
+
+	// Destination point identifier
+	DestinationPlaceId int64 `json:"destination_place_id"`
+
+	// Destination point name
+	DestinationPlaceName string `json:"destination_place_name"`
+
+	// MOQ filling percentage
+	FillingPercent float32 `json:"filling_percent"`
+
+	// Date when the shipments start to get canceled if the MOQ isn't reserved
+	FirstPostingCancellationDate time.Time `json:"first_posting_cancellation_date"`
+
+	// MOQ identifier
+	Id int64 `json:"id"`
+
+	// MOQ inventory identifier
+	QuantId int64 `json:"inv_quant_id"`
+
+	// Product identifier in the seller's system
+	OfferId string `json:"offer_id"`
+
+	// Shipments
+	Postings []GetQuantResultPosting `json:"postings"`
+
+	// Link to product photo
+	ProductPictureURL string `json:"product_picture_url"`
+
+	// Total price of products in the MOQ
+	ProductsPrice float32 `json:"products_price"`
+
+	// Start date of MOQ filling
+	QuantumStartDate time.Time `json:"quantum_start_date"`
+
+	// Product identifier in the Ozon system, SKU
+	SKU int64 `json:"sku"`
+
+	// Product name
+	SKUName string `json:"sku_name"`
+
+	// MOQ statuses
+	Status string `json:"status"`
+
+	// Required number of products in the MOQ
+	TargetPostingsCount int64 `json:"target_postings_count"`
+
+	// Delivery service name
+	TPLProviderName string `json:"tpl_provider_name"`
+
+	// MOQ type: box or pallet
+	Type string `json:"type"`
+
+	// Warehouse identifier
+	WarehouseId int64 `json:"warehouse_id"`
+
+	// Warehouse name
+	WarehouseName string `json:"warehouse_name"`
+}
+
+type GetQuantResultPosting struct {
+	// Shipment cancellation reason
+	CancelReason CancelReason `json:"cancel_reason"`
+
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+
+	// Total price of products in the MOQ
+	ProductsPrice float32 `json:"products_price"`
+
+	// Status text
+	StatusAlias string `json:"status_alias"`
+
+	// Status identifier
+	StatusId int64 `json:"status_id"`
+}
+
+func (q Quants) Get(ctx context.Context, params *GetQuantParams) (*GetQuantResponse, error) {
+	url := "/v1/quant/get"
+
+	resp := &GetQuantResponse{}
+
+	response, err := q.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type ShipQuantParams struct {
+	// MOQ inventory identifier
+	QuantId int64 `json:"quant_id"`
+}
+
+type ShipQuantResponse struct {
+	core.CommonResponse
+}
+
+func (q Quants) Ship(ctx context.Context, params *ShipQuantParams) (*ShipQuantResponse, error) {
+	url := "/v1/quant/ship"
+
+	resp := &ShipQuantResponse{}
+
+	response, err := q.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type StatusQuantParams struct {
+	// MOQ inventory identifier
+	QuantId int64 `json:"inv_quant_id"`
+}
+
+type StatusQuantResponse struct {
+	core.CommonResponse
+
+	// MOQ statuses
+	Status string `json:"status"`
+}
+
+func (q Quants) Status(ctx context.Context, params *StatusQuantParams) (*StatusQuantResponse, error) {
+	url := "/v1/quant/ship"
+
+	resp := &StatusQuantResponse{}
+
+	response, err := q.client.Request(ctx, http.MethodPost, url, params, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}

ozon/quants_test.go

@@ -0,0 +1,303 @@
+package ozon
+
+import (
+	"context"
+	"net/http"
+	"testing"
+
+	core "github.com/diphantxm/ozon-api-client"
+)
+
+func TestListQuants(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *ListQuantsParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&ListQuantsParams{
+				Cursor: "string",
+				Filter: ListQuantsFilter{
+					InvQuantIds:        []string{"string"},
+					DestinationPlaceId: 123,
+					OfferId:            "string",
+					SKUName:            "string",
+					Statuses:           []string{"unknown"},
+					WarehouseId:        456,
+				},
+				Limit:   10,
+				Sort:    "string",
+				SortDir: "string",
+			},
+			`{
+				"result": {
+				  "cursor": "string",
+				  "has_next": true,
+				  "quants": [
+					{
+					  "available_actions": [
+						"string"
+					  ],
+					  "awaiting_stock_due_date": "2019-08-24T14:15:22Z",
+					  "cancel_reason": {
+						"cancel_reason_id": 0,
+						"cancel_reason_name": "string",
+						"responsible": "string"
+					  },
+					  "company_id": 0,
+					  "created_at": "2019-08-24T14:15:22Z",
+					  "current_postings_count": 0,
+					  "cutoff": "2019-08-24T14:15:22Z",
+					  "delivery_method_name": "string",
+					  "destination_place_id": 0,
+					  "destination_place_name": "string",
+					  "filling_percent": 0,
+					  "first_posting_cancellation_date": "2019-08-24T14:15:22Z",
+					  "id": 0,
+					  "inv_quant_id": 0,
+					  "last_status_change_at": "2019-08-24T14:15:22Z",
+					  "offer_id": "string",
+					  "products_price": 0,
+					  "quantum_start_date": "2019-08-24T14:15:22Z",
+					  "sku": 0,
+					  "sku_name": "string",
+					  "status": "unknown",
+					  "target_postings_count": 0,
+					  "tpl_provider_name": "string",
+					  "type": "string",
+					  "warehouse_id": 0,
+					  "warehouse_name": "string"
+					}
+				  ]
+				}
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&ListQuantsParams{},
+			`{
+				"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.Quants().List(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &ListQuantsResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestGetQuant(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetQuantParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetQuantParams{
+				QuantId: 456,
+			},
+			`{
+				"result": [
+				  {
+					"available_actions": [
+					  "string"
+					],
+					"awaiting_stock_due_date": "2019-08-24T14:15:22Z",
+					"cancel_reason": {
+					  "cancel_reason_id": 0,
+					  "cancel_reason_name": "string",
+					  "responsible": "string"
+					},
+					"current_postings_count": 0,
+					"cutoff": "2019-08-24T14:15:22Z",
+					"delivery_method_name": "string",
+					"destination_place_id": 0,
+					"destination_place_name": "string",
+					"filling_percent": 0,
+					"first_posting_cancellation_date": "2019-08-24T14:15:22Z",
+					"id": 0,
+					"inv_quant_id": 0,
+					"offer_id": "string",
+					"postings": [
+					  {
+						"cancel_reason": {
+						  "cancel_reason_id": 0,
+						  "cancel_reason_name": "string",
+						  "responsible": "string"
+						},
+						"posting_number": "string",
+						"products_price": 0,
+						"status_alias": "string",
+						"status_id": 0
+					  }
+					],
+					"product_picture_url": "string",
+					"products_price": 0,
+					"quantum_start_date": "2019-08-24T14:15:22Z",
+					"sku": 0,
+					"sku_name": "string",
+					"status": "unknown",
+					"target_postings_count": 0,
+					"tpl_provider_name": "string",
+					"type": "string",
+					"warehouse_id": 0,
+					"warehouse_name": "string"
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetQuantParams{},
+			`{
+				"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.Quants().Get(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetQuantResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestShipQuant(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *ShipQuantParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&ShipQuantParams{
+				QuantId: 456,
+			},
+			`{}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&ShipQuantParams{},
+			`{
+				"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.Quants().Ship(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &ShipQuantResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestStatusQuant(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *StatusQuantParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&StatusQuantParams{
+				QuantId: 456,
+			},
+			`{
+				"status": "unknown"
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&StatusQuantParams{},
+			`{
+				"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.Quants().Status(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &StatusQuantResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}

ozon/rating.go

@@ -18,6 +18,11 @@ type GetCurrentSellerRatingInfoResponse struct {
 	// Rating groups list
 	Groups []GetCurrentSellerRatingInfoGroup `json:"groups"`
 
+	// Localization index details.
+	// If you had no sales in the last 14 days,
+	// the parameter fields will be empty
+	LocalizationIndex []LocalizationIndex `json:"localization_index"`
+
 	// An indication that the penalty points balance is exceeded
 	PenaltyScoreExceeded bool `json:"penalty_score_exceeded"`
 
@@ -25,6 +30,14 @@ type GetCurrentSellerRatingInfoResponse struct {
 	Premium bool `json:"premium"`
 }
 
+type LocalizationIndex struct {
+	// Date of localization index calculation
+	CalculationDate time.Time `json:"calculation_date"`
+
+	// Localization index value
+	LocalizationPercentage int32 `json:"localization_percentage"`
+}
+
 type GetCurrentSellerRatingInfoGroup struct {
 	// Ratings group name
 	GroupName string `json:"group_name"`

ozon/rating_test.go

@@ -41,6 +41,12 @@ func TestGetCurrentRatingInfo(t *testing.T) {
 					]
 				  }
 				],
+				"localization_index": [
+					{
+						"calculation_date": "2019-08-24T14:15:22Z",
+						"localization_percentage": 0
+					}
+				],
 				"penalty_score_exceeded": true,
 				"premium": true
 			}`,

ozon/reports.go

@@ -450,7 +450,7 @@ func (c Reports) GetProducts(ctx context.Context, params *GetProductsReportParam
 
 type GetReturnsReportParams struct {
 	// Filter
-	Filter GetReturnsReportsFilter `json:"filter"`
+	Filter *GetReturnsReportsFilter `json:"filter,omitempty"`
 
 	// Default: "DEFAULT"
 	// Response language:
@@ -463,8 +463,15 @@ type GetReturnsReportsFilter struct {
 	// Order delivery scheme: fbs — delivery from seller's warehouse
 	DeliverySchema string `json:"delivery_schema"`
 
-	// Order identifier
+	// Date from which the data is displayed in the report.
-	OrderId int64 `json:"order_id"`
+	//
+	// Available for the last three months only
+	DateFrom time.Time `json:"date_from"`
+
+	// Date up to which the data is displayed in the report.
+	//
+	// Available for the last three months only
+	DateTo time.Time `json:"date_to"`
 
 	// Order status
 	Status string `json:"status"`
@@ -473,20 +480,13 @@ type GetReturnsReportsFilter struct {
 type GetReturnsReportResponse struct {
 	core.CommonResponse
 
-	// Method result
-	Result GetReturnReportResult `json:"result"`
-}
-
-type GetReturnReportResult struct {
 	// Unique report identifier. The report is available for downloading within 3 days after making a request.
 	Code string `json:"code"`
 }
 
-// The report contains information about returned products that were accepted from the customer, ready for pickup, or delivered to the seller.
+// Method for getting a report on FBO and FBS returns
-//
-// The method is only suitable for orders shipped from the seller's warehouse
 func (c Reports) GetReturns(ctx context.Context, params *GetReturnsReportParams) (*GetReturnsReportResponse, error) {
-	url := "/v1/report/returns/create"
+	url := "/v2/report/returns/create"
 
 	resp := &GetReturnsReportResponse{}
 
@@ -501,7 +501,7 @@ func (c Reports) GetReturns(ctx context.Context, params *GetReturnsReportParams)
 
 type GetShipmentReportParams struct {
 	// Filter
-	Filter GetShipmentReportFilter `json:"filter"`
+	Filter *GetShipmentReportFilter `json:"filter,omitempty"`
 
 	// Default: "DEFAULT"
 	// Response language:
@@ -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"`

ozon/reports_test.go

@@ -375,14 +375,12 @@ func TestGetReturnsReport(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetReturnsReportParams{
-				Filter: GetReturnsReportsFilter{
+				Filter: &GetReturnsReportsFilter{
 					DeliverySchema: "fbs",
 				},
 			},
 			`{
-				"result": {
+				"code": "REPORT_seller_products_924336_1720170405_a9ea2f27-a473-4b13-99f9-d0cfcb5b1a69"
-				  "code": "d55f4517-8347-4e24-9d93-d6e736c1c07c"
-				}
 			}`,
 		},
 		// Test No Client-Id or Api-Key
@@ -407,16 +405,12 @@ func TestGetReturnsReport(t *testing.T) {
 			continue
 		}
 
-		compareJsonResponse(t, test.response, &GetReturnsReportResponse{})
-
 		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 resp.Result.Code == "" {
+			compareJsonResponse(t, test.response, &GetReturnsReportResponse{})
-				t.Errorf("Code cannot be empty")
-			}
 		}
 	}
 }
@@ -435,10 +429,10 @@ func TestGetShipmentReport(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetShipmentReportParams{
-				Filter: GetShipmentReportFilter{
+				Filter: &GetShipmentReportFilter{
 					DeliverySchema:  []string{"fbs", "fbo", "crossborder"},
-					ProcessedAtFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-09-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.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-02T17:10:54.861Z"),
+					ProcessedAtTo:   core.NewTimeFormat(core.TimeFromString(t, "2006-01-02T15:04:05Z", "2021-11-02T17:10:54.861Z"), "2006-01-02T15:04:05Z"),
 				},
 			},
 			`{

ozon/returns.go

@@ -12,125 +12,6 @@ type Returns struct {
 	client *core.Client
 }
 
-type GetFBOReturnsParams struct {
-	// Filter
-	Filter GetFBOReturnsFilter `json:"filter"`
-
-	// Identifier of the last value on the page. Leave this field blank in the first request.
-	//
-	// To get the next values, specify the recieved value in the next request in the `last_id` parameter
-	LastId int64 `json:"last_id"`
-
-	// Number of values in the response
-	Limit int64 `json:"limit"`
-}
-
-type GetFBOReturnsFilter struct {
-	// Shipment number
-	PostingNumber string `json:"posting_number"`
-
-	// Return status
-	Status []GetFBOReturnsFilterStatus `json:"status"`
-}
-
-type GetFBOReturnsResponse struct {
-	core.CommonResponse
-
-	// Identifier of the last value on the page
-	LastId int64 `json:"last_id"`
-
-	// Returns information
-	Returns []GetFBOReturnsReturn `json:"returns"`
-}
-
-type GetFBOReturnsReturn struct {
-	// Time when a return was received from the customer
-	AcceptedFromCustomerMoment time.Time `json:"accepted_from_customer_moment"`
-
-	// Seller identifier
-	CompanyId int64 `json:"company_id"`
-
-	// Current return location
-	CurrentPlaceName string `json:"current_place_name"`
-
-	// Return destination
-	DestinationPlaceName string `json:"dst_place_name"`
-
-	// Return identifier
-	Id int64 `json:"id"`
-
-	// Indication that the package has been opened. true, if it has been
-	IsOpened bool `json:"is_opened"`
-
-	// Shipment number
-	PostingNumber string `json:"posting_number"`
-
-	// Return reason
-	ReturnReasonName string `json:"return_reason_name"`
-
-	// Return delivery time to the Ozon warehouse
-	ReturnedToOzonMoment time.Time `json:"returned_to_ozon_moment"`
-
-	// Product identifier in the Ozon system, SKU
-	SKU int64 `json:"sku"`
-
-	// Return status
-	Status GetFBOReturnsReturnStatus `json:"status_name"`
-}
-
-// Method for getting information on returned products that are sold from the Ozon warehouse
-func (c Returns) GetFBOReturns(ctx context.Context, params *GetFBOReturnsParams) (*GetFBOReturnsResponse, error) {
-	url := "/v3/returns/company/fbo"
-
-	resp := &GetFBOReturnsResponse{}
-
-	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
-}
-
-type GetFBSReturnsParams struct {
-	// Filter
-	Filter GetFBSReturnsFilter `json:"filter"`
-
-	// Number of values in the response:
-	//   - maximum — 1000,
-	//   - minimum — 1
-	Limit int64 `json:"limit"`
-
-	// Return identifier that was loaded the last time.
-	// Return identifiers with the higher value than `last_id`
-	// will be returned in the response.
-	LastId int64 `json:"offset"`
-}
-
-type GetFBSReturnsFilter struct {
-	// Time of receiving the return from the customer
-	AcceptedFromCustomerMoment GetFBSReturnsFilterTimeRange `json:"accepted_from_customer_moment"`
-
-	// Last day of free storage
-	LastFreeWaitingDay GetFBSReturnsFilterTimeRange `json:"last_free_waiting_dat"`
-
-	// Order ID
-	OrderId int64 `json:"order_id"`
-
-	// Shipment ID
-	PostingNumber []string `json:"posting_number"`
-
-	// Product name
-	ProductName string `json:"product_name"`
-
-	// Product ID
-	ProductOfferId string `json:"product_offer_id"`
-
-	// Return status
-	Status GetFBSReturnsFilterStatus `json:"status"`
-}
-
 type GetFBSReturnsFilterTimeRange struct {
 	// The beginning of the period.
 	//
@@ -147,124 +28,9 @@ type GetFBSReturnsFilterTimeRange struct {
 	TimeTo time.Time `json:"time_to"`
 }
 
-type GetFBSReturnsResponse struct {
-	core.CommonResponse
-
-	// Return identifier that was loaded the last time.
-	// Return identifiers with the higher value than `last_id`
-	// will be returned in the response
-	LastId int64 `json:"last_id"`
-
-	// Returns information
-	Returns []GetFBSReturnResultReturn `json:"returns"`
-}
-
-type GetFBSReturnResultReturn struct {
-	// Time of receiving the return from the customer
-	AcceptedFromCustomerMoment string `json:"accepted_from_customer_moment"`
-
-	// Bottom barcode on the product label
-	ClearingId int64 `json:"clearing_id"`
-
-	// Commission fee
-	Commission float64 `json:"commission"`
-
-	// Commission percentage
-	CommissionPercent float64 `json:"commission_percent"`
-
-	// Product item identifier in the Ozon logistics system
-	ExemplarId int64 `json:"exemplar_id"`
-
-	// Return identifier in the Ozon accounting system
-	Id int64 `json:"id"`
-
-	// If the product is in transit — true
-	IsMoving bool `json:"is_moving"`
-
-	// Indication that the package has been opened. true, if it has been
-	IsOpened bool `json:"is_opened"`
-
-	// Last day of free storage
-	LastFreeWaitingDay string `json:"last_free_waiting_day"`
-
-	// 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
-	MovingToPlaceName string `json:"moving_to_place_name"`
-
-	// Delivery cost
-	PickingAmount float64 `json:"picking_amount"`
-
-	// Shipment number
-	PostingNumber string `json:"posting_number"`
-
-	PickingTag string `json:"picking_tag"`
-
-	// Current product price without a discount
-	Price float64 `json:"price"`
-
-	// Product price without commission
-	PriceWithoutCommission float64 `json:"price_without_commission"`
-
-	// Product identifier
-	ProductId int64 `json:"product_id"`
-
-	// Product name
-	ProductName string `json:"product_name"`
-
-	// Product quantity
-	Quantity int64 `json:"quantity"`
-
-	// Barcode on the return label. Use this parameter value to work with the return label
-	ReturnBarcode string `json:"return_barcode"`
-
-	// Package unit identifier in the Ozon logistics system
-	ReturnClearingId int64 `json:"return_clearing_id"`
-
-	// Product return date
-	ReturnDate string `json:"return_date"`
-
-	// Return reason
-	ReturnReasonName string `json:"return_reason_name"`
-
-	// Date when the product is ready to be handed over to the seller
-	WaitingForSellerDate string `json:"waiting_for_seller_date_time"`
-
-	// Date of handing over the product to the seller
-	ReturnedToSellerDate string `json:"returned_to_seller_date_time"`
-
-	// Return storage period in days
-	WaitingForSellerDays int64 `json:"waiting_for_seller_days"`
-
-	// Return storage cost
-	ReturnsKeepingCost float64 `json:"returns_keeping_cost"`
-
-	// Product identifier in the Ozon system, SKU
-	SKU int64 `json:"sku"`
-
-	// Return status
-	Status string `json:"status"`
-}
-
-// Method for getting information on returned products that are sold from the seller's warehouse
-func (c Returns) GetFBSReturns(ctx context.Context, params *GetFBSReturnsParams) (*GetFBSReturnsResponse, error) {
-	url := "/v3/returns/company/fbs"
-
-	resp := &GetFBSReturnsResponse{}
-
-	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
-}
-
 type GetRFBSReturnsParams struct {
 	// Filter
-	Filter GetRFBSReturnsFilter `json:"filter"`
+	Filter *GetRFBSReturnsFilter `json:"filter,omitempty"`
 
 	// Identifier of the last value on the page.
 	// Leave this field blank in the first request
@@ -667,7 +433,7 @@ func (c Returns) IsGiveoutEnabled(ctx context.Context) (*IsGiveoutEnabledRespons
 
 	resp := &IsGiveoutEnabledResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -697,7 +463,7 @@ func (c Returns) GetGiveoutPDF(ctx context.Context) (*GetGiveoutResponse, error)
 
 	resp := &GetGiveoutResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -714,7 +480,7 @@ func (c Returns) GetGiveoutPNG(ctx context.Context) (*GetGiveoutResponse, error)
 
 	resp := &GetGiveoutResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -739,7 +505,7 @@ func (c Returns) GetGiveoutBarcode(ctx context.Context) (*GetGiveoutBarcodeRespo
 
 	resp := &GetGiveoutBarcodeResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -758,7 +524,7 @@ func (c Returns) ResetGiveoutBarcode(ctx context.Context) (*GetGiveoutResponse,
 
 	resp := &GetGiveoutResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -814,7 +580,7 @@ func (c Returns) GetGiveoutList(ctx context.Context, params *GetGiveoutListParam
 
 	resp := &GetGiveoutListResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -867,7 +633,329 @@ func (c Returns) GetGiveoutInfo(ctx context.Context, params *GetGiveoutInfoParam
 
 	resp := &GetGiveoutInfoResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, struct{}{}, resp, nil)
+	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
+	if err != nil {
+		return nil, err
+	}
+	response.CopyCommonResponse(&resp.CommonResponse)
+
+	return resp, nil
+}
+
+type GetFBSQuantityReturnsParams struct {
+	Filter GetFBSQuantityReturnsFilter `json:"filter"`
+
+	// Split the method response
+	Pagination GetFBSQuantityReturnsPagination `json:"pagination"`
+}
+
+type GetFBSQuantityReturnsFilter struct {
+	// Filter by drop-off point identifier
+	PlaceId int64 `json:"place_id"`
+}
+
+type GetFBSQuantityReturnsPagination struct {
+	// Identifier of the last drop-off point on the page. Leave this field blank in the first request.
+	//
+	// To get the next values, specify id of the last drop-off point from the response of the previous request
+	LastId int64 `json:"last_id"`
+
+	// Number of drop-off points per page. Maximum is 500
+	Limit int32 `json:"limit"`
+}
+
+type GetFBSQuantityReturnsResponse struct {
+	core.CommonResponse
+
+	// Seller identifier
+	CompanyId int64 `json:"company_id"`
+
+	DropoffPoints []GetFBSQuantityDropoffPoint `json:"drop_off_points"`
+
+	// true if there are any other points where sellers have orders waiting
+	HasNext bool `json:"has_next"`
+}
+
+type GetFBSQuantityDropoffPoint struct {
+	// Drop-off point address
+	Address string `json:"address"`
+
+	// Drop-off point identifier
+	Id int64 `json:"id"`
+
+	// Drop-off point name
+	Name string `json:"name"`
+
+	// Pass information
+	PassInfo GetFBSQuantityDropoffPointPassInfo `json:"pass_info"`
+
+	// The warehouse identifier to which the shipment will arrive
+	PlaceId int64 `json:"place_id"`
+
+	// Quantity of returns at the drop-off point
+	ReturnsCount int32 `json:"returns_count"`
+
+	// Seller's warehouses identifiers
+	WarehouseIds []string `json:"warehouses_ids"`
+}
+
+type GetFBSQuantityDropoffPointPassInfo struct {
+	// Quantity of drop-off point passes
+	Count int32 `json:"count"`
+
+	// true if you need a pass to the drop-off point
+	IsRequired bool `json:"is_required"`
+}
+
+func (c Returns) FBSQuantity(ctx context.Context, params *GetFBSQuantityReturnsParams) (*GetFBSQuantityReturnsResponse, error) {
+	url := "/v1/returns/company/fbs/info"
+
+	resp := &GetFBSQuantityReturnsResponse{}
+
+	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
+}
+
+type ListReturnsParams struct {
+	// Filter
+	Filter *ListReturnsFilter `json:"filter,omitempty"`
+
+	// Number of loaded returns. The maximum value is 500
+	Limit int32 `json:"limit"`
+
+	// Identifier of the last loaded return
+	LastId int64 `json:"last_id"`
+}
+
+type ListReturnsFilter struct {
+	// Filter by return creation date
+	LogisticReturnDate *GetFBSReturnsFilterTimeRange `json:"logistic_return_date"`
+
+	// Filter by storage fees start date
+	StorageTarifficationDate *GetFBSReturnsFilterTimeRange `json:"storage_tariffication_start_date"`
+
+	// Filter by date the return status changed
+	VisualStatusChangeMoment *GetFBSReturnsFilterTimeRange `json:"visual_status_change_moment"`
+
+	// Filter by order identifier
+	OrderId int64 `json:"order_id,omitempty"`
+
+	// Filter by shipment number
+	PostingNumbers []string `json:"posting_numbers,omitempty"`
+
+	// Filter by product name
+	ProductName string `json:"product_name,omitempty"`
+
+	// Filter by product identifier in the seller's system
+	OfferId string `json:"offer_id,omitempty"`
+
+	// Filter by return status
+	VisualStatusName VisualStatus `json:"visual_status_name,omitempty"`
+
+	// Filter by warehouse identifier
+	WarehouseId int64 `json:"warehouse_id,omitempty"`
+
+	// Filter by return label barcode
+	Barcode string `json:"barcode,omitempty"`
+
+	// Filter by delivery scheme: FBS or FBO
+	ReturnSchema string `json:"return_schema,omitempty"`
+}
+
+type ListReturnsResponse struct {
+	core.CommonResponse
+
+	// Returns details
+	Returns []Return `json:"returns"`
+
+	// true, if the seller has other returns
+	HasNext bool `json:"has_next"`
+}
+
+type Return struct {
+	// Product items data
+	Exemplars []ReturnExemplar `json:"exemplars"`
+
+	// Return identifier
+	Id int64 `json:"id"`
+
+	// Company identifier
+	CompanyId int64 `json:"company_id"`
+
+	// Return reason
+	ReturnReasonName string `json:"return_reason_name"`
+
+	// Return type
+	Type string `json:"type"`
+
+	// Return scheme
+	Schema string `json:"schema"`
+
+	// Order identifier
+	OrderId int64 `json:"order_id"`
+
+	// Order number
+	OrderNumber string `json:"order_number"`
+
+	// Warehouse where the return is stored
+	Place ReturnPlace `json:"place"`
+
+	// Warehouse where returns are sent to
+	TargetPlace ReturnPlace `json:"target_place"`
+
+	// Storage details
+	Storage ReturnStorage `json:"storage"`
+
+	// Product details
+	Product ReturnProduct `json:"product"`
+
+	// Return details
+	Logistic ReturnLogistic `json:"logistic"`
+
+	// Return status details
+	Visual ReturnVisual `json:"visual"`
+
+	// Additional information
+	AdditionalInfo ReturnAdditionalInfo `json:"additional_info"`
+
+	// Previous return identifier
+	SourceId int64 `json:"source_id"`
+
+	// Shipment number
+	PostingNumber string `json:"posting_number"`
+
+	// Original shipment barcode
+	ClearingId int64 `json:"clearing_id"`
+
+	// Package unit identifier in the Ozon logistics system
+	ReturnClearingId int64 `json:"return_clearing_id"`
+}
+
+type ReturnExemplar struct {
+	// Product identifier
+	Id int64 `json:"id"`
+}
+
+type ReturnPlace struct {
+	// Warehouse identifier
+	Id int64 `json:"id"`
+
+	// Warehouse name
+	Name string `json:"name"`
+
+	// Warehouse address
+	Address string `json:"address"`
+}
+
+type ReturnStorage struct {
+	// Storage cost details
+	Sum ReturnSum `json:"sum"`
+
+	// First day of charging for storage
+	TarifficationsFirstDate time.Time `json:"tariffication_first_date"`
+
+	// Start date for storage fees
+	TarifficationsStartDate time.Time `json:"tariffication_start_date"`
+
+	// Date when the return was ready for handover
+	ArrivedMoment time.Time `json:"arrived_moment"`
+
+	// Number of days the return has been waiting for handover
+	Days int64 `json:"days"`
+
+	// Disposal cost details
+	UtilizationSum ReturnSum `json:"utilization_sum"`
+
+	// Planned disposal date
+	UtilizationForecastDate string `json:"utilization_forecast_date"`
+}
+
+type ReturnSum struct {
+	// Currency
+	CurrencyCode string `json:"currency_code"`
+
+	// Disposal cost
+	Price float64 `json:"price"`
+}
+
+type ReturnProduct struct {
+	// Product identifier in the Ozon system, SKU
+	SKU int64 `json:"sku"`
+
+	// Product identifier in the seller's system
+	OfferId string `json:"offer_id"`
+
+	// product name
+	Name string `json:"name"`
+
+	// Product price details
+	Price ReturnSum `json:"price"`
+
+	// Product cost without commission
+	PriceWithoutCommission ReturnSum `json:"price_without_commission"`
+
+	// Sales commission by category
+	CommissionPercent float64 `json:"commission_percent"`
+
+	// Commission details
+	Commission ReturnSum `json:"commission"`
+}
+
+type ReturnLogistic struct {
+	// Date when the order was placed for technical return
+	TechnicalReturnMoment time.Time `json:"technical_return_moment"`
+
+	// Date when the return arrived to the warehouse or was handed over to the seller
+	FinalMoment time.Time `json:"final_moment"`
+
+	// Date when the seller received compensation for the return
+	CancelledWithCompensationMoment time.Time `json:"cancelled_with_compensation_moment"`
+
+	// Date when the customer returned the product
+	ReturnDate time.Time `json:"return_date"`
+
+	// Return label barcode
+	Barcode string `json:"barcode"`
+}
+
+type ReturnVisual struct {
+	// Return status
+	Status ReturnVisualStatus `json:"status"`
+
+	// Date the return status changed
+	ChangeMoment time.Time `json:"change_moment"`
+}
+
+type ReturnVisualStatus struct {
+	// Return status identifier
+	Id int32 `json:"id"`
+
+	// Return status name
+	DisplayName string `json:"display_name"`
+
+	// System name of the return status
+	SystemName string `json:"sys_name"`
+}
+
+type ReturnAdditionalInfo struct {
+	// true, if the return package is opened
+	IsOpened bool `json:"is_opened"`
+
+	// true, if the return belongs to Super Economy products
+	IsSuperEconom bool `json:"is_super_econom"`
+}
+
+func (c Returns) List(ctx context.Context, params *ListReturnsParams) (*ListReturnsResponse, error) {
+	url := "/v1/returns/list"
+
+	resp := &ListReturnsResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/returns_test.go

@@ -8,194 +8,6 @@ import (
 	core "github.com/diphantxm/ozon-api-client"
 )
 
-func TestGetFBOReturns(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *GetFBOReturnsParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetFBOReturnsParams{
-				Filter: GetFBOReturnsFilter{
-					PostingNumber: "some number",
-				},
-				LastId: 123,
-				Limit:  100,
-			},
-			`{
-				"last_id": 0,
-				"returns": [
-				  {
-					"accepted_from_customer_moment": "2019-08-24T14:15:22Z",
-					"company_id": 123456789,
-					"current_place_name": "my-place",
-					"dst_place_name": "that-place",
-					"id": 123456789,
-					"is_opened": true,
-					"posting_number": "some number",
-					"return_reason_name": "ripped",
-					"returned_to_ozon_moment": "2019-08-24T14:15:22Z",
-					"sku": 123456789,
-					"status_name": "delivering"
-				  }
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&GetFBOReturnsParams{},
-			`{
-				"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.Returns().GetFBOReturns(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &GetFBOReturnsResponse{})
-
-		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.Returns) > 0 {
-				if resp.Returns[0].Id == 0 {
-					t.Errorf("Id cannot be 0")
-				}
-				if resp.Returns[0].CompanyId == 0 {
-					t.Errorf("Company id cannot be 0")
-				}
-				if resp.Returns[0].SKU == 0 {
-					t.Errorf("SKU cannot be 0")
-				}
-			}
-		}
-	}
-}
-
-func TestGetFBSReturns(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		statusCode int
-		headers    map[string]string
-		params     *GetFBSReturnsParams
-		response   string
-	}{
-		// Test Ok
-		{
-			http.StatusOK,
-			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
-			&GetFBSReturnsParams{
-				Filter: GetFBSReturnsFilter{
-					PostingNumber: []string{"07402477-0022-2"},
-					Status:        "returned_to_seller",
-				},
-				Limit:  1000,
-				LastId: 0,
-			},
-			`{
-				"last_id": 0,
-				"returns": [
-				  {
-					"accepted_from_customer_moment": "string",
-					"clearing_id": 23,
-					"commission": 21,
-					"commission_percent": 0,
-					"exemplar_id": 42,
-					"id": 123,
-					"is_moving": true,
-					"is_opened": true,
-					"last_free_waiting_day": "string",
-					"place_id": 122,
-					"moving_to_place_name": "string",
-					"picking_amount": 0,
-					"posting_number": "string",
-					"picking_tag": "string",
-					"price": 0,
-					"price_without_commission": 0,
-					"product_id": 2222,
-					"product_name": "string",
-					"quantity": 0,
-					"return_barcode": "string",
-					"return_clearing_id": 0,
-					"return_date": "string",
-					"return_reason_name": "string",
-					"waiting_for_seller_date_time": "string",
-					"returned_to_seller_date_time": "string",
-					"waiting_for_seller_days": 0,
-					"returns_keeping_cost": 0,
-					"sku": 33332,
-					"status": "string"
-				  }
-				]
-			}`,
-		},
-		// Test No Client-Id or Api-Key
-		{
-			http.StatusUnauthorized,
-			map[string]string{},
-			&GetFBSReturnsParams{},
-			`{
-				"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.Returns().GetFBSReturns(ctx, test.params)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		compareJsonResponse(t, test.response, &GetFBSReturnsResponse{})
-
-		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.Returns) > 0 {
-				if resp.Returns[0].Id == 0 {
-					t.Errorf("Id cannot be 0")
-				}
-				if resp.Returns[0].ProductId == 0 {
-					t.Errorf("Product id cannot be 0")
-				}
-				if resp.Returns[0].SKU == 0 {
-					t.Errorf("SKU cannot be 0")
-				}
-				if resp.Returns[0].Status == "" {
-					t.Errorf("Status cannot be empty")
-				}
-			}
-		}
-	}
-}
-
 func TestGetRFBSReturns(t *testing.T) {
 	t.Parallel()
 
@@ -212,7 +24,7 @@ func TestGetRFBSReturns(t *testing.T) {
 			&GetRFBSReturnsParams{
 				LastId: 999,
 				Limit:  555,
-				Filter: GetRFBSReturnsFilter{
+				Filter: &GetRFBSReturnsFilter{
 					OfferId:       "123",
 					PostingNumber: "111",
 					GroupState:    []RFBSReturnsGroupState{RFBSReturnsGroupStateAll},
@@ -987,3 +799,226 @@ func TestGetGiveoutInfo(t *testing.T) {
 		}
 	}
 }
+
+func TestFBSQuantity(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *GetFBSQuantityReturnsParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&GetFBSQuantityReturnsParams{
+				Filter: GetFBSQuantityReturnsFilter{
+					PlaceId: 1,
+				},
+				Pagination: GetFBSQuantityReturnsPagination{
+					LastId: 2,
+					Limit:  3,
+				},
+			},
+			`{
+				"company_id": 0,
+				"drop_off_points": [
+				  {
+					"address": "string",
+					"id": 0,
+					"name": "string",
+					"pass_info": {
+					  "count": 0,
+					  "is_required": true
+					},
+					"place_id": 0,
+					"returns_count": 0,
+					"warehouses_ids": [
+					  "string"
+					]
+				  }
+				],
+				"has_next": true
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&GetFBSQuantityReturnsParams{},
+			`{
+				"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.Returns().FBSQuantity(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &GetFBSQuantityReturnsResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}
+
+func TestListReturns(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *ListReturnsParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&ListReturnsParams{
+				Filter: &ListReturnsFilter{
+					LogisticReturnDate: &GetFBSReturnsFilterTimeRange{
+						TimeFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+						TimeTo:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+					},
+					StorageTarifficationDate: &GetFBSReturnsFilterTimeRange{
+						TimeFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+						TimeTo:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+					},
+					VisualStatusChangeMoment: &GetFBSReturnsFilterTimeRange{
+						TimeFrom: core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+						TimeTo:   core.TimeFromString(t, "2006-01-02T15:04:05Z", "2019-08-24T14:15:22Z"),
+					},
+					WarehouseId:  911,
+					ReturnSchema: "FBO",
+					ProductName:  "string",
+				},
+				Limit:  500,
+				LastId: 0,
+			},
+			`{
+				"returns": [
+				  {
+					"exemplars": [
+					  {
+						"id": 1019562967545956
+					  }
+					],
+					"id": 1000015552,
+					"company_id": 3058,
+					"return_reason_name": "Customer refused on receipt: not satisfied with the quality of the product",
+					"type": "FullReturn",
+					"schema": "Fbs",
+					"order_id": 24540784250,
+					"order_number": "58544282-0057",
+					"place": {
+					  "id": 23869688194000,
+					  "name": "СЦ_Львовский_Возвраты",
+					  "address": "Россия, обл. Московская, г. Подольск, промышленная зона Львовский, ул. Московская, д. 69, стр. 5"
+					},
+					"target_place": {
+					  "id": 23869688194000,
+					  "name": "СЦ_Львовский_Возвраты",
+					  "address": "Россия, обл. Московская, г. Подольск, промышленная зона Львовский, ул. Московская, д. 69, стр. 5"
+					},
+					"storage": {
+					  "sum": {
+						"currency_code": "RUB",
+						"price": 1231
+					  },
+					  "tariffication_first_date": "2024-07-30T06:15:48.998146Z",
+					  "tariffication_start_date": "2024-07-29T06:15:48.998146Z",
+					  "arrived_moment": "2024-07-29T06:15:48.998146Z",
+					  "days": 0,
+					  "utilization_sum": {
+						"currency_code": "RUB",
+						"price": 1231
+					  },
+					  "utilization_forecast_date": "2024-07-29T06:15:48.998146Z"
+					},
+					"product": {
+					  "sku": 1100526203,
+					  "offer_id": "81451",
+					  "name": "Кукла Дотти Плачущий младенец Cry Babies Dressy Dotty",
+					  "price": {
+						"currency_code": "RUB",
+						"price": 3318
+					  },
+					  "price_without_commission": {
+						"currency_code": "RUB",
+						"price": 3318
+					  },
+					  "commission_percent": 1.2,
+					  "commission": {
+						"currency_code": "RUB",
+						"price": 2312
+					  }
+					},
+					"logistic": {
+					  "technical_return_moment": "2024-07-29T06:15:48.998146Z",
+					  "final_moment": "2024-07-29T06:15:48.998146Z",
+					  "cancelled_with_compensation_moment": "2024-07-29T06:15:48.998146Z",
+					  "return_date": "2024-07-29T06:15:48.998146Z",
+					  "barcode": "ii5275210303"
+					},
+					"visual": {
+					  "status": {
+						"id": 3,
+						"display_name": "At the pick-up point",
+						"sys_name": "ArrivedAtReturnPlace"
+					  },
+					  "change_moment": "2024-07-29T06:15:48.998146Z"
+					},
+					"additional_info": {
+					  "is_opened": true,
+					  "is_super_econom": false
+					},
+					"source_id": 90426223,
+					"posting_number": "58544282-0057-1",
+					"clearing_id": 21190893156000,
+					"return_clearing_id": null
+				  }
+				],
+				"has_next": false
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&ListReturnsParams{},
+			`{
+				"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.Returns().List(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &ListReturnsResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}

ozon/strategies.go

@@ -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"
 

ozon/warehouses.go

@@ -48,6 +48,9 @@ type GetListOfWarehousesResult struct {
 	// Indication that the warehouse accepts bulky products
 	IsKGT bool `json:"is_kgt"`
 
+	// true if the warehouse handles economy products
+	IsEconomy bool `json:"is_economy"`
+
 	// Indication that warehouse schedule can be changed
 	IsTimetableEditable bool `json:"is_timetable_editable"`
 
@@ -102,7 +105,7 @@ func (c Warehouses) GetListOfWarehouses(ctx context.Context) (*GetListOfWarehous
 
 type GetListOfDeliveryMethodsParams struct {
 	// Search filter for delivery methods
-	Filter GetListOfDeliveryMethodsFilter `json:"filter"`
+	Filter *GetListOfDeliveryMethodsFilter `json:"filter,omitempty"`
 
 	// Number of items in a response. Maximum is 50, minimum is 1
 	Limit int64 `json:"limit"`
@@ -181,7 +184,62 @@ func (c Warehouses) GetListOfDeliveryMethods(ctx context.Context, params *GetLis
 
 	resp := &GetListOfDeliveryMethodsResponse{}
 
-	response, err := c.client.Request(ctx, http.MethodPost, url, nil, resp, nil)
+	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
+}
+
+type ListForShippingParams struct {
+	// Supply type
+	FilterBySupplyType []string `json:"filter_by_supply_type"`
+
+	// Search by warehouse name. To search for pick-up points, specify the full name
+	Search string `json:"search"`
+}
+
+type ListForShippingResponse struct {
+	core.CommonResponse
+
+	// Warehouse search result
+	Search []ListForShippingSearch `json:"search"`
+}
+
+type ListForShippingSearch struct {
+	// Warehouse address
+	Address string `json:"address"`
+
+	// Warehouse coordinates
+	Coordinates Coordinates `json:"coordinates"`
+
+	// Warehouse name
+	Name string `json:"name"`
+
+	// Identifier of the warehouse, pick-up point, or sorting center
+	WarehouseId int64 `json:"warehouse_id"`
+
+	// Type of warehouse, pick-up point, or sorting center
+	WarehouseType string `json:"warehouse_type"`
+}
+
+type Coordinates struct {
+	// Latitude
+	Latitude float64 `json:"latitude"`
+
+	// Longitude
+	Longitude float64 `json:"longitude"`
+}
+
+// Get a list of warehouses, sorting centers and pick-up points available for cross-docking, and direct supplies.
+func (c Warehouses) ListForShipping(ctx context.Context, params *ListForShippingParams) (*ListForShippingResponse, error) {
+	url := "/v1/warehouse/fbo/list"
+
+	resp := &ListForShippingResponse{}
+
+	response, err := c.client.Request(ctx, http.MethodPost, url, params, resp, nil)
 	if err != nil {
 		return nil, err
 	}

ozon/warehouses_test.go

@@ -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": [
+    			"result": [
-				  {
+					{
-					"warehouse_id": 15588127982000,
+						"warehouse_id": 1020000177886000,
-					"name": "Proffi (Панорама Групп)",
+						"name": "This is a test",
-					"is_rfbs": false
+						"is_rfbs": false,
-				  },
+						"has_entrusted_acceptance": false,
-				  {
+						"first_mile_type": {
-					"warehouse_id": 22142605386000,
+							"dropoff_point_id": "",
-					"name": "Склад на производственной",
+							"dropoff_timeslot_id": 0,
-					"is_rfbs": true
+							"first_mile_is_changing": false,
-				  },
+							"first_mile_type": ""
-				  {
+						},
-					"warehouse_id": 22208673494000,
+						"is_kgt": false,
-					"name": "Тест 37349",
+						"can_print_act_in_advance": false,
-					"is_rfbs": true
+						"min_working_days": 5,
-				  },
+						"is_karantin": false,
-				  {
+						"has_postings_limit": false,
-					"warehouse_id": 22240462819000,
+						"postings_limit": -1,
-					"name": "Тест12",
+						"working_days": [
-					"is_rfbs": true
+							1,
-				  }
+							2,
+							3,
+							4,
+							5,
+							6,
+							7
+						],
+						"min_postings_limit": 10,
+						"is_timetable_editable": true,
+						"status": "disabled"
+					}
 				]
 			}`,
 		},
@@ -99,7 +109,7 @@ func TestGetListOfDeliveryMethods(t *testing.T) {
 			http.StatusOK,
 			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
 			&GetListOfDeliveryMethodsParams{
-				Filter: GetListOfDeliveryMethodsFilter{
+				Filter: &GetListOfDeliveryMethodsFilter{
 					WarehouseId: 15588127982000,
 				},
 				Limit:  100,
@@ -169,3 +179,65 @@ func TestGetListOfDeliveryMethods(t *testing.T) {
 		}
 	}
 }
+
+func TestListForShipping(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		statusCode int
+		headers    map[string]string
+		params     *ListForShippingParams
+		response   string
+	}{
+		// Test Ok
+		{
+			http.StatusOK,
+			map[string]string{"Client-Id": "my-client-id", "Api-Key": "my-api-key"},
+			&ListForShippingParams{
+				FilterBySupplyType: []string{"CREATE_TYPE_UNKNOWN"},
+				Search:             "string",
+			},
+			`{
+				"search": [
+				  {
+					"address": "string",
+					"coordinates": {
+					  "latitude": 0,
+					  "longitude": 0
+					},
+					"name": "string",
+					"warehouse_id": 0,
+					"warehouse_type": "WAREHOUSE_TYPE_UNKNOWN"
+				  }
+				]
+			}`,
+		},
+		// Test No Client-Id or Api-Key
+		{
+			http.StatusUnauthorized,
+			map[string]string{},
+			&ListForShippingParams{},
+			`{
+				"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.Warehouses().ListForShipping(ctx, test.params)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		compareJsonResponse(t, test.response, &ListForShippingResponse{})
+
+		if resp.StatusCode != test.statusCode {
+			t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
+		}
+	}
+}