Fixed discount calculation

Also added GetRawPrice() function to HCOrder class