[CoreBundle] Fix issue with order not being marked as completed