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

Fix bug with option name (#179)

Browse Source 
fixes #178 ICML generation problem
This commit is contained in:
Dima Uryvskiy 2020-04-02 16:35:35 +03:00 committed by GitHub
parent 5e695863a3
commit dc2bee57d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,3 +7,4 @@
/www /www
/bin /bin
.env .env
composer.lock

2
VERSION
View File

@ -1 +1 @@
3.3.7 3.3.8

26
src/upload/admin/model/extension/retailcrm/icml.php
View File

@ -136,11 +136,13 @@ class ModelExtensionRetailcrmIcml extends Model
if ($optionString != '0:0-0') { if ($optionString != '0:0-0') {
$optionData = $this->getOptionData($optionIds[1], $option[1]); $optionData = $this->getOptionData($optionIds[1], $option[1]);
$options[$optionIds[0]] = array( if (!empty($optionData)) {
'name' => $optionData['optionName'], $options[$optionIds[0]] = array(
'value' => $optionData['optionValue'], 'name' => $optionData['optionName'],
'value_id' => $option[1] 'value' => $optionData['optionValue'],
); 'value_id' => $option[1]
);
}
} }
} }
@ -247,7 +249,7 @@ class ModelExtensionRetailcrmIcml extends Model
$productHeight = $product['height']; $productHeight = $product['height'];
} }
if ($defaultLenght['length_class_id'] != $settingLenght) { if ($defaultLenght['length_class_id'] != $settingLenght && $settingLenght) {
$unit = $this->model_localisation_length_class->getLengthClass($settingLenght); $unit = $this->model_localisation_length_class->getLengthClass($settingLenght);
$productLength = $productLength * $unit['value']; $productLength = $productLength * $unit['value'];
$productWidth = $productWidth * $unit['value']; $productWidth = $productWidth * $unit['value'];
@ -311,7 +313,7 @@ class ModelExtensionRetailcrmIcml extends Model
$weight = $this->dd->createElement('param'); $weight = $this->dd->createElement('param');
$weight->setAttribute('code', 'weight'); $weight->setAttribute('code', 'weight');
$weight->setAttribute('name', $this->language->get('weight')); $weight->setAttribute('name', $this->language->get('weight'));
$weightValue = (isset($offer['weight_class'])) $weightValue = (isset($product['weight_class']))
? round($product['weight'], 3) . ' ' . $product['weight_class'] ? round($product['weight'], 3) . ' ' . $product['weight_class']
: round($product['weight'], 3) : round($product['weight'], 3)
; ;
@ -356,10 +358,12 @@ class ModelExtensionRetailcrmIcml extends Model
$this->optionValues[$optionValueId] = $optionValue; $this->optionValues[$optionValueId] = $optionValue;
} }
return array( if (!empty($option['name']) || !empty($optionValue['name'])) {
'optionName' => $option['name'], return array(
'optionValue' => $optionValue['name'] 'optionName' => $option['name'],
); 'optionValue' => $optionValue['name']
);
}
} }
private function getDefaultCurrency() { private function getDefaultCurrency() {