Added dynamic data calculation for OrderForm