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

ref #73045 Fixed the transfer of the weight of offers

Browse Source
This commit is contained in:
Uryvskiy Dima 2023-07-04 15:03:31 +03:00 committed by GitHub
commit 22a9c2d819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## v4.1.11
* Fixed the transfer of the weight offers
## v4.1.10 ## v4.1.10
* Types of deliveries and payments are displayed only active status and available stores * Types of deliveries and payments are displayed only active status and available stores

2
VERSION
View File

@ -1 +1 @@
4.1.10 4.1.11

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

@ -22,6 +22,7 @@ class ModelExtensionRetailcrmIcml extends Model
{ {
parent::__construct($registry); parent::__construct($registry);
$this->load->library('retailcrm/retailcrm'); $this->load->library('retailcrm/retailcrm');
$this->load->model('localisation/weight_class');
} }
public function generateICML() public function generateICML()
@ -107,6 +108,12 @@ class ModelExtensionRetailcrmIcml extends Model
$defaultCurrency = $this->getDefaultCurrency(); $defaultCurrency = $this->getDefaultCurrency();
$settingLenght = $this->retailcrm->getLenghtForIcml(); $settingLenght = $this->retailcrm->getLenghtForIcml();
$leghtsArray = $this->model_localisation_length_class->getLengthClasses(); $leghtsArray = $this->model_localisation_length_class->getLengthClasses();
$weightClassesMas = $this->model_localisation_weight_class->getWeightClasses();
$weightClasses = [];
foreach ($weightClassesMas as $weightClass) {
$weightClasses[$weightClass['weight_class_id']]['value'] = $weightClass['value'];
}
foreach ($leghtsArray as $lenght) { foreach ($leghtsArray as $lenght) {
if ($lenght['value'] == 1) { if ($lenght['value'] == 1) {
@ -309,18 +316,18 @@ class ModelExtensionRetailcrmIcml extends Model
$e->appendChild($sku); $e->appendChild($sku);
} }
if ($product['weight'] != '') { if ($product['weight'] != '') {
$weight = $this->dd->createElement('param'); $weight = $this->dd->createElement('weight');
$weight->setAttribute('code', 'weight'); $coeffWeight = 1;
$weight->setAttribute('name', $this->language->get('weight'));
if (!empty($optionsValues['weight'])) { if (!empty($weightClasses[$product['weight_class_id']]['value'])) {
$weightValue = round($product['weight'] + $optionsValues['weight'], 3); $coeffWeight = $weightClasses[$product['weight_class_id']]['value'];
} else {
$weightValue = round($product['weight'], 3);
} }
if (isset($product['weight_class'])) { $weightValue = !empty($optionsValues['weight'])
$weightValue = $weightValue . ' ' . $product['weight_class']; ? $product['weight'] + $optionsValues['weight']
} : $product['weight']
;
$weightValue = round($weightValue / $coeffWeight, 6);
$weight->appendChild($this->dd->createTextNode($weightValue)); $weight->appendChild($this->dd->createTextNode($weightValue));
$e->appendChild($weight); $e->appendChild($weight);