fixed: flatrate shipping and freeshipping not added to grand total