Cart issue fixes
Merge pull request #34 from ijaz2020/dev

Cart issue fixes