diff --git a/install-dev/classes/xmlLoader.php b/install-dev/classes/xmlLoader.php index c2ca37576..be92e6c6d 100644 --- a/install-dev/classes/xmlLoader.php +++ b/install-dev/classes/xmlLoader.php @@ -84,7 +84,7 @@ class InstallXmlLoader public function setFixturesPath($path = null) { if ($path === null) - $path = _PS_INSTALL_FIXTURES_PATH_.'apple/'; + $path = _PS_INSTALL_FIXTURES_PATH_.'fashion/'; $this->path_type = 'fixture'; $this->data_path = $path.'data/'; @@ -595,10 +595,10 @@ class InstallXmlLoader $dst_path = _PS_IMG_DIR_.$p.'/'; $entity_id = $this->retrieveId($entity, $identifier); - if (!copy($from_path.$identifier.'.'.$extension, $dst_path.$entity_id.'.'.$extension)) + if (!@copy($from_path.$identifier.'.'.$extension, $dst_path.$entity_id.'.'.$extension)) { - $this->setError($this->language->l('Cannot create image "%1$s" for entity "%2$s"', $identifier, $entity)); - return; + //$this->setError($this->language->l('Cannot create image "%1$s" for entity "%2$s"', $identifier, $entity)); + continue;//return; } foreach ($types as $type) diff --git a/install-dev/fixtures/fashion/data/category.xml b/install-dev/fixtures/fashion/data/category.xml index 82d19c03e..9cc28d7a4 100644 --- a/install-dev/fixtures/fashion/data/category.xml +++ b/install-dev/fixtures/fashion/data/category.xml @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/install-dev/fixtures/fashion/img/c/Blazers.jpg b/install-dev/fixtures/fashion/img/c/Blazers.jpg new file mode 100644 index 000000000..11c6a882c Binary files /dev/null and b/install-dev/fixtures/fashion/img/c/Blazers.jpg differ diff --git a/install-dev/fixtures/fashion/img/c/Coats.jpg b/install-dev/fixtures/fashion/img/c/Coats.jpg new file mode 100644 index 000000000..11c6a882c Binary files /dev/null and b/install-dev/fixtures/fashion/img/c/Coats.jpg differ diff --git a/install-dev/fixtures/fashion/img/c/Coats_and_Jackets.jpg b/install-dev/fixtures/fashion/img/c/Coats_and_Jackets.jpg new file mode 100644 index 000000000..9fa79bb96 Binary files /dev/null and b/install-dev/fixtures/fashion/img/c/Coats_and_Jackets.jpg differ diff --git a/install-dev/fixtures/fashion/img/c/Jackets.jpg b/install-dev/fixtures/fashion/img/c/Jackets.jpg new file mode 100644 index 000000000..11c6a882c Binary files /dev/null and b/install-dev/fixtures/fashion/img/c/Jackets.jpg differ diff --git a/install-dev/fixtures/fashion/img/c/Leather_Jackets.jpg b/install-dev/fixtures/fashion/img/c/Leather_Jackets.jpg new file mode 100644 index 000000000..11c6a882c Binary files /dev/null and b/install-dev/fixtures/fashion/img/c/Leather_Jackets.jpg differ diff --git a/install-dev/fixtures/fashion/img/c/Puffer_Jackets.jpg b/install-dev/fixtures/fashion/img/c/Puffer_Jackets.jpg new file mode 100644 index 000000000..11c6a882c Binary files /dev/null and b/install-dev/fixtures/fashion/img/c/Puffer_Jackets.jpg differ diff --git a/install-dev/fixtures/fashion/img/c/Tops.jpg b/install-dev/fixtures/fashion/img/c/Tops.jpg new file mode 100644 index 000000000..129537267 Binary files /dev/null and b/install-dev/fixtures/fashion/img/c/Tops.jpg differ diff --git a/install-dev/fixtures/fashion/img/c/Women.jpg b/install-dev/fixtures/fashion/img/c/Women.jpg new file mode 100644 index 000000000..cac9d4776 Binary files /dev/null and b/install-dev/fixtures/fashion/img/c/Women.jpg differ diff --git a/install-dev/fixtures/fashion/img/m/Fashion_Manufacturer.jpg b/install-dev/fixtures/fashion/img/m/Fashion_Manufacturer.jpg new file mode 100644 index 000000000..ee8c80dd8 Binary files /dev/null and b/install-dev/fixtures/fashion/img/m/Fashion_Manufacturer.jpg differ diff --git a/install-dev/fixtures/fashion/img/st/Coconut_Grove-medium_default.jpg b/install-dev/fixtures/fashion/img/st/Coconut_Grove-medium_default.jpg new file mode 100644 index 000000000..cbdb7a7d8 Binary files /dev/null and b/install-dev/fixtures/fashion/img/st/Coconut_Grove-medium_default.jpg differ diff --git a/install-dev/fixtures/fashion/img/st/Coconut_Grove.jpg b/install-dev/fixtures/fashion/img/st/Coconut_Grove.jpg new file mode 100644 index 000000000..34b45eee6 Binary files /dev/null and b/install-dev/fixtures/fashion/img/st/Coconut_Grove.jpg differ diff --git a/install-dev/fixtures/fashion/img/st/Dade_County-medium_default.jpg b/install-dev/fixtures/fashion/img/st/Dade_County-medium_default.jpg new file mode 100644 index 000000000..cbdb7a7d8 Binary files /dev/null and b/install-dev/fixtures/fashion/img/st/Dade_County-medium_default.jpg differ diff --git a/install-dev/fixtures/fashion/img/st/Dade_County.jpg b/install-dev/fixtures/fashion/img/st/Dade_County.jpg new file mode 100644 index 000000000..34b45eee6 Binary files /dev/null and b/install-dev/fixtures/fashion/img/st/Dade_County.jpg differ diff --git a/install-dev/fixtures/fashion/img/st/E_Fort_Lauderdale-medium_default.jpg b/install-dev/fixtures/fashion/img/st/E_Fort_Lauderdale-medium_default.jpg new file mode 100644 index 000000000..cbdb7a7d8 Binary files /dev/null and b/install-dev/fixtures/fashion/img/st/E_Fort_Lauderdale-medium_default.jpg differ diff --git a/install-dev/fixtures/fashion/img/st/E_Fort_Lauderdale.jpg b/install-dev/fixtures/fashion/img/st/E_Fort_Lauderdale.jpg new file mode 100644 index 000000000..34b45eee6 Binary files /dev/null and b/install-dev/fixtures/fashion/img/st/E_Fort_Lauderdale.jpg differ diff --git a/install-dev/fixtures/fashion/img/st/N_Miami_Biscayne-medium_default.jpg b/install-dev/fixtures/fashion/img/st/N_Miami_Biscayne-medium_default.jpg new file mode 100644 index 000000000..cbdb7a7d8 Binary files /dev/null and b/install-dev/fixtures/fashion/img/st/N_Miami_Biscayne-medium_default.jpg differ diff --git a/install-dev/fixtures/fashion/img/st/N_Miami_Biscayne.jpg b/install-dev/fixtures/fashion/img/st/N_Miami_Biscayne.jpg new file mode 100644 index 000000000..34b45eee6 Binary files /dev/null and b/install-dev/fixtures/fashion/img/st/N_Miami_Biscayne.jpg differ diff --git a/install-dev/fixtures/fashion/img/st/Pembroke_Pines-medium_default.jpg b/install-dev/fixtures/fashion/img/st/Pembroke_Pines-medium_default.jpg new file mode 100644 index 000000000..cbdb7a7d8 Binary files /dev/null and b/install-dev/fixtures/fashion/img/st/Pembroke_Pines-medium_default.jpg differ diff --git a/install-dev/fixtures/fashion/img/st/Pembroke_Pines.jpg b/install-dev/fixtures/fashion/img/st/Pembroke_Pines.jpg new file mode 100644 index 000000000..34b45eee6 Binary files /dev/null and b/install-dev/fixtures/fashion/img/st/Pembroke_Pines.jpg differ diff --git a/install-dev/fixtures/fashion/img/su/Fashion_Supplier.jpg b/install-dev/fixtures/fashion/img/su/Fashion_Supplier.jpg new file mode 100644 index 000000000..ee8c80dd8 Binary files /dev/null and b/install-dev/fixtures/fashion/img/su/Fashion_Supplier.jpg differ diff --git a/install-dev/models/install.php b/install-dev/models/install.php index b064861a5..35146a29c 100644 --- a/install-dev/models/install.php +++ b/install-dev/models/install.php @@ -646,8 +646,8 @@ class InstallModelInstall extends InstallAbstractModel */ public function installFixtures($entity = null, array $data = array()) { - $fixtures_path = _PS_INSTALL_FIXTURES_PATH_.'apple/'; - $fixtures_name = 'apple'; + $fixtures_path = _PS_INSTALL_FIXTURES_PATH_.'fashion/'; + $fixtures_name = 'fashion'; $zip_file = _PS_ROOT_DIR_.'/download/fixtures.zip'; $temp_dir = _PS_ROOT_DIR_.'/download/fixtures/';