add billing in order
fix issue can not create order
merge code
merge code