diff --git a/.vscode/ftp-kr.sync.cache.json b/.vscode/ftp-kr.sync.cache.json index 8822804e..e17aa3b6 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": 17855251, + "size": 17845600, "lmtime": 0, "modified": true }, diff --git a/modules/import_api/classes/creator.php b/modules/import_api/classes/creator.php index 210b92ac..c2371597 100644 --- a/modules/import_api/classes/creator.php +++ b/modules/import_api/classes/creator.php @@ -480,7 +480,7 @@ class Creator $this->addImageToProduct($original_product['cover'], $product->id, true); } - if ( $original_product['feature'] and $original_product['feature_value'] ) { + if ( isset( $original_product['feature'] ) and $original_product['feature_value'] ) { $original_product['features'] = array( array( 'feature' => $original_product['feature'], diff --git a/modules/import_api/controllers/front/import.php b/modules/import_api/controllers/front/import.php index 9fc035d5..3cef30e4 100644 --- a/modules/import_api/controllers/front/import.php +++ b/modules/import_api/controllers/front/import.php @@ -24,7 +24,7 @@ class Import_ApiImportModuleFrontController extends ModuleFrontController private $import; private $creator; private $convertor; - public static $update_limit = 5; + public static $update_limit = 1; public function initContent() { diff --git a/modules/x13allegro/.DS_Store b/modules/x13allegro/.DS_Store new file mode 100644 index 00000000..5dd95408 Binary files /dev/null and b/modules/x13allegro/.DS_Store differ diff --git a/modules/x13allegro/classes/.DS_Store b/modules/x13allegro/classes/.DS_Store new file mode 100644 index 00000000..6d114a21 Binary files /dev/null and b/modules/x13allegro/classes/.DS_Store differ diff --git a/modules/x13allegro/classes/php5/.DS_Store b/modules/x13allegro/classes/php5/.DS_Store new file mode 100644 index 00000000..7ea8e047 Binary files /dev/null and b/modules/x13allegro/classes/php5/.DS_Store differ diff --git a/modules/x13allegro/classes/php5/Api/.DS_Store b/modules/x13allegro/classes/php5/Api/.DS_Store new file mode 100644 index 00000000..56ee48fb Binary files /dev/null and b/modules/x13allegro/classes/php5/Api/.DS_Store differ diff --git a/modules/x13allegro/classes/php5/Api/DataUpdater/.DS_Store b/modules/x13allegro/classes/php5/Api/DataUpdater/.DS_Store new file mode 100644 index 00000000..135798a0 Binary files /dev/null and b/modules/x13allegro/classes/php5/Api/DataUpdater/.DS_Store differ diff --git a/modules/x13allegro/classes/php5/SyncManager/.DS_Store b/modules/x13allegro/classes/php5/SyncManager/.DS_Store new file mode 100644 index 00000000..a1161982 Binary files /dev/null and b/modules/x13allegro/classes/php5/SyncManager/.DS_Store differ diff --git a/modules/x13allegro/classes/php5/SyncManager/Order/.DS_Store b/modules/x13allegro/classes/php5/SyncManager/Order/.DS_Store new file mode 100644 index 00000000..c21dfe76 Binary files /dev/null and b/modules/x13allegro/classes/php5/SyncManager/Order/.DS_Store differ diff --git a/modules/x13allegro/classes/php5/SyncManager/Order/Data/.DS_Store b/modules/x13allegro/classes/php5/SyncManager/Order/Data/.DS_Store new file mode 100644 index 00000000..b25ac6c4 Binary files /dev/null and b/modules/x13allegro/classes/php5/SyncManager/Order/Data/.DS_Store differ diff --git a/modules/x13allegro/classes/php70/.DS_Store b/modules/x13allegro/classes/php70/.DS_Store new file mode 100644 index 00000000..0d04780b Binary files /dev/null and b/modules/x13allegro/classes/php70/.DS_Store differ diff --git a/modules/x13allegro/classes/php70/Api/.DS_Store b/modules/x13allegro/classes/php70/Api/.DS_Store new file mode 100644 index 00000000..aa624c2b Binary files /dev/null and b/modules/x13allegro/classes/php70/Api/.DS_Store differ diff --git a/modules/x13allegro/classes/php70/Api/DataUpdater/.DS_Store b/modules/x13allegro/classes/php70/Api/DataUpdater/.DS_Store new file mode 100644 index 00000000..2e5620ef Binary files /dev/null and b/modules/x13allegro/classes/php70/Api/DataUpdater/.DS_Store differ diff --git a/modules/x13allegro/classes/php70/SyncManager/.DS_Store b/modules/x13allegro/classes/php70/SyncManager/.DS_Store new file mode 100644 index 00000000..70880e26 Binary files /dev/null and b/modules/x13allegro/classes/php70/SyncManager/.DS_Store differ diff --git a/modules/x13allegro/classes/php70/SyncManager/Order/.DS_Store b/modules/x13allegro/classes/php70/SyncManager/Order/.DS_Store new file mode 100644 index 00000000..0e52a266 Binary files /dev/null and b/modules/x13allegro/classes/php70/SyncManager/Order/.DS_Store differ diff --git a/modules/x13allegro/classes/php70/SyncManager/Order/Data/.DS_Store b/modules/x13allegro/classes/php70/SyncManager/Order/Data/.DS_Store new file mode 100644 index 00000000..b8dbf40f Binary files /dev/null and b/modules/x13allegro/classes/php70/SyncManager/Order/Data/.DS_Store differ diff --git a/modules/x13allegro/classes/php71/.DS_Store b/modules/x13allegro/classes/php71/.DS_Store new file mode 100644 index 00000000..e4079b50 Binary files /dev/null and b/modules/x13allegro/classes/php71/.DS_Store differ diff --git a/modules/x13allegro/classes/php71/Api/.DS_Store b/modules/x13allegro/classes/php71/Api/.DS_Store new file mode 100644 index 00000000..f96db5f7 Binary files /dev/null and b/modules/x13allegro/classes/php71/Api/.DS_Store differ diff --git a/modules/x13allegro/classes/php71/Api/DataUpdater/.DS_Store b/modules/x13allegro/classes/php71/Api/DataUpdater/.DS_Store new file mode 100644 index 00000000..465a407d Binary files /dev/null and b/modules/x13allegro/classes/php71/Api/DataUpdater/.DS_Store differ diff --git a/modules/x13allegro/classes/php71/SyncManager/.DS_Store b/modules/x13allegro/classes/php71/SyncManager/.DS_Store new file mode 100644 index 00000000..ee01bdae Binary files /dev/null and b/modules/x13allegro/classes/php71/SyncManager/.DS_Store differ diff --git a/modules/x13allegro/classes/php71/SyncManager/Order/.DS_Store b/modules/x13allegro/classes/php71/SyncManager/Order/.DS_Store new file mode 100644 index 00000000..e48fa03f Binary files /dev/null and b/modules/x13allegro/classes/php71/SyncManager/Order/.DS_Store differ diff --git a/modules/x13allegro/classes/php71/SyncManager/Order/Data/.DS_Store b/modules/x13allegro/classes/php71/SyncManager/Order/Data/.DS_Store new file mode 100644 index 00000000..ce929c4a Binary files /dev/null and b/modules/x13allegro/classes/php71/SyncManager/Order/Data/.DS_Store differ diff --git a/modules/x13allegro/controllers/.DS_Store b/modules/x13allegro/controllers/.DS_Store new file mode 100644 index 00000000..242eb7fb Binary files /dev/null and b/modules/x13allegro/controllers/.DS_Store differ diff --git a/modules/x13allegro/controllers/admin/.DS_Store b/modules/x13allegro/controllers/admin/.DS_Store new file mode 100644 index 00000000..97c2313b Binary files /dev/null and b/modules/x13allegro/controllers/admin/.DS_Store differ diff --git a/modules/x13allegro/img/.DS_Store b/modules/x13allegro/img/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/modules/x13allegro/img/.DS_Store differ diff --git a/modules/x13allegro/views/.DS_Store b/modules/x13allegro/views/.DS_Store new file mode 100644 index 00000000..66aa40d6 Binary files /dev/null and b/modules/x13allegro/views/.DS_Store differ diff --git a/modules/x13allegro/views/css/.DS_Store b/modules/x13allegro/views/css/.DS_Store new file mode 100644 index 00000000..90f79be2 Binary files /dev/null and b/modules/x13allegro/views/css/.DS_Store differ diff --git a/modules/x13allegro/views/js/.DS_Store b/modules/x13allegro/views/js/.DS_Store new file mode 100644 index 00000000..96c92bab Binary files /dev/null and b/modules/x13allegro/views/js/.DS_Store differ diff --git a/modules/x13allegro/views/js/chosen/.DS_Store b/modules/x13allegro/views/js/chosen/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/modules/x13allegro/views/js/chosen/.DS_Store differ diff --git a/modules/x13allegro/views/js/tinymce-variable/.DS_Store b/modules/x13allegro/views/js/tinymce-variable/.DS_Store new file mode 100644 index 00000000..3937ac4c Binary files /dev/null and b/modules/x13allegro/views/js/tinymce-variable/.DS_Store differ diff --git a/modules/x13allegro/views/js/tinymce/.DS_Store b/modules/x13allegro/views/js/tinymce/.DS_Store new file mode 100644 index 00000000..dc7eb8d3 Binary files /dev/null and b/modules/x13allegro/views/js/tinymce/.DS_Store differ diff --git a/modules/x13allegro/views/js/tinymce/plugins/.DS_Store b/modules/x13allegro/views/js/tinymce/plugins/.DS_Store new file mode 100644 index 00000000..5499ae93 Binary files /dev/null and b/modules/x13allegro/views/js/tinymce/plugins/.DS_Store differ diff --git a/modules/x13allegro/views/templates/.DS_Store b/modules/x13allegro/views/templates/.DS_Store new file mode 100644 index 00000000..a3c41b93 Binary files /dev/null and b/modules/x13allegro/views/templates/.DS_Store differ