From b97ee3132b1749cafabc72fd92a40a27eb053eb2 Mon Sep 17 00:00:00 2001 From: Bastian de Byl Date: Wed, 29 Mar 2023 13:24:09 -0400 Subject: [PATCH] consolidated webhook order to just order --- snipcart/snipcart.go | 51 ++++++++++++++++++++++---------------------- snipcart/webhook.go | 13 ----------- 2 files changed, 26 insertions(+), 38 deletions(-) diff --git a/snipcart/snipcart.go b/snipcart/snipcart.go index 910aa9f..4629ea4 100644 --- a/snipcart/snipcart.go +++ b/snipcart/snipcart.go @@ -47,31 +47,32 @@ type SnipcartItem struct { } 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"` - 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,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"` + 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"` + 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 { diff --git a/snipcart/webhook.go b/snipcart/webhook.go index 741fab7..aad3448 100644 --- a/snipcart/webhook.go +++ b/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"` -}