From 74788d09590f9c047c1219275656f72f4ef27bdf Mon Sep 17 00:00:00 2001 From: lLefevre Date: Wed, 19 Oct 2011 14:47:37 +0000 Subject: [PATCH] // revert commit 9463 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9465 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/tabs/AdminOrders.php | 5 +- admin-dev/tabs/AdminStatuses.php | 7 +- classes/Order.php | 22 ++- override/classes/Tools.php | 308 ------------------------------- 4 files changed, 26 insertions(+), 316 deletions(-) diff --git a/admin-dev/tabs/AdminOrders.php b/admin-dev/tabs/AdminOrders.php index a5a9e843b..cfe035e8d 100644 --- a/admin-dev/tabs/AdminOrders.php +++ b/admin-dev/tabs/AdminOrders.php @@ -60,7 +60,7 @@ class AdminOrders extends AdminTab 'payment' => array('title' => $this->l('Payment'), 'width' => 100), 'osname' => array('title' => $this->l('Status'), 'widthColumn' => 230, 'type' => 'select', 'select' => $statesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int', 'width' => 200), 'date_add' => array('title' => $this->l('Date'), 'width' => 35, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'), - 'id_pdf' => array('title' => $this->l('PDF'), 'callback' => 'printPDtFIcons', 'orderby' => false, 'search' => false)); + 'id_pdf' => array('title' => $this->l('PDF'), 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false)); $this->shopLinkType = 'shop'; $this->shopShareDatas = Shop::SHARE_ORDER; parent::__construct(); @@ -1002,5 +1002,4 @@ class AdminOrders extends AdminTab } return $total; } -} - +} \ No newline at end of file diff --git a/admin-dev/tabs/AdminStatuses.php b/admin-dev/tabs/AdminStatuses.php index c20054d77..2059f8b5b 100644 --- a/admin-dev/tabs/AdminStatuses.php +++ b/admin-dev/tabs/AdminStatuses.php @@ -26,7 +26,7 @@ */ include(_PS_ADMIN_DIR_.'/tabs/AdminOrdersStates.php'); -include(_PS_CONTROLLER_DIR_.'/admin/AdminReturnStatesController.php'); +include(_PS_ADMIN_DIR_.'/tabs/AdminReturnStates.php'); class AdminStatuses extends AdminTab { @@ -37,7 +37,7 @@ class AdminStatuses extends AdminTab { $this->table = array('order_state', 'order_return_state'); $this->adminOrdersStates = new adminOrdersStates(); - $this->adminReturnStates = new AdminReturnStatesController(); + $this->adminReturnStates = new adminReturnStates(); parent::__construct(); } @@ -77,8 +77,7 @@ class AdminStatuses extends AdminTab if (!Tools::isSubmit('updateorder_return_state') AND !Tools::isSubmit('submitAddorder_return_state')) echo '
 
'; echo '

'.$this->l('Order return statuses').'

