consolidated webhook order to just order

examples/example.go

@@ -7,10 +7,6 @@ import (
 	"github.com/debyltech/go-snipcart/snipcart"
 )
 
-const (
-	configFile = "config.json"
-)
-
 func main() {
 	snipcartApiKey := flag.String("key", "", "Snipcart API Key")
 	flag.Parse()
@@ -19,9 +15,9 @@ func main() {
 		log.Fatal("missing -key flag")
 	}
 
-	snipcartProvider := snipcart.NewSnipcartProvider(*snipcartApiKey)
+	Client := snipcart.NewClient(*snipcartApiKey)
 
-	response, err := snipcartProvider.GetOrdersByStatus(snipcart.Processed)
+	response, err := Client.GetOrdersByStatus(snipcart.Processed)
 	if err != nil {
 		log.Fatal(err)
 	}

examples/example_get_order.go

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"log"
+
+	"github.com/debyltech/go-snipcart/snipcart"
+)
+
+func main() {
+	snipcartApiKey := flag.String("key", "", "Snipcart API Key")
+	flag.Parse()
+
+	if *snipcartApiKey == "" {
+		log.Fatal("missing -key flag")
+	}
+
+	Client := snipcart.NewClient(*snipcartApiKey)
+
+	response, err := Client.GetOrder("b35990df-c0ca-4014-94de-1caa7bd7bb51")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	byteResponse, err := json.Marshal(response)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	fmt.Println(string(byteResponse))
+}

examples/example_update_order.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"flag"
+	"log"
+
+	"github.com/debyltech/go-snipcart/snipcart"
+)
+
+func main() {
+	snipcartApiKey := flag.String("key", "", "Snipcart API Key")
+	flag.Parse()
+
+	if *snipcartApiKey == "" {
+		log.Fatal("missing -key flag")
+	}
+
+	Client := snipcart.NewClient(*snipcartApiKey)
+
+	updateOrder := snipcart.SnipcartOrderUpdate{
+		Status: snipcart.Delivered,
+	}
+
+	response, err := Client.UpdateOrder("b35990df-c0ca-4014-94de-1caa7bd7bb51", &updateOrder)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	for k, v := range response.Items {
+		log.Printf("%v: %v\n", k, v)
+	}
+}

go.mod

@@ -1,5 +1,9 @@
 module github.com/debyltech/go-snipcart
 
-go 1.20
+go 1.19
 
-require github.com/debyltech/go-helpers v0.0.0-20230224002154-eb55816c71ec
+require (
+	github.com/debyltech/go-helpers v1.1.0
+	github.com/debyltech/go-shippr v0.1.0
+	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
+)

snipcart/snipcart.go

