The phrase "While you're here, can you just..." destroys profit margins. Stop doing free work.
Use the script from your Comm Vault:
"I can absolutely take care of that for you. Let me write up a quick change order for the additional materials and labor, and once you approve it on your phone, we'll get it done."
This politely anchors the fact that extra work costs extra money.
Did this solve your problem?