node-atol-wrapper 0.0.27 → 0.0.28

package/.github/workflows/nodejs.yml

@@ -9,12 +9,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, ubuntu-latest, macos-13]
-        node-version: [16, 18, 20, 22]
-        exclude:
-          # Exclude Node 22 on macOS 13 due to compatibility issues
-          - os: macos-13
-            node-version: 22
+        os: [windows-2022, ubuntu-latest, macos-15-intel]
+        node-version: [18, 20, 22]
 
     steps:
       - name: Checkout
@@ -32,16 +28,16 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Setup Python for macOS
-        if: matrix.os == 'macos-13'
+        if: startsWith(matrix.os, 'macos')
         uses: actions/setup-python@v4
         with:
           python-version: '3.11'
       - name: Install setuptools for macOS
-        if: matrix.os == 'macos-13'
+        if: startsWith(matrix.os, 'macos')
         run: |
           python -m pip install --upgrade pip setuptools
       - name: Configure npm for native modules
-        if: matrix.os == 'macos-13'
+        if: startsWith(matrix.os, 'macos')
         run: |
           echo "CC=clang" >> $GITHUB_ENV
           echo "CXX=clang++" >> $GITHUB_ENV

package/README.md

@@ -2,7 +2,7 @@
 
 Название
 =========
-Node.js обертка для драйвера торгового оборудования (ДТО) версии `10.10.7.0` от компании [АТОЛ](https://www.atol.ru/)
+Node.js обертка для драйвера торгового оборудования (ДТО) версии `10.10.8.0` от компании [АТОЛ](https://www.atol.ru/)
 
 [ Источник ](https://forum.atol.ru/lofiversion/index.php/t34345.html)
 

package/package.json

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

package/src/libfptr10.h

@@ -779,9 +779,13 @@ enum libfptr_param
     LIBFPTR_PARAM_ELECTRONICALLY_PAYMENT_METHOD,
     LIBFPTR_PARAM_ELECTRONICALLY_ID,
     LIBFPTR_PARAM_ELECTRONICALLY_ADD_INFO,
+    LIBFPTR_PARAM_PRINTER_DRIVER_NAME,
+    LIBFPTR_PARAM_SCRIPT_NUMBER,
+    LIBFPTR_PARAM_SCRIPT_EMBEDDED,
+    LIBFPTR_PARAM_OVERWRITE,
 
     // certification
-    LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME,
+    LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME = LIBFPTR_PARAM_FIRST + 900,
     LIBFPTR_PARAM_LAST_ATTEMPTION_FNM_UPDATE_KEYS_DATE_TIME,
     LIBFPTR_PARAM_COUNT_ATTEMPTION_FNM_UPDATE_KEYS,
 
@@ -900,6 +904,8 @@ enum libfptr_model
 
 #define LIBFPTR_SETTING_REMOTE_TIMEOUT L"RemoteTimeout"
 
+#define LIBFPTR_SETTING_USE_COMMODITY_NAME_FOR_ADVANCE L"UseCommodityNameForAdvance"
+
 enum libfptr_port
 {
     LIBFPTR_PORT_COM = 0,
@@ -1077,7 +1083,8 @@ enum libfptr_report_type
     LIBFPTR_RT_DISCOUNTS,
     LIBFPTR_RT_JOURNAL_DOCUMENT_BY_NUMBERS,
     LIBFPTR_RT_JOURNAL_DOCUMENT_BY_SHIFTS,
-    LIBFPTR_RT_CLOSE_SHIFT_REPORTS
+    LIBFPTR_RT_CLOSE_SHIFT_REPORTS,
+    LIBFPTR_RT_CLICHE_PICTURES
 };
 
 enum libfptr_payment_type
@@ -1110,6 +1117,8 @@ enum libfptr_tax_type
     LIBFPTR_TAX_VAT7,
     LIBFPTR_TAX_VAT105,
     LIBFPTR_TAX_VAT107,
+    LIBFPTR_TAX_VAT22,
+    LIBFPTR_TAX_VAT122,
     LIBFPTR_TAX_INVALID,
 };
 
@@ -1294,6 +1303,7 @@ enum libfptr_records_type
     LIBFPTR_RT_FN_UNSENT_DOCS_COUNTERS,
     LIBFPTR_RT_SETTINGS,
     LIBFPTR_RT_RUN_COMMAND,
+    LIBFPTR_RT_SCRIPTS_INFO
 };
 
 enum libfptr_nomenclature_type

package/src/macos-x86_64/fptr10.framework/Versions/A/Headers/libfptr10.h

@@ -779,9 +779,13 @@ enum libfptr_param
     LIBFPTR_PARAM_ELECTRONICALLY_PAYMENT_METHOD,
     LIBFPTR_PARAM_ELECTRONICALLY_ID,
     LIBFPTR_PARAM_ELECTRONICALLY_ADD_INFO,
+    LIBFPTR_PARAM_PRINTER_DRIVER_NAME,
+    LIBFPTR_PARAM_SCRIPT_NUMBER,
+    LIBFPTR_PARAM_SCRIPT_EMBEDDED,
+    LIBFPTR_PARAM_OVERWRITE,
 
     // certification
-    LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME,
+    LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME = LIBFPTR_PARAM_FIRST + 900,
     LIBFPTR_PARAM_LAST_ATTEMPTION_FNM_UPDATE_KEYS_DATE_TIME,
     LIBFPTR_PARAM_COUNT_ATTEMPTION_FNM_UPDATE_KEYS,
 
@@ -900,6 +904,8 @@ enum libfptr_model
 
 #define LIBFPTR_SETTING_REMOTE_TIMEOUT L"RemoteTimeout"
 
+#define LIBFPTR_SETTING_USE_COMMODITY_NAME_FOR_ADVANCE L"UseCommodityNameForAdvance"
+
 enum libfptr_port
 {
     LIBFPTR_PORT_COM = 0,
@@ -1077,7 +1083,8 @@ enum libfptr_report_type
     LIBFPTR_RT_DISCOUNTS,
     LIBFPTR_RT_JOURNAL_DOCUMENT_BY_NUMBERS,
     LIBFPTR_RT_JOURNAL_DOCUMENT_BY_SHIFTS,
-    LIBFPTR_RT_CLOSE_SHIFT_REPORTS
+    LIBFPTR_RT_CLOSE_SHIFT_REPORTS,
+    LIBFPTR_RT_CLICHE_PICTURES
 };
 
 enum libfptr_payment_type
@@ -1110,6 +1117,8 @@ enum libfptr_tax_type
     LIBFPTR_TAX_VAT7,
     LIBFPTR_TAX_VAT105,
     LIBFPTR_TAX_VAT107,
+    LIBFPTR_TAX_VAT22,
+    LIBFPTR_TAX_VAT122,
     LIBFPTR_TAX_INVALID,
 };
 
