No Condor, you should not have had to pay extra to get your gun back. That's bullshit.
When I was in college, I bought a brand new Colt Trooper Mk III .357 mag. After less than 200 rounds, it began sometimes misfiring when shooting single action. When the hammer dropped, the trigger would kick my finger forward and the transfer bar would not come up. I took it back to the gunshop where I bought it, and told the so-called gunsmith who ran the shop to return it to Colt, or an authorized Colt repair facility, since it was only a couple weeks old and should be handled under warranty.
He called a week later and said my gun was fixed. When I went to pick it up, I remarked how fast that was and he presented me with a bill for $25.00 for "cleaning and adjustment". He told me he did the work himself rather than sending it to Colt as I requested. I told him I did not ask him to clean a brand new gun that could not possibly have been dirty inside, and refused to pay. We argued and he told me he would not give me my gun until I paid, because he worked on it and did not work for free. Finally I said, I'll pay if you guarantee your work, and he agreed. I was pissed to put it mildly, because I expected to pay only for him to send the gun to Colt.
I went straight home and grabbed some cartridges and went to the range. It f---ed up on the 3rd shot. I went straight back to his shop and demanded he return my money. He refused. I got, shall we say, rather loud and boisterous. Two customers who were there quietly slipped out the door as I was turning the air blue and calling him everything but a white English gentleman. He grabbed the phone and told me to leave or he would call the cops. I told him I wanted him to call the cops because he did work that I did not authorize and charged me for guaranteed work that did not fix my gun. I told him I intended to press charges for theft of services. He went to the cash register and got my money and handed it to me and told me not to ever come back. I said, "What makes you think I would ever do business here again?"
I took it to another gun shop and explained the situation. The proprietor said he would send it to Colt and see what happens. A few weeks later Colt sent my gun back with a new hammer, and they covered postage both ways. The gun store owner told me I owed him nothing since all it cost him was the time to put it in a box and mail it. Of course, I continued to give him my business until he retired, and I gave him a ton of word of mouth advertising. The other guy... not so much. I told everyone I could about him in no uncertain terms. He went out of business a few years later, and I hope I helped.