From d30a0abadd4502d7f18b2ff1c3d12e06cdacb0ae Mon Sep 17 00:00:00 2001 From: bMancone Date: Tue, 7 Feb 2012 14:59:56 +0000 Subject: [PATCH] // Fixed Supply Orders --- .../list_action_supply_order_create_from_template.tpl | 2 +- classes/CSV.php | 1 + controllers/admin/AdminSupplyOrdersController.php | 8 +++++--- install-dev/data/db_structure.sql | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl index 7deb3740d..7252e8936 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl @@ -24,5 +24,5 @@ * International Registered Trademark & Property of PrestaShop SA *} - {$action} + {$action} diff --git a/classes/CSV.php b/classes/CSV.php index b7129b5d2..874b9cf5d 100644 --- a/classes/CSV.php +++ b/classes/CSV.php @@ -102,6 +102,7 @@ class CSVCore public function headers() { header('Content-type: text/csv'); + header('Content-Type: application/force-download; charset=UTF-8'); header('Cache-Control: no-store, no-cache'); header('Content-disposition: attachment; filename="'.$this->filename.'.csv"'); } diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index 28e54d069..c0ea83eef 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -55,7 +55,7 @@ class AdminSupplyOrdersControllerCore extends AdminController $this->fieldsDisplay = array( 'reference' => array( 'title' => $this->l('Reference'), - 'width' => 130, + 'width' => 250, 'havingFilter' => true ), 'supplier' => array( @@ -477,10 +477,10 @@ class AdminSupplyOrdersControllerCore extends AdminController unset($this->toolbar_btn['export-csv-orders']); unset($this->toolbar_btn['export-csv-details']); // adds actions - $this->addRowAction('delete'); $this->addRowAction('view'); $this->addRowAction('edit'); $this->addRowAction('createsupplyorder'); + $this->addRowAction('delete'); // unsets some fields unset($this->fieldsDisplay['state'], $this->fieldsDisplay['date_upd'], @@ -1205,6 +1205,7 @@ class AdminSupplyOrdersControllerCore extends AdminController { // header header('Content-type: text/csv'); + header('Content-Type: application/force-download; charset=UTF-8'); header('Cache-Control: no-store, no-cache'); header('Content-disposition: attachment; filename="'.$this->l('supply_orders_details').'.csv"'); @@ -2076,8 +2077,9 @@ class AdminSupplyOrdersControllerCore extends AdminController $entries = $supply_order->getEntriesCollection($supply_order->id_lang); // updates SupplyOrder so that it is not a template anymore + $language = new Language($supply_order->id_lang); $ref = $supply_order->reference; - $ref .= ' ('.date('H:i:s').')'; + $ref .= ' ('.date($language->date_format_full).')'; $supply_order->reference = $ref; $supply_order->is_template = 0; $supply_order->id = (int)0; diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql index 38eadb684..ce4226bd1 100644 --- a/install-dev/data/db_structure.sql +++ b/install-dev/data/db_structure.sql @@ -2186,7 +2186,7 @@ CREATE TABLE `PREFIX_supply_order` ( `id_supply_order_state` INT(11) UNSIGNED NOT NULL, `id_currency` INT(11) UNSIGNED NOT NULL, `id_ref_currency` INT(11) UNSIGNED NOT NULL, -`reference` VARCHAR(32) NOT NULL, +`reference` VARCHAR(64) NOT NULL, `date_add` DATETIME NOT NULL, `date_upd` DATETIME NOT NULL, `date_delivery_expected` DATETIME DEFAULT NULL,