Adjust calculation of basket total without tax but inc discounts
Replace nulls with empty strings in payment migration