Done with changes of detail view page
Merge pull request #120 from priyanka-techmaes/order-page

Removed conflicts in checkout.css file
resolved conflicts in files