make sure we only assign the order when the promotion is activated.

Fixes #4213
Fixes #4214