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

// fixed adminproduct > combinations

Browse Source 
[*] BO : now if you click on an AdminProduct sub tab (combinations, prices) already selected, this will reload it.


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9823 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti committed 2011-11-03 10:51:18 +00:00
1 parent 581cdc12e9
commit e3d03f7e7d
4 files changed
+45 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/template/products/combinations.tpl
+6 -8
View File
@@ -1,4 +1,6 @@
<a href="#" onclick="$('#add_new_combination').slideToggle();return false;"><img src="../img/admin/add.gif" alt="" />{l s='Add a new combination'}</a> <a href="#" onclick="$('#add_new_combination').slideToggle();return false;">
<img src="../img/admin/add.gif" alt="" />{l s='Add a new combination'}
</a>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$(\'#id_mvt_reason\').change(function(){ $(\'#id_mvt_reason\').change(function(){
@@ -118,8 +120,8 @@
<p><input id="virtual_product_file_attribute" name="virtual_product_file_attribute" onchange="uploadFile2();" maxlength="'.$this->maxFileSize.'" type="file"></p> <p><input id="virtual_product_file_attribute" name="virtual_product_file_attribute" onchange="uploadFile2();" maxlength="'.$this->maxFileSize.'" type="file"></p>
<div id="upload-confirmation2"> <div id="upload-confirmation2">
<p id="gethtmlink" style="display: none;">{l s='This is the link'} :&nbsp;{$productDownload->getHtmlLink(false, true)} <p id="gethtmlink" style="display: none;">{l s='This is the link'} :&nbsp;{$product->productDownload->getHtmlLink(false, true)}
<a id="make_downloadable_product_attribute" onclick="return confirm('.addslashes("{l s='Delete this file' slashes=1}")).')" href="index.php?tab=AdminProducts&id_product={$id_product}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a></p> <a id="make_downloadable_product_attribute" onclick="return confirm('.addslashes("{l s='Delete this file' slashes=1}")).')" href="index.php?tab=AdminProducts&id_product={$product->productDownload->id_product}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a></p>
<a <a
@@ -286,9 +288,5 @@
</tr> </tr>
</table> </table>
</div> </div>
</div>
{$content} {$content}
admin-dev/themes/template/products/content.tpl
+17 -6
View File
@@ -50,12 +50,22 @@ $(document).ready(function(){
currentId = $(".productTabs a.selected").attr('id').substr(5); currentId = $(".productTabs a.selected").attr('id').substr(5);
// id is the wanted producttab id // id is the wanted producttab id
id = $(this).attr('id').substr(5); id = $(this).attr('id').substr(5);
$(".tab-page").removeClass('selected'); if ($(this).attr("id") != $(".productTabs a.selected").attr('id'))
$("#product-tab-content-"+currentId).hide(); {
$("#product-tab-content-wait").show();; $(".tab-page").removeClass('selected');
$("#product-tab-content-"+currentId).hide();
}
else
{
if (confirm(' {l s='Do you really want to reload the current tab (all modifications will be lost)'}'))
$("#product-tab-content-"+currentId).html();
else
return false;
}
if($("#product-tab-content-"+id).hasClass('not-loaded')) $("#product-tab-content-wait").show();
if ($("#product-tab-content-"+id).hasClass('not-loaded') || $(this).hasClass('selected'))
{ {
myurl = $(this).attr("href")+"&ajax=1"; myurl = $(this).attr("href")+"&ajax=1";
$.ajax({ $.ajax({
@@ -63,6 +73,7 @@ $(document).ready(function(){
async : true, async : true,
success :function(data) success :function(data)
{ {
$("#product-tab-content-wait").hide();
$("#product-tab-content-"+id).html(data); $("#product-tab-content-"+id).html(data);
$("#product-tab-content-"+id).removeClass('not-loaded'); $("#product-tab-content-"+id).removeClass('not-loaded');
$("#product-tab-content-"+id).show(); $("#product-tab-content-"+id).show();
@@ -212,7 +223,7 @@ $(document).ready(function(){
<input type="hidden" name="id_product" value="{$id_product}" /> <input type="hidden" name="id_product" value="{$id_product}" />
<input type="hidden" name="tabs" id="tabs" value="0" /> <input type="hidden" name="tabs" id="tabs" value="0" />
<div class="tab-pane" id="tabPane1"> <div class="tab-pane" id="tabPane1">
<div id="product-tab-content-wait" style="display:none" ></div> <div id="product-tab-content-wait" style="display:none" >{l s='loading ...'}</div>
{if !$newproduct} {if !$newproduct}
{foreach $product_tabs key=numStep item=tab} {foreach $product_tabs key=numStep item=tab}
<div id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content" {if !$tab.selected}style="display:none"{/if}> <div id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content" {if !$tab.selected}style="display:none"{/if}>
controllers/admin/AdminProductsController.php
+21 -18
View File
@@ -1527,7 +1527,7 @@ if (false)
$product = new Product((int)(Tools::getValue('id_product'))); $product = new Product((int)(Tools::getValue('id_product')));
$this->initForm(); $this->initForm();
$this->{'initForm'.$this->action}($product, $languages, $defaultLanguage); $this->{'initForm'.$this->action}($product, $languages, $defaultLanguage);
$this->context->smarty->assign('product',$product); $this->context->smarty->assign('product', $product);
} }
} }
else else
@@ -1750,7 +1750,8 @@ if (false)
'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.$product->id, 'desc' => $this->l('Save'), 'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.$product->id, 'desc' => $this->l('Save'),
); );
} }
return parent::initToolbar(); parent::initToolbar();
$this->context->smarty->assign('toolbar_btn', $this->toolbar_btn);
} }
/** /**
@@ -3476,8 +3477,8 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
$combArray[$combinaison['id_product_attribute']]['weight'] = $combinaison['weight']; $combArray[$combinaison['id_product_attribute']]['weight'] = $combinaison['weight'];
$combArray[$combinaison['id_product_attribute']]['unit_impact'] = $combinaison['unit_price_impact']; $combArray[$combinaison['id_product_attribute']]['unit_impact'] = $combinaison['unit_price_impact'];
$combArray[$combinaison['id_product_attribute']]['reference'] = $combinaison['reference']; $combArray[$combinaison['id_product_attribute']]['reference'] = $combinaison['reference'];
$combArray[$combinaison['id_product_attribute']]['supplier_reference'] = $combinaison['supplier_reference']; $combArray[$combinaison['id_product_attribute']]['supplier_reference'] = $combinaison['supplier_reference'];
$combArray[$combinaison['id_product_attribute']]['ean13'] = $combinaison['ean13']; $combArray[$combinaison['id_product_attribute']]['ean13'] = $combinaison['ean13'];
$combArray[$combinaison['id_product_attribute']]['upc'] = $combinaison['upc']; $combArray[$combinaison['id_product_attribute']]['upc'] = $combinaison['upc'];
$combArray[$combinaison['id_product_attribute']]['minimal_quantity'] = $combinaison['minimal_quantity']; $combArray[$combinaison['id_product_attribute']]['minimal_quantity'] = $combinaison['minimal_quantity'];
$combArray[$combinaison['id_product_attribute']]['available_date'] = strftime($combinaison['available_date']); $combArray[$combinaison['id_product_attribute']]['available_date'] = strftime($combinaison['available_date']);
@@ -3512,16 +3513,16 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
$attrImage = $product_attribute['id_image'] ? new Image($product_attribute['id_image']) : false; $attrImage = $product_attribute['id_image'] ? new Image($product_attribute['id_image']) : false;
$available_date = ($product_attribute['available_date'] != 0) ? date('Y-m-d', strtotime($product_attribute['available_date'])) : '0000-00-00'; $available_date = ($product_attribute['available_date'] != 0) ? date('Y-m-d', strtotime($product_attribute['available_date'])) : '0000-00-00';
$id_product_download = $productDownload->getIdFromIdAttribute((int) $product->id, (int) $id_product_attribute); $id_product_download = $product->productDownload->getIdFromIdAttribute((int) $product->id, (int) $id_product_attribute);
if ($id_product_download) if ($id_product_download)
$productDownload = new ProductDownload($id_product_download); $product->productDownload = new ProductDownload($id_product_download);
$available_date_attribute = substr($productDownload->date_expiration, 0, -9); $available_date_attribute = substr($product->productDownload->date_expiration, 0, -9);
if ($available_date_attribute == '0000-00-00') if ($available_date_attribute == '0000-00-00')
$available_date_attribute = ''; $available_date_attribute = '';
if ($productDownload->is_shareable == 1) if ($product->productDownload->is_shareable == 1)
$is_shareable = $this->l('Yes'); $is_shareable = $this->l('Yes');
else else
$is_shareable = $this->l('No'); $is_shareable = $this->l('No');
@@ -3536,18 +3537,18 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
<td class="right">'.$product_attribute['upc'].'</td> <td class="right">'.$product_attribute['upc'].'</td>
<td class="center">'.$product_attribute['quantity'].'</td>'; <td class="center">'.$product_attribute['quantity'].'</td>';
if ($id_product_download && !empty($productDownload->display_filename)) if ($id_product_download && !empty($product->productDownload->display_filename))
{ {
$content .= '<td class="right">'.$productDownload->getHtmlLink(false, true).'</td> $content .= '<td class="right">'.$product->productDownload->getHtmlLink(false, true).'</td>
<td class="center">'.$productDownload->nb_downloadable.'</td> <td class="center">'.$product->productDownload->nb_downloadable.'</td>
<td class="center">'.$productDownload->nb_downloadable.'</td> <td class="center">'.$product->productDownload->nb_downloadable.'</td>
<td class="right">'.$is_shareable.'</td>'; <td class="right">'.$is_shareable.'</td>';
} }
$exists_file = realpath(_PS_DOWNLOAD_DIR_).'/'.$productDownload->filename; $exists_file = realpath(_PS_DOWNLOAD_DIR_).'/'.$product->productDownload->filename;
if ($productDownload->id && file_exists($exists_file)) if ($product->productDownload->id && file_exists($exists_file))
$filename = $productDownload->filename; $filename = $product->productDownload->filename;
else else
$filename = ''; $filename = '';
// @todo : a better way to "fillCombinaison" maybe ? // @todo : a better way to "fillCombinaison" maybe ?
@@ -3556,7 +3557,7 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
<img src="../img/admin/edit.gif" alt="'.$this->l('Modify this combination').'" <img src="../img/admin/edit.gif" alt="'.$this->l('Modify this combination').'"
onclick="javascript:fillCombinaison(\''.$product_attribute['wholesale_price'].'\', \''.$product_attribute['price'].'\', \''.$product_attribute['weight'].'\', \''.$product_attribute['unit_impact'].'\', \''.$product_attribute['reference'].'\', \''.$product_attribute['supplier_reference'].'\', \''.$product_attribute['ean13'].'\', onclick="javascript:fillCombinaison(\''.$product_attribute['wholesale_price'].'\', \''.$product_attribute['price'].'\', \''.$product_attribute['weight'].'\', \''.$product_attribute['unit_impact'].'\', \''.$product_attribute['reference'].'\', \''.$product_attribute['supplier_reference'].'\', \''.$product_attribute['ean13'].'\',
\''.$product_attribute['quantity'].'\', \''.($attrImage ? $attrImage->id : 0).'\', Array('.$jsList.'), \''.$id_product_attribute.'\', \''.$product_attribute['default_on'].'\', \''.$product_attribute['ecotax'].'\', \''.$product_attribute['location'].'\', \''.$product_attribute['upc'].'\', \''.$product_attribute['minimal_quantity'].'\', \''.$available_date.'\', \''.$product_attribute['quantity'].'\', \''.($attrImage ? $attrImage->id : 0).'\', Array('.$jsList.'), \''.$id_product_attribute.'\', \''.$product_attribute['default_on'].'\', \''.$product_attribute['ecotax'].'\', \''.$product_attribute['location'].'\', \''.$product_attribute['upc'].'\', \''.$product_attribute['minimal_quantity'].'\', \''.$available_date.'\',
\''.$productDownload->display_filename.'\', \''.$filename.'\', \''.$productDownload->nb_downloadable.'\', \''.$available_date_attribute.'\', \''.$productDownload->nb_days_accessible.'\', \''.$productDownload->is_shareable.'\'); calcImpactPriceTI();" /></a>&nbsp; \''.$product->productDownload->display_filename.'\', \''.$filename.'\', \''.$product->productDownload->nb_downloadable.'\', \''.$available_date_attribute.'\', \''.$product->productDownload->nb_days_accessible.'\', \''.$product->productDownload->is_shareable.'\'); calcImpactPriceTI();" /></a>&nbsp;
'.(!$product_attribute['default_on'] ? '<a href="'.self::$currentIndex.'&defaultProductAttribute&id_product_attribute='.$id_product_attribute.'&id_product='.$product->id.'&'.(Tools::isSubmit('id_category') ? 'id_category='.(int)(Tools::getValue('id_category')).'&' : '&').'token='.Tools::getAdminToken('AdminProducts'.(int)(Tab::getIdFromClassName('AdminProducts')).$this->context->employee->id).'"> '.(!$product_attribute['default_on'] ? '<a href="'.self::$currentIndex.'&defaultProductAttribute&id_product_attribute='.$id_product_attribute.'&id_product='.$product->id.'&'.(Tools::isSubmit('id_category') ? 'id_category='.(int)(Tools::getValue('id_category')).'&' : '&').'token='.Tools::getAdminToken('AdminProducts'.(int)(Tab::getIdFromClassName('AdminProducts')).$this->context->employee->id).'">
<img src="../img/admin/asterisk.gif" alt="'.$this->l('Make this the default combination').'" title="'.$this->l('Make this combination the default one').'"></a>' : '').' <img src="../img/admin/asterisk.gif" alt="'.$this->l('Make this the default combination').'" title="'.$this->l('Make this combination the default one').'"></a>' : '').'
<a href="'.self::$currentIndex.'&deleteProductAttribute&id_product_attribute='.$id_product_attribute.'&id_product='.$product->id.'&'.(Tools::isSubmit('id_category') ? 'id_category='.(int)(Tools::getValue('id_category')).'&' : '&').'token='.Tools::getAdminToken('AdminProducts'.(int)(Tab::getIdFromClassName('AdminProducts')).(int)$this->context->employee->id).'" onclick="return confirm(\''.$this->l('Are you sure?', __CLASS__, true, false).'\');"> <a href="'.self::$currentIndex.'&deleteProductAttribute&id_product_attribute='.$id_product_attribute.'&id_product='.$product->id.'&'.(Tools::isSubmit('id_category') ? 'id_category='.(int)(Tools::getValue('id_category')).'&' : '&').'token='.Tools::getAdminToken('AdminProducts'.(int)(Tab::getIdFromClassName('AdminProducts')).(int)$this->context->employee->id).'" onclick="return confirm(\''.$this->l('Are you sure?', __CLASS__, true, false).'\');">
@@ -3590,10 +3591,12 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
} }
else else
$content .= '<b>'.$this->l('You must save this product before adding combinations').'.</b>'; $content .= '<b>'.$this->l('You must save this product before adding combinations').'.</b>';
$this->context->smarty->assign('content', $content); $this->content .= $content;
// @todo // @todo
$smarty->assign('up_filename', strval(Tools::getValue('virtual_product_filename_attribute'))); $smarty->assign('up_filename', strval(Tools::getValue('virtual_product_filename_attribute')));
$this->context->smarty->assign('content', $content);
$this->context->smarty->assign('product', $product);
$this->context->smarty->assign('id_category', $product->id_category_default);
$this->content = $this->context->smarty->fetch('products/combinations.tpl'); $this->content = $this->context->smarty->fetch('products/combinations.tpl');
} }
js/attributesBack.js
+1 -3
View File
@@ -123,9 +123,7 @@ virtual_product_nb_days, is_shareable)
$("#make_downloadable_product_attribute").attr('href', link+"&id_product_attribute="+id_product_attribute); $("#make_downloadable_product_attribute").attr('href', link+"&id_product_attribute="+id_product_attribute);
$("#virtual_product_filename_attribute").val(virtual_product_filename_attribute); $("#virtual_product_filename_attribute").val(virtual_product_filename_attribute);
console.log(virtual_product_filename_attribute); $("#add_new_combination").show();
console.log("ok");
console.log($("#virtual_product_filename_attribute").val());
/* Reset all combination images */ /* Reset all combination images */