Fix currency used in test to not cause a spec failure
Refactor Spree::ProductHelper#variant_price_diff

* Change the logic of the code to make it easier for the next
  commit.
* Remove duplicate code from the HTML generation.
Change #variant_price_diff to handle when the product amount is nil
Merge branch 'fix-available-package-shipping-methods' into mrh