Updated checkout template to addOrderPayment THEN place the order

Checkout template, step #3, would not add order payments before placing the order. The result would be customers with 2 addresses having the first address in the DB used all the time for all orders.