oneentry 1.0.116 → 1.0.117

package/dist/auth-provider/authProvidersInterfaces.d.ts

@@ -16,7 +16,7 @@ import type { IError, ILocalizeInfo } from '../base/utils';
 interface IAuthProvider {
     signUp(marker: string, data: ISignUpData, langCode?: string): Promise<ISignUpEntity | IError>;
     generateCode(marker: string, userIdentifier: string, eventIdentifier: string): Promise<void | IError>;
-    checkCode(marker: string, userIdentifier: string, code: string, eventIdentifier: string): Promise<boolean | IError>;
+    checkCode(marker: string, userIdentifier: string, eventIdentifier: string, code: string): Promise<boolean | IError>;
     activateUser(marker: string, userIdentifier: string, code: string): Promise<boolean | IError>;
     auth(marker: string, data: IAuthPostBody): Promise<IAuthEntity | IError>;
     refresh(marker: string, token: string): Promise<IAuthEntity | IError>;

package/dist/base/syncModules.d.ts

@@ -43,7 +43,7 @@ export default abstract class SyncModules {
      */
     protected _clearArray(data: Record<string, any>): any;
     /**
-     * sortAttributes
+     * Sort attributes by its positions
      *
      * @param data
      * @returns
@@ -58,7 +58,7 @@ export default abstract class SyncModules {
      * @param days
      * @returns
      */
-    protected _addDays(date: string | number | Date, days: number): Date;
+    protected _addDays(date: Date, days: number): Date;
     /**
      * Function to generate intervals for a specific date
      *
@@ -66,18 +66,18 @@ export default abstract class SyncModules {
      * @param schedule
      * @param utcIntervals
      */
-    protected _generateIntervalsForDate(date: string | number | Date, schedule: {
-        inEveryWeek: any;
+    protected _generateIntervalsForDate(date: Date, schedule: {
+        inEveryWeek: boolean;
         times: any[];
-        inEveryMonth: any;
-    }, utcIntervals: any[][]): void;
+        inEveryMonth: boolean;
+    }, utcIntervals: Set<Array<string>>): void;
     /**
      * Add TimeIntervals to schedules
      *
      * @param schedules
      * @returns schedules with timeIntervals
      */
-    protected _addTimeIntervalsToSchedules(schedules: any[]): any[];
+    _addTimeIntervalsToSchedules(schedules: any[]): any[];
     /**
      * normalizeAttr
      *

package/dist/base/syncModules.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 class SyncModules {
     constructor(state) {
         /**
-         * sortAttributes
+         * Sort attributes by its positions
          *
          * @param data
          * @returns
@@ -143,40 +143,85 @@ class SyncModules {
      * @param utcIntervals
      */
     _generateIntervalsForDate(date, schedule, utcIntervals) {
-        // Generate intervals based on weekly repetition
-        if (schedule.inEveryWeek) {
-            for (let week = 0; week < 4; week++) {
+        // inEveryWeek
+        if (schedule.inEveryWeek && !schedule.inEveryMonth) {
+            let currentDate = new Date(date);
+            // Вычисляем последний день текущего месяца
+            const endOfMonth = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0);
+            while (currentDate <= endOfMonth) {
                 schedule.times.forEach((timeRange) => {
                     const [startTime, endTime] = timeRange;
-                    const intervalStart = this._addDays(date, week * 7);
+                    const intervalStart = new Date(currentDate);
                     intervalStart.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
-                    const intervalEnd = this._addDays(date, week * 7);
+                    const intervalEnd = new Date(currentDate);
                     intervalEnd.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
-                    utcIntervals.push([
+                    // Добавляем строку JSON в Set для уникальности
+                    utcIntervals.add([
                         intervalStart.toISOString(),
                         intervalEnd.toISOString(),
                     ]);
                 });
+                currentDate = this._addDays(currentDate, 7); // Переходим к следующей неделе
             }
         }
-        // Generate intervals based on monthly repetition
-        if (schedule.inEveryMonth) {
-            for (let month = 0; month < 12; month++) {
+        // inEveryMonth
+        if (schedule.inEveryMonth && !schedule.inEveryWeek) {
+            const startDate = new Date(date); // Начальная дата
+            const targetDayOfMonth = startDate.getUTCDate(); // Определяем день месяца начальной даты
+            const numberOfMonths = 12; // Количество месяцев, на которые нужно повторить
+            for (let i = 0; i < numberOfMonths; i++) {
+                const currentDate = new Date(startDate);
+                currentDate.setUTCMonth(currentDate.getUTCMonth() + i);
+                // Попробуем установить текущую дату на целевой день месяца
+                currentDate.setUTCDate(targetDayOfMonth);
+                // Проверяем, не вышли ли мы за пределы месяца
+                if (currentDate.getUTCMonth() !== (startDate.getUTCMonth() + i) % 12) {
+                    continue; // Если вышли, пропускаем этот месяц
+                }
                 schedule.times.forEach((timeRange) => {
                     const [startTime, endTime] = timeRange;
-                    const intervalStart = new Date(date);
-                    intervalStart.setUTCMonth(intervalStart.getUTCMonth() + month);
+                    const intervalStart = new Date(currentDate);
                     intervalStart.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
-                    const intervalEnd = new Date(date);
-                    intervalEnd.setUTCMonth(intervalEnd.getUTCMonth() + month);
+                    const intervalEnd = new Date(currentDate);
                     intervalEnd.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
-                    utcIntervals.push([
+                    utcIntervals.add([
                         intervalStart.toISOString(),
                         intervalEnd.toISOString(),
                     ]);
                 });
             }
         }
+        // inEveryMonth && inEveryWeek
+        if (schedule.inEveryMonth && schedule.inEveryWeek) {
+            const startDate = new Date(date); // Начальная дата
+            const targetDayOfWeek = startDate.getUTCDay(); // Определяем день недели начальной даты
+            const numberOfMonths = 12; // Количество месяцев, на которые нужно повторить
+            for (let i = 0; i < numberOfMonths; i++) {
+                const currentDate = new Date(startDate);
+                currentDate.setUTCMonth(currentDate.getUTCMonth() + i);
+                currentDate.setUTCDate(1); // Устанавливаем на первый день месяца
+                // Находим первый целевой день недели в текущем месяце
+                const daysUntilTargetDay = (targetDayOfWeek - currentDate.getUTCDay() + 7) % 7;
+                currentDate.setUTCDate(currentDate.getUTCDate() + daysUntilTargetDay);
+                // Проходим по всем целевым дням недели в текущем месяце
+                while (currentDate.getUTCMonth() ===
+                    (startDate.getUTCMonth() + i) % 12) {
+                    schedule.times.forEach((timeRange) => {
+                        const [startTime, endTime] = timeRange;
+                        const intervalStart = new Date(currentDate);
+                        intervalStart.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
+                        const intervalEnd = new Date(currentDate);
+                        intervalEnd.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
+                        utcIntervals.add([
+                            intervalStart.toISOString(),
+                            intervalEnd.toISOString(),
+                        ]);
+                    });
+                    // Переходим к следующей неделе (следующему такому же дню недели)
+                    currentDate.setUTCDate(currentDate.getUTCDate() + 7);
+                }
+            }
+        }
     }
     /**
      * Add TimeIntervals to schedules
@@ -187,23 +232,19 @@ class SyncModules {
     _addTimeIntervalsToSchedules(schedules) {
         schedules.forEach((scheduleGroup) => {
             scheduleGroup.values.forEach((schedule) => {
-                const utcIntervals = [];
+                const utcIntervals = new Set();
                 const startDate = new Date(schedule.dates[0]);
                 const endDate = new Date(schedule.dates[1]);
-                // Check if the dates are the same
                 const isSameDay = startDate.toISOString() === endDate.toISOString();
-                // If the dates are the same, process only the first date
                 if (isSameDay) {
                     this._generateIntervalsForDate(startDate, schedule, utcIntervals);
                 }
                 else {
-                    // Otherwise, process each day in the range
                     for (let currentDate = new Date(startDate); currentDate <= endDate; currentDate = this._addDays(currentDate, 1)) {
                         this._generateIntervalsForDate(currentDate, schedule, utcIntervals);
                     }
                 }
-                // Add calculated intervals to the new field timeIntervals
-                schedule.timeIntervals = utcIntervals;
+                schedule.timeIntervals = Array.from(utcIntervals).sort();
             });
         });
         return schedules;
@@ -225,7 +266,8 @@ class SyncModules {
                 // add timeIntervals
                 if (data.attributeValues[attr].type === 'timeInterval') {
                     const schedules = data.attributeValues[attr].value;
-                    if (typeof schedules === 'object' && schedules.length > 0) {
+                    // console.log(JSON.stringify(schedules));
+                    if (Array.isArray(schedules) && schedules.length > 0) {
                         const result = this._addTimeIntervalsToSchedules(schedules);
                         data.attributeValues[attr].value = result;
                     }

package/dist/base/utils.d.ts

@@ -69,6 +69,8 @@ interface IAttributes {
     type: string;
     settings?: Record<string, any>;
     validators: Record<string, any>;
+    additionalFields?: any;
+    [key: string]: any;
 }
 interface ILocalizeInfos {
     [key: string]: ILocalizeInfo;

package/dist/file-uploading/fileUploadingApi.d.ts

@@ -16,12 +16,13 @@ export default class FileUploadingApi extends AsyncModules implements IFileUploa
      * @param {File} [data] File objects. Get data as File from your unput as e.target.files[0]
      *
      * @param {IUploadingQuery} [fileQuery] - Optional set query parameters.
-     * @param {string} [fileQuery.type] - Type, determines the folder name in the storage. Example : "page"
-     * @param {string} [fileQuery.entity] - Entity name from which the file is uploaded, determines the folder name in the storage. Example : "editor"
-     * @param {number} [fileQuery.id] - Identifier of the object from which the file is uploaded, determines the folder name in the storage. Example : 3787
-     * @param {number} [fileQuery.width] - Optional width parameter. Example : 0
-     * @param {number} [fileQuery.height] - Optional height parameter. Example : 0
-     * @param {boolean} [fileQuery.compress] - Optional flag of optimization (compression) for images. Example : true
+     * @param {string} [fileQuery.type] - Type, determines the folder name in the storage. Example: "page"
+     * @param {string} [fileQuery.entity] - Entity name from which the file is uploaded, determines the folder name in the storage. Example: "editor"
+     * @param {number} [fileQuery.id] - Identifier of the object from which the file is uploaded, determines the folder name in the storage. Example: 3787
+     * @param {number} [fileQuery.width] - Optional width parameter. Example: 0
+     * @param {number} [fileQuery.height] - Optional height parameter. Example: 0
+     * @param {boolean} [fileQuery.compress] - Optional flag of optimization (compression) for images. Example: true
+     * @param {boolean} [fileQuery.template] - preview template identifier. Example: 1
      *
      * @returns Uploads a file to an Amazon S3-compatible cloud file storage
      */
@@ -32,9 +33,10 @@ export default class FileUploadingApi extends AsyncModules implements IFileUploa
      * @param {string} [filename] File name. Example "file.png"
      *
      * @param {IUploadingQuery} [fileQuery] - Optional set query parameters.
-     * @param {string} [fileQuery.type] - Type, determines the folder name in the storage. Example : "page"
-     * @param {string} [fileQuery.entity] - Entity name from which the file is uploaded, determines the folder name in the storage. Example : "editor"
-     * @param {number} [fileQuery.id] - Identifier of the object from which the file is uploaded, determines the folder name in the storage. Example : 3787
+     * @param {string} [fileQuery.type] - Type, determines the folder name in the storage. Example: "page"
+     * @param {string} [fileQuery.entity] - Entity name from which the file is uploaded, determines the folder name in the storage. Example: "editor"
+     * @param {number} [fileQuery.id] - Identifier of the object from which the file is uploaded, determines the folder name in the storage. Example: 3787
+     * @param {number} [fileQuery.template] - preview template identifier. Example: 1
      *
      * @returns Deletes a file from the cloud file storage
      */
@@ -47,8 +49,9 @@ export default class FileUploadingApi extends AsyncModules implements IFileUploa
      * @param {string} [type] - Type, determines the folder name in the storage
      * @param {string} [entity] - entity name, from which the file is uploaded, determines the folder name in the storage
      * @param {string} [filename] - Filename. Example "file.png"
+     * @param {string} [template] - preview template identifier. Example 1
      *
      * @returns Return file as File object
      */
-    getFile(id: number, type: string, entity: string, filename?: string): Promise<Blob | IError>;
+    getFile(id: number, type: string, entity: string, filename?: string, template?: string): Promise<Blob | IError>;
 }

package/dist/file-uploading/fileUploadingApi.js

@@ -28,12 +28,13 @@ class FileUploadingApi extends asyncModules_1.default {
      * @param {File} [data] File objects. Get data as File from your unput as e.target.files[0]
      *
      * @param {IUploadingQuery} [fileQuery] - Optional set query parameters.
-     * @param {string} [fileQuery.type] - Type, determines the folder name in the storage. Example : "page"
-     * @param {string} [fileQuery.entity] - Entity name from which the file is uploaded, determines the folder name in the storage. Example : "editor"
-     * @param {number} [fileQuery.id] - Identifier of the object from which the file is uploaded, determines the folder name in the storage. Example : 3787
-     * @param {number} [fileQuery.width] - Optional width parameter. Example : 0
-     * @param {number} [fileQuery.height] - Optional height parameter. Example : 0
-     * @param {boolean} [fileQuery.compress] - Optional flag of optimization (compression) for images. Example : true
+     * @param {string} [fileQuery.type] - Type, determines the folder name in the storage. Example: "page"
+     * @param {string} [fileQuery.entity] - Entity name from which the file is uploaded, determines the folder name in the storage. Example: "editor"
+     * @param {number} [fileQuery.id] - Identifier of the object from which the file is uploaded, determines the folder name in the storage. Example: 3787
+     * @param {number} [fileQuery.width] - Optional width parameter. Example: 0
+     * @param {number} [fileQuery.height] - Optional height parameter. Example: 0
+     * @param {boolean} [fileQuery.compress] - Optional flag of optimization (compression) for images. Example: true
+     * @param {boolean} [fileQuery.template] - preview template identifier. Example: 1
      *
      * @returns Uploads a file to an Amazon S3-compatible cloud file storage
      */
@@ -50,9 +51,10 @@ class FileUploadingApi extends asyncModules_1.default {
      * @param {string} [filename] File name. Example "file.png"
      *
      * @param {IUploadingQuery} [fileQuery] - Optional set query parameters.
-     * @param {string} [fileQuery.type] - Type, determines the folder name in the storage. Example : "page"
-     * @param {string} [fileQuery.entity] - Entity name from which the file is uploaded, determines the folder name in the storage. Example : "editor"
-     * @param {number} [fileQuery.id] - Identifier of the object from which the file is uploaded, determines the folder name in the storage. Example : 3787
+     * @param {string} [fileQuery.type] - Type, determines the folder name in the storage. Example: "page"
+     * @param {string} [fileQuery.entity] - Entity name from which the file is uploaded, determines the folder name in the storage. Example: "editor"
+     * @param {number} [fileQuery.id] - Identifier of the object from which the file is uploaded, determines the folder name in the storage. Example: 3787
+     * @param {number} [fileQuery.template] - preview template identifier. Example: 1
      *
      * @returns Deletes a file from the cloud file storage
      */
@@ -69,11 +71,12 @@ class FileUploadingApi extends asyncModules_1.default {
      * @param {string} [type] - Type, determines the folder name in the storage
      * @param {string} [entity] - entity name, from which the file is uploaded, determines the folder name in the storage
      * @param {string} [filename] - Filename. Example "file.png"
+     * @param {string} [template] - preview template identifier. Example 1
      *
      * @returns Return file as File object
      */
-    async getFile(id, type, entity, filename) {
-        const response = await fetch(this._getFullPath(`?id=${id}&type=${type}&entity=${entity}${filename ? `&filename=${filename}` : ''}`), {
+    async getFile(id, type, entity, filename, template) {
+        const response = await fetch(this._getFullPath(`?id=${id}&type=${type}&entity=${entity}${filename ? `&filename=${filename}` : ''}${template ? `&template=${template}` : ''}`), {
             method: 'GET',
             headers: {
                 'Content-Type': 'application/json',

package/dist/integration-collections/integrationCollectionsApi.d.ts

@@ -40,6 +40,8 @@ export default class IntegrationCollectionsApi extends AsyncModules implements I
      *
      * @param {number} [userQuery.limit] - Optional parameter for pagination, default is 0
      * @param {number} [userQuery.offset] - Optional parameter for pagination, default is 30
+     * @param {number} [userQuery.entityType] - Entity type. Example: 1
+     * @param {number} [userQuery.entityId] - Entity identifier. Example: orders
      *
      * @returns Returns object ItemsWithTotal, where items is an array of requested objects
      */

package/dist/integration-collections/integrationCollectionsApi.js

@@ -56,6 +56,8 @@ class IntegrationCollectionsApi extends asyncModules_1.default {
      *
      * @param {number} [userQuery.limit] - Optional parameter for pagination, default is 0
      * @param {number} [userQuery.offset] - Optional parameter for pagination, default is 30
+     * @param {number} [userQuery.entityType] - Entity type. Example: 1
+     * @param {number} [userQuery.entityId] - Entity identifier. Example: orders
      *
      * @returns Returns object ItemsWithTotal, where items is an array of requested objects
      */

package/dist/menus/menusInterfaces.d.ts

@@ -21,8 +21,8 @@ interface IMenus {
  */
 interface IMenusPages {
     children?: Array<IMenusPages> | IMenusPages;
-    id: number;
-    pageUrl: string;
+    id: number | null;
+    pageUrl: string | null;
     localizeInfos: ILocalizeInfo;
     attributeValues: any;
     position: number;

package/dist/orders/ordersInterfaces.d.ts

@@ -90,8 +90,8 @@ interface IBaseOrdersEntity {
     paymentAccountIdentifier: string;
     formData: Array<IOrdersFormData>;
     products: Array<IOrderProductData>;
-    createdDate: string;
-    totalSum: string;
+    createdDate?: string;
+    totalSum: number;
     currency: string;
     id: number;
     statusIdentifier?: string;

package/dist/payments/paymentsInterfaces.d.ts

@@ -115,5 +115,6 @@ interface IAccountsEntity {
     localizeInfos: Record<string, any>;
     type: 'stripe' | 'custom';
     isVisible: boolean;
+    isUsed: boolean;
 }
 export type { IAccountsEntity, IConnectedEntity, ICreateSessionEntity, IIntent, IPaymentsApi, ISessionEntity, ISessionItem, ISessionsEntity, };

package/dist/products/productsInterfaces.d.ts

@@ -100,9 +100,9 @@ interface IProductsEntity {
     localizeInfos: Record<string, any>;
     isVisible: boolean;
     statusIdentifier: string | null;
-    attributeSetIdentifier: string;
+    attributeSetIdentifier: string | null;
     isSync: number | boolean;
-    price: number;
+    price: number | null;
     templateIdentifier: string | null;
     shortDescTemplateIdentifier: string | null;
     statusLocalizeInfos: Record<string, any>;
@@ -171,8 +171,8 @@ interface IProductBlock {
         productConfig: {
             quantity: string | number;
             countElementsPerRow: string | number;
-            sortType?: string;
-            sortOrder?: string;
+            sortType?: string | number;
+            sortOrder?: string | number;
         };
         similarProductRules: Array<{
             property: string;

package/dist/templates-preview/templatesPreviewInterfaces.d.ts

@@ -29,7 +29,7 @@ interface ITemplatesPreviewEntity {
     version: number;
     identifier: string;
     attributeValues: AttributeType;
-    attributeSetIdentifier: string | null;
+    attributeSetIdentifier?: string | null;
     proportion: {
         horizontal: IProportion | null;
         vertical: IProportion | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oneentry",
-  "version": "1.0.116",
+  "version": "1.0.117",
   "description": "OneEntry NPM package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",