Check if discount is expired and strictly compare codes
Merge branch 'dev'