[T2242][UPDATE] important refactor to add support to cancelled orders

Merged Javier Vescio requested to merge T2242 into main

Merge request reports