improves Non-payment order model.
Merge pull request #315 from jasvir99/dirty

improves Non-payment order model.