Index: www-lp/www/shopping_cart.php =================================================================== diff -u -r4 -r45 --- www-lp/www/shopping_cart.php (.../shopping_cart.php) (revision 4) +++ www-lp/www/shopping_cart.php (.../shopping_cart.php) (revision 45) @@ -435,24 +435,37 @@ ); // ([5])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END + // = new UserManager($is_partner); + if (tep_session_is_registered('customer_id') == true){ + if ($um->is_partner() OR $um->is_pro()) { + $pageShoppingCart__referencers['cssClassOfPriceBox'] = '--pleaseAdaptForProOrPartnerCustomer'; + // ([4])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::BEGIN + if ($um->is_partner()) { + $pageShoppingCart__referencers['customerProfile'] = 'Partenaire'; + } + else if ($um->is_pro()) { + $pageShoppingCart__referencers['customerProfile'] = 'Professionnel'; + } + // ([4])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END + } else { + $pageShoppingCart__referencers['cssClassOfPriceBox'] = '--pleaseAdaptForProOrPartnerCustomer'; + } + } + // ([37])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::BEGIN - if (tep_session_is_registered('customer_id')) { - if ($is_partner == true OR is_pro_customer() == true) { + if ($um->is_partner() OR $um->is_pro()) { $pageShoppingCart__referencers['cssClassOfPriceBox'] = '--pleaseAdaptForProOrPartnerCustomer'; // ([4])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::BEGIN - if ($is_partner == true) { + if ($um->is_partner()) { $pageShoppingCart__referencers['customerProfile'] = 'Partenaire'; } - else if (is_pro_customer() == true) { + else if ($um->is_pro()) { $pageShoppingCart__referencers['customerProfile'] = 'Professionnel'; } // ([4])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END } else { $pageShoppingCart__referencers['cssClassOfPriceBox'] = '--pleaseAdaptForStandardOrVisitorCustomer'; } - } else { - $pageShoppingCart__referencers['cssClassOfPriceBox'] = '--pleaseAdaptForStandardOrVisitorCustomer'; - } // ([37])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END // ([6])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::BEGIN @@ -567,19 +580,19 @@ if ($pf->hasQuantityPrice()) { - if ($is_partner == true) { + if ($um->is_partner()) { // ([23])-->BEGIN[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END $pageShoppingCart__referencers['productPrices'] = $pf->getPricePartnerVersion2(); // ([22])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::BEGIN - } elseif (is_pro_customer() == true) { + } elseif ($um->is_pro()) { // ([23])-->BEGIN[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END $pageShoppingCart__referencers['productPrices'] = $pf->getPriceStringVersion2('productPriceInBox', 'right', 'Standard', 'Non!'); // ([22])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END } else { // ([23])-->BEGIN[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END - $pageShoppingCart__referencers['productPrices'] = $pf->getPriceStringVersion2('productPriceInBox', 'right', 'Standard', 'Oui!'); + $pageShoppingCart__referencers['productPrices'] = $pf->getPriceStringVersion2('productPriceInBox', 'right', 'Standard', 'Non!'); // Oui! } } // ([24])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::BEGIN @@ -603,7 +616,7 @@ } else { // ([8])-->BEGIN[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END // > [start]{"si le client n'est pas un partenaire mais est un client pro, on affiche en HT"} - if ($is_partner != true AND is_pro_customer() == true) { + if (!$um->is_partner() AND $um->is_pro()) { // si il y a des soucis avec le getPriceStringVersion2() ci-dessous, changer en getPriceString() $pageShoppingCart__referencers['productPrices'] = $pf->getPriceStringVersion2(); $pageShoppingCart__referencers['productPrices'] = str_replace( @@ -627,7 +640,7 @@ // < [stop]{"si le client n'est pas un partenaire mais est un client pro, on affiche en HT"} } // > [start]{"si le client est un client partenaire, on affiche en HT"} - else if ($is_partner == true) { + else if ($um->is_partner()) { // si il y a des soucis avec le getPricePartnerVersion2() ci-dessous, changer en getPricePartner() $pageShoppingCart__referencers['productPrices'] = $pf->getPricePartnerVersion2(); // ([8])-->BEGIN[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END @@ -712,8 +725,8 @@ // ([38])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::BEGIN // [VALORIZE_INDEX_TO_HACK_PRICE_IN_TTC_UNIT_PRICE] if (!preg_match('/(?:icon\: tag)/', $pageShoppingCart__referencers['productPrices']) - AND is_pro_customer() == false - AND $is_partner == false) { + AND !$um->is_pro() + AND !$um->is_partner()) { $pageShoppingCart__referencers['visitorOrTTC_hack_ProductPrices'] = $currencies->afficher_prix_ttc($pf->thePrice, tep_get_tax_rate($pf->taxClass)); $pageShoppingCart__referencers['visitorOrTTC_hack_ProductPrices'] = str_replace( 'EUR', @@ -830,7 +843,7 @@ -if ($is_partner ==1) { // gestion partenaire is_partner +if ($um->is_partner()) { // gestion partenaire is_partner $partner_price_precal = $products[$i]['cost']*$coeff_partner; $products[$i]['final_price'] = min($partner_price_precal, $products[$i]['final_price'],$pf->lowPrice);