update
update
commit apply discount
update promotion
Merge branch 'issue#16' into issue#15