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

[-] BO : fixed bug #PSCFV-4865

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17874 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-10-16 12:41:13 +00:00
parent e03dd8c158
commit d34dabaa7e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+5 -1
View File
@@ -168,13 +168,17 @@ class AdminOrdersControllerCore extends AdminController
'bankwire' => (int)Configuration::get('PS_OS_BANKWIRE'),
'cashondelivery' => (int)Configuration::get('PS_OS_PREPARATION'),
'other' => (int)Configuration::get('PS_OS_PAYMENT'));
$payment_modules = array();
foreach (PaymentModule::getInstalledPaymentModules() as $p_module)
$payment_modules[] = Module::getInstanceById((int)$p_module['id_module']);
$this->context->smarty->assign(array(
'recyclable_pack' => (int)Configuration::get('PS_RECYCLABLE_PACK'),
'gift_wrapping' => (int)Configuration::get('PS_GIFT_WRAPPING'),
'cart' => $cart,
'currencies' => Currency::getCurrencies(),
'langs' => Language::getLanguages(true, Context::getContext()->shop->id),
'payment_modules' => PaymentModule::getInstalledPaymentModules(),
'payment_modules' => $payment_modules,
'order_states' => OrderState::getOrderStates((int)Context::getContext()->language->id),
'defaults_order_state' => $defaults_order_state,
'show_toolbar' => $this->show_toolbar,