added order: prefix to TokenPNGBase64

example.go

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

examples/example_get_order.go

@@ -1,33 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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,9 +1,8 @@
 module github.com/debyltech/go-snipcart
 
-go 1.19
+go 1.20
 
 require (
-	github.com/debyltech/go-helpers v1.1.0
+	github.com/debyltech/go-helpers v0.0.0-20230224002154-eb55816c71ec
-	github.com/debyltech/go-shippr v0.1.0
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 )

snipcart/orderstatus.go

@@ -1,7 +1,6 @@
 package snipcart
 
 type OrderStatus string
-type NotificationType string
 
 const (
 	Processed  OrderStatus = "Processed"
@@ -11,10 +10,4 @@ const (
 	Pending                = "Pending"
 	Cancelled              = "Cancelled"
 	Dispatched             = "Dispatched"
-
-	Comment            NotificationType = "Comment"
-	OrderStatusChanged                  = "OrderStatusChanged"
-	OrderShipped                        = "OrderShipped"
-	TrackingNumber                      = "TrackingNumber"
-	Invoice                             = "Invice"
 )

snipcart/snipcart.go

@@ -5,9 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"time"
 
-	helper "github.com/debyltech/go-helpers/json"
+	helper "github.com/debyltech/go-helpers"
 	"github.com/skip2/go-qrcode"
 )
 
@@ -21,69 +20,39 @@ var (
 	orderUri = apiUri + ordersPath
 )
 
