1pc/order create - enhancements

Cleaned up the list of payment options so that stored payments would not
show up twice.