@@ -6,7 +6,8 @@ import (
 	"errors"
 	"fmt"
 
-	helper "github.com/debyltech/go-helpers"
+	helper "github.com/debyltech/go-helpers/json"
+	"github.com/skip2/go-qrcode"
 )
 
 const (
@@ -19,39 +20,67 @@ var (
 	orderUri = apiUri + ordersPath
 )
 
-type SnipcartProvider struct {
+type Client struct {
 	SnipcartKey string
 	AuthBase64  string
 	Limit       int
 }
 
+type SnipcartCustomField struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
 type SnipcartItem struct {
 	UUID         string                `json:"uniqueId"`
 	ID           string                `json:"id"`
 	Name         string                `json:"name"`
-	Quantity         float64 `json:"quantity"`
+	Quantity     int                   `json:"quantity"`
-	Weight           string  `json:"weight"`
+	TotalWeight  float64               `json:"totalWeight,omitempty"`
-	TotalWeight      float64 `json:"totalWeight"`
+	TotalPrice   float64               `json:"totalPrice,omitempty"`
-	CustomFieldsJSON string  `json:"customFieldsJson"`
+	CustomFields []SnipcartCustomField `json:"customFields"`
+	Length       float64               `json:"length,omitempty"`
+	Width        float64               `json:"width,omitempty"`
+	Height       float64               `json:"height,omitempty"`
+	Weight       float64               `json:"weight,omitempty"`
+	Shippable    bool                  `json:"shippable,omitempty"`
 }
 
 type SnipcartOrder struct {
 	Token            string                  `json:"token"`
 	Invoice          string                  `json:"invoiceNumber"`
+	Subtotal         float64                 `json:"subtotal,omitempty"`
+	Currency         string                  `json:"currency,omitempty"`
+	Total            float64                 `json:"grandTotal,omitempty"`
 	Status           string                  `json:"status"`
 	TotalWeight      float64                 `json:"totalWeight"`
-	Email          string         `json:"email"`
+	ShippingAddress  SnipcartShippingAddress `json:"shippingAddress,omitempty"`
-	Name           string         `json:"shippingAddressName"`
+	Name             string                  `json:"shippingAddressName,omitempty"`
-	Address1       string         `json:"shippingAddressAddress1"`
+	Company          string                  `json:"shippingAddressCompanyName,omitempty"`
-	Address2       string         `json:"shippingAddressAddress2"`
+	Address1         string                  `json:"shippingAddressAddress1,omitempty"`
-	City           string         `json:"shippingAddressCity"`
+	Address2         string                  `json:"shippingAddressAddress2,omitempty"`
-	Province       string         `json:"shippingAddressProvince"`
+	City             string                  `json:"shippingAddressCity,omitempty"`
-	Country        string         `json:"shippingAddressCountry"`
+	Province         string                  `json:"shippingAddressProvince,omitempty"`
-	PostalCode     string         `json:"shippingAddressPostalCode"`
+	Country          string                  `json:"shippingAddressCountry,omitempty"`
-	Phone          string         `json:"shippingAddressPhone"`
+	PostalCode       string                  `json:"shippingAddressPostalCode,omitempty"`
+	Phone            string                  `json:"shippingAddressPhone,omitempty"`
+	Email            string                  `json:"email,omitempty"`
 	TrackingNumber   string                  `json:"trackingNumber"`
 	TrackingUrl      string                  `json:"trackingUrl"`
+	ShippingCost     float64                 `json:"shippingFees"`
+	ShippingProvider string                  `json:"shippingProvider,omitempty"`
+	ShippingMethod   string                  `json:"shippingMethod,omitempty"`
+	ShippingRate     string                  `json:"shippingRateUserDefinedId,omitempty"`
 	Items            []SnipcartItem          `json:"items"`
+	Metadata         any                     `json:"metadata"`
+}
+
+type SnipcartOrderUpdate struct {
+	Status         OrderStatus `json:"status"`
+	PaymentStatus  string      `json:"paymentStatus,omitempty"`
+	TrackingNumber string      `json:"trackingNumber,omitempty"`
+	TrackingUrl    string      `json:"trackingUrl,omitempty"`
+	Metadata       any         `json:"metadata,omitempty"`
 }
 
 type SnipcartOrders struct {
@@ -59,19 +88,39 @@ type SnipcartOrders struct {
 	Items      []SnipcartOrder
 }
 
-func NewSnipcartProvider(snipcartApiKey string) SnipcartProvider {
+func NewClient(snipcartApiKey string) Client {
-	return SnipcartProvider{
+	return Client{
 		SnipcartKey: snipcartApiKey,
 		AuthBase64:  base64.StdEncoding.EncodeToString([]byte(snipcartApiKey + ":")),
 	}
 }
 
-func (s *SnipcartProvider) GetOrders(queries map[string]string) (*SnipcartOrders, error) {
+func (s *Client) GetOrder(token string) (*SnipcartOrder, error) {
+	response, err := helper.Get(orderUri+"/"+token, "Basic", s.AuthBase64, nil)
+	if err != nil {
+		return nil, err
+	}
+	if response.StatusCode < 200 && response.StatusCode >= 300 {
+		return nil, fmt.Errorf("unexpected response received: %s", response.Status)
+	}
+
+	defer response.Body.Close()
+
+	var order SnipcartOrder
+	err = json.NewDecoder(response.Body).Decode(&order)
+	if err != nil {
+		return nil, err
+	}
+
+	return &order, nil
+}
+
+func (s *Client) GetOrders(queries map[string]string) (*SnipcartOrders, error) {
 	response, err := helper.Get(orderUri, "Basic", s.AuthBase64, queries)
 	if err != nil {
 		return nil, err
 	}
-	if response.Status != "200 OK" {
+	if response.StatusCode < 200 && response.StatusCode >= 300 {
 		return nil, fmt.Errorf("unexpected response received: %s", response.Status)
 	}
 
@@ -86,10 +135,40 @@ func (s *SnipcartProvider) GetOrders(queries map[string]string) (*SnipcartOrders
 	return &orders, nil
 }
 
-func (s *SnipcartProvider) GetOrdersByStatus(status OrderStatus) (*SnipcartOrders, error) {
+func (s *Client) GetOrdersByStatus(status OrderStatus) (*SnipcartOrders, error) {
 	if status == "" {
 		return nil, errors.New("status is not set")
 	}
 
 	return s.GetOrders(map[string]string{"status": string(status)})
 }
+
+func (o *SnipcartOrder) TokenPNGBase64() (string, error) {
+	img, err := qrcode.Encode("order:"+o.Token, qrcode.Medium, 128)
+	if err != nil {
+		return "", err
+	}
+
+	return base64.StdEncoding.EncodeToString(img), nil
+}
+
+func (s *Client) UpdateOrder(token string, orderUpdate *SnipcartOrderUpdate) (*SnipcartOrder, error) {
+	response, err := helper.Put(orderUri+"/"+token, "Basic", s.AuthBase64, orderUpdate)
+	if err != nil {
+		return nil, err
+	}
+	if response.StatusCode < 200 && response.StatusCode >= 300 {
+		return nil, fmt.Errorf("unexpected response received: %s", response.Status)
+	}
+	fmt.Println(response.Status)
+
+	defer response.Body.Close()
+
+	var responseOrder SnipcartOrder
+	err = json.NewDecoder(response.Body).Decode(&responseOrder)
+	if err != nil {
+		return nil, err
+	}
+
+	return &responseOrder, nil
+}

snipcart/webhook.go

@@ -0,0 +1,17 @@
+package snipcart
+
+type SnipcartShippingAddress struct {
+	FullName    string `json:"fullName"`
+	FirstName   string `json:"firstName"`
+	Name        string `json:"name"`
+	Company     string `json:"company"`
+	Address1    string `json:"address1"`
+	Address2    string `json:"address2"`
+	FullAddress string `json:"fullAddress"`
+	City        string `json:"city"`
+	Country     string `json:"country"`
+	PostalCode  string `json:"postalCode"`
+	Province    string `json:"province"`
+	Phone       string `json:"phone"`
+	VatNumber   string `json:"vatNumber,omitempty"`
+}