// Some fix + multistore for import tools

2011-07-07 12:18:27 +00:00
parent 1c7225b4dc
commit 52be7fe939
7 changed files with 252 additions and 128 deletions
@@ -168,8 +168,7 @@ class ShopCore extends ObjectModel
 				FROM '._DB_PREFIX_.'group_shop gs
 				LEFT JOIN '._DB_PREFIX_.'shop s
 					ON (s.id_group_shop = gs.id_group_shop)
-				WHERE s.active = 1
-					AND s.deleted = 0
+				WHERE s.deleted = 0
 					AND gs.deleted = 0
 				ORDER BY gs.name, s.name';
 		if ($results = Db::getInstance()->ExecuteS($sql))
@@ -227,6 +226,22 @@ class ShopCore extends ObjectModel
 		return $results;
 	}
 	
+	/**
+	 * Return a shop ID from shop name
+	 * 
+	 * @param string $name
+	 * @return int
+	 */
+	public static function getIdByName($name)
+	{
+		Shop::loadShops();
+		foreach (self::$shops as $groupData)
+			foreach ($groupData['shops'] as $shopID => $shopData)
+				if (Tools::strtolower($shopData['name']) == Tools::strtolower($name))
+					return $shopID;
+		return false;
+	}
+	
 	/**
 	 * @return int Total of shops
 	 */
@@ -536,7 +551,8 @@ class ShopCore extends ObjectModel
 		{
 			$html .= '<option class="group" value="g-'.$gID.'" '.(($value == 'g-'.$gID) ? 'selected="selected"' : '').'>'.htmlspecialchars($groupData['name']).'</option>';
 			foreach ($groupData['shops'] as $sID => $shopData)
-				$html .= '<option value="s-'.$sID.'" class="shop" '.(($value == 's-'.$sID) ? 'selected="selected"' : '').'>&raquo; '.$shopData['name'].'</option>';
+				if ($shopData['active'])
+					$html .= '<option value="s-'.$sID.'" class="shop" '.(($value == 's-'.$sID) ? 'selected="selected"' : '').'>&raquo; '.$shopData['name'].'</option>';
 		}
 		$html .= '</select>';