bug fixes OrderInfo fields names, adding DiscountType and DiscountInfo with the method calculating DiscountInfo
merge