spree/spree — pull request #5139 by cbrunsdon (2014-08-05 22:29:12+00:00)
Title: Test to see if a better coupon exists already

If we don't find the valid promo in all our places it could be
successfully applied, but it *is* still on the order, it was accepted by
the order but a better one was used instead

This is #4790 rebased and pointed against master, instead of 2-2 stable.