u

src/providers/sqlite3/queries/article.js

@@ -8,7 +8,7 @@ export const {
   GET_BRAND_BY_COMPANY_AND_ID,
   GET_CATEGORY_ID_BY_SKU, GET_CATEGORY_TREE_FLAT, GET_ID_BY_SKU,
   SET_FATHER_SORT,
-  SET_IS_FATHER, UPDATE_BRAND, UPDATE_FATHER_BY_SKU, UPDATE_UNIT,
+  SET_IS_FATHER, UPDATE_BRAND, UPDATE_FATHER_BY_SKU, UPDATE_TRACK_STOCK, UPDATE_UNIT,
   UPDATE_UNITAMOUNT, UPDATE_UNIT_AND_AMOUNT, UPDATE_WEIGHT,
 } = queries;
 
@@ -83,7 +83,7 @@ WITH RECURSIVE category_tree AS (
   INNER JOIN category_tree ct ON c.parent_id = ct.id
 )
 SELECT DISTINCT a.id, a.sku, at.name, at.slug, u.si AS unitSi,
-     ut.symbol AS unitSymbol, a.unitamount, b.name AS brandName,
+     ut.symbol AS unitSymbol, a.unitamount, a.track_stock, b.name AS brandName,
      pr.net, t.rate AS taxRate,
      ${JSON_EANS} AS eansJson,
      ${JSON_CATEGORIES} AS categoryIdsJson,
@@ -122,6 +122,7 @@ SELECT auth.*,
      json_object(
        'id', a.id, 'sku', a.sku, 'name', at.name, 'slug', at.slug,
        'unitamount', a.unitamount, 'weight', a.weight,
+       'track_stock', a.track_stock,
        'unitSi', u.si, 'unitBasesi', u.basesi,
        'unitBasesifactor', u.basesifactor, 'unitSymbol', ut.symbol,
        'unitName', ut.name,
@@ -169,7 +170,7 @@ SELECT auth.*,
          WHERE s.article_id = a.id ORDER BY s.sort, s.id
        ))),
        'warehousesJson', json((SELECT COALESCE(json_group_array(json_object(
-         'id', w.id, 'name', w.name, 'stock', COALESCE(stock_calc.stock, 0)
+         'id', w.id, 'name', w.name, 'sort', w.sort, 'stock', COALESCE(stock_calc.stock, 0)
        )), '[]') FROM warehouse w
        LEFT JOIN (
          SELECT l.warehouse_id, SUM(l.amount) AS stock
@@ -184,7 +185,7 @@ SELECT auth.*,
          GROUP BY l.warehouse_id
        ) stock_calc ON stock_calc.warehouse_id = w.id
        WHERE w.company_id = a.company_id
-       ORDER BY w.name ASC))
+       ORDER BY w.sort ASC, w.name ASC))
      ) AS articleJson
 FROM auth
 INNER JOIN article a ON a.id = auth.articleId