u

src/providers/mssql/queries/article.js

@@ -31,6 +31,7 @@ export const ARTICLE_LIST_COLUMNS = `
     at.slug,
     pr.net,
     t.rate AS taxRate,
+    a.track_stock,
     CASE
         WHEN a.optionslist_id IS NOT NULL THEN (
             SELECT COUNT(*)
@@ -133,6 +134,12 @@ SET weight = @weight
 WHERE id = @articleId
 `;
 
+export const UPDATE_TRACK_STOCK = `
+UPDATE article
+SET track_stock = @trackStock
+WHERE id = @articleId
+`;
+
 export const UPDATE_BRAND = `
 UPDATE article
 SET brand_id = @brandId
@@ -158,9 +165,9 @@ WHERE id = @articleId
 `;
 
 export const CREATE = `
-INSERT INTO article (company_id, sku, unit_id, unitamount, weight)
+INSERT INTO article (company_id, sku, unit_id, unitamount, weight, track_stock)
 OUTPUT INSERTED.id
-VALUES (@companyId, @sku, @unitId, @unitamount, @weight)
+VALUES (@companyId, @sku, @unitId, @unitamount, @weight, @trackStock)
 `;
 
 export const DELETE_EANS_BY_ARTICLE = `
@@ -287,6 +294,7 @@ SELECT
     u.si AS unitSi,
     ut.symbol AS unitSymbol,
     a.unitamount,
+    a.track_stock,
     b.name AS brandName,
     b.name AS brandName,
     pr.net AS net,
@@ -371,6 +379,7 @@ SELECT
             at.slug,
             a.unitamount,
             a.weight,
+            a.track_stock,
             u.si            AS unitSi,
             u.basesi         AS unitBasesi,
             u.basesifactor   AS unitBasesifactor,
@@ -467,6 +476,7 @@ SELECT
                 SELECT
                     w.id,
                     w.name,
+                    w.sort,
                     COALESCE(stock_calc.stock, 0) AS stock
                 FROM warehouse w
                 LEFT JOIN (
@@ -482,7 +492,7 @@ SELECT
                     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
                 FOR JSON PATH
             ) AS warehousesJson
         FROM article a

src/providers/mssql/queries/articleDetail.js

@@ -5,6 +5,7 @@ export const ARTICLE_DETAIL_COLUMNS = `
     at.slug,
     a.unitamount,
     a.weight,
+    a.track_stock,
     u.si AS unitSi,
     u.basesi AS unitBasesi,
     u.basesifactor AS unitBasesifactor,

src/providers/mssql/queries/warehouse.js

@@ -2,17 +2,19 @@ export const LIST_BY_COMPANY = `
 SELECT
     id,
     company_id,
-    name
+    name,
+    sort
 FROM warehouse
 WHERE company_id = @companyId
-ORDER BY name ASC;
+ORDER BY sort ASC, name ASC;
 `;
 
 export const GET_BY_COMPANY_AND_ID = `
 SELECT
     id,
     company_id,
-    name
+    name,
+    sort
 FROM warehouse
 WHERE id = @id AND company_id = @companyId;
 `;
@@ -21,20 +23,39 @@ export const GET_BY_COMPANY_AND_NAME = `
 SELECT
     id,
     company_id,
-    name
+    name,
+    sort
 FROM warehouse
 WHERE company_id = @companyId AND name = @name;
 `;
 
+export const GET_NEXT_SORT = `
+SELECT ISNULL(MAX(sort), -1) + 1 AS sort
+FROM warehouse
+WHERE company_id = @companyId;
+`;
+
 export const CREATE = `
-INSERT INTO warehouse (company_id, name)
-OUTPUT INSERTED.id, INSERTED.company_id, INSERTED.name
-VALUES (@companyId, @name);
+INSERT INTO warehouse (company_id, name, sort)
+OUTPUT INSERTED.id, INSERTED.company_id, INSERTED.name, INSERTED.sort
+VALUES (@companyId, @name, @sort);
 `;
 
 export const UPDATE_BY_ID = `
 UPDATE warehouse
-SET name = @name
+SET name = @name, sort = @sort
+WHERE id = @id AND company_id = @companyId;
+`;
+
+export const LIST_IDS_BY_COMPANY = `
+SELECT id
+FROM warehouse
+WHERE company_id = @companyId;
+`;
+
+export const UPDATE_SORT = `
+UPDATE warehouse
+SET sort = @sort
 WHERE id = @id AND company_id = @companyId;
 `;
 

src/providers/mssql/schema.js

@@ -317,6 +317,7 @@ BEGIN
         unit_id INT NOT NULL,
         unitamount FLOAT NOT NULL,
         weight FLOAT NOT NULL,
+        track_stock BIT NOT NULL CONSTRAINT DF_article_track_stock DEFAULT 1,
         brand_id INT NULL,
         articlelist_id INT NULL,
         optionslist_id INT NULL,
@@ -340,6 +341,10 @@ BEGIN
         ON article (fatherarticle_id, fathersort)
         WHERE fatherarticle_id IS NOT NULL;
 END
+ELSE IF NOT EXISTS (SELECT * FROM sys.columns WHERE object_id = OBJECT_ID('article') AND name = 'track_stock')
+BEGIN
+    ALTER TABLE article ADD track_stock BIT NOT NULL CONSTRAINT DF_article_track_stock DEFAULT 1;
+END
 `;
 
 export const INIT_ARTICLEHISTORY = `
@@ -599,10 +604,15 @@ BEGIN
         id INT IDENTITY(1,1) PRIMARY KEY,
         company_id INT NOT NULL,
         name NVARCHAR(255) NOT NULL,
+        sort INT NOT NULL CONSTRAINT DF_warehouse_sort DEFAULT 0,
         CONSTRAINT FK_warehouse_company FOREIGN KEY (company_id) REFERENCES company(id) ON DELETE CASCADE,
         CONSTRAINT UQ_warehouse_company_name UNIQUE (company_id, name)
     );
 END
+ELSE IF NOT EXISTS (SELECT * FROM sys.columns WHERE object_id = OBJECT_ID('warehouse') AND name = 'sort')
+BEGIN
+    ALTER TABLE warehouse ADD sort INT NOT NULL CONSTRAINT DF_warehouse_sort DEFAULT 0;
+END
 `;
 
 export const INIT_LEDGER = `