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

// Fixed #PSTEST-261

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12079 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-01-03 16:01:33 +00:00
parent 743fc2d2b8
commit cb02fc29d4
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/orders/form.tpl
+16 -1
View File
@@ -778,6 +778,21 @@
}); });
} }
</script> </script>
{if $show_toolbar}
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
{include file="toolbar.tpl"}
<div class="pageTitle">
<h3>
{block name=pageTitle}
<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
{/block}
</h3>
</div>
</div>
</div>
<div class="leadin">{block name="leadin"}{/block}</div>
{/if}
<fieldset id="customer_part"><legend><img src="../img/admin/tab-customers.gif" />{l s='Customer'}</legend> <fieldset id="customer_part"><legend><img src="../img/admin/tab-customers.gif" />{l s='Customer'}</legend>
<p><label>{l s='Search customers:'}</label><input type="text" id="customer" value="" /> <p><label>{l s='Search customers:'}</label><input type="text" id="customer" value="" />
<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')}&addcustomer&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span></a></p> <a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')}&addcustomer&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span></a></p>
@@ -1020,4 +1035,4 @@
<div id="loader_container"> <div id="loader_container">
<div id="loader"> <div id="loader">
</div> </div>
</div> </div>
controllers/admin/AdminOrdersController.php
+6 -1
View File
@@ -86,6 +86,7 @@ class AdminOrdersControllerCore extends AdminController
public function renderForm() public function renderForm()
{ {
parent::renderForm(); parent::renderForm();
unset($this->toolbar_btn['save']);
$this->addJqueryPlugin(array('autocomplete', 'fancybox', 'typewatch')); $this->addJqueryPlugin(array('autocomplete', 'fancybox', 'typewatch'));
$cart = new Cart((int)Tools::getValue('id_cart')); $cart = new Cart((int)Tools::getValue('id_cart'));
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
@@ -95,7 +96,11 @@ class AdminOrdersControllerCore extends AdminController
'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' => PaymentModule::getInstalledPaymentModules(),
'order_states' => OrderState::getOrderStates((int)Context::getContext()->cookie->id_lang))); 'order_states' => OrderState::getOrderStates((int)Context::getContext()->cookie->id_lang),
'show_toolbar' => $this->show_toolbar,
'toolbar_btn' => $this->toolbar_btn,
'title' => $this->l('Orders : create order'),
));
$this->content .= $this->context->smarty->fetch('orders/form.tpl'); $this->content .= $this->context->smarty->fetch('orders/form.tpl');
} }