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

// fix update view.tpl in AdminManufacturersController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9915 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-11-07 09:12:51 +00:00
parent c62eb897a5
commit edb2da2600
5 changed files with 127 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/manufacturers/form_addresses.tpl
-38
View File
@@ -1,38 +0,0 @@
{*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 8971 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{if $firstCall}
{extends file="helper/form/form.tpl"}
{block name=script}
$(document).ready(function(){
if ($(".datepicker").length > 0)
$(".datepicker").datepicker({
prevText: '',
nextText: '',
dateFormat: 'yy-mm-dd'
});
});
{/block}
admin-dev/themes/template/manufacturers/list_action_edit_adresses.tpl
-27
View File
@@ -1,27 +0,0 @@
{*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 9197 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}">
<img src="../img/admin/edit.gif" alt="{$action}" title="{$action}" /></a>
admin-dev/themes/template/manufacturers/view.tpl
+75 -72
View File
@@ -24,82 +24,85 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<h2>{$manufacturer->name}</h2> {extends file="helper/view/view.tpl"}
<h3>{l s='Total addresses:'} {count($addresses)}</h3> {block name="override_tpl"}
<hr />
{if !count($addresses)} <h2>{$manufacturer->name}</h2>
{l s='No address for this manufacturer'}
{else}
{foreach $addresses AS $addresse}
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width: 600px;">
<tr>
<th><strong>{$addresse.firstname} {$addresse.lastname}</strong></th>
</tr>
<tr>
<td>
<div style="padding:5px; float:left; width:350px;">
{$addresse.address1}<br />
{if $addresse.address2}{$addresse.address2}<br />{/if}
{$addresse.postcode} {$addresse.city}<br />
{if $addresse.state}{$addresse.state}<br />{/if}
<b>{$addresse.country}</b><br />
</div>
<div style="padding:5px; float:left;">
{if $addresse.phone}{$addresse.phone}<br />{/if}
{if $addresse.phone_mobile}{$addresse.phone_mobile}<br />{/if}
</div>
{if $addresse.other}<div style="padding:5px; clear:both;"><br /><i>{$addresse.other}</i></div>{/if}
</td>
</tr>
</table><br />
{/foreach}
{/if}
<br /><br />
<h3>{l s='Total products:'} {count($products)}</h3> <h3>{l s='Total addresses:'} {count($addresses)}</h3>
{foreach $products AS $product}
<hr /> <hr />
{if !$product->hasAttributes()}
<div style="float:right;"> {if !count($addresses)}
<a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}" class="button">{l s='Edit'}</a> {l s='No address for this manufacturer'}
<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="button" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');">{l s='Delete'}</a>
</div>
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:990px;">
<tr>
<th>{$product->name}</th>
{if !empty($product->reference)}<th width="150">{l s='Ref:'} {$product->reference}</th>{/if}
{if !empty($product->ean13)}<th width="120">{l s='EAN13:'} {$product->ean13}</th>{/if}
{if !empty($product->upc)}<th width="120">{l s='UPC:'} {$product->upc}</th>{/if}
{if $stock_management}<th class="right" width="50">{l s='Qty:'} {$product->quantity}</th>{/if}
</tr>
</table>
{else} {else}
<div style="float:right;"> {foreach $addresses AS $addresse}
<a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}" class="button">{l s='Edit'}</a> <table border="0" cellpadding="0" cellspacing="0" class="table" style="width: 600px;">
<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="button" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');">{l s='Delete'}</a> <tr>
</div> <th><strong>{$addresse.firstname} {$addresse.lastname}</strong></th>
<h3><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></h3>
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:990px;">
<tr>
<th>{l s='Attribute name'}</th>
<th width="80">{l s='Reference'}</th>
<th width="80">{l s='EAN13'}</th>
<th width="80">{l s='UPC'}</th>
{if $stock_management}<th class="right" width="40">{l s='Quantity'}</th>{/if}
</tr>
{foreach $product->combinaison AS $id_product_attribute => $product_attribute}
<tr {if $id_product_attribute %2}class="alt_row"{/if} >
<td>{$product_attribute.attributes}</td>
<td>{$product_attribute.reference}</td>
<td>{$product_attribute.ean13}</td>
<td>{$product_attribute.upc}</td>
{if $stock_management}<td class="right">{$product_attribute.quantity}</td>{/if}
</tr> </tr>
{/foreach} <tr>
</table> <td>
<div style="padding:5px; float:left; width:350px;">
{$addresse.address1}<br />
{if $addresse.address2}{$addresse.address2}<br />{/if}
{$addresse.postcode} {$addresse.city}<br />
{if $addresse.state}{$addresse.state}<br />{/if}
<b>{$addresse.country}</b><br />
</div>
<div style="padding:5px; float:left;">
{if $addresse.phone}{$addresse.phone}<br />{/if}
{if $addresse.phone_mobile}{$addresse.phone_mobile}<br />{/if}
</div>
{if $addresse.other}<div style="padding:5px; clear:both;"><br /><i>{$addresse.other}</i></div>{/if}
</td>
</tr>
</table><br />
{/foreach}
{/if} {/if}
{/foreach} <br /><br />
<br /><br />
<a href="{$current}&token={$token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to manufacturer list'}</a><br /> <h3>{l s='Total products:'} {count($products)}</h3>
{foreach $products AS $product}
<hr />
{if !$product->hasAttributes()}
<div style="float:right;">
<a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}" class="button">{l s='Edit'}</a>
<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="button" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');">{l s='Delete'}</a>
</div>
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:990px;">
<tr>
<th>{$product->name}</th>
{if !empty($product->reference)}<th width="150">{l s='Ref:'} {$product->reference}</th>{/if}
{if !empty($product->ean13)}<th width="120">{l s='EAN13:'} {$product->ean13}</th>{/if}
{if !empty($product->upc)}<th width="120">{l s='UPC:'} {$product->upc}</th>{/if}
{if $stock_management}<th class="right" width="50">{l s='Qty:'} {$product->quantity}</th>{/if}
</tr>
</table>
{else}
<div style="float:right;">
<a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}" class="button">{l s='Edit'}</a>
<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="button" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');">{l s='Delete'}</a>
</div>
<h3><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></h3>
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:990px;">
<tr>
<th>{l s='Attribute name'}</th>
<th width="80">{l s='Reference'}</th>
<th width="80">{l s='EAN13'}</th>
<th width="80">{l s='UPC'}</th>
{if $stock_management}<th class="right" width="40">{l s='Quantity'}</th>{/if}
</tr>
{foreach $product->combinaison AS $id_product_attribute => $product_attribute}
<tr {if $id_product_attribute %2}class="alt_row"{/if} >
<td>{$product_attribute.attributes}</td>
<td>{$product_attribute.reference}</td>
<td>{$product_attribute.ean13}</td>
<td>{$product_attribute.upc}</td>
{if $stock_management}<td class="right">{$product_attribute.quantity}</td>{/if}
</tr>
{/foreach}
</table>
{/if}
{/foreach}
{/block}
classes/AdminController.php
+5 -5
View File
@@ -1008,17 +1008,17 @@ class AdminControllerCore extends Controller
// Template override // Template override
$tpl = $this->tpl_folder.'content.tpl'; $tpl = $this->tpl_folder.'content.tpl';
//$tpl_action = $this->tpl_folder.$this->display.'.tpl'; $tpl_action = $this->tpl_folder.$this->display.'.tpl';
// Check if action template has been override // Check if action template has been override
// new smarty : template_dir is an array. // new smarty : template_dir is an array.
// @todo : add override path to the smarty config, and checking all array item // @todo : add override path to the smarty config, and checking all array item
/*if (file_exists($this->context->smarty->template_dir[0].'/'.$tpl_action)) if (file_exists($this->context->smarty->template_dir[0].'/'.$tpl_action) && $this->display != 'view')
{ {
if (method_exists($this, $this->display.Tools::toCamelCase($this->className))) if (method_exists($this, $this->display.Tools::toCamelCase($this->className)))
$this->{$this->display.Tools::toCamelCase($this->className)}(); $this->{$this->display.Tools::toCamelCase($this->className)}();
$this->context->smarty->assign('content', $this->context->smarty->fetch($tpl_action)); $this->context->smarty->assign('content', $this->context->smarty->fetch($tpl_action));
}*/ }
// Check if content template has been override // Check if content template has been override
if (file_exists($this->context->smarty->template_dir[0].'/'.$tpl)) if (file_exists($this->context->smarty->template_dir[0].'/'.$tpl))
@@ -1253,14 +1253,14 @@ class AdminControllerCore extends Controller
return; return;
$this->content .= $this->initForm(); $this->content .= $this->initForm();
} }
elseif ($this->display == 'view') else if ($this->display == 'view')
{ {
// Some controllers use the view action without an object // Some controllers use the view action without an object
if ($this->className) if ($this->className)
$this->loadObject(true); $this->loadObject(true);
$this->content .= $this->initView(); $this->content .= $this->initView();
} }
elseif (!$this->ajax) else if (!$this->ajax)
{ {
$this->content .= $this->initList(); $this->content .= $this->initList();
$this->content .= $this->initOptions(); $this->content .= $this->initOptions();
controllers/admin/AdminManufacturersController.php
+46 -33
View File
@@ -109,14 +109,11 @@ class AdminManufacturersControllerCore extends AdminController
$this->context->smarty->assign('title_list', $this->l('List of manufacturers:')); $this->context->smarty->assign('title_list', $this->l('List of manufacturers:'));
$this->initToolbar();
$this->content .= parent::initList(); $this->content .= parent::initList();
} }
public function initListManufacturerAddresses() public function initListManufacturerAddresses()
{ {
$this->toolbar_title = $this->l('Addresses'); $this->toolbar_title = $this->l('Addresses');
// reset actions and query vars // reset actions and query vars
$this->actions = array(); $this->actions = array();
@@ -207,7 +204,6 @@ class AdminManufacturersControllerCore extends AdminController
$this->initListManufacturerAddresses(); $this->initListManufacturerAddresses();
} }
/** /**
* Display editaddresses action link * Display editaddresses action link
* @param string $token the token to add to the link * @param string $token the token to add to the link
@@ -226,7 +222,7 @@ class AdminManufacturersControllerCore extends AdminController
'action' => self::$cache_lang['editaddresses'], 'action' => self::$cache_lang['editaddresses'],
)); ));
return $this->context->smarty->fetch('manufacturers/list_action_edit_adresses.tpl'); return $this->context->smarty->fetch('helper/list/list_action_edit.tpl');
} }
public function initForm() public function initForm()
@@ -523,6 +519,16 @@ class AdminManufacturersControllerCore extends AdminController
'alias' => 'manufacturer' 'alias' => 'manufacturer'
); );
$this->toolbar_btn = array(
'save' => array(
'href' => '#',
'desc' => $this->l('Save')
),
'cancel' => array(
'href' => self::$currentIndex.'&token='.$this->token,
'desc' => $this->l('Cancel')
)
);
$this->getlanguages(); $this->getlanguages();
$helper = new HelperForm(); $helper = new HelperForm();
$helper->currentIndex = self::$currentIndex; $helper->currentIndex = self::$currentIndex;
@@ -530,12 +536,12 @@ class AdminManufacturersControllerCore extends AdminController
$helper->table = $this->table; $helper->table = $this->table;
$helper->identifier = $this->identifier; $helper->identifier = $this->identifier;
$helper->id = $address->id; $helper->id = $address->id;
$helper->toolbar_fix = true;
$helper->languages = $this->_languages; $helper->languages = $this->_languages;
$helper->default_form_language = $this->default_form_language; $helper->default_form_language = $this->default_form_language;
$helper->allow_employee_form_lang = $this->allow_employee_form_lang; $helper->allow_employee_form_lang = $this->allow_employee_form_lang;
$helper->fields_value = $this->getFieldsValue($address); $helper->fields_value = $this->getFieldsValue($address);
$helper->toolbar_btn = $this->toolbar_btn; $helper->toolbar_btn = $this->toolbar_btn;
// $helper->tpl = 'manufacturers/form_addresses.tpl';
$this->content .= $helper->generateForm($this->fields_form); $this->content .= $helper->generateForm($this->fields_form);
} }
@@ -580,11 +586,44 @@ class AdminManufacturersControllerCore extends AdminController
} }
} }
$this->context->smarty->assign(array( $this->tpl_view_vars = array(
'manufacturer' => $manufacturer, 'manufacturer' => $manufacturer,
'addresses' => $addresses, 'addresses' => $addresses,
'products' => $products, 'products' => $products,
'stock_management' => Configuration::get('PS_STOCK_MANAGEMENT'), 'stock_management' => Configuration::get('PS_STOCK_MANAGEMENT'),
);
return parent::initView();
}
public function initContent()
{
// toolbar (save, cancel, new, ..)
$this->initToolbar();
if ($this->display == 'editaddresses' || $this->display == 'addaddress')
$this->content .= $this->initFormAddress();
else if ($this->display == 'edit' || $this->display == 'add')
{
if (!$this->loadObject(true))
return;
$this->content .= $this->initForm();
}
else if ($this->display == 'view')
{
// Some controllers use the view action without an object
if ($this->className)
$this->loadObject(true);
$this->content .= $this->initView();
}
else if (!$this->ajax)
{
$this->content .= $this->initList();
$this->content .= $this->initOptions();
}
$this->context->smarty->assign(array(
'content' => $this->content,
'url_post' => self::$currentIndex.'&token='.$this->token,
)); ));
} }
@@ -620,32 +659,6 @@ class AdminManufacturersControllerCore extends AdminController
} }
} }
public function initContent()
{
if ($this->display == 'edit' || $this->display == 'add')
{
if (!($this->object = $this->loadObject(true)))
return;
$this->content .= $this->initForm();
}
else if ($this->display == 'editaddresses' || $this->display == 'addaddress')
$this->content .= $this->initFormAddress();
else if ($this->display == 'view')
$this->content .= $this->initView();
else
{
$this->content .= $this->initList();
$this->content .= $this->initOptions();
}
$this->context->smarty->assign(array(
'table' => $this->table,
'current' => self::$currentIndex,
'token' => $this->token,
'content' => $this->content
));
}
public function postProcess() public function postProcess()
{ {
if (Tools::getValue('submitAddaddress') || Tools::isSubmit('deleteaddress')) if (Tools::getValue('submitAddaddress') || Tools::isSubmit('deleteaddress'))