Will jock itch go away within 6 weeks?

i started treating my jock itch about 2 weeks ago with anti-fungal cream and have seen vast improvment in my groin area. the problem is tht it has spread to my penis (embarrassing lol) i just want to know will it go away within 6 weeks? because im going on holiday and i dnt want the condition wen im away, thanks for answers