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

[-] BO : fixed bug #PSCFV-4865

Browse Source
This commit is contained in:
vAugagneur
2012-10-16 12:41:13 +00:00
parent a0422e94de
commit c8cd148101
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/form.tpl
+1 -1
View File
@@ -1228,7 +1228,7 @@
<div class="margin-form"> <div class="margin-form">
<select name="payment_module_name" id="payment_module_name"> <select name="payment_module_name" id="payment_module_name">
{foreach from=$payment_modules item='module'} {foreach from=$payment_modules item='module'}
<option value="{$module.name}" {if isset($smarty.post.payment_module_name) && $module.name == $smarty.post.payment_module_name}selected="selected"{/if}>{$module.name}</option> <option value="{$module->name}" {if isset($smarty.post.payment_module_name) && $module->name == $smarty.post.payment_module_name}selected="selected"{/if}>{$module->displayName}</option>
{/foreach} {/foreach}
</select> </select>
</div> </div>
controllers/admin/AdminOrdersController.php
+5 -1
View File
@@ -168,13 +168,17 @@ class AdminOrdersControllerCore extends AdminController
'bankwire' => (int)Configuration::get('PS_OS_BANKWIRE'), 'bankwire' => (int)Configuration::get('PS_OS_BANKWIRE'),
'cashondelivery' => (int)Configuration::get('PS_OS_PREPARATION'), 'cashondelivery' => (int)Configuration::get('PS_OS_PREPARATION'),
'other' => (int)Configuration::get('PS_OS_PAYMENT')); '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( $this->context->smarty->assign(array(
'recyclable_pack' => (int)Configuration::get('PS_RECYCLABLE_PACK'), 'recyclable_pack' => (int)Configuration::get('PS_RECYCLABLE_PACK'),
'gift_wrapping' => (int)Configuration::get('PS_GIFT_WRAPPING'), 'gift_wrapping' => (int)Configuration::get('PS_GIFT_WRAPPING'),
'cart' => $cart, 'cart' => $cart,
'currencies' => Currency::getCurrencies(), 'currencies' => Currency::getCurrencies(),
'langs' => Language::getLanguages(true, Context::getContext()->shop->id), '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), 'order_states' => OrderState::getOrderStates((int)Context::getContext()->language->id),
'defaults_order_state' => $defaults_order_state, 'defaults_order_state' => $defaults_order_state,
'show_toolbar' => $this->show_toolbar, 'show_toolbar' => $this->show_toolbar,