From 0e50565f63be703035b5015a571c7014b2704b83 Mon Sep 17 00:00:00 2001 From: "a.belikin" Date: Wed, 13 Nov 2024 20:23:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=20=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D0=B0=D1=82=D1=8C=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B4=20?= =?UTF-8?q?=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B2=D0=BE=D0=B9?= =?UTF-8?q?=D1=81=D1=82=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- intaro.retailcrm/export/export_setup.php | 6 +- .../lib/controller/customexportprops.php | 133 ++++++++++++------ intaro.retailcrm/lib/icml/settingsservice.php | 75 +++++++--- 3 files changed, 145 insertions(+), 69 deletions(-) diff --git a/intaro.retailcrm/export/export_setup.php b/intaro.retailcrm/export/export_setup.php index f8c9d5fc..1091b5e5 100644 --- a/intaro.retailcrm/export/export_setup.php +++ b/intaro.retailcrm/export/export_setup.php @@ -944,10 +944,10 @@ if ($STEP === 1) { if (promises.length > 0) { Promise.all(promises) .finally(() => { - formElem.submit(); + // formElem.submit(); }); } else { - formElem.submit(); + // formElem.submit(); } }); @@ -963,8 +963,8 @@ if ($STEP === 1) { let customPropCatalogId = deleteButton.closest('.iblockExportTable').data('type'); let values = { - 'title': deletedPropTitle, 'code': deletedPropCode, + 'title': deletedPropTitle, }; if (customPropsToDelete.hasOwnProperty(customPropCatalogId)) { diff --git a/intaro.retailcrm/lib/controller/customexportprops.php b/intaro.retailcrm/lib/controller/customexportprops.php index cc16417d..9119932b 100644 --- a/intaro.retailcrm/lib/controller/customexportprops.php +++ b/intaro.retailcrm/lib/controller/customexportprops.php @@ -1,9 +1,12 @@ getRequest()->getInput(); + + if ($data === null) { + + } + + return json_decode($data, true); + } + public function saveAction() { - $request = $this->getRequest()->getInput(); - $response = new Result(); + $settingsService = SettingsService::getInstance( + [], + null + ); - if ($request === null) { - $response->setStatus(new Error('Ошибка')); - } - - $requestData = json_decode($request, true); - $properties = $requestData['properties']; + $requestData = $this->getRequestData(); + $props = $requestData['properties']; $profileId = $requestData['profileId']; - foreach ($properties as $catalogId => $propertyArray) { - $newPropertiesString = ''; - foreach ($propertyArray as $property) { - $newPropertiesString .= PHP_EOL . $property['code'] . ' = ' . $property['title']; + $dbConnection = Application::getInstance()->getConnection(); + try { + $dbConnection->startTransaction(); + foreach ($props as $catalogId => $propsArray) { + $catalogCustomProps = []; + foreach ($propsArray as $property) { + $catalogCustomProps[] = [ + 'code' => $property['code'], + 'title' => $property['title'] + ]; + } + $settingsService->setCustomProps($profileId, $catalogId, $catalogCustomProps); } - $filePath = sprintf( - '%s/%s_profileId_%s_catalogId_%s.txt', - $_SERVER['DOCUMENT_ROOT'] . '/local', - 'icml_property_retailcrm', - $profileId, - $catalogId - ); - $saveResult = file_put_contents($filePath, $newPropertiesString, FILE_APPEND); + $dbConnection->commitTransaction(); + } catch (\Throwable $e) { + $dbConnection->rollbackTransaction(); } - - if (!$saveResult) { - $response->setStatus(new Error('Ошибка')); - } - -// return $response->setStatus(Result::SUCCESS); } public function deleteAction() { - $request = $this->getRequest()->getInput(); + $settingsService = SettingsService::getInstance( + [], + null + ); - $requestData = json_decode($request, true); - $properties = $requestData['properties']; + $requestData = $this->getRequestData(); + $props = $requestData['properties']; $profileId = $requestData['profileId']; - foreach ($properties as $catalogId => $propsArray) { - $filePath = sprintf( - '%s/%s_profileId_%s_catalogId_%s.txt', - $_SERVER['DOCUMENT_ROOT'] . '/local', - 'icml_property_retailcrm', - $profileId, - $catalogId - ); - $fileContent = file_get_contents($filePath); + $dbConnection = Application::getInstance()->getConnection(); + + try { + $dbConnection->startTransaction(); + + foreach ($props as $catalogId => $propsArray) { + $catalogCustomProps = []; + foreach ($propsArray as $property) { + $catalogCustomProps[] = [ + 'code' => $property['code'], + 'title' => $property['title'] + ]; + } + $settingsService->deleteCustomProps($profileId, $catalogId, $catalogCustomProps); +// $filePath = sprintf( +// '%s/%s_profileId_%s_catalogId_%s.txt', +// $_SERVER['DOCUMENT_ROOT'] . '/local', +// 'icml_property_retailcrm', +// $profileId, +// $catalogId +// ); +// $fileContent = file_get_contents($filePath); +// +// foreach ($propsArray as $property) { +// $propStringToDelete = PHP_EOL . $property['code'] . ' = ' . $property['title']; +// $fileContent = str_replace($propStringToDelete, '', $fileContent); +// } +// file_put_contents($filePath, $fileContent); - foreach ($propsArray as $property) { - $propStringToDelete = PHP_EOL . $property['code'] . ' = ' . $property['title']; - $fileContent = str_replace($propStringToDelete, '', $fileContent); } - file_put_contents($filePath, $fileContent); + } catch (\Throwable $e) { + $dbConnection->rollbackTransaction(); + // Добавить возврат ответа с ошибкой + } + +// foreach ($props as $catalogId => $propsArray) { +// $filePath = sprintf( +// '%s/%s_profileId_%s_catalogId_%s.txt', +// $_SERVER['DOCUMENT_ROOT'] . '/local', +// 'icml_property_retailcrm', +// $profileId, +// $catalogId +// ); +// $fileContent = file_get_contents($filePath); +// +// foreach ($propsArray as $property) { +// $propStringToDelete = PHP_EOL . $property['code'] . ' = ' . $property['title']; +// $fileContent = str_replace($propStringToDelete, '', $fileContent); +// } +// file_put_contents($filePath, $fileContent); + } - } } \ No newline at end of file diff --git a/intaro.retailcrm/lib/icml/settingsservice.php b/intaro.retailcrm/lib/icml/settingsservice.php index 85b90088..5c04f46e 100644 --- a/intaro.retailcrm/lib/icml/settingsservice.php +++ b/intaro.retailcrm/lib/icml/settingsservice.php @@ -8,8 +8,12 @@ use CCatalogGroup; use CCatalogSku; use CCatalogVat; use CIBlock; +use COption; +use Bitrix\Main\Config\Option; use Intaro\RetailCrm\Service\Hl; use RetailcrmConfigProvider; +use Bitrix\Main\Application; +use Bitrix\Main\Entity\Query; /** * Отвечает за управление настройками выгрузки icml каталога @@ -33,6 +37,8 @@ class SettingsService */ public const INFOBLOCK_WITH_SKU = 'P'; + private const MODULE_ID = 'intaro.retailcrm'; + /** * @var array */ @@ -295,36 +301,16 @@ class SettingsService private function parseNewProps(): array { - global $APPLICATION; global $PROFILE_ID; $currentProfile = $PROFILE_ID; $currentProfileCatalogIds = $this->getProfileCatalogIds(); $result = []; foreach ($currentProfileCatalogIds as $catalogId) { - $customPropsFilePath = sprintf( - '%s/%s_profileId_%s_catalogId_%s.txt', - $_SERVER['DOCUMENT_ROOT'] . '/local', - 'icml_property_retailcrm', - $currentProfile, - $catalogId, - ); - $text = $APPLICATION->GetFileContent($customPropsFilePath); + $catalogCustomProps = $this->getCustomProps($currentProfile, $catalogId); - if ($text === false) { - continue; - } - - preg_match_all('/\w+\s*=\s*\w+[ *\w+]*/mu', $text, $matches); - - foreach ($matches[0] as $newProp) { - $elements = explode("=", $newProp); - - if (empty($elements[0]) || empty($elements[1])) { - continue; - } - - $result[$catalogId][trim($elements[0])] = trim($elements[1]); + foreach ($catalogCustomProps as $prop) { + $result[$catalogId][$prop['code']] = $prop['title']; } } @@ -813,4 +799,47 @@ class SettingsService return [$arIBlockList, $intCountChecked, $intCountAvailIBlock, $arIBlockList['iblockExport'] ?? false]; } + + private function getCustomPropsOptionName(string $profileId, string $catalogId): string + { + return sprintf( + 'customProps_profileId_%s_catalogId_%s', + $profileId, + $catalogId + ); + } + + public function getCustomProps(string $profileId, string $catalogId) + { + $optionName = $this->getCustomPropsOptionName($profileId, $catalogId); + + return unserialize(COption::GetOptionString(self::MODULE_ID, $optionName)); + } + + public function deleteCustomProps( + string $profileId, + string $catalogId, + array $propsToDelete + ): void + { + $currentCatalogProps = $this->getCustomProps($profileId, $catalogId); + $updatedCatalogProps = array_diff($currentCatalogProps, $propsToDelete); + + if (empty($updatedCatalogProps)) { + $this->setCustomProps($profileId, $catalogId, []); + } + + $this->setCustomProps($profileId, $catalogId, $updatedCatalogProps); + } + + public function setCustomProps( + string $profileId, + string $catalogId, + array $props + ): void { + $optionName = $this->getCustomPropsOptionName($profileId, $catalogId); + $propsString = serialize($props); + + COption::SetOptionString(self::MODULE_ID, $optionName, $propsString); + } }