allow empty payment method
merge fix