@softwear/latestcollectioncore 1.0.143 → 1.0.145

package/dist/articleStatus.js

@@ -77,14 +77,6 @@ function addTransactionToAggregations(beginTimestamp, endTimestamp, aggregateKey
         return;
     // Period transactions: add everything from BEGIN_STOCK_VECTOR_END onwards
     addVectors(aggregateVector, v, BEGIN_STOCK_VECTOR_END, v.length);
-    // Also update QTY_SHELF_STOCK and AMOUNT_SHELF_STOCK from period transactions
-    // (they're in the begin stock range but need to be updated by period transactions too)
-    if (v[QTY_SHELF_STOCK] !== undefined) {
-        aggregateVector[QTY_SHELF_STOCK] += v[QTY_SHELF_STOCK] || 0;
-    }
-    if (v[AMOUNT_SHELF_STOCK] !== undefined) {
-        aggregateVector[AMOUNT_SHELF_STOCK] += v[AMOUNT_SHELF_STOCK] || 0;
-    }
     // Calculate derived fields
     aggregateVector[QTY_RETURN] += v[QTY_SOLD] < 0 ? v[QTY_SOLD] : 0;
     aggregateVector[AMOUNT_RETURN] += v[AMOUNT_SOLD_EXCL] < 0 ? v[AMOUNT_SOLD_EXCL] : 0;
@@ -266,11 +258,9 @@ function postAgg(v, timeFrame) {
     // QTY_SHELF_STOCK includes:
     // - beginStock from type 0 (same as QTY_STOCK)
     // - beginShelfStock adjustment from type 10 (negative picktickets from previous shards)
-    // - shelfStock-affecting transactions during the period (type 1, type 2, etc.)
-    // So QTY_SHELF_STOCK already represents the shelfStock value including all transactions
-    // endShelfStock = QTY_SHELF_STOCK - consignment - picklist
-    v[QTY_END_SHELF_STOCK] = v[QTY_SHELF_STOCK] - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST];
-    v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_SHELF_STOCK] - v[COSTPRICE_CONSIGNMENT] - v[AMOUNT_PICKLIST];
+    v[QTY_END_SHELF_STOCK] = v[QTY_SHELF_STOCK] + v[QTY_RECIEVED] + v[QTY_CHANGE] + v[QTY_TRANSIT] - totalQtySold - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST];
+    v[AMOUNT_END_SHELF_STOCK] =
+        v[AMOUNT_SHELF_STOCK] + v[AMOUNT_RECIEVED] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - totalCostSold - v[AMOUNT_CONSIGNMENT] - v[AMOUNT_PICKLIST];
     v[SELLOUT_PERCENTAGE] = (totalQtySold / (totalQtySold + v[QTY_END_STOCK])) * 100;
     v[ROI] = totalAmountSold - v[AMOUNT_RECIEVED] + v[AMOUNT_TRANSIT];
     v[QTY_AVG_STOCK] = (v[QTY_STOCK] * timeFrame + v[STOCK_TIME_PRODUCT]) / timeFrame;

package/dist/hashBrand.js

@@ -5,7 +5,7 @@ const DIACRITIC_REGEX = /[\u0300-\u036f]/g;
 // '~.<>!@#$%^&*():'"? /-\\'
 // Note: '-' is placed at the end of the class so it is treated literally,
 // and '\' is escaped.
