EB-8087 Updated punchout shopping related to 'End Shopping' function