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

Merge branch 'ticket-eanUpgrade' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-09-20 14:49:30 +02:00
commit 430cabc449
5 changed files with 431 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
adm/tabs/AdminProducts.php
View File

@ -251,16 +251,16 @@ class AdminProducts extends AdminTab
// Position mise à 0
Db::getInstance()->Execute('
UPDATE `'._DB_PREFIX_.'category_product`
SET `position` = 0
SET `position` = 0
WHERE `id_category` = '.(int)$this->_category->id
);
if (Tools::isSubmit('reorderproduct')) {
// Récupération de tous les produits de la catégorie ordonée
// Récupération de tous les produits de la catégorie ordonée
// selon la position de la sous-catégorie puis de la position dans la sous catégorie et sinon par id_product
$first_products = Db::getInstance()->ExecuteS('
SELECT cp.*
FROM `'._DB_PREFIX_.'category_product` cp
FROM `'._DB_PREFIX_.'category_product` cp
LEFT JOIN `'._DB_PREFIX_.'category` c ON (c.id_parent = cp.id_category)
LEFT JOIN `'._DB_PREFIX_.'category_product` cp2 ON (cp2.id_category = c.id_category AND cp2.id_product=cp.id_product)
RIGHT JOIN `'._DB_PREFIX_.'product` p ON (p.id_product=cp.id_product)
@ -271,20 +271,20 @@ class AdminProducts extends AdminTab
');
$second_products = Db::getInstance()->ExecuteS('
SELECT cp.*
FROM `'._DB_PREFIX_.'category_product` cp
FROM `'._DB_PREFIX_.'category_product` cp
RIGHT JOIN `'._DB_PREFIX_.'product` p ON (p.id_product=cp.id_product)
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.id_product=p.id_product AND pl.`id_lang` = 1)
WHERE cp.id_category ='.(int)$this->_category->id.'
AND cp.id_product NOT IN
AND cp.id_product NOT IN
(
SELECT cp2.id_product
FROM `'._DB_PREFIX_.'category_product` cp2
FROM `'._DB_PREFIX_.'category_product` cp2
WHERE cp2.id_category IN
(
SELECT id_category
FROM `'._DB_PREFIX_.'category`
WHERE id_parent ='.(int)$this->_category->id.'
)
)
)
ORDER BY pl.`name`
');
@ -294,7 +294,7 @@ class AdminProducts extends AdminTab
} else {
$products = Db::getInstance()->ExecuteS('
SELECT cp.*
FROM `'._DB_PREFIX_.'category_product` cp
FROM `'._DB_PREFIX_.'category_product` cp
RIGHT JOIN `'._DB_PREFIX_.'product` p ON (p.id_product=cp.id_product)
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.id_product=p.id_product AND pl.`id_lang` = 1)
WHERE cp.id_category ='.(int)$this->_category->id.'
@ -309,7 +309,7 @@ class AdminProducts extends AdminTab
}
Db::getInstance()->Execute('
UPDATE `'._DB_PREFIX_.'category_product`
SET `position` = '. (int)($key) .'
SET `position` = '. (int)($key) .'
WHERE `id_product` = '.(int)($product['id_product']).'
AND `id_category`='.(int)$this->_category->id
);
@ -1132,7 +1132,7 @@ class AdminProducts extends AdminTab
elseif (isset($_FILES['image_product']['tmp_name']) AND $_FILES['image_product']['tmp_name'] != NULL)
$this->copySingleImage($product->id, $image->id, $_FILES['image_product'], $method);
}
if (isset($image) AND Validate::isLoadedObject($image) AND !file_exists(_PS_PROD_IMG_DIR_.$image->getExistingImgPath().'.'.$image->image_format))
$image->delete();
if (sizeof($this->_errors))
@ -1145,8 +1145,8 @@ class AdminProducts extends AdminTab
/* Adding new product images */
elseif (isset($_FILES['image_product']['name']) && is_array($_FILES['image_product']['name'])) {
// ensure there is actually any file to process
// ensure there is actually any file to process
$has_any_file = false;
foreach ($_FILES['image_product']['name'] as $value) {
$has_any_file = $has_any_file || !empty($value);
@ -1160,7 +1160,7 @@ class AdminProducts extends AdminTab
// reorganise the array into an indexed array
$images_product = [];
for ($i=sizeof($_FILES['image_product']['name']); $i>0; $i--) {
$images_product[] = [
'name' => '',
'type' => '',
@ -1173,14 +1173,14 @@ class AdminProducts extends AdminTab
foreach ($_FILES['image_product'] as $key => $array_values) {
$i=0;
$i=0;
foreach ($array_values as $value) {
$images_product[$i][$key] = $value;
$i++;
}
}
if (!Validate::isLoadedObject($product)) {
$this->_errors[] = Tools::displayError('Cannot add image because product add failed.');
}
@ -1243,8 +1243,8 @@ class AdminProducts extends AdminTab
return $success;
}
}
}
}
public function uploadImageZip($product)
@ -1368,7 +1368,7 @@ class AdminProducts extends AdminTab
@unlink($tmpName);
Module::hookExec('watermark', array('id_image' => $id_image, 'id_product' => $id_product));
}
}
}
/**
@ -1533,13 +1533,13 @@ class AdminProducts extends AdminTab
$preview_url .= 'adtoken='.$token.'&ad='.$admin_dir;
}
Tools::redirectAdmin($preview_url);
}
}
// Save and stay on same form
elseif (Tools::isSubmit('submitAdd'.$this->table.'AndStay')
OR ($id_image AND $id_image !== true))
elseif (Tools::isSubmit('submitAdd'.$this->table.'AndStay')
OR ($id_image AND $id_image !== true))
{
// Save and stay on same form
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay'))
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay'))
{
Tools::redirectAdmin($currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&conf=4&tabs='.(int)(Tools::getValue('tabs')).'&token='.($token ? $token : $this->token));
}
@ -1815,6 +1815,7 @@ class AdminProducts extends AdminTab
echo '<input type="checkbox" name="blocks[]" value="short_description"> Description courte ';
echo '<input type="checkbox" name="blocks[]" value="description"> Bon à savoir ';
echo '<input type="checkbox" name="blocks[]" value="description_more"> Les plus ';
echo '<input type="checkbox" name="blocks[]" value="description_comment"> Commentaires (braderie) ';
echo '<input type="checkbox" name="blocks[]" value="videos"> Vidéos ';
echo '<input type="checkbox" name="blocks[]" value="description_delivery"> Livraison ';
@ -3404,6 +3405,16 @@ class AdminProducts extends AdminTab
echo ' <div class="lang_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').';float: left;">
<textarea class="other_textarea" cols="100" rows="3" id="description_more_'.$language['id_lang'].'" name="description_more_'.$language['id_lang'].'">'.htmlentities(stripslashes($this->getFieldValue($obj, 'description_more', $language['id_lang'])), ENT_COMPAT, 'UTF-8').'</textarea>
</div>';
echo ' </td>
</tr>
<tr><td colspan="2" style="padding-bottom:5px;"><hr style="width:100%;" /></td></tr>
<tr>
<td class="col-left">'.$this->l('Comments :').'<br /><br /></td>
<td style="padding-bottom:5px;" class="translatable">';
foreach ($this->_languages as $language)
echo ' <div class="lang_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').';float: left;">
<textarea class="other_textarea" cols="100" rows="3" id="description_comment_'.$language['id_lang'].'" name="description_comment_'.$language['id_lang'].'">'.htmlentities(stripslashes($this->getFieldValue($obj, 'description_comment', $language['id_lang'])), ENT_COMPAT, 'UTF-8').'</textarea>
</div>';
echo ' </td>
</tr>
<tr><td colspan="2" style="padding-bottom:5px;"><hr style="width:100%;" /></td></tr>

658
modules/braderie/AdminBraderie.php
View File

@ -1,344 +1,406 @@
<?php
if(!defined('_PS_VERSION_')) {
exit;
exit;
}
class AdminBraderie extends AdminTab
{
private $_html = '';
private $error = '';
private $_html = '';
private $error = '';
public function display()
{
global $cookie;
public function display()
{
global $cookie;
$this->_html .= '<style type="text/css">
@import "'.__PS_BASE_URI__.'css/custom_admin.css";
</style>';
$this->_html .= '<style type="text/css">
@import "'.__PS_BASE_URI__.'css/custom_admin.css";
</style>';
$id_category = Tools::getValue('id_category', 1);
$id_product = Tools::getValue('id_product', false);
$id_category = Tools::getValue('id_category', 1);
$id_product = Tools::getValue('id_product', false);
$db = Db::getInstance();
/*$sql_category = '
SELECT * FROM `'._DB_PREFIX_.'privatesale` ps
LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON ps.`id_category` = cl.`id_category`
WHERE ps.`braderie` = 1
AND cl.`id_lang` = '.(int) $cookie->id_lang;*/
$sql_category = '
SELECT c.`id_category`, cl.`name` FROM `'._DB_PREFIX_.'category` c
LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON c.`id_category` = cl.`id_category`
WHERE c.`id_parent` = 1
AND cl.`id_lang` = '.(int) $cookie->id_lang.'
ORDER BY c.`id_category` DESC';
$categories = $db->ExecuteS($sql_category);
$db = Db::getInstance();
/*$sql_category = '
SELECT * FROM `'._DB_PREFIX_.'privatesale` ps
LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON ps.`id_category` = cl.`id_category`
WHERE ps.`braderie` = 1
AND cl.`id_lang` = '.(int) $cookie->id_lang;*/
$sql_category = '
SELECT c.`id_category`, cl.`name` FROM `'._DB_PREFIX_.'category` c
LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON c.`id_category` = cl.`id_category`
WHERE c.`id_parent` = 1
AND cl.`id_lang` = '.(int) $cookie->id_lang.'
ORDER BY c.`id_category` DESC';
$categories = $db->ExecuteS($sql_category);
$ids_categories = array();
foreach ($categories as $key => $category) {
$ids_categories[] = (int) $category["id_category"];
}
$ids_categories = array();
foreach ($categories as $key => $category) {
$ids_categories[] = (int) $category["id_category"];
}
$small_titles = array();
foreach (Db::getInstance()->executeS('
SELECT ex.`value`, ps.`id_category`
FROM `'._DB_PREFIX_.'privatesale_extrafield_sale` ex
LEFT JOIN `'._DB_PREFIX_.'privatesale` ps on ex.`id_sale` = ps.`id_sale`
LEFT JOIN `'._DB_PREFIX_.'category` c on c.`id_category` = ps.`id_category`
WHERE ex.`id_field` = 1
AND ex.`id_lang` = '. (int) $cookie->id_lang.'
AND c.`id_category` IN ('.implode(',', $ids_categories).')
') as $key => $data) {
$small_titles[(int) $data['id_category']] = $data['value'];
}
$small_titles = array();
foreach (Db::getInstance()->executeS('
SELECT ex.`value`, ps.`id_category`
FROM `'._DB_PREFIX_.'privatesale_extrafield_sale` ex
LEFT JOIN `'._DB_PREFIX_.'privatesale` ps on ex.`id_sale` = ps.`id_sale`
LEFT JOIN `'._DB_PREFIX_.'category` c on c.`id_category` = ps.`id_category`
WHERE ex.`id_field` = 1
AND ex.`id_lang` = '. (int) $cookie->id_lang.'
AND c.`id_category` IN ('.implode(',', $ids_categories).')
') as $key => $data) {
$small_titles[(int) $data['id_category']] = $data['value'];
}
$this->_html .= $this->_buildHtmlCategoryBlock($categories, $small_titles);
$this->_html .= $this->_buildHtmlCategoryBlock($categories, $small_titles);
$this->_html .= '<link type="text/css" rel="stylesheet" href="'._MODULE_DIR_.'bulkupdate/chosen.min.css" />';
$this->_html .= '<script type="text/javascript" src="'._MODULE_DIR_.'bulkupdate/chosen.jquery.min.js"></script>';
$this->_html .= '<script type="text/javascript">
$(function() {
$this->_html .= '<link type="text/css" rel="stylesheet" href="'._MODULE_DIR_.'bulkupdate/chosen.min.css" />';
$this->_html .= '<script type="text/javascript" src="'._MODULE_DIR_.'bulkupdate/chosen.jquery.min.js"></script>';
$this->_html .= '<script type="text/javascript">
$(function() {
$(".chosen-select").chosen(
{
allow_single_deselect:true,
placeholder_text_single : "Choisir une vente",
no_results_text : "Aucun résultat",
enable_split_word_search : true,
search_contains : true,
}
);
$(".chosen-select").chosen(
{
allow_single_deselect:true,
placeholder_text_single : "Choisir une vente",
no_results_text : "Aucun résultat",
enable_split_word_search : true,
search_contains : true,
}
);
var $token = "'.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)($cookie->id_employee)).'";
var $product_id = 0;
var $token = "'.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)($cookie->id_employee)).'";
var $product_id = 0;
$(\'#sale\').change(function() {
$.ajax({
type: \'POST\',
url: \''._MODULE_DIR_.'braderie/ajax.php?action=getCategories'.'\',
dataType: \'json\',
data: { sale: $(this).val() },
success: function(response) {
$(\'#category\').empty();
for (var i in response) {
var html = \'<option value="\'+ response[i].id_category +\'">\'+ response[i].id_category +\' - \'+ response[i].name +\'</option>\';
$(\'#category\').append(html);
}
$(".chosen-select").trigger("chosen:updated");
$("#divider, #category_input_group, #ean_input_group, #storage_input_group, #button_input_group, #show_current_category_button, #quantity_input_group").show();
$("#error").empty();
},
error: function(xhr) {
$("#ean_from_product").empty();
$("#error").empty().append(JSON.parse(xhr.responseText));
}
});
});
$(\'#sale\').change(function() {
$.ajax({
type: \'POST\',
url: \''._MODULE_DIR_.'braderie/ajax.php?action=getCategories'.'\',
dataType: \'json\',
data: { sale: $(this).val() },
success: function(response) {
$(\'#category\').empty();
for (var i in response) {
var html = \'<option value="\'+ response[i].id_category +\'">\'+ response[i].id_category +\' - \'+ response[i].name +\'</option>\';
$(\'#category\').append(html);
}
$(".chosen-select").trigger("chosen:updated");
$("#divider, #category_input_group, #ean_input_group, #storage_input_group, #button_input_group, #show_current_category_button, #quantity_input_group").show();
$("#error").empty();
},
error: function(xhr) {
$("#ean_from_product").empty();
$("#error").empty().append(JSON.parse(xhr.responseText));
}
});
});
$("#category").change(function(event) {
$("#show_current_category_button").show();
});
$("#category").change(function(event) {
$("#show_current_category_button").show();
});
$("#input_ean").change(function(event) {
$.ajax({
type: \'POST\',
url: \''._MODULE_DIR_.'braderie/ajax.php?action=getProductId'.'\',
dataType: \'json\',
data: { ean: $(this).val() },
success: function(response) {
if (response.name == null) {
$("#error").empty().append("'.$this->l('Aucun produit n\'a été trouvé. Vérifier le code EAN').'");
$("#ean_from_product").empty();
return false;
}
$("#input_ean").change(function(event) {
$.ajax({
type: \'POST\',
url: \''._MODULE_DIR_.'braderie/ajax.php?action=getProductId'.'\',
dataType: \'json\',
data: { ean: $(this).val() },
success: function(response) {
if (response.name == null) {
$("#error").empty().append("'.$this->l('Aucun produit n\'a été trouvé. Vérifier le code EAN').'");
$("#ean_from_product").empty();
return false;
}
$product_id = response.id_product;
$attibute_id = response.id_product_attribute;
if (response.id_image == null) {
image = \'\';
} else {
image = \'<img src="'._THEME_PROD_DIR_.'\'+response.img_path+\'-small.jpg" />\';
}
if (response.attribute_name) {
$("#ean_from_product").empty().append(image+"<p>"+response.name+" - "+response.attribute_name+"</p>");
} else {
$("#ean_from_product").empty().append(image+"<p>"+response.name+"</p>");
}
if ($attibute_id) {
$("#hidden_attribute_id").val($attibute_id);
} else {
$("#hidden_attribute_id").val(0);
}
$("#hidden_product_id").val($product_id);
$("#error").empty();
$("#input_storage").focus();
},
error: function(xhr) {
$("#ean_from_product").empty();
$("#error").empty().append(JSON.parse(xhr.responseText));
}
});
});
$product_id = response.id_product;
$attibute_id = response.id_product_attribute;
if (response.id_image == null) {
image = \'\';
} else {
image = \'<img src="'._THEME_PROD_DIR_.'\'+response.img_path+\'-small.jpg" />\';
}
if (response.attribute_name) {
$("#ean_from_product").empty().append(image+"<p>"+response.name+" - "+response.attribute_name+"</p>");
} else {
$("#ean_from_product").empty().append(image+"<p>"+response.name+"</p>");
}
if ($attibute_id) {
$("#hidden_attribute_id").val($attibute_id);
} else {
$("#hidden_attribute_id").val(0);
}
$("#hidden_product_id").val($product_id);
if(response.comments != null){
tinymce.activeEditor.setContent(response.comments);
} else {
tinymce.activeEditor.setContent("");
}
$("#comment_input_group").show();
$("#error").empty();
$("#input_storage").focus();
},
error: function(xhr) {
$("#ean_from_product").empty();
$("#input_comment").val("");
$("#comment_input_group").hide();
$("#error").empty().append(JSON.parse(xhr.responseText));
}
});
});
$("#check_button").click(function(event) {
$("#check_button").click(function(event) {
if ($product_id == undefined || $product_id == 0) {
$("#error").empty().append("'.$this->l('Aucun produit n\'a été trouvé. Vérifier le code EAN').'");
return false;
}
if ($product_id == undefined || $product_id == 0) {
$("#error").empty().append("'.$this->l('Aucun produit n\'a été trouvé. Vérifier le code EAN').'");
return false;
}
if ($token.length == 0) {
$("#error").empty().append("'.$this->l('Un problème de sécurité est survenu. Merci de réinitialisé la page').'");
return false;
}
if ($token.length == 0) {
$("#error").empty().append("'.$this->l('Un problème de sécurité est survenu. Merci de réinitialisé la page').'");
return false;
}
window.open("?tab=AdminCatalog&updateproduct&id_product=" + $product_id + "&token=" + $token);
return false;
});
window.open("?tab=AdminCatalog&updateproduct&id_product=" + $product_id + "&token=" + $token);
return false;
});
$("#input_storage").change(function(event) {
event.preventDefault();
if ($product_id == undefined || $product_id == 0) {
$("#error").empty().append("'.$this->l('Aucun produit n\'a été trouvé. Vérifier le code EAN').'");
return false;
}
// $("#input_comment").change(function(event) {
// $("#input_storage").focus();
// });
var emplacement = $("#input_storage").val();
$("#input_storage").change(function(event) {
event.preventDefault();
if ($product_id == undefined || $product_id == 0) {
$("#error").empty().append("'.$this->l('Aucun produit n\'a été trouvé. Vérifier le code EAN').'");
return false;
}
if (emplacement.length == 0 || emplacement>205) {
$("#error").empty().append("'.$this->l('L\'emplacement n\'est pas renseigné ou est mal renseigné').'");
return false;
}
var emplacement = $("#input_storage").val();
if ($("#input_quantity").val().length == 0) {
$("#error").empty().append("'.$this->l('La quantité n\'est pas renseignée').'");
return false;
}
if (emplacement.length == 0 || emplacement>205) {
$("#error").empty().append("'.$this->l('L\'emplacement n\'est pas renseigné ou est mal renseigné').'");
return false;
}
$("#hidden_product_id").val($product_id);
if ($("#input_quantity").val().length == 0) {
$("#error").empty().append("'.$this->l('La quantité n\'est pas renseignée').'");
return false;
}
$.ajax({
type: \'POST\',
url: \''._MODULE_DIR_.'braderie/ajax.php?action=addToSellout'.'\',
dataType: \'json\',
data: {
parent_category: $("#sale").val(),
category: $("#category").val(),
ean: $("#input_ean").val(),
storage: $("#input_storage").val(),
product: $("#hidden_product_id").val(),
quantity: $("#input_quantity").val(),
attribute: $("#hidden_attribute_id").val()
},
success: function(response) {
$("#error").empty().append(response);
$("#input_ean, #input_storage").val("");
$("#input_quantity").val(1);
$("#ean_from_product").empty();
$("#input_ean").focus();
},
error: function(xhr) {
$("#error").empty().append(JSON.parse(xhr.responseText));
}
});
return false;
});
$("#hidden_product_id").val($product_id);
$.ajax({
type: \'POST\',
url: \''._MODULE_DIR_.'braderie/ajax.php?action=addToSellout'.'\',
dataType: \'json\',
data: {
parent_category: $("#sale").val(),
category: $("#category").val(),
ean: $("#input_ean").val(),
storage: $("#input_storage").val(),
product: $("#hidden_product_id").val(),
quantity: $("#input_quantity").val(),
attribute: $("#hidden_attribute_id").val(),
comment: tinymce.activeEditor.getContent()
},
success: function(response) {
$("#error").empty().append(response);
$("#input_ean, #input_storage").val("");
$("#comment_input_group").hide();
$("#input_quantity").val(1);
$("#ean_from_product").empty();
$("#input_ean").focus();
},
error: function(xhr) {
$("#error").empty().append(JSON.parse(xhr.responseText));
}
});
return false;
});
$("#add_button").click(function(event) {
event.preventDefault();
return false;
$("#add_button").click(function(event) {
event.preventDefault();
return false;
if ($product_id == undefined || $product_id == 0) {
$("#error").empty().append("'.$this->l('Aucun produit n\'a été trouvé. Vérifier le code EAN').'");
return false;
}
if ($product_id == undefined || $product_id == 0) {
$("#error").empty().append("'.$this->l('Aucun produit n\'a été trouvé. Vérifier le code EAN').'");
return false;
}
var emplacement = $("#input_storage").val();
var emplacement = $("#input_storage").val();
if (emplacement.length == 0 || emplacement>205) {
$("#error").empty().append("'.$this->l('L\'emplacement n\'est pas renseigné ou est mal renseigné').'");
return false;
}
if (emplacement.length == 0 || emplacement>205) {
$("#error").empty().append("'.$this->l('L\'emplacement n\'est pas renseigné ou est mal renseigné').'");
return false;
}
if ($("#input_quantity").val().length == 0) {
$("#error").empty().append("'.$this->l('La quantité n\'est pas renseignée').'");
return false;
}
if ($("#input_quantity").val().length == 0) {
$("#error").empty().append("'.$this->l('La quantité n\'est pas renseignée').'");
return false;
}
$("#hidden_product_id").val($product_id);
$("#hidden_product_id").val($product_id);
$.ajax({
type: \'POST\',
url: \''._MODULE_DIR_.'braderie/ajax.php?action=addToSellout'.'\',
dataType: \'json\',
data: {
parent_category: $("#sale").val(),
category: $("#category").val(),
ean: $("#input_ean").val(),
storage: $("#input_storage").val(),
product: $("#hidden_product_id").val(),
quantity: $("#input_quantity").val(),
attribute: $("#hidden_attribute_id").val()
},
success: function(response) {
$("#error").empty().append(response);
$("#input_ean, #input_storage").val("");
$("#ean_from_product").empty();
},
error: function(xhr) {
$("#error").empty().append(JSON.parse(xhr.responseText));
}
});
return false;
});
$.ajax({
type: \'POST\',
url: \''._MODULE_DIR_.'braderie/ajax.php?action=addToSellout'.'\',
dataType: \'json\',
data: {
parent_category: $("#sale").val(),
category: $("#category").val(),
ean: $("#input_ean").val(),
storage: $("#input_storage").val(),
product: $("#hidden_product_id").val(),
quantity: $("#input_quantity").val(),
attribute: $("#hidden_attribute_id").val()
},
success: function(response) {
$("#error").empty().append(response);
$("#input_ean, #input_storage").val("");
$("#ean_from_product").empty();
},
error: function(xhr) {
$("#error").empty().append(JSON.parse(xhr.responseText));
}
});
return false;
});
$("#show_current_category_button").click(function() {
$category = $("#category").val();
if ($category.length == 0) {
$("#error").empty().append("'.$this->l('Catégorie invalide').'");
return false;
}
window.open("?tab=AdminCatalog&viewcategory&id_category=" + $category + "&token=" + $token, "_blank");
return false;
});
$("#show_current_category_button").click(function() {
$category = $("#category").val();
if ($category.length == 0) {
$("#error").empty().append("'.$this->l('Catégorie invalide').'");
return false;
}
window.open("?tab=AdminCatalog&viewcategory&id_category=" + $category + "&token=" + $token, "_blank");
return false;
});
});
</script>';
echo $this->_html;
}
});
</script>';
$iso = Language::getIsoById((int)($cookie->id_lang));
$isoTinyMCE = (file_exists(_PS_ROOT_DIR_.'/js/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en');
$ad = dirname($_SERVER["PHP_SELF"]);
$this->_html.= '
<script type="text/javascript">
var iso = \''.$isoTinyMCE.'\' ;
var pathCSS = \''._THEME_CSS_DIR_.'\' ;
var ad = \''.$ad.'\' ;
</script>
<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tinymce.inc.js"></script>
<script type="text/javascript">
// other_textarea different config
$(function() {
tinymce.init({
mode : "specific_textareas",
theme : "advanced",
skin:"cirkuit",
editor_selector : "other_textarea",
editor_deselector : "noEditor",
plugins : "safari,pagebreak,style,table,advimage,advlink,inlinepopups,media,contextmenu,paste,fullscreen,xhtmlxtras,preview",
// Theme options
theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",
theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,,|,forecolor,backcolor",
theme_advanced_buttons3 : "",
theme_advanced_buttons4 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : false,
content_css : pathCSS+"global.css",
document_base_url : ad,
width: "200",
height: "200",
font_size_style_values : "8pt, 10pt, 12pt, 14pt, 18pt, 24pt, 36pt",
elements : "nourlconvert,ajaxfilemanager",
file_browser_callback : "ajaxfilemanager",
entity_encoding: "raw",
convert_urls : false,
language : iso,
extended_valid_elements: "iframe[src,width,height,frameborder,marginwidth,marginheight],script[type,src]",
});
});
</script>';
echo $this->_html;
}
private function _buildHtmlCategoryBlock($categories, $small_titles)
{
global $cookie;
private function _buildHtmlCategoryBlock($categories, $small_titles)
{
global $cookie;
$token = Tools::getAdminToken('AdminBraderie'.(int)(Tab::getIdFromClassName('AdminBraderie')).(int)($cookie->id_employee));
$token = Tools::getAdminToken('AdminBraderie'.(int)(Tab::getIdFromClassName('AdminBraderie')).(int)($cookie->id_employee));
$html = '
<style>
.chosen-container { width: 315px !important; }
.button-container input { margin: 10px 25px; }
#ean_from_product {
background-color: rgba(86,84,133,0.7);
color:#fff;
margin-top: 5px;
}
#ean_from_product p{width: 200px;text-align: center;}
#ean_from_product p,#ean_from_product img{
display:inline-block;
vertical-align:middle;
margin: 5px;
}
#error, #ean_from_product { margin-left: 210px; width: 312px;}
#error { font-weight: bold; margin-bottom: 20px; color: #CC0000; }
</style>
<fieldset>
<legend>'.$this->l('Braderie').'</legend>';
if ($this->error) {
$html .= '<p class="margin-form" id="error">'.$this->error.'</p>';
} else {
$html .= '<p class="margin-form" id="error">'.$this->error.'</p>';
}
$html .= '<div class="margin-form">
<label>'.$this->l('Ventes').' : </label>
<select class="chosen-select" id="sale" name="sale">
<option value=""></option>';
$html = '
<style>
.chosen-container { width: 315px !important; }
.button-container input { margin: 10px 25px; }
#ean_from_product {
background-color: rgba(86,84,133,0.7);
color:#fff;
margin-top: 5px;
}
#ean_from_product p{width: 200px;text-align: center;}
#ean_from_product p,#ean_from_product img{
display:inline-block;
vertical-align:middle;
margin: 5px;
}
#error, #ean_from_product { margin-left: 205px; width: 312px;}
#error { font-weight: bold; margin-bottom: 20px; color: #CC0000; }
.margin-form {padding: 0 0 1em 10px;}
</style>
<fieldset>
<legend>'.$this->l('Braderie').'</legend>';
if ($this->error) {
$html .= '<p class="margin-form" id="error">'.$this->error.'</p>';
} else {
$html .= '<p class="margin-form" id="error">'.$this->error.'</p>';
}
$html .= '<div class="margin-form">
<label>'.$this->l('Ventes').' : </label>
<select class="chosen-select" id="sale" name="sale">
<option value=""></option>';
foreach ($categories as $key => $value) {
$html .= '<option value="'.$value['id_category'].'">'.$value['id_category'].' - '.$value['name'].(!empty($small_titles[(int)$value['id_category']])?' - '.$small_titles[(int)$value['id_category']]:'').'</option>';
}
foreach ($categories as $key => $value) {
$html .= '<option value="'.$value['id_category'].'">'.$value['id_category'].' - '.$value['name'].(!empty($small_titles[(int)$value['id_category']])?' - '.$small_titles[(int)$value['id_category']]:'').'</option>';
}
$html .= ' </select>
</div>
<hr id="divider" style="display: none;">
<div class="margin-form" id="category_input_group" style="display: none;">
<label>'.$this->l('Catégories').' : </label>
<select class="chosen-select" id="category" name="category">
<option value=""></option>
</select>
<input type="submit" class="button" id="show_current_category_button" value="'.$this->l('Voir cette catégorie').'" style="margin-left: 20px; display: none">
</div>
<form id="formBraderie" action="?tab=AdminBraderie&token='.$token.'" method="POST">
<div class="margin-form" id="ean_input_group" style="display: none;">
<label>'.$this->l('Code EAN').' : </label>
<input type="text" name="ean" id="input_ean">
<div id="ean_from_product"></div>
</div>
<div class="margin-form" id="storage_input_group" style="display: none;">
<label>'.$this->l('Emplacement').' : </label>
<input type="text" name="storage" id="input_storage">
</div>
<div class="margin-form" id="quantity_input_group" style="display: none;">
<label>'.$this->l('Quantité').' : </label>
<input type="number" name="quantity" id="input_quantity" value="1">
</div>
<div class="margin-form button-container" id="button_input_group" style="display: none;">
<input type="submit" class="button" name="adminbraderie" value="'.$this->l('Ajouter').'" style="margin-left: 200px;" id="add_button">
<input type="submit" class="button" id="check_button" value="'.$this->l('Vérifier').'">
</div>
<input type="hidden" name="product" id="hidden_product_id">
<input type="hidden" name="attribute" id="hidden_attribute_id">
</form>
</fieldset>';
return $html;
}
$html .= ' </select>
</div>
<hr id="divider" style="display: none;">
<div class="margin-form" id="category_input_group" style="display: none;">
<label>'.$this->l('Catégories').' : </label>
<select class="chosen-select" id="category" name="category">
<option value=""></option>
</select>
<input type="submit" class="button" id="show_current_category_button" value="'.$this->l('Voir cette catégorie').'" style="margin-left: 20px; display: none">
</div>
<form id="formBraderie" action="?tab=AdminBraderie&token='.$token.'" method="POST">
<div class="margin-form" id="ean_input_group" style="display: none;">
<label>'.$this->l('Code EAN').' : </label>
<input type="text" name="ean" id="input_ean">
<div id="ean_from_product"></div>
</div>
<div class="margin-form" id="comment_input_group" style="display: none;">
<label>'.$this->l('Commentaires').' : </label>
<textarea class="other_textarea" cols="49" rows="3" id="input_comment" name="input_comment"></textarea>
</div>
<div class="margin-form" id="storage_input_group" style="display: none;">
<label>'.$this->l('Emplacement').' : </label>
<input type="text" name="storage" id="input_storage">
</div>
<div class="margin-form" id="quantity_input_group" style="display: none;">
<label>'.$this->l('Quantité').' : </label>
<input type="number" name="quantity" id="input_quantity" value="1">
</div>
<div class="margin-form button-container" id="button_input_group" style="display: none;">
<input type="submit" class="button" name="adminbraderie" value="'.$this->l('Ajouter').'" style="margin-left: 200px;" id="add_button">
<input type="submit" class="button" id="check_button" value="'.$this->l('Vérifier').'">
</div>
<input type="hidden" name="product" id="hidden_product_id">
<input type="hidden" name="attribute" id="hidden_attribute_id">
</form>
</fieldset>';
return $html;
}
}

