Fix Docno type

api/client.go

@@ -1,28 +1,48 @@
 package api
 
-import "resty.dev/v3"
+import (
+	"crypto/tls"
+
+	"resty.dev/v3"
+)
 
 type Client struct {
-	token         string
-	resty         *resty.Client
-	apiBaseURL    string
+	token          string
+	device         string
+	isDM           bool
+	resty          *resty.Client
+	apiBaseURL     string
 	fiscalEndpoint string
 }
 
 func NewClient(token string) *Client {
 	return &Client{
 		token:          token,
+		isDM:           false,
 		resty:          resty.New(),
 		apiBaseURL:     "https://kasa.vchasno.ua/api/v3",
 		fiscalEndpoint: "/fiscal/execute",
 	}
 }
 
-func NewDMClient(token string, dmURL string) *Client {
+func NewDMClient(token, dmURL, device string) *Client {
+	restyClient := resty.New()
+	restyClient.SetTLSClientConfig(&tls.Config{
+		MinVersion: tls.VersionTLS12,
+		CipherSuites: []uint16{
+			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
+		},
+	})
+
 	return &Client{
 		token:          token,
-		resty:          resty.New(),
+		device:         device,
+		isDM:           true,
+		resty:          restyClient,
 		apiBaseURL:     dmURL,
-		fiscalEndpoint: "/dm/fiscal",
+		fiscalEndpoint: "/dm/execute",
 	}
 }

api/fiscal.go

@@ -5,40 +5,69 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 )
 
+type APIError struct {
+	Code    int
+	Message string
+}
+
+func (e *APIError) Error() string {
+	return fmt.Sprintf("vchasno api error %d: %s", e.Code, e.Message)
+}
+
 func (c *Client) executeRequest(ctx context.Context, request FiscalRequest, response interface{}) error {
-	//execute request with json body in request
+	request.Device = c.device
+
+	if c.isDM {
+		request.Ver = 6
+		request.Type = 1
+	}
+
 	reqJson, err := json.Marshal(request)
 	if err != nil {
 		return fmt.Errorf("failed to marshal request: %w", err)
 	}
 
+	url := c.apiBaseURL + c.fiscalEndpoint
+	log.Printf("[VCHASNO] POST %s", url)
+	log.Printf("[VCHASNO] Request: %s", string(reqJson))
+
 	resp, err := c.resty.R().
 		SetContext(ctx).
 		SetHeader("Authorization", c.token).
+		SetHeader("Content-Type", "application/json").
 		SetBody(reqJson).
-		Post(c.apiBaseURL + c.fiscalEndpoint)
+		Post(url)
 
 	if err != nil {
 		return fmt.Errorf("request failed: %w", err)
 	}
 
-	if resp.IsError() {
-		return fmt.Errorf("api error: %v", resp.Error())
-	}
-
-	if resp.StatusCode() != 200 {
-		return fmt.Errorf("unexpected status code: %d", resp.StatusCode())
-	}
-
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return fmt.Errorf("failed to read response: %w", err)
 	}
 
+	log.Printf("[VCHASNO] Response (status %d): %s", resp.StatusCode(), string(body))
+
+	if resp.StatusCode() != 200 {
+		return fmt.Errorf("api error (status %d): %s", resp.StatusCode(), string(body))
+	}
+
 	if err := json.Unmarshal(body, response); err != nil {
-		return fmt.Errorf("failed to unmarshal response: %w", err)
+		return fmt.Errorf("failed to unmarshal response: %w, body: %s", err, string(body))
+	}
+
+	var baseResp BaseResponse
+	if err := json.Unmarshal(body, &baseResp); err == nil {
+		if baseResp.HasError() {
+			return &APIError{
+				Code:    baseResp.Res,
+				Message: baseResp.Errortxt,
+			}
+		}
 	}
 
 	return nil
