Merge branch 'ticket-flexibilite' into develop
This commit is contained in:
commit
7affaf4a41
@ -401,10 +401,10 @@ class Cart extends CartCore {
|
||||
// if ($carrier->id == 28
|
||||
// || $carrier->id == 24
|
||||
// || $carrier->id == 27)
|
||||
if ($carrier->id == 38
|
||||
|| $carrier->id == 39
|
||||
|| $carrier->id == 40
|
||||
|| $carrier->id == 41) {
|
||||
if ($carrier->id == 45
|
||||
|| $carrier->id == 46
|
||||
|| $carrier->id == 47
|
||||
|| $carrier->id == 48) {
|
||||
|
||||
if($cpt_sales == 2) {
|
||||
$shipping_cost += (float) Configuration::get('PS_SHIPPING_HANDLING_PS_1');
|
||||
@ -458,7 +458,7 @@ class Cart extends CartCore {
|
||||
// ajout du surcout
|
||||
// $socolissimo_carriers = array(45, 33, 37, 22);
|
||||
// $socolissimo_carriers = array(24, 27, 28, 22);
|
||||
$socolissimo_carriers = array(38, 39, 40, 41, 22);
|
||||
$socolissimo_carriers = array(45, 46, 47, 48, 22);
|
||||
$socolissimo_found = false;
|
||||
foreach ($_carriers as $key => $carrier_to_add) {
|
||||
if (in_array($carrier_to_add, $socolissimo_carriers) ) {
|
||||
|
Loading…
Reference in New Issue
Block a user