showing variants images in the right places fix #2529

Fixes #2538
Add order_id index to spree_payments

Fixes #2536