Merge pull request #2058 from OpenBazaar/bulk

Fix bug bulk updating currencies on listings

Author: cpacia

core/listings.go

@@ -657,7 +657,6 @@ func (n *OpenBazaarNode) SetCurrencyOnListings(currencies []string) error {
 	if err != nil {
 		return err
 	}
-
 	walkpath := func(p string, f os.FileInfo, err error) error {
 		if !f.IsDir() && filepath.Ext(p) == ".json" {
 			signedProto, err := GetSignedListingFromPath(p)
@@ -674,7 +673,6 @@ func (n *OpenBazaarNode) SetCurrencyOnListings(currencies []string) error {
 			if l.GetContractType() == pb.Listing_Metadata_CRYPTOCURRENCY.String() {
 				return nil
 			}
-
 			if err := l.SetAcceptedCurrencies(currencies...); err != nil {
 				return err
 			}
@@ -701,6 +699,5 @@ func (n *OpenBazaarNode) SetCurrencyOnListings(currencies []string) error {
 	if err != nil {
 		return err
 	}
-
 	return nil
 }

openbazaar-qa renamed to qa/ob

@@ -1029,10 +1029,21 @@ func (l *Listing) GetShippingOptions() ([]*pb.Listing_ShippingOption, error) {
 	}
 	switch l.GetVersion() {
 	case 3, 4:
-		for _, o := range so {
-			for _, s := range o.Services {
-				s.BigPrice = big.NewInt(int64(s.Price)).String()
-				s.BigAdditionalItemPrice = big.NewInt(int64(s.AdditionalItemPrice)).String()
+		for a, o := range so {
+			for x, s := range o.Services {
+				so[a].Services[x].BigPrice = big.NewInt(int64(s.Price)).String()
+				so[a].Services[x].BigAdditionalItemPrice = big.NewInt(int64(s.AdditionalItemPrice)).String()
+			}
+		}
+	case 5:
+		for a, o := range so {
+			for x, s := range o.Services {
+				if s.BigPrice == "" {
+					so[a].Services[x].BigPrice = "0"
+				}
+				if s.BigAdditionalItemPrice == "" {
+					so[a].Services[x].BigAdditionalItemPrice = "0"
+				}
 			}
 		}
 	}
@@ -1212,6 +1223,9 @@ func (l *Listing) GetInventory() (map[int]*big.Int, error) {
 		var amtStr string
 		switch l.GetVersion() {
 		case 5:
+			if s.BigQuantity == "" {
+				continue
+			}
 			amtStr = s.BigQuantity
 		default:
 			amtStr = strconv.Itoa(int(s.Quantity))