[v4.6] Promotions: First Order condition must not fail on canceled orders#6344

mamhoff merged 2 commits intov4.6solidusio/solidus:v4.6from

backport/v4.6/pr-6343solidusio/solidus:backport/v4.6/pr-6343Copy head branch name to clipboard