RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-24 06:06:06 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #161 from KMityai/v2.2

Browse Source 
fix empty categories and empty options
This commit is contained in:
Alex Lushpai 2019-07-01 10:18:34 +03:00 committed by GitHub
commit 417edc99be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/model/retailcrm/icml.php
View File

@ -69,6 +69,7 @@ class ModelRetailcrmIcml extends Model
foreach($categories as $category) { foreach($categories as $category) {
$category = $this->model_catalog_category->getCategory($category['category_id']); $category = $this->model_catalog_category->getCategory($category['category_id']);
if (!empty($category)) {
$e = $this->eCategories->appendChild( $e = $this->eCategories->appendChild(
$this->dd->createElement( $this->dd->createElement(
'category', $category['name'] 'category', $category['name']
@ -81,7 +82,7 @@ class ModelRetailcrmIcml extends Model
$e->setAttribute('parentId', $category['parent_id']); $e->setAttribute('parentId', $category['parent_id']);
} }
} }
}
} }
private function addOffers() private function addOffers()
@ -174,6 +175,8 @@ class ModelRetailcrmIcml extends Model
$optionIds = explode(':', $option[0]); $optionIds = explode(':', $option[0]);
if($optionString != '0:0-0') { if($optionString != '0:0-0') {
$optionData = $this->getOptionData($optionIds[1], $option[1]); $optionData = $this->getOptionData($optionIds[1], $option[1]);
if (!empty($optionData)) {
$options[$optionIds[0]] = array( $options[$optionIds[0]] = array(
'name' => $optionData['optionName'], 'name' => $optionData['optionName'],
'value' => $optionData['optionValue'], 'value' => $optionData['optionValue'],
@ -181,6 +184,7 @@ class ModelRetailcrmIcml extends Model
); );
} }
} }
}
ksort($options); ksort($options);
$offerId = array(); $offerId = array();
foreach($options as $optionKey => $optionData) { foreach($options as $optionKey => $optionData) {
@ -348,9 +352,14 @@ class ModelRetailcrmIcml extends Model
$optionValue = $this->model_catalog_option->getOptionValue($optionValueId); $optionValue = $this->model_catalog_option->getOptionValue($optionValueId);
$this->optionValues[$optionValueId] = $optionValue; $this->optionValues[$optionValueId] = $optionValue;
} }
if (!empty($option['name']) && !empty($optionValue['name'])) {
return array( return array(
'optionName' => $option['name'], 'optionName' => $option['name'],
'optionValue' => $optionValue['name'] 'optionValue' => $optionValue['name']
); );
} else {
return null;
}
} }
} }