godaddy/spree — pull request #12 by IrvinFan (2014-07-01 18:24:15+00:00)
Title: Revert bonobos' changes on choosing best promotion since we don't have line_item level promotion and bonobos' changes caused NEMO-2543

This reverts commit 97bb4f992b50a373d7e6dbccbeff70952cd2c6f9.

Revert "Eliminate need for stubbing."

This reverts commit 506aaa1790c5eebf1ea8b49afd8c7dda5c31cb6b.

Revert "Update comment and move private method down."

This reverts commit b93362b051ac08e393ee9ddf11460ba8760ee547.

Revert "Prevent multiple promotions on the same order"

This reverts commit 5a128a8775b00e4350ea49f8239068215e8f9d46.

Conflicts:
core/spec/models/spree/item_adjustments_spec.rb

Revert "This also gets initialized with Orders"

This reverts commit 1748111f40cf65200758df59e9e7dcd5f690e0bf.