I hope that you have a good time with her and everything is going according to your plans.
I am asking this question because I have an English test. I wonder whether I should put comma in both sentences, and I didn't put a comma before "and" in the first sentence because I thought if I did I would have to write it like this.
I hope that you have a good time with her, and I hope everything is going according to your plans.