@@ -1294,6 +1303,7 @@ enum libfptr_records_type
     LIBFPTR_RT_FN_UNSENT_DOCS_COUNTERS,
     LIBFPTR_RT_SETTINGS,
     LIBFPTR_RT_RUN_COMMAND,
+    LIBFPTR_RT_SCRIPTS_INFO
 };
 
 enum libfptr_nomenclature_type

package/src/macos-x86_64/fptr10.framework/Versions/A/Headers/libfptr10_objc.h

@@ -37,6 +37,7 @@
 #define LIBFPTR_SETTING_MERGE_RECEIPT_ITEMS @"MergeReceiptItems"
 #define LIBFPTR_SETTING_TIME_ZONE @"TimeZone"
 #define LIBFPTR_SETTING_REMOTE_TIMEOUT @"RemoteTimeout"
+#define LIBFPTR_SETTING_USE_COMMODITY_NAME_FOR_ADVANCE @"UseCommodityNameForAdvance"
 #define LIBFPTR_MODEL_UNKNOWN 0
 #define LIBFPTR_MODEL_ATOL_25F 57
 #define LIBFPTR_MODEL_ATOL_30F 61
@@ -589,9 +590,17 @@ enum libfptr_param
     LIBFPTR_PARAM_ELECTRONICALLY_PAYMENT_METHOD = 65938,
     LIBFPTR_PARAM_ELECTRONICALLY_ID = 65939,
     LIBFPTR_PARAM_ELECTRONICALLY_ADD_INFO = 65940,
-    LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME = 65941,
-    LIBFPTR_PARAM_LAST_ATTEMPTION_FNM_UPDATE_KEYS_DATE_TIME = 65942,
-    LIBFPTR_PARAM_COUNT_ATTEMPTION_FNM_UPDATE_KEYS = 65943,
+    LIBFPTR_PARAM_PRINTER_DRIVER_NAME = 65941,
+    LIBFPTR_PARAM_SCRIPT_NUMBER = 65942,
+    LIBFPTR_PARAM_SCRIPT_EMBEDDED = 65943,
+    LIBFPTR_PARAM_OVERWRITE = 65944,
+};
+
+enum libfptr_certification_param
+{
+    LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME = 66436,
+    LIBFPTR_PARAM_LAST_ATTEMPTION_FNM_UPDATE_KEYS_DATE_TIME = 66437,
+    LIBFPTR_PARAM_COUNT_ATTEMPTION_FNM_UPDATE_KEYS = 66438,
 };
 
 enum libfptr_error
@@ -1059,6 +1068,7 @@ enum libfptr_report_type
     LIBFPTR_RT_JOURNAL_DOCUMENT_BY_NUMBERS = 21,
     LIBFPTR_RT_JOURNAL_DOCUMENT_BY_SHIFTS = 22,
     LIBFPTR_RT_CLOSE_SHIFT_REPORTS = 23,
+    LIBFPTR_RT_CLICHE_PICTURES = 24,
 };
 
 enum libfptr_payment_type
@@ -1091,7 +1101,9 @@ enum libfptr_tax_type
     LIBFPTR_TAX_VAT7 = 10,
     LIBFPTR_TAX_VAT105 = 11,
     LIBFPTR_TAX_VAT107 = 12,
-    LIBFPTR_TAX_INVALID = 13,
+    LIBFPTR_TAX_VAT22 = 13,
+    LIBFPTR_TAX_VAT122 = 14,
+    LIBFPTR_TAX_INVALID = 15,
 };
 
 enum libfptr_external_device_type
@@ -1239,6 +1251,7 @@ enum libfptr_records_type
     LIBFPTR_RT_FN_UNSENT_DOCS_COUNTERS = 9,
     LIBFPTR_RT_SETTINGS = 10,
     LIBFPTR_RT_RUN_COMMAND = 11,
+    LIBFPTR_RT_SCRIPTS_INFO = 12,
 };
 
 enum libfptr_log_level

package/src/macos-x86_64/fptr10.framework/Versions/A/Resources/Info.plist

@@ -24,10 +24,10 @@
 	<string>FMWK</string>
 
 	<key>CFBundleVersion</key>
-	<string>10.10.7.0</string>
+	<string>10.10.8.0</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>10.10.7</string>
+	<string>10.10.8</string>
 
 	<key>CSResourcesFileMapped</key>
 	<true/>