force Canadian postal codes to uppercase

Canadian postal codes are forced to upper case only they are 6 characters long (in which case a space is also inserted in the middle).

This leaves out the case when the postal code has 7 characters, that should also be forced to upper case.

Very simple fix, in the format_ca_zipcode function move the substr call outside of the if, maybe around the trim call.