Merge pull request #744 from OpenBazaar/rules

Prevent overlapping shipping rule range for quantity discount
OpenBazaar · Oct 24, 2017 · efa03dd · efa03dd
2 parents 403cdab + 9ef13be
commit efa03dd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/listings.go b/core/listings.go
@@ -968,7 +968,9 @@ func validateListing(listing *pb.Listing, testnet bool) (err error) {
 				return fmt.Errorf("Shipping rules exceeds max of %d", MaxListItems)
 			}
 			for i, rule := range shippingOption.ShippingRules.Rules {
-				if (shippingOption.ShippingRules.RuleType == pb.Listing_ShippingOption_ShippingRules_FLAT_FEE_QUANTITY_RANGE || shippingOption.ShippingRules.RuleType == pb.Listing_ShippingOption_ShippingRules_FLAT_FEE_WEIGHT_RANGE) && rule.MaxRange <= rule.MinRange {
+				if (shippingOption.ShippingRules.RuleType == pb.Listing_ShippingOption_ShippingRules_FLAT_FEE_QUANTITY_RANGE ||
+					shippingOption.ShippingRules.RuleType == pb.Listing_ShippingOption_ShippingRules_FLAT_FEE_WEIGHT_RANGE ||
+					shippingOption.ShippingRules.RuleType == pb.Listing_ShippingOption_ShippingRules_QUANTITY_DISCOUNT) && rule.MaxRange <= rule.MinRange {
 					return errors.New("Shipping rule max range cannot be less than or equal to the min range")
 				}
 				for x, checkRule := range shippingOption.ShippingRules.Rules {