From e7264d40cfd54a94f9eec81b2167cffb41e7dd8f Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Thu, 29 Dec 2011 14:35:03 +0000
Subject: [PATCH] // Improve backoffice order

---
 admin-dev/themes/template/images/content.tpl   |  2 +-
 admin-dev/themes/template/orders/form.tpl      |  2 +-
 classes/AdminController.php                    | 13 ++++++++-----
 classes/shop/Shop.php                          |  4 ++--
 controllers/admin/AdminAddressesController.php | 14 +++++++++++---
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/admin-dev/themes/template/images/content.tpl b/admin-dev/themes/template/images/content.tpl
index 6437bb354..23e7c330c 100644
--- a/admin-dev/themes/template/images/content.tpl
+++ b/admin-dev/themes/template/images/content.tpl
@@ -53,7 +53,7 @@
 				<div class="second-select margin-form format_{$k}" style="display:none;">
 					<select class="second-select format_{$k}" name="format_{$k}">
 						<option value="all">{l s='All'}</option>';
-						{foreach $formats AS $format}
+						{foreach $formats[$k] AS $format}
 							<option value="{$format['id_image_type']}">{$format['name']}</option>
 						{/foreach}
 					</select>
diff --git a/admin-dev/themes/template/orders/form.tpl b/admin-dev/themes/template/orders/form.tpl
index 6071fcb25..f85b4970d 100755
--- a/admin-dev/themes/template/orders/form.tpl
+++ b/admin-dev/themes/template/orders/form.tpl
@@ -909,7 +909,7 @@
 	<p>
 		<label>{l s='Search a voucher:'} </label>
 		<input type="text" id="voucher" value="" />
-		<a class="fancybox button" href="{$link->getAdminLink('AdminDiscounts')}&adddiscount&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new voucher'}</a>
+		<a class="fancybox button" href="{$link->getAdminLink('AdminCartRules')}&addcart_rule&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new voucher'}</a>
 	</p>
 	<div class="margin-form">
 		<table cellspacing="0" cellpadding="0" class="table" id="voucher_list">
diff --git a/classes/AdminController.php b/classes/AdminController.php
index b2858d2e3..6d1272454 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -155,6 +155,8 @@ class AdminControllerCore extends Controller
 	/** @var array list of row ids associated with a given action for witch this action have to not be available */
 	protected $list_skip_actions = array();
 
+	/* @var boolean don't show header & footer */
+	protected $lite_display = false;
 	/** @var bool boolean List content lines are clickable if true */
 	protected $list_no_link = false;
 
@@ -968,11 +970,11 @@ class AdminControllerCore extends Controller
 				$back = Tools::safeOutput(Tools::getValue('back', ''));
 				if (empty($back))
 					$back = self::$currentIndex.'&token='.$this->token;
-
-				$this->toolbar_btn['back'] = array(
-					'href' => $back,
-					'desc' => $this->l('Back to list')
-				);
+				if (!$this->lite_display)
+					$this->toolbar_btn['back'] = array(
+						'href' => $back,
+						'desc' => $this->l('Back to list')
+					);
 				break;
 			case 'options':
 				$this->toolbar_btn['save'] = array(
@@ -1696,6 +1698,7 @@ class AdminControllerCore extends Controller
 			$this->display_header = false;
 			$this->display_footer = false;
 			$this->content_only = false;
+			$this->lite_display = true;
 		}
 
 		// Change shop context ?
diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index 6e6a3201d..b15e814c4 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -120,14 +120,13 @@ class ShopCore extends ObjectModel
 	public function __construct($id = null, $id_lang = null, $id_shop = null)
 	{
 		parent::__construct($id, $id_lang, $id_shop);
-
 		if ($this->id)
 		{
 			$sql = 'SELECT su.physical_uri, su.virtual_uri, su.domain, su.domain_ssl, t.name, t.directory
 					FROM '._DB_PREFIX_.'shop s
 					LEFT JOIN '._DB_PREFIX_.'shop_url su ON (s.id_shop = su.id_shop)
 					LEFT JOIN '._DB_PREFIX_.'theme t ON (t.id_theme = s.id_theme)
-					WHERE s.id_shop = '.$this->id.'
+					WHERE s.id_shop = '.(int)$this->id.'
 						AND s.active = 1
 						AND s.deleted = 0
 						AND su.main = 1';
@@ -226,6 +225,7 @@ class ShopCore extends ObjectModel
 	 */
 	public static function initialize()
 	{
+
 		// Get list of excluded uri
 		$dirname = dirname(__FILE__);
 		$directories = scandir($dirname.'/../');
diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php
index 183aa42ef..d2bd432be 100644
--- a/controllers/admin/AdminAddressesController.php
+++ b/controllers/admin/AdminAddressesController.php
@@ -134,10 +134,12 @@ class AdminAddressesControllerCore extends AdminController
 				'class' => 'button'
 			)
 		);
-
-		if (Validate::isLoadedObject($this->object))
+		$id_customer = (int)Tools::getValue('id_customer');
+		if (!$id_customer && Validate::isLoadedObject($this->object))
+			$id_customer = $this->object->id_customer;
+		if ($id_customer)
 		{
-			$customer = new Customer($this->object->id_customer);
+			$customer = new Customer((int)$id_customer);
 			$tokenCustomer = Tools::getAdminToken('AdminCustomers'.(int)(Tab::getIdFromClassName('AdminCustomers')).(int)$this->context->employee->id);
 		}
 
@@ -271,6 +273,12 @@ class AdminAddressesControllerCore extends AdminController
 
 			}
 		}
+		
+		if (!Tools::isSubmit('submit'.strtoupper($this->table)) && Validate::isLoadedObject($customer) && !Validate::isLoadedObject($this->object))
+		{
+			$this->fields_value['lastname'] = $customer->lastname;
+			$this->fields_value['firstname'] = $customer->firstname;
+		}
 
 		// merge address format with the rest of the form
 		array_splice($this->fields_form['input'], 3, 0, $temp_fields);