-const REMOVE_CHARS_TEST_REGEX = /[~.<>!@#$%^&*():'"? \/\\-]/;
+const REMOVE_CHARS_TEST_REGEX = /[~.<>!@#$%^&*():´'"? \/\\-]/;
 const REMOVE_CHARS_REGEX = /[~.<>!@#$%^&*():´'"? \/\\-]/g;
 // Fast check: returns true if the string contains any non-ASCII character,
 // which we treat as a potential diacritic and normalize only in that case.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@softwear/latestcollectioncore",
-	"version": "1.0.143",
+	"version": "1.0.145",
 	"description": "Core functions for LatestCollections applications",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/src/articleStatus.ts

@@ -139,14 +139,6 @@ function addTransactionToAggregations(beginTimestamp: number, endTimestamp: numb
   if (transaction.time > endTimestamp) return
   // Period transactions: add everything from BEGIN_STOCK_VECTOR_END onwards
   addVectors(aggregateVector, v, BEGIN_STOCK_VECTOR_END, v.length)
-  // Also update QTY_SHELF_STOCK and AMOUNT_SHELF_STOCK from period transactions
-  // (they're in the begin stock range but need to be updated by period transactions too)
-  if (v[QTY_SHELF_STOCK] !== undefined) {
-    aggregateVector[QTY_SHELF_STOCK] += v[QTY_SHELF_STOCK] || 0
-  }
-  if (v[AMOUNT_SHELF_STOCK] !== undefined) {
-    aggregateVector[AMOUNT_SHELF_STOCK] += v[AMOUNT_SHELF_STOCK] || 0
-  }
 
   // Calculate derived fields
 
@@ -348,11 +340,9 @@ function postAgg(v: any, timeFrame: number): void {
   // QTY_SHELF_STOCK includes:
   // - beginStock from type 0 (same as QTY_STOCK)
   // - beginShelfStock adjustment from type 10 (negative picktickets from previous shards)
-  // - shelfStock-affecting transactions during the period (type 1, type 2, etc.)
-  // So QTY_SHELF_STOCK already represents the shelfStock value including all transactions
-  // endShelfStock = QTY_SHELF_STOCK - consignment - picklist
-  v[QTY_END_SHELF_STOCK] = v[QTY_SHELF_STOCK] - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST]
-  v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_SHELF_STOCK] - v[COSTPRICE_CONSIGNMENT] - v[AMOUNT_PICKLIST]
+  v[QTY_END_SHELF_STOCK] = v[QTY_SHELF_STOCK] + v[QTY_RECIEVED] + v[QTY_CHANGE] + v[QTY_TRANSIT] - totalQtySold - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST]
+  v[AMOUNT_END_SHELF_STOCK] =
+    v[AMOUNT_SHELF_STOCK] + v[AMOUNT_RECIEVED] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - totalCostSold - v[AMOUNT_CONSIGNMENT] - v[AMOUNT_PICKLIST]
   v[SELLOUT_PERCENTAGE] = (totalQtySold / (totalQtySold + v[QTY_END_STOCK])) * 100
   v[ROI] = totalAmountSold - v[AMOUNT_RECIEVED] + v[AMOUNT_TRANSIT]
   v[QTY_AVG_STOCK] = (v[QTY_STOCK] * timeFrame + v[STOCK_TIME_PRODUCT]) / timeFrame

package/src/hashBrand.ts

@@ -3,7 +3,7 @@ const DIACRITIC_REGEX = /[\u0300-\u036f]/g
 // '~.<>!@#$%^&*():'"? /-\\'
 // Note: '-' is placed at the end of the class so it is treated literally,
 // and '\' is escaped.
-const REMOVE_CHARS_TEST_REGEX = /[~.<>!@#$%^&*():'"? \/\\-]/
+const REMOVE_CHARS_TEST_REGEX = /[~.<>!@#$%^&*():´'"? \/\\-]/
 const REMOVE_CHARS_REGEX = /[~.<>!@#$%^&*():´'"? \/\\-]/g
 
 // Fast check: returns true if the string contains any non-ASCII character,

package/test/articleStatus.spec.js

@@ -361,12 +361,12 @@ describe('articleStatus', () => {
       expect(testResult.vector[articleStatus.QTY_STOCK]).toBe(100)
       expect(testResult.vector[articleStatus.AMOUNT_STOCK]).toBe(1000)
 
-      // QTY_SHELF_STOCK includes beginShelfStock (100 - 5 = 95) + period transactions (20 - 2 = 18) = 113
+      // QTY_SHELF_STOCK includes beginShelfStock (100 - 5 = 95)
       // beginShelfStock from beginTimestamp: 100 (type 0) - 5 (type 10) = 95
       // Period transactions: +20 (receiving) - 2 (sale) = +18
       // Total: 95 + 18 = 113
-      expect(testResult.vector[articleStatus.QTY_SHELF_STOCK]).toBe(113)
-      expect(testResult.vector[articleStatus.AMOUNT_SHELF_STOCK]).toBe(1130)
+      expect(testResult.vector[articleStatus.QTY_SHELF_STOCK]).toBe(95)
+      expect(testResult.vector[articleStatus.AMOUNT_SHELF_STOCK]).toBe(950)
 
       // Transactions during period: +20 (receiving) - 2 (sale) = +18
       // endStock: 100 + 20 - 2 = 118