Index: www-lp/www/design/ResponsiveOverrides/si_css-ro-_mainMediaQueriesForScreens.css =================================================================== diff -u -r36 -r37 --- www-lp/www/design/ResponsiveOverrides/si_css-ro-_mainMediaQueriesForScreens.css (.../si_css-ro-_mainMediaQueriesForScreens.css) (revision 36) +++ www-lp/www/design/ResponsiveOverrides/si_css-ro-_mainMediaQueriesForScreens.css (.../si_css-ro-_mainMediaQueriesForScreens.css) (revision 37) @@ -23,6 +23,7 @@ * *********************************************************************************************************************************/ @media screen and (max-width: 320px) { + body.isResponsive--Main table.headerNavigation tr.size-rectangle-sales{display:none !important} body.isResponsive--Main table, body.isResponsive--Main tbody, body.isResponsive--Main tr, @@ -804,6 +805,7 @@ * *********************************************************************************************************************************/ @media screen and (min-width: 321px) and (max-width: 360px) { + body.isResponsive--Main table.headerNavigation tr.size-rectangle-sales{display:none !important} body.isResponsive--Main table, body.isResponsive--Main tbody, body.isResponsive--Main tr, @@ -1571,6 +1573,7 @@ * *********************************************************************************************************************************/ @media screen and (min-width: 361px) and (max-width: 640px) { + body.isResponsive--Main table.headerNavigation tr.size-rectangle-sales{display:none !important} body.isResponsive--Main table, body.isResponsive--Main tbody, body.isResponsive--Main tr, @@ -3232,7 +3235,8 @@ * *********************************************************************************************************************************/ @media screen and (min-width: 941px) and (max-width: 1540px) { -/* is-for-responsive-newDesign2022SecondIterationOfTheWelcomeText */ + body.isResponsive--Main table.--siteMainTableIndex td.padding-sales{padding-top:100px;} /* hidden the slogan sales for this mediaqueries */ + body.isResponsive--Main section.secondIterationOfTheWelcomeTextContainer p.salesText{visibility: hidden;} /* hidden the slogan sales text for this mediaqueries */ body.isResponsive--Main section.secondIterationOfTheWelcomeTextContainer { padding-top: 12.5em !important; margin-bottom: 2px !important; /*text-align: left !important; padding-left: 10em !important;*/ } body.isResponsive--Main section.secondIterationOfTheWelcomeTextContainer span.secondIterationOfTheWelcomeTextSlogan { /*font-size: 2.90vw !important;*/font-size: 2vw !important; } body.isResponsive--Main section.menu2019 .cd-accordion.itemElementsInMenu div.hasThatCategoryName { font-size: 1.7em !important; } @@ -3313,6 +3317,7 @@ * *********************************************************************************************************************************/ @media screen and (min-width: 1540px) { + body.isResponsive--Main section.secondIterationOfTheWelcomeTextContainer p.salesText{visibility: hidden;} /* hidden the slogan sales for this mediaqueries /* is-for-responsive-newDesign2022BeforeMainContentPagerTable */ body.isResponsive--Main div.subHeaderBeforePagerTable { display: block !important; } /* is-for-responsive-newDesign2022SecondIterationOfTheWelcomeText */ @@ -3365,6 +3370,7 @@ /*--topPageContent{background:blueviolet !important;}*/ /* is-again-for-to-verify */ /* body.isResponsive--Main section.isFragment--vtabFragmentBreadcrumbarOrderSteps{padding:25px !important;}*/ + body.isResponsive--Main.isPage--Index div.--topPageContent{ padding-top:50px; } /* body.isResponsive--Main.isPage--Index div.--topPageContent{padding-top:0em !important; background:blueviolet; } */ /* body.isResponsive--Main.isPage--AccountEdit div.--topPageContent, body.isResponsive--Main.isPage--AccountHistory div.--topPageContent, body.isResponsive--Main.isPage--AccountNewsletters div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--AccountPassword div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--Account div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--AddressBook div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--AddressBookProcess div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--AdvancedSearch div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--CheckoutFail div.--topPageContent:not(.--weHaveChosenCategory) body.isResponsive--Main.isPage--CheckoutSuccess div.--topPageContent:not(.--weHaveChosenCategory) body.isResponsive--Main.isPage--CommissionHistory div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--CommunityAdvancedSearchResult div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--CommunityExtraInfoPages div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--Conditions div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--ContactUs div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--CookieUsage div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--CreateAccount div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--CreateAccountSuccess div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--Login div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--Logoff div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--PasswordForgotten div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--Privacy div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--ProductInfo div.--topPageContent.--weHaveChosenCategory, body.isResponsive--Main.isPage--ProductsNew div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--ProductReviews div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--Reviews div.--topPageContent:not(.--weHaveChosenCategory), body.isResponsive--Main.isPage--ShoppingCart div.--topPageContent:not(.--weHaveChosenCategory) body.isResponsive--Main.isPage--SSLCheck div.--topPageContent:not(.--weHaveChosenCategory){padding-top:12em !important;} */ /* body.isResponsive--Main.isPage--ProductInfo div.--cellProductInfos td.--cellProductName section.--sectionProductName h1{ font-size:2em;} */ Index: www-lp/www/includes/classes/PriceFormatter.php =================================================================== diff -u -r36 -r37 --- www-lp/www/includes/classes/PriceFormatter.php (.../PriceFormatter.php) (revision 36) +++ www-lp/www/includes/classes/PriceFormatter.php (.../PriceFormatter.php) (revision 37) @@ -930,7 +930,7 @@ // [TEXT_ON_SALE_BASED_HERE] // ([1])-->BEGIN[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END // ([4])-->BEGIN[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END - . '' . str_replace(TEXT_ON_SALE, 'Promotion', TEXT_ON_SALE) . ' ' + . '' . str_replace(TEXT_ON_SALE, '' . tep_get_specials_indicator($this->thePrice, $this->specialPrice) . '', TEXT_ON_SALE) . ' ' . '' // ([7])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END // ([2])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END @@ -1002,7 +1002,7 @@ // [TEXT_ON_SALE_BASED_HERE] // ([1])-->BEGIN[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END // ([4])-->BEGIN[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END - . '' . str_replace(TEXT_ON_SALE, 'Promotion', TEXT_ON_SALE) . ' ' + . '' . str_replace(TEXT_ON_SALE, '' . tep_get_specials_indicator($this->thePrice, $this->specialPrice) . '', TEXT_ON_SALE) . ' ' . '' // ([7])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END // ([2])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END Index: www-lp/script/auto_backup_catalogue.sh =================================================================== diff -u -r4 -r37 --- www-lp/script/auto_backup_catalogue.sh (.../auto_backup_catalogue.sh) (revision 4) +++ www-lp/script/auto_backup_catalogue.sh (.../auto_backup_catalogue.sh) (revision 37) @@ -4,5 +4,5 @@ # OLD: wget --user-agent=pnsgej12 -O /dev/null 'http://lp.accrosys.com/admin/backup.php?action=clean_backup_catalog' # not_installed: curl --user-agent "pnsgej12" http://lp.accrosys.com/admin/backup.php?action=backup_catalog # not_installed: curl --user-agent "pnsgej12" http://lp.accrosys.com/admin/backup.php?action=clean_backup_catalog -wget --post-data 'backupAction=backup_catalog' --user-agent=pnsgej12 -O /dev/null 'http://www.linder-partner.com/admin/signin.php' -wget --post-data 'backupAction=clean_backup_catalog' --user-agent=pnsgej12 -O /dev/null 'http://linder-partner.com/admin/signin.php' +wget --post-data 'backupAction=backup_catalog' --user-agent=pnsgej12 -O /dev/null 'https://www.linder-partner.com/admin/signin.php' +wget --post-data 'backupAction=clean_backup_catalog' --user-agent=pnsgej12 -O /dev/null 'https://linder-partner.com/admin/signin.php' Index: www-lp/www/includes/header.php =================================================================== diff -u -r35 -r37 --- www-lp/www/includes/header.php (.../header.php) (revision 35) +++ www-lp/www/includes/header.php (.../header.php) (revision 37) @@ -168,7 +168,6 @@ - [SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END . '' ; + if (LPOSC_SALES_ENABLED == "True"){ + $logo_path = DIR_WS_DESIGN . '_logo_soldes.svg'; + } + else { + $logo_path = DIR_WS_DESIGN . '_logo.svg'; + } echo ' + + + + + + + + + + [SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END ?> + +

+ +

+ [VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END ?> BEGIN[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END // CODETAG[TEXT_ON_SALE_BASED_HERE] if ( !preg_match('/Promotion/', $price) ) { $price = $price . '€' . ' HT'; } - + $percent_vip = tep_get_specials_indicator_vip(tep_get_products_cost($listing[$x]['products_id']), $coeff_partner, $listing[$x]["specials_new_products_price"]); + if ($percent_vip != '' ){ + $percent_vip_text = '
' + . '' . str_replace(TEXT_ON_SALE, '' . $percent_vip .'', TEXT_ON_SALE) . ' ' + . '
'; + } + else{ + $percent_vip_text = ""; + } + // ([5])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::BEGIN $lc_text = ' ' // ([1])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::BEGIN @@ -734,8 +743,9 @@ */ // ([1])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END // ([11])-->BEGIN[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END - . '' . $price . '' - . ''; + . '' . $price . '
' + . '' + . $percent_vip_text ; // ([5])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::END // ([3])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::BEGIN Index: www-lp/www/product_info.php =================================================================== diff -u -r36 -r37 --- www-lp/www/product_info.php (.../product_info.php) (revision 36) +++ www-lp/www/product_info.php (.../product_info.php) (revision 37) @@ -810,8 +810,17 @@ // ([35])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END $products_price ); - // ([45])-->BEGIN[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END - $products_price = '
Prix VIP   ' . $products_price . '
'; + $percent_vip = tep_get_specials_indicator_vip(tep_get_products_cost($product_info['products_id']), $coeff_partner, tep_get_products_special_price($product_info['products_id'])); + if ($percent_vip != ''){ + $percent_vip_text = '
' + . '' . str_replace(TEXT_ON_SALE, '' . $percent_vip . '', TEXT_ON_SALE) . ' ' + . '
'; + } + else{ + $percent_vip_text = ""; + } + // ([45])-->BEGIN[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END body.isResponsive--Main.isPage--ProductInfo div#cat_pd section.--sectionProductHasPromotion span + $products_price = '
Prix VIP   ' . $products_price . '
' . $percent_vip_text; // < [stop]{"si le client est un client partenaire, on affiche en HT"} // > [start]{"si le client n'est pas un client pro ni partenaire, on affiche en TTC"} @@ -1520,7 +1529,7 @@ // ([46])-->BEGIN[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::END if (tep_get_products_special_price($product_info['products_id']) AND $is_partner != true) { ?>
- PROMOTION +
Index: www-lp/script/icirelais.sh =================================================================== diff -u -r4 -r37 --- www-lp/script/icirelais.sh (.../icirelais.sh) (revision 4) +++ www-lp/script/icirelais.sh (.../icirelais.sh) (revision 37) @@ -1,5 +1,5 @@ #!/bin/bash -source $HOME/.bashrc +source $HOME/.profile cd $HOME ; php www/admin/call_icirelais_file_synchronize.php /bin/rm -f /tmp/ICIRELAIS* Index: www-lp/www/--SI--2020DesignInitializer.php =================================================================== diff -u -r36 -r37 --- www-lp/www/--SI--2020DesignInitializer.php (.../--SI--2020DesignInitializer.php) (revision 36) +++ www-lp/www/--SI--2020DesignInitializer.php (.../--SI--2020DesignInitializer.php) (revision 37) @@ -87,7 +87,7 @@ */ // ([1])-->[SI-LINDER-PARTNER-2][OSC][SubTaskDescription]::BEGIN // ([2])-->[VTAB-TEAM-LINDER-PARTNER-1][OSC][SubTaskDescription]::BEGIN -$MY_CACHE_VERSION="20241201"; +$MY_CACHE_VERSION="202501181"; if (!empty($_SI__NewDesign['pageFilepath'])) { Index: www-lp/www/includes/functions/general.php =================================================================== diff -u -r4 -r37 --- www-lp/www/includes/functions/general.php (.../general.php) (revision 4) +++ www-lp/www/includes/functions/general.php (.../general.php) (revision 37) @@ -132,6 +132,76 @@ return $product['specials_new_products_price']; } + // Return the product price + function tep_get_products_price($product_id) { + $product_price_query = tep_db_query( + "SELECT products_price + FROM " . TABLE_PRODUCTS . " + WHERE products_status = 1 + AND products_id = " . (int)$product_id + ); + + $product_price = tep_db_fetch_array($product_price_query); + + return $product_price['products_price']; + } + + // Return the product price + function tep_get_products_cost($product_id) { + $product_price_query = tep_db_query( + "SELECT products_cost + FROM " . TABLE_PRODUCTS . " + WHERE products_status = 1 + AND products_id = " . (int)$product_id + ); + + $product_price = tep_db_fetch_array($product_price_query); + + return $product_price['products_cost']; + } + + function tep_get_sales_percentage($products_price, $specials_new_products_price ){ + return number_format(100 - (((float)$specials_new_products_price / (float)$products_price) * 100)) . '%'; +} + +function tep_get_specials_indicator($products_price, $specials_new_products_price){ + if (LPOSC_SALES_ENABLED == "True"){ + return 'SOLDES: -' . tep_get_sales_percentage($products_price, $specials_new_products_price); + } + else{ + return 'PROMOTION'; + } +} + + +function tep_get_sales_percentage_vip($products_cost, $coeff_partner, $specials_new_products_price){ + if($specials_new_products_price > ((float)$products_cost * $coeff_partner)){ + return Null; + } + + $percent_vip = number_format(100 - (((float)$specials_new_products_price / ((float)$products_cost*$coeff_partner)) * 100)); + if($percent_vip > 0 && $percent_vip < 100) + return '- ' .$percent_vip . '%'; + else{ + return Null; + } +} + +function tep_get_specials_indicator_vip($products_cost, $coeff_partner, $specials_new_products_price){ + if (LPOSC_SALES_ENABLED == "True"){ + $percent_vip = tep_get_sales_percentage_vip($products_cost, $coeff_partner, $specials_new_products_price); + if($percent_vip == Null || $percent_vip == ''){ + return ''; + } + else{ + return 'SOLDES: ' . tep_get_sales_percentage_vip($products_cost, $coeff_partner, $specials_new_products_price); + } + } + else{ + return ''; + } +} + //// // Return a product's stock // TABLES: products Index: www-lp/www/checkout_process.php =================================================================== diff -u -r4 -r37 --- www-lp/www/checkout_process.php (.../checkout_process.php) (revision 4) +++ www-lp/www/checkout_process.php (.../checkout_process.php) (revision 37) @@ -207,7 +207,7 @@ } if ($stock_left <= $stock_level ) { // find the products category - $category_query = tep_db_query("select categories_id from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id = '" . (int)($order->products[i]['id']) . "'"); + $category_query = tep_db_query("select categories_id from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id = '" . (int)($order->products[$i]['id']) . "'"); $category = tep_db_fetch_array($category_query); $p_category = $category["categories_id"]; $email_subject = sprintf(EMAIL_STOCK_SUBJECT, $stock_left, html_entity_decode($order->products[$i]['name'])); @@ -219,10 +219,30 @@ // Update products_ordered (for bestsellers list) tep_db_query("update " . TABLE_PRODUCTS . " set products_ordered = products_ordered + " . sprintf('%d', $order->products[$i]['qty']) . " where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'"); +// 2025-01-14 : Get price special + + // Pas d'affichage de % de remise pour le moment + $result_percentage_reduce = ""; + if (LPOSC_SALES_ENABLED == "True"){ + $special_price = tep_get_products_special_price(tep_get_prid($order->products[$i]['id'])); + if ( $special_price ) + $product_price = tep_get_products_price(tep_get_prid($order->products[$i]['id'])); + if ( $special_price ) + { + $percentage_reduce = tep_get_sales_percentage($product_price, + $special_price); + $result_percentage_reduce = ' (- ' . $percentage_reduce .')'; + } + + } + +// 2025-01-14 + + $sql_data_array = array('orders_id' => $insert_id, 'products_id' => tep_get_prid($order->products[$i]['id']), 'products_model' => $order->products[$i]['model'], - 'products_name' => $order->products[$i]['name'], + 'products_name' => $order->products[$i]['name'], //. $result_percentage_reduce, // sales % not added to invoice (not wished by customer) 'products_price' => $order->products[$i]['price'], // -> MARP256 'products_cost' => $order->products[$i]['cost'],
+ + + + + + + +