refactor shipping detail and payment detail inside order