Fixing duplicate payment creation for non paypal payment methods