node-atol-wrapper 0.0.24 → 0.0.26

package/README.md

@@ -2,7 +2,7 @@
 
 Название
 =========
-Node.js обертка для драйвера торгового оборудования (ДТО) версии [10.9.3.1](http://fs.atol.ru/_layouts/15/atol.templates/Handlers/FileHandler.ashx?guid=9c00e55f-7cfe-4918-8702-8df7e5fca2ca&webUrl=) от компании [АТОЛ](https://www.atol.ru/)
+Node.js обертка для драйвера торгового оборудования (ДТО) версии `10.10.6.0` от компании [АТОЛ](https://www.atol.ru/)
 
 [ Источник ](https://forum.atol.ru/lofiversion/index.php/t34345.html)
 

package/binding.gyp

@@ -51,6 +51,13 @@
                         '<(module_root_dir)/src/linux-armhf/libudev.so.1',
                         '<(module_root_dir)/src/linux-armhf/libusb-1.0.so.0',
                       ],
+                    }],
+                    ["arch=='arm64'", {
+                      'files': [
+                        '<(module_root_dir)/src/linux-arm64/libfptr10.so',
+                        '<(module_root_dir)/src/linux-arm64/libudev.so.1',
+                        '<(module_root_dir)/src/linux-arm64/libusb-1.0.so.0',
+                      ],
                     }]
                  ]
                }],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-atol-wrapper",
   "description": "Node ATOL DTO 10 wrapper",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "main": "bindings.js",
   "types": "bindings.d.ts",
   "scripts": {

package/src/libfptr10.h

@@ -314,6 +314,14 @@ enum libfptr_error
     LIBFPTR_ERROR_OVERLAY_DATA_OVERFLOW,
     LIBFPTR_ERROR_INVALID_MODULE_ADDRESS,
     LIBFPTR_ERROR_ECR_MODEL_NOT_SUPPORTED,
+    LIBFPTR_ERROR_PAID_NOT_REQUIRED,
+    LIBFPTR_ERROR_NON_PRINTABLE_CHAR,
+	LIBFPTR_ERROR_INVALID_USER_TAG,
+    LIBFPTR_ERROR_COMMODITIES_TABLE_ITERATION_STOPPED,
+    LIBFPTR_ERROR_COMMODITIES_TABLE_INVALID_CSV_FORMAT,
+    LIBFPTR_ERROR_MINIPOS_NO_FILE_ON_USB_STORE,
+    LIBFPTR_ERROR_MINIPOS_NO_AGENT_FISCAL_PROPERTY,
+    LIBFPTR_ERROR_NO_CONNECTION_WITH_PRINT_SERVICE,
 
     LIBFPTR_ERROR_BASE_MARKING = 400,
     LIBFPTR_ERROR_MARKING_CODE_VALIDATION_IN_PROGRESS,
@@ -718,7 +726,7 @@ enum libfptr_param
     LIBFPTR_PARAM_MARKING_CODE_ONLINE_VALIDATION_RESULT,
     LIBFPTR_PARAM_MARKING_CODE_ONLINE_VALIDATION_ERROR_DESCRIPTION,
     LIBFPTR_PARAM_FN_CONTAINS_KEYS_UPDATER_SERVER_URI,
-    LIBFPTR_PARAM_MARKING_CODE_CLEAR,
+    LIBFPTR_PARAM_CLEAR_MARKING_TABLE,
     LIBFPTR_PARAM_MODULE_ADDRESS,
     LIBFPTR_PARAM_SEGMENT_ADDRESS,
     LIBFPTR_PARAM_LAST_SUCCESSFUL_OKP,
@@ -732,6 +740,41 @@ enum libfptr_param
     LIBFPTR_PARAM_PRINT_UPDATE_FNM_KEYS_REPORT,
     LIBFPTR_PARAM_FN_KEYS_UPDATER_SERVER_URI,
     LIBFPTR_PARAM_DOCUMENT_ELECTRONICALLY,
+    LIBFPTR_PARAM_FORMAT_TEXT,
+    LIBFPTR_PARAM_RECEIPT_SIZE,
+    LIBFPTR_PARAM_MARK_SIZE,
+    LIBFPTR_PARAM_MCU_TEMPERATURE,
+    LIBFPTR_PARAM_DATA_FOR_SEND_IS_EMPTY,
+    LIBFPTR_PARAM_AVAILABLE_CLOSING,
+    LIBFPTR_PARAM_AVAILABLE_CANCELLATION,
+    LIBFPTR_PARAM_AVAILABLE_POSITION_ADDING,
+    LIBFPTR_PARAM_AVAILABLE_PAYMENT,
+    LIBFPTR_PARAM_AVAILABLE_TOTAL,
+    LIBFPTR_PARAM_AVAILABLE_ATTRIBUTES_ADDING,
+	LIBFPTR_PARAM_OPERATOR_REGISTERED,
+    LIBFPTR_PARAM_DEVICE_PLATFORM_VERSION,
+    LIBFPTR_PARAM_GUID,
+    LIBFPTR_PARAM_PATTERN_REGISTERS,
+    LIBFPTR_PARAM_PATTERN_TAGS,
+    LIBFPTR_PARAM_PATTERN_SETTINGS,
+    LIBFPTR_PARAM_VENDING,
+    LIBFPTR_PARAM_CATERING,
+    LIBFPTR_PARAM_WHOLESALE,
+    LIBFPTR_PARAM_REGISTRATION_POSITION_FORM,
+    LIBFPTR_PARAM_MERGE_POSITIONS,
+    LIBFPTR_PARAM_DATAFLASH_JEDEC_ID,
+    LIBFPTR_PARAM_DATAFLASH_NAME,
+    LIBFPTR_PARAM_DATAFLASH_SIZE,
+    LIBFPTR_PARAM_FRAM_EEPROM_NAME,
+    LIBFPTR_PARAM_FRAM_EEPROM_SIZE,
+    LIBFPTR_PARAM_MARKING_NOT_FORM_REQUEST,
+    LIBFPTR_PARAM_PRINT_ENTITY_TYPE,
+    LIBFPTR_PARAM_RECEIPT_TAPE_PATH_LENGTH,
+
+    // certification
+    LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME,
+    LIBFPTR_PARAM_LAST_ATTEMPTION_FNM_UPDATE_KEYS_DATE_TIME,
+    LIBFPTR_PARAM_COUNT_ATTEMPTION_FNM_UPDATE_KEYS,
 
     LIBFPTR_PARAM_LAST
 };
