Feature/fixing direct purchase order