main added Metadata field to SnipcartOrder struct

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,8 +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
+	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,7 @@ import (
 	"errors"
 	"fmt"
 
-	helper "github.com/debyltech/go-helpers"
+	helper "github.com/debyltech/go-helpers/json"
 	"github.com/skip2/go-qrcode"
 )
 
@@ -20,44 +20,63 @@ 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         int     `json:"quantity"`
-	TotalWeight      float64 `json:"totalWeight,omitempty"`
-	CustomFieldsJSON string  `json:"customFieldsJson"`
-	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"`
+	UUID         string                `json:"uniqueId"`
+	ID           string                `json:"id"`
+	Name         string                `json:"name"`
+	Quantity     int                   `json:"quantity"`
+	TotalWeight  float64               `json:"totalWeight,omitempty"`
+	TotalPrice   float64               `json:"totalPrice,omitempty"`
+	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"`
 	Name           string         `json:"shippingAddressName"`
+	Company        string         `json:"shippingAddressCompanyName"`
 	Address1       string         `json:"shippingAddressAddress1"`
 	Address2       string         `json:"shippingAddressAddress2"`
 	City           string         `json:"shippingAddressCity"`
 	Province       string         `json:"shippingAddressProvince"`
 	Country        string         `json:"shippingAddressCountry"`
 	PostalCode     string         `json:"shippingAddressPostalCode"`
-	Phone          string         `json:"shippingAddressPhone"`
+	Phone          string         `json:"shippingAddressPhone,omitempty"`
+	Email          string         `json:"email,omitempty"`
 	TrackingNumber string         `json:"trackingNumber"`
 	TrackingUrl    string         `json:"trackingUrl"`
-	ShippingCost   string         `json:"shippingFees"`
+	ShippingCost   float64        `json:"shippingFees"`
 	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 {
@@ -65,19 +84,19 @@ type SnipcartOrders struct {
 	Items      []SnipcartOrder
 }
 
-func NewSnipcartProvider(snipcartApiKey string) SnipcartProvider {
-	return SnipcartProvider{
+func NewClient(snipcartApiKey string) Client {
+	return Client{
 		SnipcartKey: snipcartApiKey,
 		AuthBase64:  base64.StdEncoding.EncodeToString([]byte(snipcartApiKey + ":")),
 	}
 }
 
-func (s *SnipcartProvider) GetOrder(token string) (*SnipcartOrder, 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.Status != "200 OK" {
+	if response.StatusCode < 200 && response.StatusCode >= 300 {
 		return nil, fmt.Errorf("unexpected response received: %s", response.Status)
 	}
 
@@ -92,12 +111,12 @@ func (s *SnipcartProvider) GetOrder(token string) (*SnipcartOrder, error) {
 	return &order, nil
 }
 
-func (s *SnipcartProvider) GetOrders(queries map[string]string) (*SnipcartOrders, error) {
+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)
 	}
 
@@ -112,7 +131,7 @@ 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")
 	}
@@ -128,3 +147,24 @@ func (o *SnipcartOrder) TokenPNGBase64() (string, error) {
 
 	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/config.go

@@ -0,0 +1,33 @@
+package webhook
+
+import (
+	"bytes"
+	"encoding/json"
+	"io/ioutil"
+
+	"github.com/debyltech/go-shippr/shippo"
+)
+
+type Config struct {
+	ShippoApiKey       string         `json:"shippo_api_key"`
+	WeightUnit         string         `json:"weight_unit"`
+	DimensionUnit      string         `json:"dimension_unit"`
+	ManufactureCountry string         `json:"manufacture_country"`
+	SenderAddress      shippo.Address `json:"sender_address"`
+	DefaultParcel      shippo.Parcel  `json:"default_parcel"`
+}
+
+func NewConfigFromFile(filePath string) (*Config, error) {
+	configBytes, err := ioutil.ReadFile(filePath)
+	if err != nil {
+		return nil, err
+	}
+
+	var config Config
+	err = json.NewDecoder(bytes.NewBuffer(configBytes)).Decode(&config)
+	if err != nil {
+		return nil, err
+	}
+
+	return &config, nil
+}