@@ -752,6 +795,7 @@ enum libfptr_model
     LIBFPTR_MODEL_ATOL_50F = 80,
     LIBFPTR_MODEL_ATOL_52F = 64,
     LIBFPTR_MODEL_ATOL_55F = 62,
+    LIBFPTR_MODEL_ATOL_55v2F = 66,
     LIBFPTR_MODEL_ATOL_60F = 75,
     LIBFPTR_MODEL_ATOL_77F = 69,
     LIBFPTR_MODEL_ATOL_90F = 72,
@@ -764,6 +808,12 @@ enum libfptr_model
     LIBFPTR_MODEL_KAZNACHEY_FA = 76,
     LIBFPTR_MODEL_ATOL_1F = 93,
     LIBFPTR_MODEL_ATOL_22v2F = 95,
+    LIBFPTR_MODEL_ATOL_42FA = 70,
+    LIBFPTR_MODEL_ALLIANCE_20F = 50,
+    LIBFPTR_MODEL_ATOL_STB_6F = 94,
+    LIBFPTR_MODEL_ATOL_35F = 97,
+    // certification
+    LIBFPTR_MODEL_ATOL_27_FP7_F = 99,
 };
 
 #define LIBFPTR_SETTING_LIBRARY_PATH L"LibraryPath"
@@ -822,6 +872,20 @@ enum libfptr_model
 
 #define LIBFPTR_SETTING_SILENT_REBOOT L"SilentReboot"
 
+#define LIBFPTR_SETTING_GUI_PARAMETERS L"GuiParametersMapping"
+
+#define LIBFPTR_SETTING_GUI_PATTERN_REG L"PatternParameters"
+
+#define LIBFPTR_SETTING_AUTO_TIME_SYNC L"AutoTimeSync"
+
+#define LIBFPTR_SETTING_AUTO_TIME_SYNC_TIME L"AutoTimeSyncTime"
+
+#define LIBFPTR_SETTING_LOG_PATHS L"LogPaths"
+
+#define LIBFPTR_SETTING_MERGE_RECEIPT_ITEMS L"MergeReceiptItems"
+
+#define LIBFPTR_SETTING_LICENSE L"Licenses"
+
 enum libfptr_port
 {
     LIBFPTR_PORT_COM = 0,
@@ -1028,6 +1092,10 @@ enum libfptr_tax_type
     LIBFPTR_TAX_VAT20,
     LIBFPTR_TAX_VAT120,
     LIBFPTR_TAX_INVALID,
+    LIBFPTR_TAX_VAT5,
+    LIBFPTR_TAX_VAT105,
+    LIBFPTR_TAX_VAT7,
+    LIBFPTR_TAX_VAT107
 };
 
 enum libfptr_external_device_type
@@ -1093,6 +1161,12 @@ enum libfptr_kkt_data_type
     LIBFPTR_DT_MCU_INFO,
     LIBFPTR_DT_MODULE_ADDRESS,
     LIBFPTR_DT_CACHE_REQUISITES,
+    LIBFPTR_DT_DEPARTMENT_SUM,
+    LIBFPTR_DT_MCU_TEMPERATURE,
+    LIBFPTR_DT_AVAILABLE_OPERATIONS,
+    LIBFPTR_DT_PATTERN_PARAMETERS,
+    LIBFPTR_DT_RECEIPT_TAPE_PATH_LENGTH,
+    LIBFPTR_DT_LAST_DATA_TYPE
 };
 
 enum libfptr_fn_data_type
