1c/OpenIntegrations
1
0
Fork 0
mirror of https://github.com/Bayselonarrend/OpenIntegrations.git synced 2025-02-03 13:22:19 +02:00
Code Issues Releases Activity

CDEK: Штрихкоды

Browse Source
This commit is contained in:
Anton 2024-10-20 10:28:57 +03:00
commit 6039ae7db4
7 changed files with 361 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

680
service/dictionaries/en.json
View File

File diff suppressed because it is too large Load Diff

2
src/en/OInt/core/Modules/OPI_Bitrix24.os
View File

@ -1026,7 +1026,7 @@ Function GetTasksFilterStructure(Val Clear = False, Val AsMap = False) Export
, "<status for sorting. Similar to REAL_STATUS, but has three additional meta-statuses>");
If Clear Then
OPI_Tools.ClearCollectionRecursively(FilterStructure);
FilterStructure = OPI_Tools.ClearCollectionRecursively(FilterStructure);
EndIf;
//@skip-check constructor-function-return-section

10
src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os
View File

@ -461,8 +461,6 @@ Function ClearCollectionRecursively(Val Collection) Export
EndDo;
Collection_ = Collection;
ElsIf ValeType = Type("Map") Then
Collection_ = New Map;
@ -475,6 +473,8 @@ Function ClearCollectionRecursively(Val Collection) Export
EndDo;
Collection = Collection_;
ElsIf ValeType = Type("Array") Then
Collection_ = New Array;
@ -486,13 +486,15 @@ Function ClearCollectionRecursively(Val Collection) Export
EndDo;
Collection = Collection_;
Else
Collection_ = "";
Collection = "";
EndIf;
Return Collection_;
Return Collection;
EndFunction

2
src/en/OPI/src/CommonModules/OPI_Bitrix24/Module.bsl
View File

@ -1026,7 +1026,7 @@ Function GetTasksFilterStructure(Val Clear = False, Val AsMap = False) Export
, "<status for sorting. Similar to REAL_STATUS, but has three additional meta-statuses>");
If Clear Then
OPI_Tools.ClearCollectionRecursively(FilterStructure);
FilterStructure = OPI_Tools.ClearCollectionRecursively(FilterStructure);
EndIf;
//@skip-check constructor-function-return-section

10
src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl
View File

@ -461,8 +461,6 @@ Function ClearCollectionRecursively(Val Collection) Export
EndDo;
Collection_ = Collection;
ElsIf ValeType = Type("Map") Then
Collection_ = New Map;
@ -475,6 +473,8 @@ Function ClearCollectionRecursively(Val Collection) Export
EndDo;
Collection = Collection_;
ElsIf ValeType = Type("Array") Then
Collection_ = New Array;
@ -486,13 +486,15 @@ Function ClearCollectionRecursively(Val Collection) Export
EndDo;
Collection = Collection_;
Else
Collection_ = "";
Collection = "";
EndIf;
Return Collection_;
Return Collection;
EndFunction

4
src/ru/OInt/tools/Modules/internal/Modules/OPI_Инструменты.os
View File

@ -472,9 +472,9 @@
Коллекция_.Вставить(ЭлементКоллекции.Ключ, ОчищенноеПоле);
КонецЦикла;
Коллекция = Коллекция_;
ИначеЕсли ТипЗначения = Тип("Массив") Тогда
Коллекция_ = Новый Массив;

8
src/ru/OPI/src/CommonModules/OPI_Инструменты/Module.bsl
View File

@ -462,9 +462,9 @@
КонецЦикла;
ИначеЕсли ТипЗначения = Тип("Соответствие") Тогда
Коллекция_ = Новый Соответствие;
Для Каждого ЭлементКоллекции Из Коллекция Цикл
ОчищенноеПоле = ОчиститьКоллекциюРекурсивно(ЭлементКоллекции.Значение);
@ -472,9 +472,9 @@
Коллекция_.Вставить(ЭлементКоллекции.Ключ, ОчищенноеПоле);
КонецЦикла;
Коллекция = Коллекция_;
ИначеЕсли ТипЗначения = Тип("Массив") Тогда
Коллекция_ = Новый Массив;