fix prepareOrder so that it doesn't show orders that are in delievery
Merge branch 'devel' of github.com:ludovicbouliane/Log210-E03 into devel