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

Merge branch 'ticket-12199-PopupAddToCart' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-01-09 10:44:30 +01:00
commit f62b3b6993
3 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
override/classes/OrderMessage.php Normal file
View File

@ -0,0 +1,31 @@
<?php
/*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 7540 $
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
class OrderMessage extends OrderMessageCore
{
protected $fieldsSizeLang = array('name' => 128, 'message' => 1500);
}

20
override/controllers/ParentOrderController.php
View File

@ -185,21 +185,21 @@ class ParentOrderController extends ParentOrderControllerCore {
// distinction "at home" et "out of home"
$carriers_ah = array();
$carriers_ooh = array();
//$config_carrier_ooh = array(88,89); // prod
$config_carrier_ooh = array(47,48); // dev
$config_carrier_ooh = array(88,89); // prod
//$config_carrier_ooh = array(47,48); // dev
//$config_carrier_ooh = array(40,45); // local
foreach ($carriers as $carrier) {
//if($shipping_only_athome && $carrier['id_carrier'] != 87) { // prod
if($shipping_only_athome && $carrier['id_carrier'] != 45) { // dev
if($shipping_only_athome && $carrier['id_carrier'] != 87) { // prod
//if($shipping_only_athome && $carrier['id_carrier'] != 45) { // dev
//if($shipping_only_athome && $carrier['id_carrier'] != 38) { // local
continue;
}
// if($carrier['id_carrier'] != 87
// && isset($count_carriers[(int)$carrier['id_carrier']]) && isset($count_carriers[87])
// && $count_carriers[(int)$carrier['id_carrier']] < $count_carriers[87]) { // prod
if($carrier['id_carrier'] != 45
&& isset($count_carriers[(int)$carrier['id_carrier']]) && isset($count_carriers[45])
&& $count_carriers[(int)$carrier['id_carrier']] < $count_carriers[45]) { // dev
if($carrier['id_carrier'] != 87
&& isset($count_carriers[(int)$carrier['id_carrier']]) && isset($count_carriers[87])
&& $count_carriers[(int)$carrier['id_carrier']] < $count_carriers[87]) { // prod
// if($carrier['id_carrier'] != 45
// && isset($count_carriers[(int)$carrier['id_carrier']]) && isset($count_carriers[45])
// && $count_carriers[(int)$carrier['id_carrier']] < $count_carriers[45]) { // dev
// if($carrier['id_carrier'] != 38
// && isset($count_carriers[(int)$carrier['id_carrier']]) && isset($count_carriers[38])
// && $count_carriers[(int)$carrier['id_carrier']] < $count_carriers[38]) { //local

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

@ -399,7 +399,7 @@
display: none;
box-shadow: 2px 2px 5px 0px rgba(0, 0, 0, 0.1);
position: fixed;
top: 150px;
top: 55px;
z-index: 99999;
background: rgba(255,255,255,0.4);
width: 550px;