cash-register promo bugfix
Merge branch '1'