From 99035dbb6743471b2cec8bb73e8f89b060153d6f Mon Sep 17 00:00:00 2001 From: lLefevre Date: Fri, 6 Jul 2012 12:55:48 +0000 Subject: [PATCH] [-] BO : fix #PSCFV-3087 --- controllers/admin/AdminOrdersController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 279bff4c6..adeaa1710 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -715,6 +715,8 @@ class AdminOrdersControllerCore extends AdminController $total += $order->total_shipping; $cartrule->reduction_amount = $total; + $cartrule->minimum_amount_currency = $order->id_currency; + $cartrule->reduction_currency = $order->id_currency; if (!$cartrule->add()) $this->errors[] = Tools::displayError('Cannot generate voucher'); @@ -722,8 +724,8 @@ class AdminOrdersControllerCore extends AdminController { // Update the voucher code and name foreach ($languages as $language) - $cartrule->name[$language['id_lang']] = 'V'.(int)($voucher->id).'C'.(int)($order->id_customer).'O'.$order->id; - $cartrule->code = 'V'.(int)($voucher->id).'C'.(int)($order->id_customer).'O'.$order->id; + $cartrule->name[$language['id_lang']] = 'V'.(int)($cartrule->id).'C'.(int)($order->id_customer).'O'.$order->id; + $cartrule->code = 'V'.(int)($cartrule->id).'C'.(int)($order->id_customer).'O'.$order->id; if (!$cartrule->update()) $this->errors[] = Tools::displayError('Cannot generate voucher'); else