fixed currentOrder persistence problem
Merge branch 'payment'