modified Order and Payment
Merge branch 'master' of https://github.com/MiraitSystems/enju_trunk