fixed condition
moved checkbox into common payment template