consolidated webhook order to just order

go.mod

@@ -1,8 +1,9 @@
 module github.com/debyltech/go-snipcart
 
-go 1.20
+go 1.19
 
 require (
-	github.com/debyltech/go-helpers v1.0.5
+	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"
 )
 
@@ -50,22 +50,29 @@ 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"`
-	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"`
+	ShippingAddress  SnipcartShippingAddress `json:"shippingAddress,omitempty"`
+	Name             string                  `json:"shippingAddressName,omitempty"`
+	Company          string                  `json:"shippingAddressCompanyName,omitempty"`
+	Address1         string                  `json:"shippingAddressAddress1,omitempty"`
+	Address2         string                  `json:"shippingAddressAddress2,omitempty"`
+	City             string                  `json:"shippingAddressCity,omitempty"`
+	Province         string                  `json:"shippingAddressProvince,omitempty"`
+	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"`
+	ShippingRate     string                  `json:"shippingRateUserDefinedId,omitempty"`
 	Items            []SnipcartItem          `json:"items"`
+	Metadata         any                     `json:"metadata"`
 }
 
 type SnipcartOrderUpdate struct {

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"`
+}