dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : fix #PSCFV-3087

Browse Source
This commit is contained in:
lLefevre
2012-07-06 12:55:48 +00:00
parent ffea13c43b
commit 99035dbb67
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+4 -2
View File
@@ -715,6 +715,8 @@ class AdminOrdersControllerCore extends AdminController
$total += $order->total_shipping; $total += $order->total_shipping;
$cartrule->reduction_amount = $total; $cartrule->reduction_amount = $total;
$cartrule->minimum_amount_currency = $order->id_currency;
$cartrule->reduction_currency = $order->id_currency;
if (!$cartrule->add()) if (!$cartrule->add())
$this->errors[] = Tools::displayError('Cannot generate voucher'); $this->errors[] = Tools::displayError('Cannot generate voucher');
@@ -722,8 +724,8 @@ class AdminOrdersControllerCore extends AdminController
{ {
// Update the voucher code and name // Update the voucher code and name
foreach ($languages as $language) foreach ($languages as $language)
$cartrule->name[$language['id_lang']] = '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)($voucher->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()) if (!$cartrule->update())
$this->errors[] = Tools::displayError('Cannot generate voucher'); $this->errors[] = Tools::displayError('Cannot generate voucher');
else else