diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ae64386..c8b33fc 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,9 @@ +2.1.0 (2.06.2021) +------------------ + +- Повышена версия `komtet-kassa-php-sdk` до версии 8.0.0 +- Добавлено метаобновление для удаления неиспользуемых файлов (`CourierManager`,`CourierManagerTest`) + 2.0.5 (13.04.2021) ------------------ diff --git a/komtetkassa/lib/config/plugin.php b/komtetkassa/lib/config/plugin.php index 76c4c1e..15e22e8 100755 --- a/komtetkassa/lib/config/plugin.php +++ b/komtetkassa/lib/config/plugin.php @@ -3,7 +3,7 @@ return array( 'name' => 'КОМТЕТ Касса', 'description' => 'Фискализация платежей с помощью сервиса КОМТЕТ Касса', - 'version' => '2.0.5', + 'version' => '2.1.0', 'vendor' => 1087963, 'frontend' => true, 'handlers' => array( diff --git a/komtetkassa/lib/shopKomtetkassa.plugin.php b/komtetkassa/lib/shopKomtetkassa.plugin.php index b885f93..6f11aa3 100755 --- a/komtetkassa/lib/shopKomtetkassa.plugin.php +++ b/komtetkassa/lib/shopKomtetkassa.plugin.php @@ -236,7 +236,7 @@ private function processReceipt($params, $operation = 'payment', $check_type=Cal $position = $this->generatePosition($item, 1, $vat, $check_type); if ($check_type != CalculationMethod::PRE_PAYMENT_FULL) { - $nomenclature = new Nomenclature(Nomenclature::SHOES, $nomenclatures[$i]); + $nomenclature = new Nomenclature($nomenclatures[$i]); $position->setNomenclature($nomenclature); } $check->addPosition($position); @@ -266,7 +266,6 @@ private function processReceipt($params, $operation = 'payment', $check_type=Cal round($order['shipping'], 2), 1, round($order['shipping'], 2), - 0, $vat ); $check->addPosition($position); @@ -579,7 +578,6 @@ private function generatePosition($item, $quantity, $vat, $check_type) { round($item['price'], 2), round(floatval($quantity), 2), round($item_total, 2), - 0, $vat); // // start 1C sku // $sql_one = sprintf( diff --git a/komtetkassa/lib/updates/1622615423.php b/komtetkassa/lib/updates/1622615423.php new file mode 100644 index 0000000..8f61baa --- /dev/null +++ b/komtetkassa/lib/updates/1622615423.php @@ -0,0 +1,22 @@ +getAppPath($file); + + if (file_exists($path)) { + try { + waFiles::delete($path); + } catch (waException $e) { + $this->writeLog('Error while delete files'); + } + } else { + $this->writeLog('File not exists'); + } +} diff --git a/komtetkassa/lib/vendors/komtet-kassa-php-sdk b/komtetkassa/lib/vendors/komtet-kassa-php-sdk index ea77633..4a2a787 160000 --- a/komtetkassa/lib/vendors/komtet-kassa-php-sdk +++ b/komtetkassa/lib/vendors/komtet-kassa-php-sdk @@ -1 +1 @@ -Subproject commit ea776335f8f329ac64adfd3a25e72b088dee7b8a +Subproject commit 4a2a78738f46f31ea1e082947f5bb4427ecd30d5