fix conflicts
This commit is contained in:
Marion Muszynski
commit
e016c0057a
@ -67,7 +67,7 @@ class AdminAntConfigurations extends AdminTab
|
||||
');
|
||||
HelperFormBootstrap::displaySuccess($this->l('Produits associés aux ventes depuis le produit #').$min_id_product);
|
||||
} else {
|
||||
HelperFormBootstrap::displayErrors($this->l('Pas de produit ajouté depuis 10 jours'));
|
||||
HelperFormBootstrap::displayWarning($this->l('Pas de produit ajouté depuis 10 jours'));
|
||||
}
|
||||
}
|
||||
} elseif(Tools::isSubmit('submitCategorySaleCache')) {
|
||||
@ -171,6 +171,8 @@ class AdminAntConfigurations extends AdminTab
|
||||
} else {
|
||||
HelperFormBootstrap::displayWarning($this->l('Aucun résultat trouvé'));
|
||||
}
|
||||
} elseif (Tools::isSubmit('submitExportLoyalty')){
|
||||
HelperFormBootstrap::displayWarning($this->l('Outils non disponible pour le moment !'));
|
||||
}
|
||||
}
|
||||
|
||||
@ -221,6 +223,14 @@ class AdminAntConfigurations extends AdminTab
|
||||
.control-label {
|
||||
padding: 0;
|
||||
}
|
||||
.heading-title{
|
||||
margin: 5px 0 20px;
|
||||
display: block;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
color: #504d8b;
|
||||
}
|
||||
</style>';
|
||||
|
||||
$id_sale_options = array();
|
||||
@ -247,204 +257,238 @@ class AdminAntConfigurations extends AdminTab
|
||||
$helperForm = new HelperFormBootstrap();
|
||||
$helperForm->_select2 = true;
|
||||
$helperForm->_inputMask = true;
|
||||
$form .= $helperForm->renderStyle();
|
||||
|
||||
$helperForm->_forms = array(
|
||||
array(
|
||||
'action' => $base_link,
|
||||
'title' => $this->l('Outils - Suivi bons réduction'),
|
||||
'icon' => '<span class="glyphicon glyphicon-cog"></span> ',
|
||||
'class' => 'form-horizontal',
|
||||
'class_div' => 'col-md-4',
|
||||
// 'information' => 'Petit outils d\'exports utiles pour les suivis',
|
||||
'sections' => array(
|
||||
array(
|
||||
'inputs' => array(
|
||||
array(
|
||||
'type' => 'simpleDate',
|
||||
'period' => true,
|
||||
'class-from' => 'col-md-6',
|
||||
'class-to' => 'col-md-6',
|
||||
// 'label' => 'De :',
|
||||
// 'label-to' => 'A :',
|
||||
'id' => 'date_from',
|
||||
'id-to' => 'date_to',
|
||||
'name' => 'date_from',
|
||||
'name-to' => 'date_to',
|
||||
'before' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
'before-to' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
$form .= '
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="panel">
|
||||
<h2 class="heading-title"><span class="anticon anticon-cog"></span> '.$this->l('Outils utiles').'</h2>
|
||||
<ul class="nav nav-tabs nav-justified">
|
||||
<li role="presentation" class="'.(!Tools::getIsset('tab-pan') || Tools::getValue('tab-pan') == 'categories'?'active':'').'">
|
||||
<a href="#categories" aria-controls="categories" role="tab" data-toggle="tab"><span class="text-rose anticon anticon-tree"></span> '.$this->l('Association Catégorie/vente').'</a>
|
||||
</li>
|
||||
<li role="presentation" class="'.(Tools::getIsset('tab-pan') && Tools::getValue('tab-pan') == 'products'?'active':'').'">
|
||||
<a href="#products" aria-controls="prices" role="tab" data-toggle="tab"><span class="text-rose anticon anticon-tree"></span> '.$this->l('Association Produit/vente').'</a>
|
||||
</li>
|
||||
<li role="presentation" class="'.(Tools::getIsset('tab-pan') && Tools::getValue('tab-pan') == 'discounts'?'active':'').'">
|
||||
<a href="#discounts" aria-controls="discount" role="tab" data-toggle="tab"><span class="text-rose anticon anticon-price-tags"></span> '.$this->l('Suivi bons réductions').'</a>
|
||||
</li>
|
||||
<li role="presentation" class="'.(Tools::getIsset('tab-pan') && Tools::getValue('tab-pan') == 'loyalties'?'active':'').'">
|
||||
<a href="#loyalties" aria-controls="loyalty" role="tab" data-toggle="tab"><span class="text-rose anticon anticon-star-full"></span> '.$this->l('Suivi crédits fidélités').'</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div role="tabpanel" class="tab-pane '.(!Tools::getIsset('tab-pan') || Tools::getValue('tab-pan') == 'categories'?'active':'').'" id="categories">
|
||||
<div class="panel-content">
|
||||
<h3 class="">'.$this->l('Association Catégories/Ventes').'</h3>
|
||||
<br>
|
||||
<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&tab-pan=categories" method="post" enctype="multipart/form-data">
|
||||
<div class="col-md-6 col-md-offset-3">';
|
||||
$input = $input = array(
|
||||
'type' => 'select2',
|
||||
'label' => $this->l('Vente à associer :'),
|
||||
'label-class' => 'col-md-12',
|
||||
'input-class' => 'col-md-12',
|
||||
'select-class' => 'col-md-12',
|
||||
'name' => 'id_sale',
|
||||
'options' => $id_sale_options,
|
||||
);
|
||||
$form .= $helperForm->generateInput($input).
|
||||
'</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="ln_solid"></div>
|
||||
<div class="form-group text-right">
|
||||
<button type="submit" class="btn btn-primary" name="submitCategorySaleCache">'.$this->l('Mettre à jour l\'association').'</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div role="tabpanel" class="tab-pane '.(Tools::getIsset('tab-pan') && Tools::getValue('tab-pan') == 'products'?'active':'').'" id="products">
|
||||
<div class="panel-content">
|
||||
<h3 class="">'.$this->l('Association Produit/Ventes').'</h3>
|
||||
<br>
|
||||
<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&tab-pan=products" method="post" enctype="multipart/form-data">
|
||||
<div class="col-md-6 col-md-offset-3">
|
||||
<p class="text-center">'.$this->l('Permet d\'associer les produits aux ventes lorsque le cron n\'est pas encore passé.').'</p>
|
||||
<p class="text-center">'.$this->l('Passage du cron toutes les 3h : 6h12, 9H12, 12h12 ...').'</p>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="ln_solid"></div>
|
||||
<div class="form-group text-right">
|
||||
<button type="submit" class="btn btn-primary" name="submitProductSaleCache">'.$this->l('Mettre à jour l\'association').'</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div role="tabpanel" class="tab-pane '.(Tools::getIsset('tab-pan') && Tools::getValue('tab-pan') == 'discounts'?'active':'').'" id="discounts">
|
||||
<div class="panel-content">
|
||||
<h3 class="">'.$this->l('Suivi Code Promo').'</h3>
|
||||
<br>
|
||||
<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&tab-pan=discounts" method="post" enctype="multipart/form-data">
|
||||
<div class="col-md-6 col-md-offset-3">
|
||||
<p class="text-center">'.$this->l('Export des codes promos générés et de leur utilisations.').'</p>
|
||||
<p class="text-center">'.$this->l('Préférer de courtes périodes (se base sur la date de génération du bon).').'</p>';
|
||||
$input = array(
|
||||
'type' => 'simpleDate',
|
||||
'period' => true,
|
||||
'class-from' => 'col-md-6',
|
||||
'class-to' => 'col-md-6',
|
||||
'label' => 'De :',
|
||||
'label-to' => 'A :',
|
||||
'id' => 'date_from',
|
||||
'id-to' => 'date_to',
|
||||
'name' => 'date_from',
|
||||
'name-to' => 'date_to',
|
||||
'before' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
'before-to' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
);
|
||||
$form .= $helperForm->generateInput($input).
|
||||
'</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="ln_solid"></div>
|
||||
<div class="form-group text-right">
|
||||
<button type="submit" class="btn btn-primary" name="submitExportDiscount">'.$this->l('Exporter Suivi Code promo').'</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div role="tabpanel" class="tab-pane '.(Tools::getIsset('tab-pan') && Tools::getValue('tab-pan') == 'loyalties'?'active':'').'" id="loyalties">
|
||||
<div class="panel-content">
|
||||
<h3 class="">'.$this->l('Suivi Crédit Fidélité').'</h3>
|
||||
<br>
|
||||
<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&tab-pan=loyalties" method="post" enctype="multipart/form-data">
|
||||
<div class="col-md-6 col-md-offset-3">
|
||||
<p class="text-center">'.$this->l('Choisir de préférence un plage d\'1 mois').'</p>';
|
||||
$input = array(
|
||||
'type' => 'simpleDate',
|
||||
'period' => true,
|
||||
'class-from' => 'col-md-6',
|
||||
'class-to' => 'col-md-6',
|
||||
'label' => 'De :',
|
||||
'label-to' => 'A :',
|
||||
'id' => 'date_from_2',
|
||||
'id-to' => 'date_to_2',
|
||||
'name' => 'date_from',
|
||||
'name-to' => 'date_to',
|
||||
'before' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
'before-to' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
);
|
||||
$form .= $helperForm->generateInput($input).
|
||||
'</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="ln_solid"></div>
|
||||
<div class="form-group text-right">
|
||||
<button type="submit" class="btn btn-primary" name="submitExportLoyalty">'.$this->l('Exporter Crédits fidélités').'</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
|
||||
if($cookie->id_employee == 1) {
|
||||
$nb_credits = $this->getNbOrderToUpdate();
|
||||
$helperForm->_forms = array(
|
||||
array(
|
||||
'action' => $base_link,
|
||||
'title' => $this->l('Section Antadis'),
|
||||
'class' => 'form-horizontal',
|
||||
'class_div' => 'col-md-12',
|
||||
'sections' => array(
|
||||
array(
|
||||
'class' => 'col-md-6',
|
||||
'title' => $this->l('Actions diverses'),
|
||||
'inputs' => array(
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-default',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'name' => 'submitUpdateLoyaltyOrders',
|
||||
'label' => $this->l('Credit fidélité ').($nb_credits>0?'('.$nb_credits.')':'').' : ',
|
||||
'value' => $this->l('Mettre à jour'),
|
||||
),
|
||||
array(
|
||||
'type' => 'simpleText',
|
||||
'name' => 'carrier_dropshipping',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'label' => $this->l('Transporteur Dropshipping :'),
|
||||
'default' => Configuration::get('ANT_CARRIER_DROP')
|
||||
),
|
||||
array(
|
||||
'type' => 'simpleText',
|
||||
'name' => 'carrier_domicile',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'label' => $this->l('Transporteur domicile :'),
|
||||
'default' => Configuration::get('ANT_CARRIER_DOM')
|
||||
),
|
||||
array(
|
||||
'type' => 'simpleText',
|
||||
'name' => 'carriers_socol',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'label' => $this->l('Transporteur socol :'),
|
||||
'default' => Configuration::get('ANT_CARRIERS_SOCOL')
|
||||
),
|
||||
array(
|
||||
'type' => 'simpleText',
|
||||
'name' => 'carriers_ooh',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'label' => $this->l('Transporteur OOH :'),
|
||||
'default' => Configuration::get('ANT_CARRIERS_OOH')
|
||||
),
|
||||
),
|
||||
),
|
||||
'actions' => array(
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-primary',
|
||||
'name' => 'submitExportDiscount',
|
||||
'value' => $this->l('Exporter Suivi Code promo'),
|
||||
array(
|
||||
'class' => 'col-md-6',
|
||||
'title' => $this->l('Mettre à jour PS Cache'),
|
||||
'inputs' => array(
|
||||
array(
|
||||
'label' => $this->l('PS Cache : '),
|
||||
'type' => 'select2',
|
||||
'class-select' => '',
|
||||
'name' => 'id_category',
|
||||
'options' => $id_category_options,
|
||||
),
|
||||
),
|
||||
),
|
||||
'actions-class' => 'text-right',
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
$helperForm->_forms[] = array(
|
||||
'action' => $base_link,
|
||||
'title' => $this->l('Association Produits'),
|
||||
'icon' => '<span class="glyphicon glyphicon-refresh"></span> ',
|
||||
'class' => 'form-horizontal',
|
||||
'class_div' => 'col-md-3',
|
||||
'information' => 'Permet d\'associer les produits aux ventes lorsque le cron n\'est pas encore passé',
|
||||
'sections' => array(
|
||||
array(
|
||||
'inputs' => array(
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-primary',
|
||||
'name' => 'submitProductSaleCache',
|
||||
'value' => $this->l('Mettre à jour l\'association'),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
$helperForm->_forms[] = array(
|
||||
'action' => $base_link,
|
||||
'title' => $this->l('Association categories/ventes'),
|
||||
'icon' => '<span class="glyphicon glyphicon-cog"></span> ',
|
||||
'class' => 'form-horizontal',
|
||||
'class_div' => 'col-md-5',
|
||||
'sections' => array(
|
||||
array(
|
||||
'inputs' => array(
|
||||
array(
|
||||
'type' => 'select2',
|
||||
'class-select' => '',
|
||||
'name' => 'id_sale',
|
||||
'options' => $id_sale_options,
|
||||
'actions' => array(
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-default',
|
||||
'name' => 'submitShowProductCacheSale',
|
||||
'value' => $this->l('Voir'),
|
||||
),
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-primary',
|
||||
'name' => 'submitUpdateCacheSale',
|
||||
'value' => $this->l('Ré-Associer'),
|
||||
),
|
||||
),
|
||||
'actions-class' => 'text-right',
|
||||
),
|
||||
),
|
||||
'actions' => array(
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-primary',
|
||||
'name' => 'submitCategorySaleCache',
|
||||
'value' => $this->l('Associer')
|
||||
'name' => 'submitUpdateConfigurations',
|
||||
'value' => $this->l('Mettre à jour les configurations')
|
||||
)
|
||||
),
|
||||
'actions-class' => 'text-right',
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
if($cookie->id_employee == 1) {
|
||||
$nb_credits = $this->getNbOrderToUpdate();
|
||||
$helperForm->_forms[] = array(
|
||||
'action' => $base_link,
|
||||
'title' => $this->l('Section Antadis'),
|
||||
'class' => 'form-horizontal',
|
||||
'class_div' => 'col-md-12',
|
||||
'sections' => array(
|
||||
array(
|
||||
'class' => 'col-md-6',
|
||||
'title' => $this->l('Actions diverses'),
|
||||
'inputs' => array(
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-default',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'name' => 'submitUpdateLoyaltyOrders',
|
||||
'label' => $this->l('Credit fidélité ').($nb_credits>0?'('.$nb_credits.')':'').' : ',
|
||||
'value' => $this->l('Mettre à jour'),
|
||||
),
|
||||
array(
|
||||
'type' => 'simpleText',
|
||||
'name' => 'carrier_dropshipping',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'label' => $this->l('Transporteur Dropshipping :'),
|
||||
'default' => Configuration::get('ANT_CARRIER_DROP')
|
||||
),
|
||||
array(
|
||||
'type' => 'simpleText',
|
||||
'name' => 'carrier_domicile',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'label' => $this->l('Transporteur domicile :'),
|
||||
'default' => Configuration::get('ANT_CARRIER_DOM')
|
||||
),
|
||||
array(
|
||||
'type' => 'simpleText',
|
||||
'name' => 'carriers_socol',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'label' => $this->l('Transporteur socol :'),
|
||||
'default' => Configuration::get('ANT_CARRIERS_SOCOL')
|
||||
),
|
||||
array(
|
||||
'type' => 'simpleText',
|
||||
'name' => 'carriers_mr',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'label' => $this->l('Transporteur MR :'),
|
||||
'default' => Configuration::get('ANT_CARRIERS_MR')
|
||||
),
|
||||
array(
|
||||
'type' => 'simpleText',
|
||||
'name' => 'carriers_ooh',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'label' => $this->l('Transporteur OOH :'),
|
||||
'default' => Configuration::get('ANT_CARRIERS_OOH')
|
||||
),
|
||||
array(
|
||||
'type' => 'simpleText',
|
||||
'name' => 'carriers_special',
|
||||
'label-class' => 'col-md-6',
|
||||
'input-class' => 'col-md-4',
|
||||
'label' => $this->l('Transporteur speciaux :'),
|
||||
'default' => Configuration::get('ANT_CARRIERS_SPECIAL')
|
||||
),
|
||||
),
|
||||
),
|
||||
array(
|
||||
'class' => 'col-md-6',
|
||||
'title' => $this->l('Mettre à jour PS Cache'),
|
||||
'inputs' => array(
|
||||
array(
|
||||
'label' => $this->l('PS Cache : '),
|
||||
'type' => 'select2',
|
||||
'class-select' => '',
|
||||
'name' => 'id_category',
|
||||
'options' => $id_category_options,
|
||||
),
|
||||
),
|
||||
'actions' => array(
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-default',
|
||||
'name' => 'submitShowProductCacheSale',
|
||||
'value' => $this->l('Voir'),
|
||||
),
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-primary',
|
||||
'name' => 'submitUpdateCacheSale',
|
||||
'value' => $this->l('Ré-Associer'),
|
||||
),
|
||||
),
|
||||
'actions-class' => 'text-right',
|
||||
),
|
||||
),
|
||||
'actions' => array(
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-primary',
|
||||
'name' => 'submitUpdateConfigurations',
|
||||
'value' => $this->l('Mettre à jour les configurations')
|
||||
)
|
||||
),
|
||||
'actions-class' => 'text-center',
|
||||
'actions-class' => 'text-center',
|
||||
)
|
||||
);
|
||||
}
|
||||
$helperForm->_js .= '
|
||||
@ -452,9 +496,12 @@ class AdminAntConfigurations extends AdminTab
|
||||
$(document).ready(function() {
|
||||
$("#date_from").inputmask("9999-99-99");
|
||||
$("#date_to").inputmask("9999-99-99");
|
||||
$("#date_from_2").inputmask("9999-99-99");
|
||||
$("#date_to_2").inputmask("9999-99-99");
|
||||
|
||||
$("#id_sale").parent().children(".select2-container").css(\'width\',\'449px\');
|
||||
});
|
||||
</script>';
|
||||
$form .= $helperForm->renderStyle();
|
||||
$form .= '<div class="clearfix"></div><div class="row">'.$helperForm->renderForm(false, NULL, NULL, true).'</div>';
|
||||
$form .= $helperForm->renderScript();
|
||||
|
||||
|
||||
@ -70,7 +70,7 @@ function generateDiscount($id_customer)
|
||||
$discount->behavior_not_exhausted = 1;
|
||||
$discount->cumulable = 0;
|
||||
$discount->cumulable_reduction = 1;
|
||||
$discount->minimal = 10;
|
||||
$discount->minimal = 50;
|
||||
$discount->include_tax = 1;
|
||||
$discount->cart_display = 0;
|
||||
$discount->active = 1;
|
||||
@ -99,7 +99,7 @@ function generateDiscount($id_customer)
|
||||
}
|
||||
|
||||
$discount->id_currency = 1;
|
||||
$discount->value = 50;
|
||||
$discount->value = 10;
|
||||
|
||||
if($discount->add(true, false, array(1)) ) {
|
||||
return $discount;
|
||||
|
||||
@ -40,7 +40,8 @@ class AdminBulkUpdate extends AdminTab {
|
||||
INSERT INTO `'._DB_PREFIX_.'product_customs` VALUES (
|
||||
'.(int) $line[0].',
|
||||
"'.pSQL($line[1]).'",
|
||||
"'.pSQL($line[2]).'"
|
||||
"'.pSQL($line[2]).'",
|
||||
0
|
||||
)
|
||||
');
|
||||
}
|
||||
|
||||
@ -3052,7 +3052,7 @@ div.addresses ul.address li.address_title {
|
||||
top: -37px;
|
||||
width: 257px;
|
||||
display: none;
|
||||
z-index: 2;
|
||||
z-index: 3;
|
||||
}
|
||||
#product .info_coeur p{
|
||||
color: #666666;
|
||||
@ -7231,6 +7231,30 @@ table#carrierTable tbody td {
|
||||
z-index: 2;
|
||||
border-top: 0;
|
||||
}
|
||||
#category .info_random {
|
||||
background: #fff;
|
||||
height: auto!important;
|
||||
padding: 10px!important;
|
||||
left: 300px;
|
||||
width: 150px;
|
||||
position: absolute;
|
||||
top: 115px;
|
||||
display: none;
|
||||
z-index: 3;
|
||||
border-radius: 4px;
|
||||
-webkit-filter:drop-shadow(rgba(0, 0, 0, 0.3) 0 2px 10px);
|
||||
filter: drop-shadow(rgba(0, 0, 0, 0.3) 0 2px 10px);
|
||||
}
|
||||
#category .info_random:before{
|
||||
content: '';
|
||||
left: -10px;
|
||||
top: 20px;
|
||||
position: absolute;
|
||||
border-top: 15px solid transparent;
|
||||
border-bottom: 15px solid transparent;
|
||||
border-right: 15px solid #fff;
|
||||
}
|
||||
|
||||
#product .random{
|
||||
left: 370px;
|
||||
position: absolute;
|
||||
@ -7241,13 +7265,25 @@ table#carrierTable tbody td {
|
||||
height: 50px;
|
||||
}
|
||||
#product .info_random {
|
||||
background: url(../img/bg_coup_coeur.png) no-repeat;
|
||||
height: 143px;
|
||||
left: 410px;
|
||||
padding: 30px 45px;
|
||||
background: #fff;
|
||||
height: auto;
|
||||
padding: 10px;
|
||||
left: 412px;
|
||||
width: 150px;
|
||||
position: absolute;
|
||||
top: -10px;
|
||||
width: 257px;
|
||||
top: 45px;
|
||||
display: none;
|
||||
z-index: 2;
|
||||
z-index: 3;
|
||||
border-radius: 4px;
|
||||
-webkit-filter:drop-shadow(rgba(0, 0, 0, 0.3) 0 2px 10px);
|
||||
filter: drop-shadow(rgba(0, 0, 0, 0.3) 0 2px 10px);
|
||||
}
|
||||
#product .info_random:before{
|
||||
content: '';
|
||||
left: -10px;
|
||||
top: 20px;
|
||||
position: absolute;
|
||||
border-top: 15px solid transparent;
|
||||
border-bottom: 15px solid transparent;
|
||||
border-right: 15px solid #fff;
|
||||
}
|
||||
|
||||
@ -5,6 +5,14 @@ $(document).ready(function() {
|
||||
var endreached = false;
|
||||
var filter = new Array();
|
||||
|
||||
$('.random').each(function(){
|
||||
$(this).hover(function() {
|
||||
$(this).parent().children('.info_random').stop(true, true).fadeIn();
|
||||
}, function(){
|
||||
$(this).parent().children('.info_random').stop(true, true).fadeOut();
|
||||
});
|
||||
});
|
||||
|
||||
$(window).scroll(function() {
|
||||
if(!endreached && !error) {
|
||||
if((($(window).scrollTop() + $(window).height()) + 550) >= $(document).height()) {
|
||||
@ -26,7 +34,7 @@ $(document).ready(function() {
|
||||
animation: "slide",
|
||||
controlNav: false,
|
||||
slideshow: false,
|
||||
itemWidth: 300,
|
||||
itemWidth: 300,
|
||||
pauseOnHover : false,
|
||||
mousewheel: false,
|
||||
});
|
||||
@ -48,14 +56,14 @@ $(document).ready(function() {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
$(".block_filter :checkbox").change(function(){
|
||||
if(loading == false) {
|
||||
filter.length = 0;
|
||||
$(".block_filter input:checkbox[name=size]:checked").each(function(){
|
||||
filter.push($(this).val());
|
||||
});
|
||||
$("#product_list").val(0);
|
||||
$("#product_list").val(0);
|
||||
|
||||
loading = true;
|
||||
$.get("{/literal}{$base_dir_ssl}{literal}modules/categoryscroll/ajax.php?c={/literal}{$id_category}{literal}&init=1&f="+ filter +"&p=1", function(loaded) {
|
||||
@ -69,7 +77,7 @@ $(document).ready(function() {
|
||||
animation: "slide",
|
||||
controlNav: false,
|
||||
slideshow: false,
|
||||
itemWidth: 300,
|
||||
itemWidth: 300,
|
||||
pauseOnHover : false,
|
||||
mousewheel: false,
|
||||
});
|
||||
@ -87,7 +95,7 @@ $(document).ready(function() {
|
||||
loading = false;
|
||||
$("#product_list").trigger('updated');
|
||||
});
|
||||
}
|
||||
}
|
||||
// $.scrollTo('#product_list', 400);
|
||||
});
|
||||
|
||||
|
||||
@ -10,6 +10,9 @@
|
||||
<div class="random">
|
||||
<img src="{$img_dir}random.png" alt="{l s='Random'}">
|
||||
</div>
|
||||
<div class="info_random">
|
||||
<p>{l s='Bébé Boutik vous propose ce produit de façon aléatoire !'}</p>
|
||||
</div>
|
||||
{/if}
|
||||
<h3>{if isset($product.new) && $product.new == 1}<span class="new">{l s='New' mod='categoryscroll'}</span>{/if}<a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:64:'...'|escape:'htmlall':'UTF-8'}</a></h3>
|
||||
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
|
||||
|
||||
@ -39,6 +39,9 @@
|
||||
<div class="random">
|
||||
<img src="{$img_dir}random.png" alt="{l s='Random'}">
|
||||
</div>
|
||||
<div class="info_random">
|
||||
<p>{l s='Bébé Boutik vous propose ce produit de façon aléatoire !'}</p>
|
||||
</div>
|
||||
{/if}
|
||||
<h3>{if isset($product.new) && $product.new == 1}<span class="new">{l s='New'}</span>{/if}<a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:64:'...'|escape:'htmlall':'UTF-8'}</a></h3>
|
||||
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.av3ailable_for_order) && $product.available_for_order)))}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user