From 0af24ab0349730c6954c1ebbce8b347ebfb9da0f Mon Sep 17 00:00:00 2001 From: indesign47 Date: Fri, 4 Oct 2013 04:31:51 +0200 Subject: [PATCH 1/2] [-] BO : AdminImport add adresses required fields --- controllers/admin/AdminImportController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 98b338a44..11ff2d8c2 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -293,6 +293,7 @@ class AdminImportControllerCore extends AdminController case $this->entities[$this->l('Addresses')]: //Overwrite required_fields $this->required_fields = array( + 'alias', 'lastname', 'firstname', 'address1', @@ -307,7 +308,7 @@ class AdminImportControllerCore extends AdminController 'id' => array('label' => $this->l('ID')), 'alias' => array('label' => $this->l('Alias *')), 'active' => array('label' => $this->l('Active (0/1)')), - 'customer_email' => array('label' => $this->l('Customer email')), + 'customer_email' => array('label' => $this->l('Customer email *')), 'id_customer' => array('label' => $this->l('Customer ID:')), 'manufacturer' => array('label' => $this->l('Manufacturer')), 'supplier' => array('label' => $this->l('Supplier')), @@ -316,7 +317,7 @@ class AdminImportControllerCore extends AdminController 'firstname' => array('label' => $this->l('First Name *')), 'address1' => array('label' => $this->l('Address 1 *')), 'address2' => array('label' => $this->l('Address 2')), - 'postcode' => array('label' => $this->l('Postal code / Zipcode*')), + 'postcode' => array('label' => $this->l('Postal code / Zipcode *')), 'city' => array('label' => $this->l('City *')), 'country' => array('label' => $this->l('Country *')), 'state' => array('label' => $this->l('State')), @@ -2950,4 +2951,4 @@ class AdminImportControllerCore extends AdminController die; } } -} \ No newline at end of file +} From 6c9b71ee5810120c361f9ee65cd2124dc37a7181 Mon Sep 17 00:00:00 2001 From: indesign47 Date: Fri, 4 Oct 2013 04:35:00 +0200 Subject: [PATCH 2/2] [-] BO : AdminImport add adresses required fields --- docs/csv_import/addresses_import.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/csv_import/addresses_import.csv b/docs/csv_import/addresses_import.csv index 2ba8be1ca..60f603f4a 100644 --- a/docs/csv_import/addresses_import.csv +++ b/docs/csv_import/addresses_import.csv @@ -1,4 +1,4 @@ -"id";"Alias*";"Active (0/1)";"Customer e-mail";"Customer ID";"Manufacturer";"Supplier";"Company";"Lastname*";"Firstname*";"Address 1*";"Address 2";"Postcode* / Zipcode*";"City*";"Country*";"State";"Other";"Phone";"Mobile Phone";"VAT number" +"id";"Alias*";"Active (0/1)";"Customer e-mail*";"Customer ID";"Manufacturer";"Supplier";"Company";"Lastname*";"Firstname*";"Address 1*";"Address 2";"Postcode* / Zipcode*";"City*";"Country*";"State";"Other";"Phone";"Mobile Phone";"VAT number" 1;"My Adress";1;"pub@prestashop.com";1;;;;"Doe";"John";"16, Main street";"2nd floor";75000;"PARIS ";"France";;;140138844;; 2;"My work";1;"pub@prestashop.com";1;;;"My Company";"Doe";"John";"535, Baker street";;13000;"Marseile";"France";;;235445588;; 3;"My work";0;;;"Apple Computer, Inc";;;"Jobs";"Steve";"1 Infinite Loop";;95014;"CUPERTINO";"United States";"California";;"(800) 275-2273";;