'; - $this->adminReturnStates->initContent($this->token); + $this->adminReturnStates->display($this->token); } } } - diff --git a/classes/Order.php b/classes/Order.php index 979eeea18..55ee2d6ad 100644 --- a/classes/Order.php +++ b/classes/Order.php @@ -923,6 +923,26 @@ class OrderCore extends ObjectModel $this->update(); } + public static function printPDFIcons($id_order, $tr) + { + $order = new Order($id_order); + $orderState = OrderHistory::getLastOrderState($id_order); + if (!Validate::isLoadedObject($orderState) OR !Validate::isLoadedObject($order)) + die(Tools::displayError('Invalid objects')); + echo ''; + if (($orderState->invoice AND $order->invoice_number) AND (int)($tr['product_number'])) + echo 'invoice'; + else + echo ' '; + echo ''; + echo ''; + if ($orderState->delivery AND $order->delivery_number) + echo 'delivery'; + else + echo ' '; + echo ''; + } + public static function getByDelivery($id_delivery) { $sql = 'SELECT id_order @@ -1022,4 +1042,4 @@ class OrderCore extends ObjectModel DELETE FROM `'._DB_PREFIX_.'order_detail` WHERE `id_order` = '.(int)($this->id)) !== false); } -} +} \ No newline at end of file diff --git a/override/classes/Tools.php b/override/classes/Tools.php index 2fa87facf..78819632d 100644 --- a/override/classes/Tools.php +++ b/override/classes/Tools.php @@ -1,314 +1,6 @@ -* @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 -*/ - -// -// IMPORTANT : don't forget to delete the underscore _ in the file name if you want to use it ! -// - -// if FB class is already loaded, just enable it. else, enable it only if fb.php exists and is loaded -if (!defined('PS_USE_FIREPHP') AND class_exists('FB')) - define('PS_USE_FIREPHP',true); -elseif (file_exists(dirname(__FILE__).DIRECTORY_SEPARATOR.'fb.php')) -{ - if (!defined('PS_USE_FIREPHP')) - { - require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'fb.php'); - define('PS_USE_FIREPHP',true); - } - else - define('PS_USE_FIREPHP',false); -} -else - define('PS_USE_FIREPHP',class_exists('FB')); class Tools extends ToolsCore { - /** - * Redirect user to another page after 5 sec - * - * @param string $url Desired URL - * @param string $baseUri Base URI (optional) - */ - public static function redirect($url, $baseUri = __PS_BASE_URI__, Link $link = null) - { - if (!$link) - $link = Context::getContext()->link; - if (strpos($url, 'http://') === FALSE && strpos($url, 'https://') === FALSE) - { - if (strpos($url, $baseUri) !== FALSE && strpos($url, $baseUri) == 0) - $url = substr($url, strlen($baseUri)); - $explode = explode('?', $url); - $url = $link->getPageLink($explode[0], true); - if (isset($explode[1])) - $url .= '?'.$explode[1]; - $baseUri = ''; - } - if (isset($_SERVER['HTTP_REFERER']) AND ($url == $_SERVER['HTTP_REFERER'])) - header('Refresh: 5; url='.$_SERVER['HTTP_REFERER']); - else - header('Refresh: 5; url='.$baseUri.$url); - echo '

Redirection automatique dans 5 secondes

'.$url.''; - exit; - } - - - /** - * Redirect url wich allready PS_BASE_URI after 5 sec - * - * @param string $url Desired URL - */ - public static function redirectLink($url) - { - if (!preg_match('@^https?://@i', $url)) - { - if (strpos($url, __PS_BASE_URI__) !== FALSE && strpos($url, __PS_BASE_URI__) == 0) - $url = substr($url, strlen(__PS_BASE_URI__)); - $explode = explode('?', $url); - $url = Context::getContext()->link->getPageLink($explode[0]); - if (isset($explode[1])) - $url .= '?'.$explode[1]; - } - - header('Refresh: 5; url='.$url); - echo '

Redirection automatique dans 5 secondes

'.$url.''; - exit; - } - /** - * Redirect user to another admin page after 5 sec - * - * @param string $url Desired URL - */ - public static function redirectAdmin($url) - { - header('Refresh: 5; url='.$url); - echo '

Redirection automatique dans 5 secondes

'.$url.''; - exit; - } - - - /** - * Display an error with detailed object - * (display in firefox console if Firephp is enabled) - * - * @param mixed $object - * @param boolean $kill - * @return $object if $kill = false; - */ - public static function dieObject($object, $kill = true) - { - if(PS_USE_FIREPHP) - FB::error($object); - else - return parent::dieObject($object,$kill); - - if ($kill) - die('END'); - return $object; - } - - /** - * ALIAS OF dieObject() - Display an error with detailed object - * (display in firefox console if Firephp is enabled) - * - * @param object $object Object to display - */ - public static function d($obj, $kill = true) - { - if(PS_USE_FIREPHP) - FB::error($obj); - else - parent::d($obj,$kill); - - if ($kill) - die('END'); - return $object; - } - - /** - * ALIAS OF dieObject() - Display an error with detailed object but don't stop the execution - * (display in firefox console if Firephp is enabled) - * - * @param object $object Object to display - */ - public static function p($object) - { - if(PS_USE_FIREPHP) - FB::info($object); - else - return parent::p($object); - return $object; - } - - /** - * Display a warning message indicating that the method is deprecated - * (display in firefox console if Firephp is enabled) - */ - public static function displayAsDeprecated() - { - if (_PS_DISPLAY_COMPATIBILITY_WARNING_) - { - $backtrace = debug_backtrace(); - $callee = next($backtrace); - if (PS_USE_FIREPHP) - FB::warn('Function '.$callee['function'].'() is deprecated in '.$callee['file'].' on line '.$callee['line'].'
', 'Deprecated method'); - else - trigger_error('Function '.$callee['function'].'() is deprecated in '.$callee['file'].' on line '.$callee['line'].'
', E_USER_WARNING); - - $message = Tools::displayError('The function').' '.$callee['function'].' ('.Tools::displayError('Line').' '.$callee['line'].') '.Tools::displayError('is deprecated and will be removed in the next major version.'); - Logger::addLog($message, 3, $callee['class']); - } - } - - /** - * Display a warning message indicating that the parameter is deprecated - * (display in firefox console if Firephp is enabled) - */ - public static function displayParameterAsDeprecated($parameter) - { - if (_PS_DISPLAY_COMPATIBILITY_WARNING_) - { - $backtrace = debug_backtrace(); - $callee = next($backtrace); - trigger_error('Parameter '.$parameter.' in function '.$callee['function'].'() is deprecated in '.$callee['file'].' on line '.$callee['Line'].'
', E_USER_WARNING); - - if(PS_USE_FIREPHP) - FB::trace('Parameter '.$parameter.' in function '.$callee['function'].'() is deprecated in '.$callee['file'].' on line '.$callee['Line'].'
', 'deprecated parameter'); - else - $message = Tools::displayError('The parameter').' '.$parameter.' '.Tools::displayError(' in function ').' '.$callee['function'].' ('.Tools::displayError('Line').' '.$callee['Line'].') '.Tools::displayError('is deprecated and will be removed in the next major version.'); - - Logger::addLog($message, 3, $callee['class']); - } - } - - /** - * use of FirePHP::error() if allowed - * - * @param mixed $obj - * @param string $label - * @return void - */ - public static function error($obj, $label = '') - { - if(PS_USE_FIREPHP) - FB::error($obj, $label); - } - - /** - * use of FirePHP::warn() if allowed - * - * @param mixed $obj - * @param string $label - * @return void - */ - public static function warn($obj, $label = '') - { - if(PS_USE_FIREPHP) - FB::warn($obj, $label); - } - - /** - * use of FirePHP::info() if allowed - * - * @param mixed $obj - * @param string $label - * @return void - */ - public static function info($obj, $label = '') - { - if(PS_USE_FIREPHP) - FB::info($obj, $label); - } - - /** - * use of FirePHP::log() if allowed - * - * @param mixed $obj - * @param string $label - * @return void - */ - public static function log($obj, $label = '') - { - if(PS_USE_FIREPHP) - FB::log($obj,$label); - } - /** - * display debug_backtrace() - * (display in firefox console if Firephp is enabled) - * - * @param mixed $obj - * @return void - */ - public static function trace($obj = NULL, $label = '') - { - if(PS_USE_FIREPHP) - FB::trace($obj, $label); - else{ - Tools::p($obj); - echo'
'.$label.'

';
-			debug_print_backtrace();
-			echo '
'; - } - } } -// Add some convenient shortcut - -if (!function_exists('error')) -{ - function error($obj, $label = ''){ - return Tools::error($obj, $label); - } -} - -if (!function_exists('warn')) -{ - function warn($obj, $label = ''){ - return Tools::warn($obj,$label); - } -} - -if (!function_exists('info')) -{ - function info($obj, $label = ''){ - return Tools::info($obj, $label); - } -} - -if (!function_exists('log')) -{ - function log($obj, $label = ''){ - return Tools::log($obj, $label); - } -} - -if (!function_exists('trace')) -{ - function trace($obj, $label = ''){ - return Tools::trace($obj, $label); - } -} -