Правки по стилю кода, удаление лишнего кода
This commit is contained in:
Ivan Chaplygin
parent
7159558231
commit
493efbb516
3 changed files with 11 additions and 218 deletions
|
|
@ -64,7 +64,6 @@ function setCustomProperties()
|
|||
customPropertiesRows.each(function (index, propertyRow) {
|
||||
let propertyRowObj = $(propertyRow);
|
||||
customPropertyCatalogId = propertyRowObj.closest('.iblockExportTable').data('type');
|
||||
|
||||
customPropertyTitle = propertyRowObj.find('input[name="custom-property-title"]').val();
|
||||
|
||||
if (!customPropertyTitle) {
|
||||
|
|
@ -87,6 +86,7 @@ function setCustomProperties()
|
|||
} else {
|
||||
customProps[customPropertyCatalogId].push(values);
|
||||
}
|
||||
|
||||
catalogIds.push(customPropertyCatalogId);
|
||||
});
|
||||
}
|
||||
|
|
@ -95,8 +95,8 @@ function getUniquePropertyCode(customPropertyTitle)
|
|||
{
|
||||
let uniqueValue = transliterate(customPropertyTitle).replace(/ /g, '_');
|
||||
let counter = 0;
|
||||
|
||||
const setupFieldsListValues = setupFieldsListElement.val().split(',');
|
||||
|
||||
while (setupFieldsListValues.includes(uniqueValue)) {
|
||||
uniqueValue = `${customPropertyTitle}${++counter}`;
|
||||
}
|
||||
|
|
@ -167,6 +167,7 @@ function createCustomPropsRaw(addRowButton)
|
|||
function fillTemplateSelect(sourceSelectElement, templateSelectElement)
|
||||
{
|
||||
let selectOptions = sourceSelectElement.find('option');
|
||||
|
||||
selectOptions.each(function (index, element) {
|
||||
let optionElem = $(element);
|
||||
let value = $(optionElem).val();
|
||||
|
|
@ -225,212 +226,3 @@ function transliterate(titleToTransliterate)
|
|||
}
|
||||
return translitedText;
|
||||
}
|
||||
/*
|
||||
$(document).on('blur', 'input[name="custom-property-title"]', function () {
|
||||
let inputElem = $(this);
|
||||
let newPropertyTitle = inputElem.val();
|
||||
|
||||
if (!newPropertyTitle) {
|
||||
return;
|
||||
}
|
||||
|
||||
let newPropertyCode = getUniquePropertyCode(newPropertyTitle);
|
||||
addCustomPropCodeToSelectAttributes(newPropertyCode, inputElem);
|
||||
});
|
||||
|
||||
$('#submit-form').submit(function (formEvent) {
|
||||
let formElem = formEvent.currentTarget;
|
||||
formEvent.preventDefault();
|
||||
setCustomProperties();
|
||||
addParamsToSetupFieldsList();
|
||||
|
||||
BX.ajax.runAction('intaro:retailcrm.api.customexportprops.save', {
|
||||
json: {properties: customProps},
|
||||
}).then(function() {
|
||||
formElem.submit();
|
||||
});
|
||||
});
|
||||
|
||||
function addCustomPropCodeToSelectAttributes(customPropCode, customPropTitleElem)
|
||||
{
|
||||
let selectElements = customPropTitleElem.closest('.custom-property-row').find('td select');
|
||||
let catalogId = customPropTitleElem.closest('.iblockExportTable').data('type');
|
||||
|
||||
selectElements.each(function (index, element) {
|
||||
let selectElem = $(element);
|
||||
let newSelectIdValue = selectElem.attr('id').match(/^[^_]*_/)[0] + customPropCode + catalogId;
|
||||
let newSelectNameValue = selectElem.attr('name').match(/^[^_]*_/)[0] + customPropCode + `[${catalogId}]`;
|
||||
|
||||
selectElem.attr('id', newSelectIdValue);
|
||||
selectElem.attr('name', newSelectNameValue);
|
||||
selectElem.data('type', customPropCode);
|
||||
triggerSelectChange(selectElem);
|
||||
});
|
||||
}
|
||||
|
||||
function triggerSelectChange(selectElem)
|
||||
{
|
||||
if (selectElem.val().length > 0) {
|
||||
console.log('был')
|
||||
selectElem.trigger('change', [self]);
|
||||
}
|
||||
}
|
||||
|
||||
function setCustomProperties()
|
||||
{
|
||||
let customPropertiesRows = $('.custom-property-row');
|
||||
let customPropertyCatalogId;
|
||||
let customPropertyTitle = '';
|
||||
let customPropertyCode = '';
|
||||
let productPropertyMatch = '';
|
||||
let offerPropertyMatch = '';
|
||||
|
||||
let catalogIds = [];
|
||||
customPropertiesRows.each(function (index, propertyRow) {
|
||||
let propertyRowObj = $(propertyRow);
|
||||
customPropertyCatalogId = propertyRowObj.closest('.iblockExportTable').data('type');
|
||||
|
||||
customPropertyTitle = propertyRowObj.find('input[name="custom-property-title"]').val();
|
||||
customPropertyCode = getUniquePropertyCode(customPropertyTitle);
|
||||
productPropertyMatch = propertyRowObj.find('select[name=custom-product-property-select]').val();
|
||||
offerPropertyMatch = propertyRowObj.find('select[name=custom-offer-property-select]').val();
|
||||
|
||||
let values = {
|
||||
'title': customPropertyTitle,
|
||||
'code': customPropertyCode,
|
||||
'productProperty': productPropertyMatch,
|
||||
'offerProperty': offerPropertyMatch
|
||||
};
|
||||
|
||||
if (catalogIds.indexOf(customPropertyCatalogId) === -1) {
|
||||
customProps[customPropertyCatalogId] = [values];
|
||||
} else {
|
||||
customProps[customPropertyCatalogId].push(values);
|
||||
}
|
||||
catalogIds.push(customPropertyCatalogId);
|
||||
});
|
||||
}
|
||||
|
||||
function getUniquePropertyCode(customPropertyTitle)
|
||||
{
|
||||
let uniqueValue = transliterate(customPropertyTitle).replace(/ /g, '_');
|
||||
let counter = 0;
|
||||
|
||||
const setupFieldsListValues = setupFieldsListElement.val().split(',');
|
||||
while (setupFieldsListValues.includes(uniqueValue)) {
|
||||
uniqueValue = `${customPropertyTitle}${++counter}`;
|
||||
}
|
||||
|
||||
return uniqueValue;
|
||||
}
|
||||
|
||||
function addParamsToSetupFieldsList()
|
||||
{
|
||||
let newParams = '';
|
||||
let parametersToFill = [
|
||||
'iblockPropertySku_',
|
||||
'iblockPropertyUnitSku_',
|
||||
'iblockPropertyProduct_',
|
||||
'iblockPropertyUnitProduct_',
|
||||
'highloadblockb_hlsys_marking_code_group_',
|
||||
'highloadblock_productb_hlsys_marking_code_group_',
|
||||
'highloadblockeshop_color_reference_',
|
||||
'highloadblock_producteshop_color_reference_',
|
||||
'highloadblockeshop_brand_reference_',
|
||||
'highloadblock_producteshop_brand_reference_'
|
||||
];
|
||||
|
||||
for (let propertiesByCatalogId of Object.values(customProps)) {
|
||||
propertiesByCatalogId.forEach(function (values) {
|
||||
parametersToFill.forEach(function (param) {
|
||||
newParams += ',' + param + values.code;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
let newValue = setupFieldsListElement.val() + newParams;
|
||||
setupFieldsListElement.val(newValue);
|
||||
}
|
||||
|
||||
function createCustomPropsRaw(addRowButton)
|
||||
{
|
||||
let templateRow = $($('#custom-property-template-row').html());
|
||||
let templateSelectElements = templateRow.find('select');
|
||||
|
||||
let prevTableRow = $(addRowButton).prev('table').find('tbody tr:last-child');
|
||||
let lastRawSelectElements = prevTableRow.find('td select');
|
||||
|
||||
lastRawSelectElements.each(function (index, element) {
|
||||
let selectElement = $(element);
|
||||
let templateSelectElement = templateSelectElements[index];
|
||||
fillTemplateSelect(selectElement, templateSelectElement);
|
||||
prevTableRow.after(templateRow);
|
||||
});
|
||||
}
|
||||
|
||||
function deleteCustomPropsRaw(buttonEvent)
|
||||
{
|
||||
buttonEvent.closest('tr').remove();
|
||||
}
|
||||
|
||||
function fillTemplateSelect(sourceSelectElement, templateSelectElement)
|
||||
{
|
||||
let selectOptions = sourceSelectElement.find('option');
|
||||
selectOptions.each(function (index, element) {
|
||||
let optionElem = $(element);
|
||||
let value = $(optionElem).val();
|
||||
let text = $(optionElem).text();
|
||||
|
||||
$('<option>', { value: value, text: text }).appendTo(templateSelectElement);
|
||||
});
|
||||
}
|
||||
|
||||
function transliterate(titleToTransliterate)
|
||||
{
|
||||
const hasCyrillicChars = /[\u0400-\u04FF]/.test(titleToTransliterate);
|
||||
|
||||
if (!hasCyrillicChars) {
|
||||
return titleToTransliterate;
|
||||
}
|
||||
|
||||
translitedText = '';
|
||||
for (var i = 0; i < titleToTransliterate.length; i++) {
|
||||
switch (titleToTransliterate[i]) {
|
||||
case 'а': case 'А': translitedText += 'a'; break;
|
||||
case 'б': case 'Б': translitedText += 'b'; break;
|
||||
case 'в': case 'В': translitedText += 'v'; break;
|
||||
case 'г': case 'Г': translitedText += 'g'; break;
|
||||
case 'д': case 'Д': translitedText += 'd'; break;
|
||||
case 'е': case 'Е': translitedText += 'e'; break;
|
||||
case 'ё': case 'Ё': translitedText += 'yo'; break;
|
||||
case 'ж': case 'Ж': translitedText += 'zh'; break;
|
||||
case 'з': case 'З': translitedText += 'z'; break;
|
||||
case 'и': case 'И': translitedText += 'i'; break;
|
||||
case 'й': case 'Й': translitedText += 'y'; break;
|
||||
case 'к': case 'К': translitedText += 'k'; break;
|
||||
case 'л': case 'Л': translitedText += 'l'; break;
|
||||
case 'м': case 'М': translitedText += 'm'; break;
|
||||
case 'н': case 'Н': translitedText += 'n'; break;
|
||||
case 'о': case 'О': translitedText += 'o'; break;
|
||||
case 'п': case 'П': translitedText += 'p'; break;
|
||||
case 'р': case 'Р': translitedText += 'r'; break;
|
||||
case 'с': case 'С': translitedText += 's'; break;
|
||||
case 'т': case 'Т': translitedText += 't'; break;
|
||||
case 'у': case 'У': translitedText += 'u'; break;
|
||||
case 'ф': case 'Ф': translitedText += 'f'; break;
|
||||
case 'х': case 'Х': translitedText += 'h'; break;
|
||||
case 'ц': case 'Ц': translitedText += 'c'; break;
|
||||
case 'ч': case 'Ч': translitedText += 'ch'; break;
|
||||
case 'ш': case 'Ш': translitedText += 'sh'; break;
|
||||
case 'щ': case 'Щ': translitedText += 'sch'; break;
|
||||
case 'ъ': case 'Ъ': translitedText += ''; break;
|
||||
case 'ы': case 'Ы': translitedText += 'y'; break;
|
||||
case 'ь': case 'Ь': translitedText += ''; break;
|
||||
case 'э': case 'Э': translitedText += 'e'; break;
|
||||
case 'ю': case 'Ю': translitedText += 'yu'; break;
|
||||
case 'я': case 'Я': translitedText += 'ya'; break;
|
||||
default: translitedText += titleToTransliterate[i]; break;
|
||||
}
|
||||
}
|
||||
return translitedText;
|
||||
}*/
|
||||
|
|
|
|||
|
|
@ -78,15 +78,18 @@ class CustomExportProps extends Controller
|
|||
|
||||
foreach ($props as $catalogId => $propsArray) {
|
||||
$catalogCustomProps = [];
|
||||
|
||||
foreach ($propsArray as $property) {
|
||||
$catalogCustomProps[] = [
|
||||
'code' => $property['code'],
|
||||
'title' => $property['title']
|
||||
];
|
||||
}
|
||||
|
||||
$settingsService
|
||||
->setCatalogCustomPropsOptionName($catalogId)
|
||||
->removeCustomProps($catalogCustomProps, $catalogId);
|
||||
->removeCustomProps($catalogCustomProps, $catalogId)
|
||||
;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -546,9 +546,6 @@ class SettingsService
|
|||
*/
|
||||
public function isOptionSelected(array $prop, array $oldSelect, string $key): bool
|
||||
{
|
||||
if ($key === 'manufacturer') {
|
||||
$a = 'yes';
|
||||
}
|
||||
if (count($oldSelect) > 0) {
|
||||
if ($prop['CODE'] === $oldSelect[$key]) {
|
||||
return true;
|
||||
|
|
@ -844,9 +841,10 @@ class SettingsService
|
|||
public function removeCustomProps(array $propsToDelete, string $catalogId): void
|
||||
{
|
||||
$currentCatalogProps = $this->getCustomProps();
|
||||
$updatedCatalogProps = array_values(array_filter(
|
||||
$currentCatalogProps,
|
||||
fn ($currentProp) => !in_array($currentProp, $propsToDelete)
|
||||
$updatedCatalogProps = array_values(
|
||||
array_filter(
|
||||
$currentCatalogProps,
|
||||
fn ($currentProp) => !in_array($currentProp, $propsToDelete)
|
||||
));
|
||||
|
||||
if (empty($updatedCatalogProps)) {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue