Fixes for errors when user use a gift.
Fix empty cart.
Merge remote-tracking branch 'origin/develop'
commit all files