Discounts
Update ShoppingCart.php
Added discounts support
Merge branch 'OmgDef-master'