diff --git a/README.md b/README.md index f185693..edd96f6 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,12 @@ func main() { Limit: 20, Page: 1, }) - if err != nil { - fmt.Printf("%v", err) + if err.ErrorMsg != "" { + fmt.Printf("%v", err.ErrorMsg) } if status >= http.StatusBadRequest { - fmt.Printf("%v", err) + fmt.Printf("%v", err.ErrorMsg) } for _, value := range data.Orders { @@ -41,6 +41,36 @@ func main() { } fmt.Println(data.Orders[1].FirstName) + + idata, status, err := c.InventoriesUpload( + []InventoryUpload{ + { + XmlId: "pTKIKAeghYzX21HTdzFCe1", + Stores: []InventoryUploadStore{ + {Code: "test-store-v5", Available: 10, PurchasePrice: 1500}, + {Code: "test-store-v4", Available: 20, PurchasePrice: 1530}, + {Code: "test-store", Available: 30, PurchasePrice: 1510}, + }, + }, + { + XmlId: "JQIvcrCtiSpOV3AAfMiQB3", + Stores: []InventoryUploadStore{ + {Code: "test-store-v5", Available: 45, PurchasePrice: 1500}, + {Code: "test-store-v4", Available: 32, PurchasePrice: 1530}, + {Code: "test-store", Available: 46, PurchasePrice: 1510}, + }, + }, + }, + ) + if err.ErrorMsg != "" { + fmt.Printf("%v", err.ErrorMsg) + } + + if status >= http.StatusBadRequest { + fmt.Printf("%v", err.ErrorMsg) + } + + fmt.Println(idata.processedOffersCount) } ``` @@ -55,4 +85,4 @@ cd $GOPATH/src/github.com/retailcrm/api-client-go go test -v ./... -``` \ No newline at end of file +``` diff --git a/v5/client.go b/v5/client.go index 7036120..2141a41 100644 --- a/v5/client.go +++ b/v5/client.go @@ -1444,3 +1444,41 @@ func (c *Client) StoreEdit(store Store) (*SucessfulResponse, int, ErrorResponse) return &resp, status, err } + +// Inventories method +func (c *Client) Inventories(parameters InventoriesRequest) (*InventoriesResponse, int, ErrorResponse) { + var resp InventoriesResponse + + params, _ := query.Values(parameters) + + data, status, err := c.GetRequest(fmt.Sprintf("%s/store/inventories?%s", versionedPrefix, params.Encode())) + if err.ErrorMsg != "" { + return &resp, status, err + } + + json.Unmarshal(data, &resp) + + return &resp, status, err +} + +// InventoriesUpload method +func (c *Client) InventoriesUpload(inventories []InventoryUpload, site ...string) (*InventoriesUploadResponse, int, ErrorResponse) { + var resp InventoriesUploadResponse + + uploadJson, _ := json.Marshal(&inventories) + + p := url.Values{ + "offers": {string(uploadJson[:])}, + } + + fillSite(&p, site) + + data, status, err := c.PostRequest(fmt.Sprintf("%s/store/inventories/upload", versionedPrefix), p) + if err.ErrorMsg != "" { + return &resp, status, err + } + + json.Unmarshal(data, &resp) + + return &resp, status, err +} diff --git a/v5/client_test.go b/v5/client_test.go index 1e9b391..93dcd32 100644 --- a/v5/client_test.go +++ b/v5/client_test.go @@ -1834,3 +1834,23 @@ func TestClient_Packs(t *testing.T) { t.Fail() } } + +func TestClient_Inventories(t *testing.T) { + c := client() + + data, status, err := c.Inventories(InventoriesRequest{Filter: InventoriesFilter{Details: 1}, Page: 1}) + if err.ErrorMsg != "" { + t.Errorf("%v", err.ErrorMsg) + t.Fail() + } + + if status >= http.StatusBadRequest { + t.Errorf("%v", err.ErrorMsg) + t.Fail() + } + + if data.Success != true { + t.Errorf("%v", err.ErrorMsg) + t.Fail() + } +} diff --git a/v5/filters.go b/v5/filters.go index e6cbc1c..b893d04 100644 --- a/v5/filters.go +++ b/v5/filters.go @@ -227,3 +227,16 @@ type PacksFilter struct { InvoiceNumber string `url:"invoiceNumber,omitempty"` DeliveryNoteNumber string `url:"deliveryNoteNumber,omitempty"` } + +// InventoriesFilter type +type InventoriesFilter struct { + Ids []int `url:"ids,omitempty,brackets"` + ProductExternalId string `url:"productExternalId,omitempty"` + ProductArticle string `url:"productArticle,omitempty"` + OfferExternalId string `url:"offerExternalId,omitempty"` + OfferXmlId string `url:"offerXmlId,omitempty"` + OfferArticle string `url:"offerArticle,omitempty"` + ProductActive int `url:"productActive,omitempty"` + Details int `url:"details,omitempty"` + Sites []string `url:"sites,omitempty"` +} diff --git a/v5/request.go b/v5/request.go index a6f69e9..097398f 100644 --- a/v5/request.go +++ b/v5/request.go @@ -99,3 +99,10 @@ type SegmentsRequest struct { Limit int `url:"limit,omitempty"` Page int `url:"page,omitempty"` } + +// InventoriesRequest type +type InventoriesRequest struct { + Filter InventoriesFilter `url:"filter,omitempty"` + Limit int `url:"limit,omitempty"` + Page int `url:"page,omitempty"` +} diff --git a/v5/response.go b/v5/response.go index bf47c29..276de32 100644 --- a/v5/response.go +++ b/v5/response.go @@ -277,3 +277,17 @@ type StoresResponse struct { Success bool `json:"success"` Stores []Store `json:"stores,omitempty,brackets"` } + +// InventoriesResponse type +type InventoriesResponse struct { + Success bool `json:"success"` + Pagination *Pagination `json:"pagination,omitempty"` + Offers []Offer `json:"offers,omitempty"` +} + +// InventoriesUploadResponse type +type InventoriesUploadResponse struct { + Success bool `json:"success"` + ProcessedOffersCount int `json:"processedOffersCount,omitempty"` + NotFoundOffers []Offer `json:"notFoundOffers,omitempty"` +} diff --git a/v5/types.go b/v5/types.go index c3cf37e..5b9a945 100644 --- a/v5/types.go +++ b/v5/types.go @@ -330,10 +330,52 @@ type PacksHistoryRecord struct { // Offer type type Offer struct { - Id int `json:"id,omitempty"` - ExternalId string `json:"externalId,omitempty"` - XmlId string `json:"xmlId,omitempty"` - VatRate string `json:"vatRate,omitempty"` + Id int `json:"id,omitempty"` + ExternalId string `json:"externalId,omitempty"` + Name string `json:"name,omitempty"` + XmlId string `json:"xmlId,omitempty"` + Article string `json:"article,omitempty"` + VatRate string `json:"vatRate,omitempty"` + Price float32 `json:"price,omitempty"` + PurchasePrice float32 `json:"purchasePrice,omitempty"` + Quantity float32 `json:"quantity,omitempty"` + Height float32 `json:"height,omitempty"` + Width float32 `json:"width,omitempty"` + Length float32 `json:"length,omitempty"` + Weight float32 `json:"weight,omitempty"` + Stores []Inventory `json:"stores,omitempty,brackets"` + Properties []map[string]string `json:"properties,omitempty,brackets"` + Prices []OfferPrice `json:"prices,omitempty,brackets"` + Images []string `json:"images,omitempty,brackets"` +} + +// Inventory type +type Inventory struct { + PurchasePrice float32 `json:"purchasePrice,omitempty"` + Quantity float32 `json:"quantity,omitempty"` + Store string `json:"store,omitempty"` +} + +// InventoryUpload type +type InventoryUpload struct { + Id int `json:"id,omitempty"` + ExternalId string `json:"externalId,omitempty"` + XmlId string `json:"xmlId,omitempty"` + Stores []InventoryUploadStore `json:"stores,omitempty"` +} + +// InventoryUploadStore type +type InventoryUploadStore struct { + PurchasePrice float32 `json:"purchasePrice,omitempty"` + Available float32 `json:"available,omitempty"` + Code string `json:"code,omitempty"` +} + +// OfferPrice type +type OfferPrice struct { + Price float32 `json:"price,omitempty"` + Ordering int `json:"ordering,omitempty"` + PriceType string `json:"priceType,omitempty"` } /**