From 92da1ffa832b58feed05f56318b50bdfc62339ee Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 23 May 2013 15:24:25 +0200 Subject: [PATCH] //Merged pull request 124 - thanks to @rynge --- modules/mailalerts/mailalerts.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php index 20add47cc..9baaa815c 100644 --- a/modules/mailalerts/mailalerts.php +++ b/modules/mailalerts/mailalerts.php @@ -353,7 +353,9 @@ class MailAlerts extends Module '{delivery_postal_code}' => $delivery->postcode, '{delivery_country}' => $delivery->country, '{delivery_state}' => $delivery->id_state ? $delivery_state->name : '', - '{delivery_phone}' => $delivery->phone ? $delivery->phone : $delivery->phone_mobile, + '{delivery_phone}' => $delivery->phone, + '{delivery_phone_mobile}' => $delivery->phone_mobile, + '{delivery_vat_number}' => $delivery->vat_number, '{delivery_other}' => $delivery->other, '{invoice_company}' => $invoice->company, '{invoice_firstname}' => $invoice->firstname, @@ -364,7 +366,9 @@ class MailAlerts extends Module '{invoice_postal_code}' => $invoice->postcode, '{invoice_country}' => $invoice->country, '{invoice_state}' => $invoice->id_state ? $invoice_state->name : '', - '{invoice_phone}' => $invoice->phone ? $invoice->phone : $invoice->phone_mobile, + '{invoice_phone}' => $invoice->phone, + '{invoice_phone_mobile}' => $invoice->phone_mobile, + '{invoice_vat_number}' => $invoice->vat_number, '{invoice_other}' => $invoice->other, '{order_name}' => sprintf('%06d', $order->id), '{shop_name}' => Configuration::get('PS_SHOP_NAME'),