Let's think this through, Andy: does it seem likely that the OP's mtb came equipped with cantis and disc tabs?

They screwed up. They're either incompetent or unscrupulous. They need to make this right for the OP, and then he needs to find a new shop.