Currently when an order has been redone and a customer tries to do a return through the return's portal, an error advises that the order must be delivered in order for the return to be processed. To get the return to work, you have to un-archive the original order and change the status to delivered (so that the original order and the redone order are in the shipped tab).

We would like the redone order to be the order that the return checks instead of the original order that has been archived.