Fixed pack price breakdown and made it futureproof
Merge pull request #347 from EhsanKia/patch-2

Fixed pack price breakdown and made it futureproof (dev branch)