Changed options to accept customer as per active merchant guidelines
Merge branch 'two_pay' into two_pay_global_trans