diff --git a/modules/feeder/rss.php b/modules/feeder/rss.php index fad90e212..caa32a3c8 100644 --- a/modules/feeder/rss.php +++ b/modules/feeder/rss.php @@ -34,6 +34,7 @@ $id_category = ((int)(Tools::getValue('id_category')) ? (int)(Tools::getValue('i $products = Product::getProducts((int)Context::getContext()->language->id, 0, ($number > 10 ? 10 : $number), $orderBy, $orderWay, $id_category, true); $currency = new Currency((int)Context::getContext()->currency->id); $affiliate = (Tools::getValue('ac') ? '?ac='.(int)(Tools::getValue('ac')) : ''); +$metas = Meta::getMetaByPage('index', (int)Context::getContext()->language->id); // Send feed header("Content-Type:text/xml; charset=utf-8"); @@ -42,8 +43,9 @@ echo ''."\n"; <![CDATA[<?php echo Configuration::get('PS_SHOP_NAME') ?>]]> + ]]> - + PrestaShop language->iso_code; ?> 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'),