diff --git a/.vscode/ftp-kr.sync.cache.json b/.vscode/ftp-kr.sync.cache.json index d5fd495d..f602eedf 100644 --- a/.vscode/ftp-kr.sync.cache.json +++ b/.vscode/ftp-kr.sync.cache.json @@ -98,7 +98,7 @@ }, "google-merchant_id-1.xml": { "type": "-", - "size": 18184009, + "size": 17872793, "lmtime": 0, "modified": true }, diff --git a/modules/import_api/classes/convertor.php b/modules/import_api/classes/convertor.php index 06ae6b46..ffa3da4e 100644 --- a/modules/import_api/classes/convertor.php +++ b/modules/import_api/classes/convertor.php @@ -80,7 +80,7 @@ class Convertor if (!in_array(Configuration::get('PS_HOME_CATEGORY'), $product_category)) { - //$product_category[] = Configuration::get('PS_HOME_CATEGORY'); + $product_category[] = Configuration::get('PS_HOME_CATEGORY'); } if (!$product_category) @@ -192,7 +192,7 @@ class Convertor $this->creator->addImageToProduct($original_product['cover'], $product->id, true); } - if ($original_product['feature'] and $original_product['feature_value']) + if ( isset( $original_product['feature'] ) and isset( $original_product['feature_value'] ) ) { $original_product['features'] = array( array( diff --git a/modules/import_api/classes/creator.php b/modules/import_api/classes/creator.php index 8a3f5551..210b92ac 100644 --- a/modules/import_api/classes/creator.php +++ b/modules/import_api/classes/creator.php @@ -100,7 +100,6 @@ class Creator public function addImageToProduct($url, $id, $is_cover = false){ if (!empty($url)) { $url = str_replace(' ', '%20', $url); - $image = new Image(); $image->id_product = (int)$id; $image->position = Image::getHighestPosition($id) + 1; diff --git a/modules/x13allegro/.DS_Store b/modules/x13allegro/.DS_Store deleted file mode 100644 index 5dd95408..00000000 Binary files a/modules/x13allegro/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/.DS_Store b/modules/x13allegro/classes/.DS_Store deleted file mode 100644 index 6d114a21..00000000 Binary files a/modules/x13allegro/classes/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php5/.DS_Store b/modules/x13allegro/classes/php5/.DS_Store deleted file mode 100644 index 7ea8e047..00000000 Binary files a/modules/x13allegro/classes/php5/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php5/Api/.DS_Store b/modules/x13allegro/classes/php5/Api/.DS_Store deleted file mode 100644 index 56ee48fb..00000000 Binary files a/modules/x13allegro/classes/php5/Api/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php5/Api/DataUpdater/.DS_Store b/modules/x13allegro/classes/php5/Api/DataUpdater/.DS_Store deleted file mode 100644 index 135798a0..00000000 Binary files a/modules/x13allegro/classes/php5/Api/DataUpdater/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php5/SyncManager/.DS_Store b/modules/x13allegro/classes/php5/SyncManager/.DS_Store deleted file mode 100644 index a1161982..00000000 Binary files a/modules/x13allegro/classes/php5/SyncManager/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php5/SyncManager/Order/.DS_Store b/modules/x13allegro/classes/php5/SyncManager/Order/.DS_Store deleted file mode 100644 index c21dfe76..00000000 Binary files a/modules/x13allegro/classes/php5/SyncManager/Order/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php5/SyncManager/Order/Data/.DS_Store b/modules/x13allegro/classes/php5/SyncManager/Order/Data/.DS_Store deleted file mode 100644 index b25ac6c4..00000000 Binary files a/modules/x13allegro/classes/php5/SyncManager/Order/Data/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php70/.DS_Store b/modules/x13allegro/classes/php70/.DS_Store deleted file mode 100644 index 0d04780b..00000000 Binary files a/modules/x13allegro/classes/php70/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php70/Api/.DS_Store b/modules/x13allegro/classes/php70/Api/.DS_Store deleted file mode 100644 index aa624c2b..00000000 Binary files a/modules/x13allegro/classes/php70/Api/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php70/Api/DataUpdater/.DS_Store b/modules/x13allegro/classes/php70/Api/DataUpdater/.DS_Store deleted file mode 100644 index 2e5620ef..00000000 Binary files a/modules/x13allegro/classes/php70/Api/DataUpdater/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php70/SyncManager/.DS_Store b/modules/x13allegro/classes/php70/SyncManager/.DS_Store deleted file mode 100644 index 70880e26..00000000 Binary files a/modules/x13allegro/classes/php70/SyncManager/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php70/SyncManager/Order/.DS_Store b/modules/x13allegro/classes/php70/SyncManager/Order/.DS_Store deleted file mode 100644 index 0e52a266..00000000 Binary files a/modules/x13allegro/classes/php70/SyncManager/Order/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php70/SyncManager/Order/Data/.DS_Store b/modules/x13allegro/classes/php70/SyncManager/Order/Data/.DS_Store deleted file mode 100644 index b8dbf40f..00000000 Binary files a/modules/x13allegro/classes/php70/SyncManager/Order/Data/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php71/.DS_Store b/modules/x13allegro/classes/php71/.DS_Store deleted file mode 100644 index e4079b50..00000000 Binary files a/modules/x13allegro/classes/php71/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php71/Api/.DS_Store b/modules/x13allegro/classes/php71/Api/.DS_Store deleted file mode 100644 index f96db5f7..00000000 Binary files a/modules/x13allegro/classes/php71/Api/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php71/Api/DataUpdater/.DS_Store b/modules/x13allegro/classes/php71/Api/DataUpdater/.DS_Store deleted file mode 100644 index 465a407d..00000000 Binary files a/modules/x13allegro/classes/php71/Api/DataUpdater/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php71/SyncManager/.DS_Store b/modules/x13allegro/classes/php71/SyncManager/.DS_Store deleted file mode 100644 index ee01bdae..00000000 Binary files a/modules/x13allegro/classes/php71/SyncManager/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php71/SyncManager/Order/.DS_Store b/modules/x13allegro/classes/php71/SyncManager/Order/.DS_Store deleted file mode 100644 index e48fa03f..00000000 Binary files a/modules/x13allegro/classes/php71/SyncManager/Order/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/classes/php71/SyncManager/Order/Data/.DS_Store b/modules/x13allegro/classes/php71/SyncManager/Order/Data/.DS_Store deleted file mode 100644 index ce929c4a..00000000 Binary files a/modules/x13allegro/classes/php71/SyncManager/Order/Data/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/controllers/.DS_Store b/modules/x13allegro/controllers/.DS_Store deleted file mode 100644 index 242eb7fb..00000000 Binary files a/modules/x13allegro/controllers/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/controllers/admin/.DS_Store b/modules/x13allegro/controllers/admin/.DS_Store deleted file mode 100644 index 97c2313b..00000000 Binary files a/modules/x13allegro/controllers/admin/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/img/.DS_Store b/modules/x13allegro/img/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/modules/x13allegro/img/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/views/.DS_Store b/modules/x13allegro/views/.DS_Store deleted file mode 100644 index 66aa40d6..00000000 Binary files a/modules/x13allegro/views/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/views/css/.DS_Store b/modules/x13allegro/views/css/.DS_Store deleted file mode 100644 index 90f79be2..00000000 Binary files a/modules/x13allegro/views/css/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/views/js/.DS_Store b/modules/x13allegro/views/js/.DS_Store deleted file mode 100644 index 96c92bab..00000000 Binary files a/modules/x13allegro/views/js/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/views/js/chosen/.DS_Store b/modules/x13allegro/views/js/chosen/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/modules/x13allegro/views/js/chosen/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/views/js/tinymce-variable/.DS_Store b/modules/x13allegro/views/js/tinymce-variable/.DS_Store deleted file mode 100644 index 3937ac4c..00000000 Binary files a/modules/x13allegro/views/js/tinymce-variable/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/views/js/tinymce/.DS_Store b/modules/x13allegro/views/js/tinymce/.DS_Store deleted file mode 100644 index dc7eb8d3..00000000 Binary files a/modules/x13allegro/views/js/tinymce/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/views/js/tinymce/plugins/.DS_Store b/modules/x13allegro/views/js/tinymce/plugins/.DS_Store deleted file mode 100644 index 5499ae93..00000000 Binary files a/modules/x13allegro/views/js/tinymce/plugins/.DS_Store and /dev/null differ diff --git a/modules/x13allegro/views/templates/.DS_Store b/modules/x13allegro/views/templates/.DS_Store deleted file mode 100644 index a3c41b93..00000000 Binary files a/modules/x13allegro/views/templates/.DS_Store and /dev/null differ