Asus battery / charging issue?

I have a fairly new asus laptop. I have a after market power supply. Last night while charging- it zapped me and shut my laptop down. When i plug my power supply in, it makes a cracking sound. I dont know if it my battery or power supply since it can still run on battery and if i remove the battery it will still run on power supply. Last night i was able to put the charger on, but i had an orange light flashing where it is either red or green, depending on charged or charging. Hope this isnt too confusing haha. Thanks!!