Is what the questioner did correct, sometimes combining and shortening prayers, and at other times offering them in full, during his fourteen-day journey and his travels in areas far from the capital?

If a traveler stays in a city for more than four days, they are not permitted the concessions of travel and must repeat the prayers they performed shortened.

If moving outside the capital necessitates a stay of more than four days, the person is not considered a traveler. However, if the stay is less than that, they are a traveler.

Combining two prayers (Jam') is a concession during travel according to the majority of scholars. So, if prayers are combined during the travel period (four days or less), there is no harm. However, if they are combined during a long stay (more than four days): if it was a combination of advancement (Jam' Taqdim), the second prayer is invalid and must be repeated. If it was a combination of delay (Jam' Ta'khir), the prayer is valid unless it was shortened, in which case both prayers must be repeated.