Done payment checkout page
Start payment shipping page
Done: handle payment switch page to page
Merge branch 'dev_peace' into dev
Merge remote-tracking branch 'origin/dev' into dev_jo