@@ -47,8 +76,7 @@ func (c *Client) executeRequest(ctx context.Context, request FiscalRequest, resp
 func (c *Client) OpenShift(ctx context.Context, cashier string) (*SellResponse, error) {
 	request := FiscalRequest{
 		Fiscal: Fiscal{
-			Task:    TaskOpenShift,
-			Cashier: cashier,
+			Task: TaskOpenShift,
 		},
 	}
 
@@ -63,8 +91,7 @@ func (c *Client) OpenShift(ctx context.Context, cashier string) (*SellResponse,
 func (c *Client) CloseShift(ctx context.Context, cashier string) (*ZReportResponse, error) {
 	request := FiscalRequest{
 		Fiscal: Fiscal{
-			Task:    TaskZReport,
-			Cashier: cashier,
+			Task: TaskZReport,
 		},
 	}
 

api/requests.go

@@ -1,8 +1,11 @@
 package api
 
 type FiscalRequest struct {
-	Source   string   `json:"source"`
+	Ver      int      `json:"ver,omitempty"`
+	Source   string   `json:"source,omitempty"`
 	Device   string   `json:"device,omitempty"`
+	Tag      string   `json:"tag,omitempty"`
+	Type     int      `json:"type,omitempty"`
 	Userinfo Userinfo `json:"userinfo,omitempty"`
 	Fiscal   Fiscal   `json:"fiscal"`
 }
@@ -14,7 +17,7 @@ type Userinfo struct {
 
 type Fiscal struct {
 	Task    int      `json:"task"`
-	Cashier string   `json:"cashier"`
+	Cashier string   `json:"cashier,omitempty"`
 	Receipt *Receipt `json:"receipt,omitempty"`
 }
 

api/responses.go

@@ -15,25 +15,40 @@ type BaseResponse struct {
 	ErrorExtra interface{} `json:"error_extra"`
 }
 
+func (r *BaseResponse) HasError() bool {
+	return r.Res != 0
+}
+
+func (r *BaseResponse) Error() string {
+	if r.Errortxt != "" {
+		return r.Errortxt
+	}
+	return ""
+}
+
 type SellResponse struct {
 	BaseResponse
 	Info SellInfo `json:"info"`
 }
 
 type SellInfo struct {
-	Task      int     `json:"task"`
-	Fisid     string  `json:"fisid"`
-	Dataid    int     `json:"dataid"`
-	Doccode   string  `json:"doccode"`
-	Dt        string  `json:"dt"`
-	Cashier   string  `json:"cashier"`
-	Dtype     int     `json:"dtype"`
-	Isprint   int     `json:"isprint"`
-	Isoffline bool    `json:"isoffline"`
-	Safe      float64 `json:"safe"`
-	ShiftLink int     `json:"shift_link"`
-	Docno     int     `json:"docno"`
-	Cancelid  string  `json:"cancelid,omitempty"`
+	Task           int         `json:"task"`
+	Fisid          string      `json:"fisid"`
+	Dataid         int         `json:"dataid"`
+	Doccode        string      `json:"doccode"`
+	Docno          interface{} `json:"docno"`
+	Dt             string      `json:"dt"`
+	Cashier        string      `json:"cashier"`
+	Dtype          int         `json:"dtype"`
+	Isprint        int         `json:"isprint"`
+	Isoffline      bool        `json:"isoffline"`
+	Safe           float64     `json:"safe"`
+	ShiftLink      int         `json:"shift_link"`
+	ShiftPrevLink  int         `json:"shift_prev_link"`
+	ShiftID        string      `json:"shift_id"`
+	OpenShiftDt    string      `json:"open_shift_dt"`
+	Cancelid       string      `json:"cancelid,omitempty"`
+	SafeStartShift float64     `json:"safe_start_shift"`
 }
 
 type ZReportResponse struct {
@@ -46,6 +61,7 @@ type ZReportInfo struct {
 	Fisid         string         `json:"fisid"`
 	Dataid        int            `json:"dataid"`
 	Doccode       string         `json:"doccode"`
+	Docno         interface{}    `json:"docno"`
 	Dt            string         `json:"dt"`
 	Cashier       string         `json:"cashier"`
 	Dtype         int            `json:"dtype"`
@@ -53,7 +69,6 @@ type ZReportInfo struct {
 	Isoffline     bool           `json:"isoffline"`
 	Safe          float64        `json:"safe"`
 	ShiftLink     int            `json:"shift_link"`
-	Docno         int            `json:"docno"`
 	Receipt       ZReportReceipt `json:"receipt"`
 	Summary       ZReportSummary `json:"summary"`
 	Taxes         []ZReportTax   `json:"taxes"`

examples.go

@@ -7,9 +7,10 @@ import (
 
 func ExampleBasicUsage() {
 	client := NewClient(Config{
-		Token:   "your-token",
-		Cashier: "Иванов",
-		Source:  "parking",
+		Token:     "your-token",
+		Cashier:   "Иванов",
+		Source:    "parking",
+		CustomURL: "DM URL/",
 	})
 
 	ctx := context.Background()

vchasno.go

@@ -25,13 +25,13 @@ type Client struct {
 	defaults *DefaultParams
 }
 
-// !! If you are using Device Manager, set the CustomURL to "http(s)://HOST/api/v3".
 type Config struct {
 	Token     string
 	Cashier   string
 	Source    string
 	Defaults  *DefaultParams
 	CustomURL string
+	Device    string
 }
 
 type DefaultParams struct {
@@ -67,12 +67,11 @@ func NewClient(config Config) *Client {
 		defaults.DefaultTimeout = 30 * time.Second
 	}
 
-	apicfg := &api.Client{}
-
+	var apicfg *api.Client
 	if config.CustomURL == "" {
 		apicfg = api.NewClient(config.Token)
 	} else {
-		apicfg = api.NewDMClient(config.Token, config.CustomURL)
+		apicfg = api.NewDMClient(config.Token, config.CustomURL, config.Device)
 	}
 
 	return &Client{