-type Client struct {
+type SnipcartProvider 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"`
+	UUID             string  `json:"uniqueId"`
-	ID           string                `json:"id"`
+	ID               string  `json:"id"`
-	Name         string                `json:"name"`
+	Name             string  `json:"name"`
-	Quantity     int                   `json:"quantity"`
+	Quantity         float64 `json:"quantity"`
-	TotalWeight  float64               `json:"totalWeight,omitempty"`
+	Weight           string  `json:"weight"`
-	TotalPrice   float64               `json:"totalPrice,omitempty"`
+	TotalWeight      float64 `json:"totalWeight"`
-	CustomFields []SnipcartCustomField `json:"customFields"`
+	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"`
 }
 
 type SnipcartOrder struct {
-	Token            string                  `json:"token"`
+	Token          string         `json:"token"`
-	Created          time.Time               `json:"creationDate"`
+	Invoice        string         `json:"invoiceNumber"`
-	Modified         time.Time               `json:"modificationDate"`
+	Status         string         `json:"status"`
-	Invoice          string                  `json:"invoiceNumber"`
+	TotalWeight    float64        `json:"totalWeight"`
-	Subtotal         float64                 `json:"subtotal,omitempty"`
+	Email          string         `json:"email"`
-	Currency         string                  `json:"currency,omitempty"`
+	Name           string         `json:"shippingAddressName"`
-	Total            float64                 `json:"grandTotal,omitempty"`
+	Address1       string         `json:"shippingAddressAddress1"`
-	Status           string                  `json:"status"`
+	Address2       string         `json:"shippingAddressAddress2"`
-	TotalWeight      float64                 `json:"totalWeight"`
+	City           string         `json:"shippingAddressCity"`
-	ShippingAddress  SnipcartShippingAddress `json:"shippingAddress,omitempty"`
+	Province       string         `json:"shippingAddressProvince"`
-	Name             string                  `json:"shippingAddressName,omitempty"`
+	Country        string         `json:"shippingAddressCountry"`
-	Company          string                  `json:"shippingAddressCompanyName,omitempty"`
+	PostalCode     string         `json:"shippingAddressPostalCode"`
-	Address1         string                  `json:"shippingAddressAddress1,omitempty"`
+	Phone          string         `json:"shippingAddressPhone"`
-	Address2         string                  `json:"shippingAddressAddress2,omitempty"`
+	TrackingNumber string         `json:"trackingNumber"`
-	City             string                  `json:"shippingAddressCity,omitempty"`
+	TrackingUrl    string         `json:"trackingUrl"`
-	Province         string                  `json:"shippingAddressProvince,omitempty"`
+	Items          []SnipcartItem `json:"items"`
-	Country          string                  `json:"shippingAddressCountry,omitempty"`
-	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"`
-	ShippingRateId   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 {
@@ -91,63 +60,19 @@ type SnipcartOrders struct {
 	Items      []SnipcartOrder
 }
 
-type SnipcartTax struct {
+func NewSnipcartProvider(snipcartApiKey string) SnipcartProvider {
-	Name             string  `json:"name"`
+	return SnipcartProvider{
-	Amount           float64 `json:"amount"`
-	NumberForInvoice string  `json:"numberForInvoice"`
-	Rate             float64 `json:"rate"`
-}
-
-type SnipcartNotification struct {
-	Type           NotificationType `json:"type"`
-	DeliveryMethod string           `json:"deliveryMethod"`
-	Message        string           `json:"message,omitempty"`
-}
-
-type SnipcartNotificationResponse struct {
-	Id             string           `json:"id"`
-	Created        time.Time        `json:"creationDate"`
-	Type           NotificationType `json:"type"`
-	DeliveryMethod string           `json:"deliveryMethod"`
-	Body           string           `json:"body"`
-	Message        string           `json:"message"`
-	Subject        string           `json:"subject"`
-	SentOn         time.Time        `json:"sentOn"`
-}
-
-func NewClient(snipcartApiKey string) Client {
-	return Client{
 		SnipcartKey: snipcartApiKey,
 		AuthBase64:  base64.StdEncoding.EncodeToString([]byte(snipcartApiKey + ":")),
 	}
 }
 
-func (s *Client) GetOrder(token string) (*SnipcartOrder, error) {
+func (s *SnipcartProvider) GetOrders(queries map[string]string) (*SnipcartOrders, 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.StatusCode < 200 && response.StatusCode >= 300 {
+	if response.Status != "200 OK" {
 		return nil, fmt.Errorf("unexpected response received: %s", response.Status)
 	}
 
@@ -162,7 +87,7 @@ func (s *Client) GetOrders(queries map[string]string) (*SnipcartOrders, error) {
 	return &orders, nil
 }
 
-func (s *Client) GetOrdersByStatus(status OrderStatus) (*SnipcartOrders, error) {
+func (s *SnipcartProvider) GetOrdersByStatus(status OrderStatus) (*SnipcartOrders, error) {
 	if status == "" {
 		return nil, errors.New("status is not set")
 	}
@@ -171,47 +96,10 @@ func (s *Client) GetOrdersByStatus(status OrderStatus) (*SnipcartOrders, error)
 }
 
 func (o *SnipcartOrder) TokenPNGBase64() (string, error) {
-	img, err := qrcode.Encode("order:"+o.Token, qrcode.Medium, 128)
+	img, err := qrcode.Encode(o.Token, qrcode.Medium, 128)
 	if err != nil {
 		return "", err
 	}
 
-	return base64.StdEncoding.EncodeToString(img), nil
+	return "order:" + 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)
-	}
-
-	defer response.Body.Close()
-
-	var responseOrder SnipcartOrder
-	err = json.NewDecoder(response.Body).Decode(&responseOrder)
-	if err != nil {
-		return nil, err
-	}
-
-	return &responseOrder, nil
-}
-
-func (s *Client) SendNotification(token string, notification *SnipcartNotification) (*SnipcartNotificationResponse, error) {
-	response, err := helper.Post(orderUri+"/"+token+"/notifications", "Basic", s.AuthBase64, notification)
-	if err != nil {
-		return nil, err
-	}
-
-	defer response.Body.Close()
-
-	var responseNotification SnipcartNotificationResponse
-	err = json.NewDecoder(response.Body).Decode(&responseNotification)
-	if err != nil {
-		return nil, err
-	}
-
-	return &responseNotification, nil
 }

snipcart/webhook.go

@@ -1,21 +0,0 @@
-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"`
-}
-
-type SnipcartWebhookTaxResponse struct {
-	Taxes []SnipcartTax `json:"taxes"`
-}