add delivery model
move money logic from order to payment
fix merge error