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

Merge branch 'ticket-10393-guide-achat' into develop

Browse Source 
Conflicts:
	themes/site/css/style.css
This commit is contained in:
Michael RICOIS 2017-11-28 14:23:37 +01:00
commit 352a26f0ef
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/purchaseguide/purchaseguide.php
View File

@ -284,16 +284,22 @@ class PurchaseGuide extends Module
$id_category = $postModel->id_guide_category;
}
// Get selected categories
$model = new GuideCategory($id_category);
if ($model->id_parent === 0) {
$id_main_category = $id_category;
$id_child_category = 0;
} else {
$mainCategory = $model->getCategoryLang($model->id_parent, $cookie->id_lang);
$id_main_category = $mainCategory['id_guide_category'];
$id_child_category = $id_category;
}
if($id_category == 0) {
$model = new GuideCategory();
$id_main_category = $id_child_category = 0;
}
else {
// Get selected categories
$model = new GuideCategory($id_category);
if ($model->id_parent == 0) {
$id_main_category = $id_category;
$id_child_category = 0;
} else {
$mainCategory = $model->getCategoryLang($model->id_parent, $cookie->id_lang);
$id_main_category = $mainCategory['id_guide_category'];
$id_child_category = $id_category;
}
}
$tree = $model->getTree($cookie->id_lang, $isEmployee);
$smarty->assign(array(

22
themes/site/css/style.css
View File

@ -1863,7 +1863,7 @@ body#page-404 .footer_links {
/** SUBMENU **/
.container_submenu {
border-top: 4px solid #70bc2c;
height: 380px;
height: 400px;
left: 0;
position: absolute;
overflow: hidden;
@ -7576,7 +7576,6 @@ div.addresses ul.address.item {
.ant_support {
padding:0px!important;
}
#sensefuel {
display: inline-block;
vertical-align: top;
@ -7623,8 +7622,23 @@ div.addresses ul.address.item {
height: 30px;
width: 100%;
}
.container_submenu .content_footer {
display: block;
width: 100%;
margin: 0 auto;
position: absolute;
bottom: 0;
background-color: #fff;
padding:15px 0;
color: #666666;
font-size: 14px;
font-weight: bold;
}
.container_submenu .content_footer a,
.container_submenu .content_footer a:hover,
.container_submenu .content_footer a:visited {
color: #ec15ac;
}
.block-guide {
margin-bottom: 20px;
background: #f6f6f6;