Add payment method in orderfees calculator
Merge branch 'master' into booking