Fixes to the calculations

Subtotal no longer includes tax, subtotal is the sum before tax.
total1 renamed to currentItem, as it is set to the price of the current
item.
Added functions to return strings to we have less casting and string
parsing.
Calculations work now, except for the discounts