From baa091d7713faed10af602bcb8619b31164e2b17 Mon Sep 17 00:00:00 2001 From: dSevere Date: Wed, 23 Nov 2011 13:30:42 +0000 Subject: [PATCH] // not required anymore --- .../ajax_supplier_order_products_list.php | 73 ------------------ admin-dev/ajax_supply_order_products_list.php | 74 ------------------- 2 files changed, 147 deletions(-) delete mode 100644 admin-dev/ajax_supplier_order_products_list.php delete mode 100644 admin-dev/ajax_supply_order_products_list.php diff --git a/admin-dev/ajax_supplier_order_products_list.php b/admin-dev/ajax_supplier_order_products_list.php deleted file mode 100644 index 4b6e527e3..000000000 --- a/admin-dev/ajax_supplier_order_products_list.php +++ /dev/null @@ -1,73 +0,0 @@ - -* @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ -/** - * Used in AdminSupplierOrdersController in order to retrieves products, given a pattern - * @since 1.5.0 - */ -define('_PS_ADMIN_DIR_', getcwd()); -include(_PS_ADMIN_DIR_.'/../config/config.inc.php'); -/* Gets cookie or logout */ -require_once(dirname(__FILE__).'/init.php'); - -/* @var string Given this pattern, it will return a list of products */ -$pattern = pSQL(Tools::getValue('q', false)); -if (!$pattern || $pattern == '' || strlen($pattern) < 1) - die(); - -/* @var int Supplier id */ -$id_supplier = (int)Tools::getValue('id_supplier', false); - -/* @var int Lang used */ -$id_lang = (int)Context::getContext()->language->id; - -/* @var DbQuery query used */ -$query = new DbQuery(); -$query->select(' - CONCAT(p.id_product, \'_\', IFNULL(pa.id_product_attribute, \'0\')) as id, - p.reference, - p.ean13, - md5(CONCAT(\''._COOKIE_KEY_.'\', p.id_product, \'_\', IFNULL(pa.id_product_attribute, \'0\'))) as checksum, - IFNULL(CONCAT(pl.name, \' : \', GROUP_CONCAT(agl.name, \' - \', al.name SEPARATOR \', \')), pl.name) as name -'); -$query->from('product p'); -$query->innerJoin('product_lang pl ON (pl.id_product = p.id_product AND pl.id_lang = '.$id_lang.')'); -$query->leftJoin('product_attribute pa ON (pa.id_product = p.id_product)'); -$query->leftJoin('product_attribute_combination pac ON (pac.id_product_attribute = pa.id_product_attribute)'); -$query->leftJoin('attribute atr ON (atr.id_attribute = pac.id_attribute)'); -$query->leftJoin('attribute_lang al ON (al.id_attribute = atr.id_attribute AND al.id_lang = '.$id_lang.')'); -$query->leftJoin('attribute_group_lang agl ON (agl.id_attribute_group = atr.id_attribute_group AND agl.id_lang = '.$id_lang.')'); -$query->where('pl.name LIKE \'%'.$pattern.'%\' OR p.reference LIKE \'%'.$pattern.'%\''); -$query->where('p.id_product NOT IN (SELECT pd.id_product FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))'); -$query->where('p.is_virtual = 0 AND p.cache_is_pack = 0'); -if ($id_supplier) - $query->where('p.id_supplier = '.$id_supplier); -$query->groupBy('pa.id_product_attribute'); - -$items = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); -if ($items) - die(Tools::jsonEncode($items)); -die(); \ No newline at end of file diff --git a/admin-dev/ajax_supply_order_products_list.php b/admin-dev/ajax_supply_order_products_list.php deleted file mode 100644 index d081d6f57..000000000 --- a/admin-dev/ajax_supply_order_products_list.php +++ /dev/null @@ -1,74 +0,0 @@ - -* @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ -/** - * Used in AdminSupplierOrdersController in order to retrieves products, given a pattern - * @since 1.5.0 - */ -define('_PS_ADMIN_DIR_', getcwd()); -include(_PS_ADMIN_DIR_.'/../config/config.inc.php'); -/* Gets cookie or logout */ -require_once(dirname(__FILE__).'/init.php'); - -/* @var string Given this pattern, it will return a list of products */ -$pattern = pSQL(Tools::getValue('q', false)); -if (!$pattern || $pattern == '' || strlen($pattern) < 1) - die(); - -/* @var int Supplier id */ -$id_supplier = (int)Tools::getValue('id_supplier', false); - -/* @var int Lang used */ -$id_lang = (int)Context::getContext()->language->id; - -/* @var DbQuery query used */ -$query = new DbQuery(); -$query->select(' - CONCAT(p.id_product, \'_\', IFNULL(pa.id_product_attribute, \'0\')) as id, - IFNULL(pa.reference, IFNULL(p.reference, \'\')) as reference, - IFNULL(pa.ean13, IFNULL(p.ean13, \'\')) as ean13, - IFNULL(pa.upc, IFNULL(p.upc, \'\')) as upc, - md5(CONCAT(\''._COOKIE_KEY_.'\', p.id_product, \'_\', IFNULL(pa.id_product_attribute, \'0\'))) as checksum, - IFNULL(CONCAT(pl.name, \' : \', GROUP_CONCAT(agl.name, \' - \', al.name SEPARATOR \', \')), pl.name) as name -'); -$query->from('product p'); -$query->innerJoin('product_lang pl ON (pl.id_product = p.id_product AND pl.id_lang = '.$id_lang.')'); -$query->leftJoin('product_attribute pa ON (pa.id_product = p.id_product)'); -$query->leftJoin('product_attribute_combination pac ON (pac.id_product_attribute = pa.id_product_attribute)'); -$query->leftJoin('attribute atr ON (atr.id_attribute = pac.id_attribute)'); -$query->leftJoin('attribute_lang al ON (al.id_attribute = atr.id_attribute AND al.id_lang = '.$id_lang.')'); -$query->leftJoin('attribute_group_lang agl ON (agl.id_attribute_group = atr.id_attribute_group AND agl.id_lang = '.$id_lang.')'); -$query->where('pl.name LIKE \'%'.$pattern.'%\' OR p.reference LIKE \'%'.$pattern.'%\''); -$query->where('p.id_product NOT IN (SELECT pd.id_product FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))'); -$query->where('p.is_virtual = 0 AND p.cache_is_pack = 0'); -if ($id_supplier) - $query->where('p.id_supplier = '.$id_supplier); -$query->groupBy('pa.id_product_attribute'); - -$items = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); -if ($items) - die(Tools::jsonEncode($items)); -die(); \ No newline at end of file