fixed promotion bugs empty string
Merge branch 'develop' of https://github.com/CE-KMITL-OOAD-2014/online_shopping_system into develop