fix conflit FrontController

.gitignore

@@ -41,6 +41,7 @@ tools/smarty*/cache/*.php
 
 #### CONFIG ####
 config/settings.*.php
+config/config.inc.php
 config/xml/*.xml
 config/settings.inc.php
 config/settings.old.php

adm/tabs/AdminImport.php

@@ -604,6 +604,12 @@ class AdminImport extends AdminTab
 			// 	&& $info['weight'] != "0") {
 			// 	$product->weight = 0.2;
 			// }
+			$iso_lang = trim(Tools::getValue('iso_lang'));
+			if ($iso_lang == 'fr') {
+			 	if (empty($info['weight']) && $info['weight'] != "0") {
+					$product->weight = 0.2;
+				}
+			}
 
 			if ((int)$product->id_tax_rules_group != 0)
 			{

adm/tabs/AdminProducts.php

@@ -178,7 +178,7 @@ class AdminProducts extends AdminTab
 	 */
 	public function postProcess($token = null)
 	{
-		if(Tools::isSubmit('editProduct')){
+		if (Tools::isSubmit('editProduct')) {
 			global $cookie, $currentIndex;
 			$products = Tools::getValue('productBox');
 			$id_lang_fast = Tools::getValue('id_lang_fast');
@@ -188,10 +188,10 @@ class AdminProducts extends AdminTab
 			Tools::redirectAdmin($redirect . "&id_product=". json_encode($products)."&id_lang_fast=".(int) $id_lang_fast."&token=". $token_redirect);			
 		}
 
-		if(Tools::isSubmit('addCategoryProduct')){
+		if (Tools::isSubmit('addCategoryProduct')) {
 			global $cookie, $currentIndex;
 
-			$id_category = Tools::getValue('id_category');			
+			$id_category = Tools::getValue('id_category');
 			$products = Tools::getValue('productBox');
 			$id_category_paste = Tools::getValue('id_category_paste');
 			$keep_category = Tools::getValue('keep_category');
@@ -209,11 +209,19 @@ class AdminProducts extends AdminTab
 				}
 			}
 
+			$sale = false;
 			foreach ($products as $key => $product) {
 				if (Validate::isLoadedObject($product = new Product((int)$product ) ))
 				{
+					// adding - ticket #8267
+					if (!$sale) {
+						include_once(_PS_ROOT_DIR_.'/modules/privatesales/Sale.php');
+						$sale = Sale::getSaleFromCategory((int) $id_category);
+					}
+
 					if($keep_category == 1){
-						Db::getInstance()->delete( _DB_PREFIX_.'category_product', 'id_product = ' . $product->id);
+						/*Db::getInstance()->delete( _DB_PREFIX_.'category_product', 'id_product = ' . $product->id);*/
+						Db::getInstance()->delete( _DB_PREFIX_.'category_product', 'id_product = ' . $product->id . ' AND id_category != ' . $sale->id_category);
 					}
 
 					$categories_product = $product->getCategories();
@@ -1665,16 +1673,17 @@ class AdminProducts extends AdminTab
 						<input style="margin:2px" type="radio" id="keep_category_yes" name="keep_category" value="1" >
 				</p>
 			<div class="clear"></div>
-			';		
+			';
 			echo '<h3>Choisir la catégorie à associer :</h3>';
 
-			if ($array_categories['id_category'] != $id_category) {
+			// adding comment - ticket #8267
+			/*if ($array_categories['id_category'] != $id_category) {
 				echo '<input type="checkbox" id="cat_'. $array_categories['id_category'] .'" name="id_category_paste[]" value="'. $array_categories['id_category'] .'">';
 				echo ' <label for="cat_'. $array_categories['id_category'] .'" style="font-weight:normal; float:none">' . $array_categories['name'] . '</label>';
 			} else {
 				echo '<input type="checkbox" id="cat_'. $array_categories['id_category'] .'" name="id_category_paste[]" checked value="'. $array_categories['id_category'] .'">';
 				echo ' <label for="cat_'. $array_categories['id_category'] .'" style="font-weight:normal; float:none">' . $array_categories['name'] . '</label>';
-			}
+			}*/
 
 			if ($array_categories['childrens']) {
 				foreach ($array_categories['childrens'] as $key => $catchild) {
@@ -1699,7 +1708,9 @@ class AdminProducts extends AdminTab
 							}
 						}
 				}
-			}
+			}/*else {
+                echo '<p> Il n\'y a pas de sous catégorie</p>';
+            }*/
 
 			// foreach($categories_vp as $category) {
 			// 	if($category['id_category'] != $id_category){

modules/privatesales/cron.php

@@ -1,12 +1,17 @@
 <?php
 if(isset($_SERVER['REMOTE_ADDR'])) exit;
-
 $_SERVER['SERVER_PORT'] = 80;
+$_SERVER['HTTP_HOST'] = 'www.bebeboutik.com';
 
 include(dirname(__FILE__).'/../../config/config.inc.php');
 include(dirname(__FILE__).'/Sale.php');
 
 $sales = Sale::getSales(TRUE, NULL, NULL, FALSE);
+
+$file = fopen('lastupdate.txt', 'w');
+fwrite($file, date('Ymd His'));
+fclose($file);
+
 foreach($sales as $sale) {
 	$sale->end(TRUE);
 }

modules/privatesales/lastupdate.txt

@@ -0,0 +1 @@
+20160224 162301

override/classes/FrontController.php

@@ -373,11 +373,11 @@ class FrontController extends FrontControllerCore {
 			'module-referralprogram-referral-program', 'module-cheque-payment',
 			'module-bankwire-payment', 'module-invite-invite-rules',
 			'module-advsendtoafriend-sendtoafriend-form', 'featured',
-			'module-ant_support-help',
-			'module-ant_support_form-support',
 			'list-tag-sales',
 			'module-contactform-provider',
-			'module-contactform-press'
+			'module-contactform-press',
+			'module-ant_support-help',
+			'module-ant_support_form-support',
 		);
 
 		$displayRight = array(

themes/site/lang/es.php

@@ -569,6 +569,8 @@ $_LANG['product-list_2d0f6b8300be19cf35e89e66f0677f95'] = 'Añadir a la cesta';
 $_LANG['product-list_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Agotado';
 $_LANG['product-list_78945de8de090e90045d299651a68a9b'] = 'Disponible';
 $_LANG['product-list_4351cfebe4b61d8aa5efa1d020710005'] = 'Ver';
+$_LANG['product-list_4391a5fd21c767037fbb3bcad0c1f595'] = 'Producto agotado';
+$_LANG['product-list_763ea78c330dfb4adafcaf118747de76'] = 'Comprar expreso';
 $_LANG['product-list_77798ad342555ffa834758a2aaa6fc11'] = 'Comparar';
 $_LANG['product-sort_cfab1ba8c67c7c838db98d666f02a132'] = '--';
 $_LANG['product-sort_b3c4afbd8ec3b1e28710fcbdc8cc0549'] = 'Precio: más baratos primero';