consolidated webhook order to just order

snipcart/snipcart.go

@@ -54,14 +54,15 @@ type SnipcartOrder struct {
 	Total            float64                 `json:"grandTotal,omitempty"`
 	Status           string                  `json:"status"`
 	TotalWeight      float64                 `json:"totalWeight"`
-	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"`
+	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"`

snipcart/webhook.go

@@ -15,16 +15,3 @@ type SnipcartShippingAddress struct {
 	Phone       string `json:"phone"`
 	VatNumber   string `json:"vatNumber,omitempty"`
 }
-
-type SnipcartOrderEventContent struct {
-	Token           string                  `json:"token"`
-	Invoice         string                  `json:"invoiceNumber"`
-	Status          string                  `json:"status"`
-	PaymentStatus   string                  `json:"paymentStatus"`
-	Email           string                  `json:"email"`
-	Currency        string                  `json:"currency"`
-	TotalWeight     float64                 `json:"totalWeight"`
-	Items           []SnipcartItem          `json:"items"`
-	ShippingAddress SnipcartShippingAddress `json:"shippingAddress"`
-	Metadata        string                  `json:"metadata"`
-}