Authored by hf

code review by lzf: do merge shopping cart code

This diff could not be displayed because it is too large.