From 7bd44ca1b13883af8eb3a94ab5cedb7c3dd65586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 4 Feb 2013 15:11:29 +0100 Subject: [PATCH] [-] BO: get the invoice prefix from the right shop --- .../default/template/controllers/orders/_product_line.tpl | 2 +- classes/PaymentModule.php | 2 +- classes/order/OrderInvoice.php | 4 ++-- classes/pdf/HTMLTemplateInvoice.php | 2 +- controllers/admin/AdminOrdersController.php | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl index 4453470c8..6519dadaf 100755 --- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl @@ -135,7 +135,7 @@ {if sizeof($invoices_collection)} {else} diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index e8edc2e58..16ef6d1f9 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -616,7 +616,7 @@ abstract class PaymentModuleCore extends Module { $pdf = new PDF($order->getInvoicesCollection(), PDF::TEMPLATE_INVOICE, $this->context->smarty); $file_attachement['content'] = $pdf->render(false); - $file_attachement['name'] = Configuration::get('PS_INVOICE_PREFIX', (int)$order->id_lang).sprintf('%06d', $order->invoice_number).'.pdf'; + $file_attachement['name'] = Configuration::get('PS_INVOICE_PREFIX', (int)$order->id_lang, null, $order->id_shop).sprintf('%06d', $order->invoice_number).'.pdf'; $file_attachement['mime'] = 'application/pdf'; } else diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php index 7d46ec488..fee05a4a1 100644 --- a/classes/order/OrderInvoice.php +++ b/classes/order/OrderInvoice.php @@ -654,9 +654,9 @@ class OrderInvoiceCore extends ObjectModel * @param int $id_lang for invoice_prefix * @return string */ - public function getInvoiceNumberFormatted($id_lang) + public function getInvoiceNumberFormatted($id_lang, $id_shop = null) { - return '#'.Configuration::get('PS_INVOICE_PREFIX', $id_lang).sprintf('%06d', $this->number); + return '#'.Configuration::get('PS_INVOICE_PREFIX', $id_lang, null, $id_shop).sprintf('%06d', $this->number); } public function saveCarrierTaxCalculator(array $taxes_amount) diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php index 8861f7459..efbbc790a 100755 --- a/classes/pdf/HTMLTemplateInvoice.php +++ b/classes/pdf/HTMLTemplateInvoice.php @@ -42,7 +42,7 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $this->date = Tools::displayDate($order_invoice->date_add, (int)$this->order->id_lang); $id_lang = Context::getContext()->language->id; - $this->title = HTMLTemplateInvoice::l('Invoice ').' #'.Configuration::get('PS_INVOICE_PREFIX', $id_lang).sprintf('%06d', $order_invoice->number); + $this->title = HTMLTemplateInvoice::l('Invoice ').' #'.Configuration::get('PS_INVOICE_PREFIX', $id_lang, null, (int)$this->order->id_shop).sprintf('%06d', $order_invoice->number); // footer informations $this->shop = new Shop((int)$this->order->id_shop); } diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 8116a14a3..34ca02861 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1102,7 +1102,7 @@ class AdminOrdersControllerCore extends AdminController foreach ($order_invoices_collection as $order_invoice) { if (Tools::getValue('discount_value') > $order_invoice->total_paid_tax_incl) - $this->errors[] = Tools::displayError('Discount value is greater than the order invoice total (Invoice:').$order_invoice->getInvoiceNumberFormatted(Context::getContext()->language->id).')'; + $this->errors[] = Tools::displayError('Discount value is greater than the order invoice total (Invoice:').$order_invoice->getInvoiceNumberFormatted(Context::getContext()->language->id, (int)$order->id_shop).')'; else { $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round(Tools::getValue('discount_value'), 2); @@ -1713,7 +1713,7 @@ class AdminOrdersControllerCore extends AdminController $invoice_array = array(); foreach ($invoice_collection as $invoice) { - $invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id); + $invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id, (int)$order->id_shop); $invoice_array[] = $invoice; } @@ -1916,7 +1916,7 @@ class AdminOrdersControllerCore extends AdminController $invoice_array = array(); foreach ($invoice_collection as $invoice) { - $invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id); + $invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id, (int)$order->id_shop); $invoice_array[] = $invoice; } @@ -2003,7 +2003,7 @@ class AdminOrdersControllerCore extends AdminController $invoice_array = array(); foreach ($invoice_collection as $invoice) { - $invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id); + $invoice->name = $invoice->getInvoiceNumberFormatted(Context::getContext()->language->id, (int)$order->id_shop); $invoice_array[] = $invoice; }