payment info
Merge branch 'issue#13' into issue#14
Merge branch '1.7' into issue#14
Merge branch '1.7' into issue#14
Merge branch 'issue#16' into issue#14
update
update
Merge branch 'issue#16' into issue#14
update
commit apply discount
update promotion
switch to issue#15
update issue#14
checkout to issue#16
update
update
fixes show merge table name
success
Merge branch 'issue#16' into issue#14
merge issue#14, #16