38
modules/braderie/ajax.php
View File

@ -59,7 +59,7 @@ function getProductId()
}
$result = Db::getInstance()->getRow('
SELECT p.`id_product`, p.`reference`, pl.`name`, i.`id_image`
SELECT p.`id_product`, p.`reference`, pl.`name`, pl.`description_comment` as comments, i.`id_image`
FROM `'._DB_PREFIX_.'product` p
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = p.`id_product`)
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1)
@ -71,7 +71,7 @@ function getProductId()
if (empty($result)) {
$result = Db::getInstance()->getRow('
SELECT pa.*, pl.`name`, p.`reference` as product_reference, al.`name` as attribute_name, ia.`id_image` as id_image_attribute, i.`id_image`
SELECT pa.*, pl.`name`, pl.`description_comment` as comments, p.`reference` as product_reference, al.`name` as attribute_name, ia.`id_image` as id_image_attribute, i.`id_image`
FROM `'._DB_PREFIX_.'product_attribute` pa
LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = pa.`id_product`)
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = p.`id_product`)
@ -183,6 +183,8 @@ function addToSellout()
return Tools::displayError('L\'emplacement n\'est pas valide');
}
$comment = Tools::getValue('comment', false);
//$category_name = Tools::getValue('category_name', false);
//$product_name = Tools::getValue('product_name', false);
$ean13 = Tools::getValue('ean', false);
@ -199,17 +201,6 @@ function addToSellout()
$languages = Language::getLanguages(false);
foreach ($languages as $key => $language) {
/*if(!$category_name) {
$category_name = Db::getInstance()->getRow('
SELECT cl.`name`
FROM `'._DB_PREFIX_.'category_lang` cl
LEFT JOIN `'._DB_PREFIX_.'privatesale` ps ON (ps.`id_category` = cl.`id_category`)
LEFT JOIN `'._DB_PREFIX_.'product_ps_cache` pps ON (pps.`id_sale` = ps.`id_sale`)
WHERE pps.`id_product` = '.(int)$id_product_old.'
AND cl.`id_lang` = '.(int)$language['id_lang']
);
$category_name = $category_name['name'];
}*/
// récupération de la catégorie originale (nom de la première catégorie)
$category_name = Db::getInstance()->getRow('
@ -267,6 +258,9 @@ function addToSellout()
}
$product->id_category_default = (int)$category;
if ($comment) {
$product->description_comment[2] = $comment;
}
if ($product->add()) {
if (!$id_attribute) {
@ -283,28 +277,12 @@ function addToSellout()
$product->UpdateCategories(array((int)$category,(int)$parent_category));
/*$max_position = Db::getInstance()->getValue("SELECT MAX(cp.`position`) AS max FROM `"._DB_PREFIX_."category_product` cp WHERE cp.`id_category`=" . (int)$category);
$add_category = Db::getInstance()->Execute("INSERT INTO `"._DB_PREFIX_."category_product` (`id_product`, `id_category`, `position`)
VALUES (
'". $product->id ."',
'". (int)$category ."',
'". (int)($max_position + 1 ) ."'
)");
$max_position_in_parent = Db::getInstance()->getValue("SELECT MAX(cp.`position`) AS max FROM `"._DB_PREFIX_."category_product` cp WHERE cp.`id_category`=" . (int)$parent_category);
$add_parent_category = Db::getInstance()->Execute("INSERT INTO `"._DB_PREFIX_."category_product` (`id_product`, `id_category`, `position`)
VALUES (
'". $product->id ."',
'". (int)$parent_category ."',
'". (int)($max_position_in_parent + 1 ) ."'
)");*/
if ($product->hasAttributes())
Product::updateDefaultAttribute($product->id);
Image::duplicateProductImages($id_product_old, $product->id, $combinationImages);
}
return Tools::displayError('Le produit à été mis dans la braderie');
return Tools::displayError('Le produit ajoute dans la braderie');
}
function pSQLArray($data)

40
modules/bulkupdate/AdminEditFast.php
View File

@ -8,16 +8,17 @@ class AdminEditFast extends AdminTab {
public function postProcess(){
if (Tools::isSubmit('submitEditFast')){
$products = json_decode(Tools::getValue('id_product'), 0);
$title = Tools::getValue('title');
$short_description = Tools::getValue('short_description', array());
$description = Tools::getValue('description', array());
$description_more = Tools::getValue('description_more', array());
$products = json_decode(Tools::getValue('id_product'), 0);
$title = Tools::getValue('title');
$short_description = Tools::getValue('short_description', array());
$description = Tools::getValue('description', array());
$description_more = Tools::getValue('description_more', array());
$description_comment = Tools::getValue('description_comment', array());
$description_delivery = Tools::getValue('description_delivery', array());
$videos = Tools::getValue('videos', array());
$reference = Tools::getValue('reference');
$id_lang_fast = Tools::getValue('id_lang_fast');
$nbProduct = 0;
$videos = Tools::getValue('videos', array());
$reference = Tools::getValue('reference');
$id_lang_fast = Tools::getValue('id_lang_fast');
$nbProduct = 0;
foreach ($products as $key => $product) {
if (Validate::isLoadedObject($product = new Product((int)$product))) {
@ -26,7 +27,7 @@ class AdminEditFast extends AdminTab {
// $product->name[$language['id_lang']] = $title[$product->id];
// }
// if(isset($short_description[$product->id])){
// $product->description_short[$language['id_lang']] = $short_description[$product->id];
// $product->description_short[$language['id_lang']] = $short_description[$product->id];
// }
// if(isset($description[$product->id])){
// $product->description[$language['id_lang']] = $description[$product->id];
@ -36,7 +37,7 @@ class AdminEditFast extends AdminTab {
$product->name[(int) $id_lang_fast] = $title[$product->id];
}
if (isset($short_description[$product->id])) {
$product->description_short[(int) $id_lang_fast] = $short_description[$product->id];
$product->description_short[(int) $id_lang_fast] = $short_description[$product->id];
}
if(isset($description[$product->id])){
$product->description[(int) $id_lang_fast] = $description[$product->id];
@ -44,6 +45,9 @@ class AdminEditFast extends AdminTab {
if(isset($description_more[$product->id])){
$product->description_more[(int) $id_lang_fast] = $description_more[$product->id];
}
if(isset($description_comment[$product->id])){
$product->description_comment[(int) $id_lang_fast] = $description_comment[$product->id];
}
if(isset($description_delivery[$product->id])){
$product->description_delivery[(int) $id_lang_fast] = $description_delivery[$product->id];
}
@ -57,7 +61,7 @@ class AdminEditFast extends AdminTab {
if ($product->save()) {
$nbProduct++;
} else {
$this->_html .= $product . " erreur";
$this->_html .= $product . " erreur";
}
} else {
$this->_html .= $product . " erreur";
@ -78,6 +82,7 @@ class AdminEditFast extends AdminTab {
'short_description',
'description',
'description_more',
'description_comment',
'description_delivery',
'videos'
);
@ -103,7 +108,7 @@ class AdminEditFast extends AdminTab {
$this->_html .= '<input type="submit" class="button" value="Mettre à jour" name="submitEditFast">';
$this->_html .= '</div>';
$this->_html .= '</form>';
}else{
$this->_html .= "<div class='error'>Vous devez choisir des produits dans l'onglet Catalogue</div>";
}
@ -119,7 +124,7 @@ class AdminEditFast extends AdminTab {
var pathCSS = \''._THEME_CSS_DIR_.'\' ;
var ad = \''.$ad.'\' ;
</script>
<link type="text/css" rel="stylesheet" href="'.__PS_BASE_URI__.'js/jquery/accordion/accordion.css" />
<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tiny_mce/tiny_mce.js"></script>
@ -160,6 +165,11 @@ class AdminEditFast extends AdminTab {
$form .= '<textarea name="description_more['. (int) $product->id.']" class="rte" id="" cols="10" rows="10">'.$product->description_more.'</textarea>';
$form .= '<br /><br />';
}
if (in_array('description_comment',$blocks)) {
$form .= '<label>Commentaires (braderie)</label>';
$form .= '<textarea name="description_comment['. (int) $product->id.']" class="rte" id="" cols="10" rows="10">'.$product->description_comment.'</textarea>';
$form .= '<br /><br />';
}
if (in_array('videos',$blocks)) {
$form .= '<label>Videos</label>';
$form .= '<textarea name="videos['. (int) $product->id.']" class="rte" id="" cols="10" rows="10">'.$product->videos.'</textarea>';
@ -170,7 +180,7 @@ class AdminEditFast extends AdminTab {
$form .= '<textarea name="description_delivery['. (int) $product->id.']" class="rte" id="" cols="10" rows="10">'.$product->description_delivery.'</textarea>';
$form .= '<br /><br />';
}
$form .= '</fieldset>';
$form .= '</div>';

8
override/classes/Product.php
View File

@ -1,7 +1,8 @@
<?php
class Product extends ProductCore
{
public $description_more;
public $description_more;
public $description_comment;
public $description_delivery;
public $videos;
@ -12,7 +13,7 @@ class Product extends ProductCore
'meta_description' => 'isGenericName', 'meta_keywords' => 'isGenericName',
'meta_title' => 'isGenericName', 'link_rewrite' => 'isLinkRewrite', 'name' => 'isCatalogName',
'description' => 'isString', 'description_short' => 'isString', 'available_now' => 'isGenericName', 'available_later' => 'IsGenericName',
'description_more' => 'isString','videos' => 'isString', 'description_delivery' => 'isString');
'description_more' => 'isString', 'description_comment' => 'isString', 'videos' => 'isString', 'description_delivery' => 'isString');
/**
* @Override
@ -35,6 +36,7 @@ class Product extends ProductCore
$fields[$language['id_lang']]['description'] = (isset($this->description[$language['id_lang']])) ? pSQL($this->description[$language['id_lang']], true) : '';
$fields[$language['id_lang']]['description_short'] = (isset($this->description_short[$language['id_lang']])) ? pSQL($this->description_short[$language['id_lang']], true) : '';
$fields[$language['id_lang']]['description_more'] = (isset($this->description_more[$language['id_lang']])) ? pSQL($this->description_more[$language['id_lang']], true) : '';
$fields[$language['id_lang']]['description_comment'] = (isset($this->description_comment[$language['id_lang']])) ? pSQL($this->description_comment[$language['id_lang']], true) : '';
$fields[$language['id_lang']]['videos'] = (isset($this->videos[$language['id_lang']])) ? pSQL($this->videos[$language['id_lang']], true) : '';
$fields[$language['id_lang']]['description_delivery'] = (isset($this->description_delivery[$language['id_lang']])) ? pSQL($this->description_delivery[$language['id_lang']], true) : '';
foreach ($fieldsArray as $field)
@ -69,7 +71,7 @@ class Product extends ProductCore
/**
* @Override
* Admin panel product search
*
*
* @param integer $id_lang Language id
* @param string $query Search query
* @return array Matching products