X-Cart forums - Address Line 2 in Invoice

Hello,

For the shipping and billing address', I get the following shown inside the invoices :-
Billing Address
David Ullswater,
sadfsdfhsdf,
,
yrewyery,
Worcestershire,
cfghsfghf,
United Kingdom (Great Britain)

Shipping Address
David Ullswater,
sadfsdfhsdf,
,
yrewyery,
Worcestershire,
cfghsfghf,
United Kingdom (Great Britain)

Notice the 3rd line of each is ",". This is where the Address Line 2 should go. How do I get it so if the user doesn't enter an address line 2, it isn't shown on the invoice?

My code for each is as follows :-

Billing Address

Code:

{if $_userinfo.default_fields.firstname}{$order.b_firstname}{/if} 

{if $_userinfo.default_fields.lastname}{$order.b_lastname}{/if},




{if $_userinfo.default_fields.b_address}{$order.b_address},

{/if}

{if $_userinfo.default_fields.b_address_2}{$order.b_address_2},

{/if}

{if $_userinfo.default_fields.b_city}{$order.b_city},

{/if}

{if $_userinfo.default_fields.b_county && $config.General.use_counties eq 'Y'}{$order.b_countyname},

{/if}

{if $_userinfo.default_fields.b_state}{$order.b_statename},

{/if}

{if $_userinfo.default_fields.b_zipcode}{$order.b_zipcode},

{/if}

{if $_userinfo.default_fields.b_country}{$order.b_countryname}{/if}

Shipping Address

Code:

{if $_userinfo.default_fields.firstname}{$order.s_firstname}{/if} 

{if $_userinfo.default_fields.lastname}{$order.s_lastname}{/if},




{if $_userinfo.default_fields.s_address}{$order.s_address},

{/if}

{if $_userinfo.default_fields.s_address_2}{$order.s_address_2},

{/if}

{if $_userinfo.default_fields.s_city}{$order.s_city},

{/if}

{if $_userinfo.default_fields.s_county && $config.General.use_counties eq 'Y'}{$order.s_countyname},

{/if}

{if $_userinfo.default_fields.s_state}{$order.s_statename},

{/if}

{if $_userinfo.default_fields.s_zipcode}{$order.s_zipcode},

{/if}

{if $_userinfo.default_fields.s_country}{$order.s_countryname}{/if}

Best Regards,
Craig Brass