Merge pull request #2092 from OpenBazaar/brian.fixCheckoutBreakdownBug

cpacia · web-flow · commit b77cd6f3f9ca · 2020-07-06T12:20:38.000-04:00
Push fix for shipping price
diff --git a/core/order.go b/core/order.go
@@ -973,8 +973,13 @@ func (n *OpenBazaarNode) CheckoutBreakdown(data *repo.PurchaseData) (repo.Checko
 		}
 	}
 	// Convert to final currency
-	shippingCurrencyValue := repo.NewCurrencyValueFromBigInt(shippingTotal, listingCurDef)
-	finalShippingTotal, _, err := shippingCurrencyValue.ConvertUsingProtobufDef(v5Order.Payment.AmountCurrency, cc)
+	originalPrice, err := nrl.GetPrice()
+	if err != nil {
+		return emptyCheckoutBreakdown, err
+	}
+	originalPrice.Amount = shippingTotal
+
+	finalShippingTotal, _, err := originalPrice.ConvertUsingProtobufDef(v5Order.Payment.AmountCurrency, cc)
 	if err != nil {
 		return emptyCheckoutBreakdown, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -973,8 +973,13 @@ func (n OpenBazaarNode) CheckoutBreakdown(data repo.PurchaseData) (repo.Checko`
`973`	`973`	`}`
`974`	`974`	`}`
`975`	`975`	`// Convert to final currency`
`976`		`- shippingCurrencyValue := repo.NewCurrencyValueFromBigInt(shippingTotal, listingCurDef)`
`977`		`- finalShippingTotal, _, err := shippingCurrencyValue.ConvertUsingProtobufDef(v5Order.Payment.AmountCurrency, cc)`
	`976`	`+ originalPrice, err := nrl.GetPrice()`
	`977`	`+ if err != nil {`
	`978`	`+ return emptyCheckoutBreakdown, err`
	`979`	`+ }`
	`980`	`+ originalPrice.Amount = shippingTotal`
	`981`	`+`
	`982`	`+ finalShippingTotal, _, err := originalPrice.ConvertUsingProtobufDef(v5Order.Payment.AmountCurrency, cc)`
`978`	`983`	`if err != nil {`
`979`	`984`	`return emptyCheckoutBreakdown, err`
`980`	`985`	`}`