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

Merge branch 'ticket-simplemulti_front' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-06-29 09:59:37 +02:00
commit 7fa45bf40f
3 changed files with 95 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
override/controllers/CartController.php
View File

@ -101,7 +101,6 @@ class CartController extends CartControllerCore
die('{"hasError" : true, "popup_error_cart": true, "errors" : ["'.Tools::displayError('Sorry your cart already contains products from a sale shipped within a special period. To continue, please confirm your order or empty your cart.', false).'"]}');
} else {
$this->errors[] = Tools::displayError('Sorry your cart already contains products from a sale shipped within a special period. To continue, please confirm your order or empty your cart.', false);
/*$smarty->assign("popup_error_cart",1);*/
}
} elseif ($current_sale['delivery_delay'] == 1 && $adding_sale['delivery_delay'] != 1) {
// Product in cart comes from classic delivery sale - only products from classic delivery sale can be added
@ -109,7 +108,6 @@ class CartController extends CartControllerCore
die('{"hasError" : true, "popup_error_cart": true, "errors" : ["'.Tools::displayError('Sorry your cart already contains products from a sale shipped within 3 weeks. To continue, please confirm your order or empty your cart.', false).'"]}');
} else {
$this->errors[] = Tools::displayError('Sorry your cart already contains products from a sale shipped within 3 weeks. To continue, please confirm your order or empty your cart.', false);
/*$smarty->assign("popup_error_cart",1);*/
}
}
}

77
themes/site_mobile/css/style.css
View File

@ -4817,3 +4817,80 @@ body#product .flex-control-nav.flex-control-paging{
body#product #best-sellers_block_product{
display: none;
}
#box_error_cart{
display: none;
box-shadow: 2px 2px 5px 0px rgba(0, 0, 0, 0.1);
position: fixed;
top: 50px;
z-index: 99999;
background: rgba(255,255,255,0.4);
width: 300px;
left: 50%;
margin: 0 auto;
margin-left: -150px;
padding: 20px;
}
#box_error_cart .close{
position: absolute;
right: 26px;
top: 26px;
cursor: pointer;
}
#box_error_cart .content{
background: #fff;
padding: 15px;
}
#box_error_cart .content_best_sales h3,
#box_error_cart .content h3{
color:#54508b;
padding-right: 20px;
font-size: 12px;
padding-bottom: 10px;
border-bottom: 4px double #ccc;
font-family: Georgia;
}
#box_error_cart .content .product_box{
float: left;
font-family: Tahoma;
width: 100%;
}
#box_error_cart .content .product_box #box_error_cart_text{
text-align:center;
margin-bottom: 15px;
}
#box_error_cart .content .others_links{
border-top: 1px solid #ccc;
padding-top: 15px;
clear: both;
overflow: hidden;
}
#box_error_cart .content .others_links .show_sales{
color: #FFF;
margin: 0px auto;
padding: 7px 20px 6px;
background:#B5B1B1;
border-radius: 20px;
text-decoration: none;
clear: both;
display: block;
text-align: center;
margin-bottom: 15px;
}
#box_error_cart .content .others_links .show_cart{
color: #FFF;
margin: 0px;
padding: 7px 20px 6px 20px;
background: url("../img/cart.png") no-repeat left 12px center #e36ea2;
text-align: center;
border-radius: 20px;
text-decoration: none;
display: block;
background-size: 10%;
clear: both;
margin-bottom: 15px;
}
#box_error_cart .content .others_links .show_cart:hover {
background: url("../img/cart.png") no-repeat left 12px center #504D8B;
background-size: 10%;
}

18
themes/site_mobile/product-add_to_cart.tpl
View File

@ -32,4 +32,22 @@
<h3>{l s='Nos meilleures ventes'}</h3>
{$bestSaleCart}
</div>
</div>
<div id="box_error_cart">
<div class="content">
<h3>{l s='Warning'}</h3>
<div class="close" id="close_error_cart">
<img src="{$img_dir}close.jpg" alt="{l s='Fermer'}">
</div>
<div class="product_box">
<p id='box_error_cart_text'></p>
</div>
<div class="others_links">
<a class="show_cart" href="{$link->getPageLink('order.php')}">{l s='Valider mon panier'}</a>
<a class="show_sales" id="remove_cart" href="#" onclick="removeAllCart();">{l s='Vider mon panier'}</a>
<a class="show_sales" href="{$link->getPageLink('index.php')}">{l s='Retourner à la vente'}</a>
</div>
</div>
</div>