antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-ean' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-04-04 15:54:44 +02:00
commit 4a41ef84eb
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/labelgenerate/AdminLabelGenerate.php
View File

@ -66,9 +66,7 @@ class AdminLabelGenerate extends AdminTab {
}
$this->_html .= '<p class="conf">Suppression terminée </p>';
}
}
if ($current_sale && !Tools::getValue('deleteEAN')) {
}elseif ($current_sale && !Tools::getValue('deleteEAN')) {
$sale = new Sale((int)$current_sale);
if(!Validate::isLoadedObject($sale)) {
@ -179,7 +177,7 @@ class AdminLabelGenerate extends AdminTab {
<br class="clear"/>
<br class="clear"/>
<button class="button" id="generateEAN">Générer les EANs</button>
<button class="button" id="deleteEAN" onclick="return confirm(\'Êtes cous sur de vouloir supprimer les eans de cette vente ?\');">Supprimer les EANs</button>
<button class="button" id="deleteEAN" >Supprimer les EANs</button>
</div>
</fieldset>
<br /><br />';
@ -202,20 +200,23 @@ class AdminLabelGenerate extends AdminTab {
$(".chosen-select").chosen().change( function() {});
$("#generateEAN").click(function(){
if($(".chosen-select").val() != 999999) {
if ($(".chosen-select").val() != 999999) {
$(\'#category_selector\').hide();
document.location.href=\'index.php?tab=AdminLabelGenerate&token='.Tools::getAdminTokenLite('AdminLabelGenerate').'&id_sale=\' + $(".chosen-select").val();
}
});
$("#deleteEAN").click(function(){
if($(".chosen-select").val() != 999999) {
console.log($(".chosen-select").val());
document.location.href=\'index.php?tab=AdminLabelGenerate&token='.Tools::getAdminTokenLite('AdminLabelGenerate').'&deleteEAN=1&id_sale=\' + $(".chosen-select").val();
ok = confirm("Êtes vous sur de vouloir supprimer les eans de cette vente ?")
if (ok == true){
if ($(".chosen-select").val() != 999999) {
document.location.href=\'index.php?tab=AdminLabelGenerate&token='.Tools::getAdminTokenLite('AdminLabelGenerate').'&deleteEAN=1&id_sale=\' + $(".chosen-select").val();
}
}
});
});
</script>';