I haven't picked it up yet:<br/><br/>Should I say:<br/><br/>I told them I would pay for it when I pick it up.<br/><br/>or<br/><br/>I told them I would pay for it when I picked it up.