[Shipping] - Bug fixed when not calculating the total

As we changed the categories the shipping calculation was not working
properly
Merge branch 'master' of https://github.com/radicalgraphics/looklala14