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

Merge branch 'ticket-flexibilite' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-05-09 18:02:50 +02:00
commit 9bc89e472a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
override/classes/Cart.php
View File

@ -398,9 +398,13 @@ class Cart extends CartCore {
// || $carrier->id == 24
// || $carrier->id == 37
// || $carrier->id == 45) {
if ($carrier->id == 28
|| $carrier->id == 24
|| $carrier->id == 27) {
// if ($carrier->id == 28
// || $carrier->id == 24
// || $carrier->id == 27)
if ($carrier->id == 38
|| $carrier->id == 39
|| $carrier->id == 40
|| $carrier->id == 41) {
if($cpt_sales == 2) {
$shipping_cost += (float) Configuration::get('PS_SHIPPING_HANDLING_PS_1');
@ -454,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);
$socolissimo_carriers = array(38, 39, 40, 41, 22);
$socolissimo_found = false;
foreach ($_carriers as $key => $carrier_to_add) {
if (in_array($carrier_to_add, $socolissimo_carriers) ) {