Fixed error with missing payment method on manual order. Master branch also fixed. Close #931