no message
This commit is contained in:
Kevin Granger
@@ -3739,7 +3739,7 @@ a .icon-flip-vertical:before {
|
||||
.icon-ok:before {
|
||||
content: "\f00c"; }
|
||||
|
||||
.icon-remove:before {
|
||||
.icon-remove:before, .process-icon-cancel:before {
|
||||
content: "\f00d"; }
|
||||
|
||||
.icon-zoom-in:before {
|
||||
@@ -3944,10 +3944,10 @@ a .icon-flip-vertical:before {
|
||||
.icon-chevron-right:before {
|
||||
content: "\f054"; }
|
||||
|
||||
.icon-plus-sign:before, .process-icon-newCombination:before {
|
||||
.icon-plus-sign:before, .process-icon-newCombination.toolbar-new:before {
|
||||
content: "\f055"; }
|
||||
|
||||
.icon-minus-sign:before {
|
||||
.icon-minus-sign:before, .process-icon-newCombination.toolbar-cancel:before {
|
||||
content: "\f056"; }
|
||||
|
||||
.icon-remove-sign:before {
|
||||
@@ -4340,7 +4340,7 @@ a .icon-flip-vertical:before {
|
||||
.icon-lightbulb:before {
|
||||
content: "\f0eb"; }
|
||||
|
||||
.icon-exchange:before {
|
||||
.icon-exchange:before, .process-icon-partial_refund:before {
|
||||
content: "\f0ec"; }
|
||||
|
||||
.icon-cloud-download:before, .process-icon-export:before {
|
||||
|
||||
@@ -323,9 +323,18 @@ body.fixed-top
|
||||
@extend .icon-bar-chart
|
||||
.process-icon-duplicate
|
||||
@extend .icon-copy
|
||||
.process-icon-newCombination
|
||||
|
||||
.process-icon-newCombination.toolbar-new
|
||||
@extend .icon-plus-sign
|
||||
|
||||
.process-icon-newCombination.toolbar-cancel
|
||||
@extend .icon-minus-sign
|
||||
|
||||
.process-icon-partial_refund
|
||||
@extend .icon-exchange
|
||||
.process-icon-cancel
|
||||
@extend .icon-remove
|
||||
|
||||
.navbar-inner
|
||||
box-shadow: none!important
|
||||
.input-append
|
||||
|
||||
@@ -27,80 +27,102 @@
|
||||
|
||||
{block name="override_tpl"}
|
||||
|
||||
<h2>{$manufacturer->name}</h2>
|
||||
<legend>{$manufacturer->name}</legend>
|
||||
|
||||
<h3>{l s='Total addresses'} {count($addresses)}</h3>
|
||||
<span>{l s='Total addresses'} {count($addresses)}</span>
|
||||
<hr />
|
||||
|
||||
{if !count($addresses)}
|
||||
{l s='No address has been found 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} <a href="{$link->getAdminLink('AdminManufacturers')}&id_address={$addresse.id_address}&editaddresses=1"><img src="../img/admin/edit.gif"></a></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 />
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{$addresse.firstname} {$addresse.lastname}
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
{$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 />
|
||||
{if $addresse.phone}{$addresse.phone}<br />{/if}
|
||||
{if $addresse.phone_mobile}{$addresse.phone_mobile}<br />{/if}
|
||||
{if $addresse.other}<div ><br />
|
||||
<i>{$addresse.other}</i></div>
|
||||
{/if}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td><a class="btn btn-default pull-right" href="{$link->getAdminLink('AdminManufacturers')}&id_address={$addresse.id_address}&editaddresses=1">
|
||||
<i class="icon-edit"></i> {l s='Edit'}</a></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
{/foreach}
|
||||
{/if}
|
||||
|
||||
<h3>{l s='Total products'} {count($products)}</h3>
|
||||
<span>{l s='Total products'} {count($products)}</span>
|
||||
|
||||
{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>
|
||||
<a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}" class="btn btn-default"><i class="icon-edit"></i> {l s='Edit'}</a>
|
||||
<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="btn btn-default" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');"><i class="icon-trash"></i> {l s='Delete'}</a>
|
||||
</div>
|
||||
<br/><br/>
|
||||
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
|
||||
<tr>
|
||||
<th height="39">{$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 class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th >{$product->name}</th>
|
||||
{if !empty($product->reference)}<th>{l s='Ref:'} {$product->reference}</th>{/if}
|
||||
{if !empty($product->ean13)}<th>{l s='EAN13:'} {$product->ean13}</th>{/if}
|
||||
{if !empty($product->upc)}<th>{l s='UPC:'} {$product->upc}</th>{/if}
|
||||
{if $stock_management}<th>{l s='Qty:'} {$product->quantity}</th>{/if}
|
||||
</tr>
|
||||
</thead>
|
||||
</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>
|
||||
<a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}" class="btn btn-default"><i class="icon-edit"></i> {l s='Edit'}</a>
|
||||
<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="btn btn-default" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');"><i class="icon-trash"></i> {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:100%;">
|
||||
<tr>
|
||||
<th height="39">{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 && $shopContext != Shop::CONTEXT_ALL}<th class="right" width="150">{l s='Available Quantity'}</th>{/if}
|
||||
</tr>
|
||||
|
||||
<span><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></span>
|
||||
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{l s='Attribute name'}</th>
|
||||
<th>{l s='Reference'}</th>
|
||||
<th>{l s='EAN13'}</th>
|
||||
<th>{l s='UPC'}</th>
|
||||
{if $stock_management && $shopContext != Shop::CONTEXT_ALL}
|
||||
<th>{l s='Available Quantity'}</th>
|
||||
{/if}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach $product->combination 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 && $shopContext != Shop::CONTEXT_ALL}<td class="right">{$product_attribute.quantity}</td>{/if}
|
||||
{if $stock_management && $shopContext != Shop::CONTEXT_ALL}
|
||||
<td class="right">{$product_attribute.quantity}</td>
|
||||
{/if}
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
{/if}
|
||||
{/foreach}
|
||||
|
||||
@@ -156,7 +156,7 @@
|
||||
{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
|
||||
{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
|
||||
{if isset($input.suffix)}{$input.suffix}{/if}
|
||||
{if !empty($input.hint)}<span class="alert alert-info" name="help_box">{$input.hint}<span class="hint-pointer"> </span></span>{/if}
|
||||
{if !empty($input.desc)}<div class="alert alert-info">{$input.desc}</div>{/if}
|
||||
{/if}
|
||||
{elseif $input.type == 'select'}
|
||||
{if isset($input.options.query) && !$input.options.query && isset($input.empty_message)}
|
||||
|
||||
@@ -144,34 +144,27 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
|
||||
$this->fields_list = array(
|
||||
'id_address' => array(
|
||||
'title' => $this->l('ID'),
|
||||
'width' => 25
|
||||
'title' => $this->l('ID')
|
||||
),
|
||||
'manufacturer_name' => array(
|
||||
'title' => $this->l('Manufacturer'),
|
||||
'width' => 'auto'
|
||||
'title' => $this->l('Manufacturer')
|
||||
),
|
||||
'firstname' => array(
|
||||
'title' => $this->l('First name'),
|
||||
'width' => 80
|
||||
'title' => $this->l('First name')
|
||||
),
|
||||
'lastname' => array(
|
||||
'title' => $this->l('Last name'),
|
||||
'width' => 100,
|
||||
'filter_key' => 'a!name'
|
||||
),
|
||||
'postcode' => array(
|
||||
'title' => $this->l('Zip Code/Postal Code'),
|
||||
'align' => 'right',
|
||||
'width' => 50
|
||||
'align' => 'right'
|
||||
),
|
||||
'city' => array(
|
||||
'title' => $this->l('City'),
|
||||
'width' => 150
|
||||
'title' => $this->l('City')
|
||||
),
|
||||
'country' => array(
|
||||
'title' => $this->l('Country'),
|
||||
'width' => 100,
|
||||
'type' => 'select',
|
||||
'list' => $this->countries_array,
|
||||
'filter_key' => 'cl!id_country'
|
||||
@@ -237,7 +230,6 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Name:'),
|
||||
'name' => 'name',
|
||||
'size' => 40,
|
||||
'required' => true,
|
||||
'hint' => $this->l('Invalid characters:').' <>;=#{}'
|
||||
),
|
||||
@@ -246,8 +238,6 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
'label' => $this->l('Short description:'),
|
||||
'name' => 'short_description',
|
||||
'lang' => true,
|
||||
'cols' => 60,
|
||||
'rows' => 10,
|
||||
'class' => 'rte',
|
||||
'hint' => $this->l('Invalid characters:').' <>;=#{}'
|
||||
),
|
||||
@@ -256,8 +246,6 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
'label' => $this->l('Description:'),
|
||||
'name' => 'description',
|
||||
'lang' => true,
|
||||
'cols' => 60,
|
||||
'rows' => 10,
|
||||
'class' => 'rte',
|
||||
'hint' => $this->l('Invalid characters:').' <>;=#{}'
|
||||
),
|
||||
@@ -266,7 +254,7 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
'label' => $this->l('Logo:'),
|
||||
'name' => 'logo',
|
||||
'display_image' => true,
|
||||
'desc' => $this->l('Upload a manufacturer logo from your computer.')
|
||||
'hint' => $this->l('Upload a manufacturer logo from your computer.')
|
||||
),
|
||||
array(
|
||||
'type' => 'text',
|
||||
@@ -412,7 +400,6 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Last name:'),
|
||||
'name' => 'lastname',
|
||||
'size' => 33,
|
||||
'required' => true,
|
||||
'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:'
|
||||
);
|
||||
@@ -420,7 +407,6 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
'type' => 'text',
|
||||
'label' => $this->l('First name:'),
|
||||
'name' => 'firstname',
|
||||
'size' => 33,
|
||||
'required' => true,
|
||||
'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:'
|
||||
);
|
||||
@@ -428,14 +414,12 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Address:'),
|
||||
'name' => 'address1',
|
||||
'size' => 33,
|
||||
'required' => true,
|
||||
);
|
||||
$form['input'][] = array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Address (2):'),
|
||||
'name' => 'address2',
|
||||
'size' => 33,
|
||||
'required' => false,
|
||||
);
|
||||
$form['input'][] = array(
|
||||
@@ -443,14 +427,12 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
'label' => $this->l('Zip Code/Postal Code'),
|
||||
'name' => 'postcode',
|
||||
'required' => true,
|
||||
'size' => 33,
|
||||
'required' => false,
|
||||
);
|
||||
$form['input'][] = array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('City:'),
|
||||
'name' => 'city',
|
||||
'size' => 33,
|
||||
'required' => true,
|
||||
);
|
||||
$form['input'][] = array(
|
||||
@@ -480,22 +462,18 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Home phone:'),
|
||||
'name' => 'phone',
|
||||
'size' => 33,
|
||||
'required' => false,
|
||||
);
|
||||
$form['input'][] = array(
|
||||
'type' => 'text',
|
||||
'label' => $this->l('Mobile phone:'),
|
||||
'name' => 'phone_mobile',
|
||||
'size' => 33,
|
||||
'required' => false,
|
||||
);
|
||||
$form['input'][] = array(
|
||||
'type' => 'textarea',
|
||||
'label' => $this->l('Other:'),
|
||||
'name' => 'other',
|
||||
'cols' => 36,
|
||||
'rows' => 4,
|
||||
'required' => false,
|
||||
'hint' => $this->l('Forbidden characters:').' <>;=#{}'
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user