vat refactor in order creation and details