added better error handling for shipping_rates.json api, added shop public URL handling for shipping_rates.json api

Author: smellai

shopify/shopify.go

@@ -28,6 +28,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
 	jww "github.com/spf13/jwalterweatherman"
 )
 
@@ -39,13 +40,15 @@ const (
 type Shopify struct {
 	shopifyDomain      string
 	shopifySecretToken string
+	// we need the public Store URL because with Redirect shipping_rates.json doesn't work
+	shopifyPublicURL string
 
 	Products []Product
 }
 
 // NewClient inits shopify client
-func NewClient(domain string, secrettoken string) Shopify {
-	shop := Shopify{shopifyDomain: domain, shopifySecretToken: secrettoken}
+func NewClient(domain string, secrettoken string, publicURL string) Shopify {
+	shop := Shopify{shopifyDomain: domain, shopifySecretToken: secrettoken, shopifyPublicURL: publicURL}
 	return shop
 }
 
@@ -191,11 +194,10 @@ func (shopifyClient *Shopify) ShippingOptions(order Order) ([]ShippingRate, erro
 
 	urlStr = urlStr + v.Encode()
 
-	completeURL = fmt.Sprintf("https://%s%s%s", shopifyClient.shopifyDomain, baseURLString, urlStr)
+	completeURL = fmt.Sprintf("%s%s", shopifyClient.shopifyPublicURL, urlStr)
 	jww.INFO.Printf("[ShippingOptions] - Request URL: %s", completeURL)
 
 	r, err = http.NewRequest("GET", completeURL, nil)
-
 	resp, err = client.Do(r)
 
 	defer resp.Body.Close()
@@ -213,6 +215,11 @@ func (shopifyClient *Shopify) ShippingOptions(order Order) ([]ShippingRate, erro
 		return shopifyResponse.ShippingRates, err
 	}
 
+	if shopifyResponse.Error != nil {
+		genericError := errors.New(strings.Join(shopifyResponse.Error, ", "))
+		return shopifyResponse.ShippingRates, genericError
+	}
+
 	// Address not supported error handling
 	if shopifyResponse.Country != nil || shopifyResponse.Zip != nil || shopifyResponse.Province != nil {
 		var errorsArray []string

shopify/shopifyorder.go

@@ -308,4 +308,5 @@ type ShippingRatesResponse struct {
 	Zip      []string `json:"zip,omitempty"`
 	Province []string `json:"province,omitempty"`
 	Country  []string `json:"country,omitempty"`
+	Error    []string `json:"error,omitempty"`
 }