@@ -1119,7 +1193,11 @@ enum libfptr_fn_data_type
     LIBFPTR_FNDT_ISM_ERRORS,
     LIBFPTR_FNDT_ISM_EXCHANGE_STATUS,
     LIBFPTR_FNDT_MARKING_MODE_STATUS,
-    LIBFPTR_FNDT_CHECK_MARK_TIME
+    LIBFPTR_FNDT_CHECK_MARK_TIME,
+    LIBFPTR_FNDT_RECEIPT_SIZE,
+
+    // certification
+    LIBFPTR_FNDT_FNM_KEYS_UPDATE_DATE_TIME
 };
 
 enum libfptr_ffd_version
@@ -1462,7 +1540,8 @@ enum libfptr_mark_checking_type_in_cash
     LIBFPTR_MCT_AUTONOMOUS = 0,
     LIBFPTR_MCT_WAIT_FOR_RESULT,
     LIBFPTR_MCT_RESULT_NOT_WAIT,
-    LIBFPTR_MCT_QUERY_NOT_SEND
+    LIBFPTR_MCT_QUERY_NOT_SEND,
+    LIBFPTR_MCT_QUERY_NOT_FORM
 };
 
 enum libfptr_mark_checking_stage_in_cash
@@ -1484,6 +1563,57 @@ enum libfptr_silent_reboot
     LIBFPTR_SILENT_REBOOT_BEFORE_SESSION_OPEN
 };
 
+enum libfptr_platform_version
+{
+    LIBFPTR_PLATFORM_UNKNOWN = 0,
+    LIBFPTR_PLATFORM_25 = 25,
+    LIBFPTR_PLATFORM_50 = 50,
+};
+
+enum libfptr_registration_position_form
+{
+    LIBFPTR_RPF_ELECTRONIC_AND_PRINT = 0,
+    LIBFPTR_RPF_ONLY_ELECTRONIC,
+    LIBFPTR_RPF_ONLY_PRINT,
+};
+
+enum libfptr_merge_receipt_items
+{
+    LIBFPTR_MERGE_RECEIPT_NO = 0,
+    LIBFPTR_MERGE_RECEIPT_ALL,
+    LIBFPTR_MERGE_RECEIPT_MARK_ONLY,
+};
+
+enum libfptr_license
+{
+    LIBFPTR_LIC_BASE_FISCAL = 1,
+    LIBFPTR_LIC_WRITE_FW,
+    LIBFPTR_LIC_TAX_20,
+    LIBFPTR_LIC_FFD_1_1,
+    LIBFPTR_LIC_MARK_CODE,
+    LIBFPTR_LIC_EXT_FUNC,
+    LIBFPTR_LIC_TEMPLATE,
+    LIBFPTR_LIC_PRINT_BMP,
+    LIBFPTR_LIC_DISABLE_PF,
+    LIBFPTR_LIC_FFD_1_2,
+    LIBFPTR_LIC_FR_WORK,
+    LIBFPTR_LIC_WEB,
+    LIBFPTR_LIC_FFD_1_1_2,
+    LIBFPTR_LIC_TEST_LAB,
+    LIBFPTR_LIC_WEB_REQ,
+    LIBFPTR_LIC_RELESE,
+    LIBFPTR_LIC_EXT_PRINT,
+    LIBFPTR_LIC_OSU,
+    LIBFPTR_LIC_EXT_FISCAL,
+};
+
+enum libfptr_print_entity_type
+{
+    LIBFPTR_PET_STRINGS = 0,
+    LIBFPTR_PET_PICTURES,
+    LIBFPTR_PET_FISCAL_DOCUMENT,
+};
+
 #define LIBFPTR_UC_OTHERS 4294967295
 
 
@@ -1498,6 +1628,9 @@ DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_create_with_id(libfptr_handle *ha
 DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_set_settings(libfptr_handle handle,
                                                             const wchar_t *settings);
 
+DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_validate_merge_position_support(libfptr_handle handle,
+                                                                               wchar_t *value, int size);
+
 DTOX_SHARED_EXPORT void DTOX_SHARED_CCA libfptr_destroy(libfptr_handle *handle);
 
 DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_get_settings(libfptr_handle handle, wchar_t *value,
@@ -1649,7 +1782,6 @@ DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_cash_income(libfptr_handle handle
 
 DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_cash_outcome(libfptr_handle handle);
 
-
 DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_open_receipt(libfptr_handle handle);
 
 DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_cancel_receipt(libfptr_handle handle);
@@ -1869,6 +2001,16 @@ DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_get_last_document_journal(libfptr
 
 DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_change_label(libfptr_handle handle, const wchar_t *label);
 
+DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_is_param_available(libfptr_handle handle, int param_id);
+
+DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_error_recommendation(libfptr_handle handle, wchar_t *value, int size);
+
+DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_find_document_in_journal(libfptr_handle handle);
+
+// certification
+
+DTOX_SHARED_EXPORT int DTOX_SHARED_CCA libfptr_run_fn_command(libfptr_handle handle);
+
 #ifdef __cplusplus
 }
 #endif