@alizadefaig/pos-server 1.2.27 → 1.2.28

package/app/core/resources/TeamResource.js

@@ -42,11 +42,42 @@ const teamResource = (team, {currencySymbol = null, languageCode = null, urls =
     };
 };
 
+const OFFLINE_MODES = ['off', 'standalone', 'hall'];
+
+/**
+ * Порт OfflineSetupService::forTerminal (Laravel): офлайн-режим кассы из суперадминки — то, что
+ * касса записывает в секцию offline своего config.json. null — заведение офлайном не управляет.
+ * Правила меняются в обоих местах сразу.
+ *
+ * @param {object} terminal строка terminals
+ * @param {?object} company строка companies (offline_mode, offline_master_terminal_id, offline_lan_key, offline_lan_front)
+ */
+const offlineConfig = (terminal, company) => {
+    const mode = company ? company.offline_mode : null;
+    if (!OFFLINE_MODES.includes(mode)) {
+        return null;
+    }
+    if (mode === 'off') {
+        return {enabled: false};
+    }
+    if (mode === 'hall' && company.offline_master_terminal_id && company.offline_lan_key) {
+        const isMaster = company.offline_master_terminal_id === terminal.id;
+        return {
+            enabled: true,
+            role: isMaster ? 'master' : 'follower',
+            master_url: isMaster ? null : 'auto',
+            lan_front: isMaster && Boolean(nullableBool(company.offline_lan_front)),
+            lan_key: company.offline_lan_key,
+        };
+    }
+    return {enabled: true, role: 'standalone', master_url: null, lan_front: false};
+};
+
 /**
  * @param {object} terminal строка terminals
- * @param {{companyName: ?string, workshops: Array<{id, name}>, posMode: object}} rel
+ * @param {{companyName: ?string, workshops: Array<{id, name}>, posMode: object, company: ?object}} rel
  */
-const terminalResource = (terminal, {companyName = null, workshops = [], posMode}) => ({
+const terminalResource = (terminal, {companyName = null, workshops = [], posMode, company = null}) => ({
     id: terminal.id,
     name: terminal.name,
     is_active: nullableBool(terminal.is_active),
@@ -58,6 +89,7 @@ const terminalResource = (terminal, {companyName = null, workshops = [], posMode
     // Каст 'array', `?? []`.
     settings: phpArray(terminal.settings) ?? [],
     pos_mode: posMode,
+    offline: offlineConfig(terminal, company),
 });
 
 /**
@@ -82,4 +114,4 @@ const teamUserResource = (member, {user = null, role = null, scopes = {}, cashSh
     shift: shiftResource(workShift),
 });
 
-module.exports = {teamResource, terminalResource, teamUserResource};
+module.exports = {teamResource, terminalResource, teamUserResource, offlineConfig};

package/app/core/services/InitService.js

@@ -106,7 +106,7 @@ class InitService {
                 ? this.db.get(`SELECT code FROM languages WHERE id = ?${this.alive()}`, [team.language_id])
                 : null,
             terminal.company_id
-                ? this.db.get(`SELECT name FROM companies WHERE id = ?${this.alive()}`, [terminal.company_id])
+                ? this.db.get(`SELECT * FROM companies WHERE id = ?${this.alive()}`, [terminal.company_id])
                 : null,
             this.db.all(
                 `SELECT pw.id, pw.name FROM product_workshops pw
@@ -129,6 +129,8 @@ class InitService {
                 companyName: company ? company.name : null,
                 workshops: terminalWorkshops,
                 posMode: mode,
+                // SELECT * выше: офлайн-колонок (offline_*) в локальной схеме кассы нет.
+                company,
             }),
         };
     }

package/app/core/services/OrderProductService.js

@@ -235,7 +235,7 @@ class OrderProductService {
 
     async updateModifiers({orderProductId, modifiers}) {
         const orderProduct = await this.findMutable(orderProductId, 'orderProducts.updateModifiers');
-        const [sets, , hash] = await OrderService.collectModifierSets(this.snapshot, modifiers);
+        const [sets, , hash] = await OrderService.collectModifierSets(this.snapshot, modifiers, this.context.locale());
 
         await this.orderProducts.update(orderProductId, {modifications_sets_hash: hash});
         await this.orderProducts.deleteModifierSets(orderProductId);

package/app/core/services/OrderService.js

@@ -15,6 +15,7 @@ const {businessDay} = require('../support/tz');
 const {uuid, isUuid} = require('../support/ids');
 const {htmlspecialchars, md5, phpJsonEncode} = require('../support/str');
 const {castRow} = require('../support/db');
+const {translated} = require('../support/lang');
 const {assertOrderMutable} = require('../guard');
 const {withLock} = require('../support/lock');
 
@@ -239,7 +240,7 @@ class OrderService {
             throw notFound('Product not found');
         }
 
-        const [sets, , hash] = await OrderService.collectModifierSets(this.snapshot, modifierSets);
+        const [sets, , hash] = await OrderService.collectModifierSets(this.snapshot, modifierSets, this.context.locale());
 
         // Повременная позиция уникальна по времени старта — её нельзя доливать в существующую.
         const hasTimerModifier = await this.snapshot.hasTimerModifier(product.id);
@@ -861,11 +862,17 @@ class OrderService {
      * Порядок ключей в элементе важен: хэш считается от json_encode этого массива и служит
      * ключом склейки строк чека — переставь поля, и одинаковые позиции перестанут склеиваться.
      */
-    static async collectModifierSets(snapshot, modifierSets) {
+    static async collectModifierSets(snapshot, modifierSets, locale) {
         let totalPrice = 0;
         const data = [];
 
-        for (const modifier of modifierSets || []) {
+        // Фронт шлёт modifier_sets_form как есть — объект по id модификатора (так его отдаёт и
+        // ProductResource). PHP-шный foreach обходит его как массив, for..of — нет.
+        const items = Array.isArray(modifierSets)
+            ? modifierSets
+            : (modifierSets && typeof modifierSets === 'object' ? Object.values(modifierSets) : []);
+
+        for (const modifier of items) {
             const modifierSet = await snapshot.findModifierSet(modifier.modifier_set_id);
             if (!modifierSet) {
                 throw notFound('Modifier set not found');
@@ -884,7 +891,8 @@ class OrderService {
 
             data.push({
                 modifier_set_type: modifierSet.type,
-                modifier_set_title: productModifierSet.title,
+                // title переводимый (Spatie): PHP отдаёт строку локали, а не JSON из колонки.
+                modifier_set_title: translated(productModifierSet.title, locale),
                 name: modifier.name,
                 total,
                 price,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alizadefaig/pos-server",
-    "version": "1.2.27",
+    "version": "1.2.28",
     "description": "Server in express js with Proxy to Main server if need and will work with Electron JS",
     "homepage": "https://gitlab.com/faigalizade/pos-server#readme",
     "bugs": {