diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index 9847509b0..551e9c207 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -385,7 +385,7 @@ class AdminAddressesControllerCore extends AdminController { $this->fields_list = array_merge($this->fields_list, array( 'email' => array('title' => $this->l('Customer Email')), - 'phone' => array('title' => $this->l('Phone')), + 'phone' => array('title' => $this->l('Phone'), 'filter_key' => 'a!phone'), 'phone_mobile' => array('title' => $this->l('Mobile phone')), 'address1' => array('title' => $this->l('Address (2)')), 'dni' => array('title' => $this->l('Identification Number')), diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index dad09b3b0..028976d07 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1386,13 +1386,12 @@ class AdminOrdersControllerCore extends AdminController $id_lang_shop = false ){ if ($this->action == 'export' && empty($this->_listsql)) { - $this->_select .= ', c.`email`, cgd.`phone`, a.`total_paid_real`, + $this->_select .= ', c.`email`, c.`phone`, a.`total_paid_real`, orf.`cancellation_date`, orf.`cancellation_fee`, cy.`iso_code` AS country, st.`iso_code` as state, ad.`city`, CONCAT(ad.`address1`, \', \', ad.`postcode`) AS `cus_address`, hbdtl.*'; - $this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'cart_customer_guest_detail` cgd ON cgd.`email` = c.`email` AND cgd.`id_cart` = 0 - LEFT JOIN `'._DB_PREFIX_.'address` ad ON a.`id_customer`= ad.`id_customer` AND ad.`id_customer`!=0 + $this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'address` ad ON a.`id_customer`= ad.`id_customer` AND ad.`id_customer`!=0 LEFT JOIN `'._DB_PREFIX_.'country` cy ON cy.`id_country`= ad.`id_country` LEFT JOIN `'._DB_PREFIX_.'state` st ON st.`id_state`= ad.`id_state` LEFT JOIN (