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

Merge branch 'develop' of gitlab.antadis.net:dev-antadis/chocolatdemariage into develop

Browse Source
This commit is contained in:
Nolwenn 2017-07-27 16:35:07 +02:00
commit e4646d8365
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/modules/antadisconfigurator/classes/ConfiguratorStorage.php
View File

@ -48,12 +48,13 @@ class ConfiguratorStorage extends ObjectModel
public static function getConfiguratorOptImpact($id_product)
{
$context = Context::getContext();
$id_lang = $context->language->id;
$result = Db::getInstance()->executeS('
SELECT pcoi.`id_product_configurator_opt_impact`, pcoi.`id_product_configurator_opt_group`, pcoi.`id_configurator_opt`, col.`name`, pcoi.`price`, co.`position`
FROM `'._DB_PREFIX_.'product_configurator_opt_impact` pcoi
LEFT JOIN `'._DB_PREFIX_.'configurator_opt` co ON co.`id_configurator_opt` = pcoi.`id_configurator_opt`
LEFT JOIN `'._DB_PREFIX_.'configurator_opt_lang` col
ON (col.`id_configurator_opt` = pcoi.`id_configurator_opt` AND col.`id_lang` = '.(int)$context->language->id.')
ON (col.`id_configurator_opt` = pcoi.`id_configurator_opt` AND col.`id_lang` = '.(int)$id_lang.')
WHERE pcoi.`id_product` = '.(int)$id_product.'
ORDER BY pcoi.`id_product_configurator_opt_group`, co.`position` ASC');

7
www/modules/antadisconfigurator/controllers/admin/AdminAntadisConfiguratorController.php
View File

@ -530,12 +530,7 @@ class AdminAntadisConfiguratorController extends ModuleAdminController
{
$id_product_from = Tools::getValue('id_product_from');
$id_product_to = Tools::getValue('id_product_to');
echo Tools::jsonEncode(array(
'hasError' => true,
'errors' => 'ID product cannot be null',
));
if (empty($id_product_from) || empty($id_product_to)) {
$return = array(
'hasError' => true,

3
www/modules/antadisconfigurator/views/templates/hook/displayAdminProductsExtra.tpl
View File

@ -51,7 +51,6 @@ $('form#product-configurator-opt-add').submit(function(){
{$ProductOptGroupList}
{if $OptNb == 0}
<div class="panel product-tab">
<div class="panel-heading">{l s='Copy options from product'}</div>
@ -107,7 +106,9 @@ $('#configurator_product_autocomplete_input').autocomplete('ajax_products_list.p
$('#configurator_product_autocomplete_input').val('');
});
$('a#submitCopyoptions').on('click', function(e){
e.stopPropagation();
e.preventDefault();
$(this).removeAttr('id');
$.post($(this).data('url'), {id_product_from: $('input[name=configurator_product_id]').val()}, function(data){
if (data.hasError == true) {
alert(data.errors);