add order detail
Merge branch 'add-order-detail'