consolidated webhook order to just order

snipcart/snipcart.go

@@ -47,28 +47,32 @@ type SnipcartItem struct {
 }
 
 type SnipcartOrder struct {
-	Token          string         `json:"token"`
+	Token            string                  `json:"token"`
-	Invoice        string         `json:"invoiceNumber"`
+	Invoice          string                  `json:"invoiceNumber"`
-	Subtotal       float64        `json:"subtotal,omitempty"`
+	Subtotal         float64                 `json:"subtotal,omitempty"`
-	Currency       string         `json:"currency,omitempty"`
+	Currency         string                  `json:"currency,omitempty"`
-	Total          float64        `json:"grandTotal,omitempty"`
+	Total            float64                 `json:"grandTotal,omitempty"`
-	Status         string         `json:"status"`
+	Status           string                  `json:"status"`
-	TotalWeight    float64        `json:"totalWeight"`
+	TotalWeight      float64                 `json:"totalWeight"`
-	Name           string         `json:"shippingAddressName"`
+	ShippingAddress  SnipcartShippingAddress `json:"shippingAddress,omitempty"`
-	Company        string         `json:"shippingAddressCompanyName"`
+	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,omitempty"`
+	PostalCode       string                  `json:"shippingAddressPostalCode,omitempty"`
-	Email          string         `json:"email,omitempty"`
+	Phone            string                  `json:"shippingAddressPhone,omitempty"`
-	TrackingNumber string         `json:"trackingNumber"`
+	Email            string                  `json:"email,omitempty"`
-	TrackingUrl    string         `json:"trackingUrl"`
+	TrackingNumber   string                  `json:"trackingNumber"`
-	ShippingCost   float64        `json:"shippingFees"`
+	TrackingUrl      string                  `json:"trackingUrl"`
-	Items          []SnipcartItem `json:"items"`
+	ShippingCost     float64                 `json:"shippingFees"`
-	Metadata       any            `json:"metadata"`
+	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"`
+}

snipcart/webhook/config.go

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