@softwear/latestcollectioncore 1.0.91 → 1.0.93

package/dist/articleStatus.d.ts

@@ -46,19 +46,19 @@ declare const _default: {
     AMOUNT_STOCK: number;
     AMOUNT_TRANSIT: number;
     AMOUNT_TURNOVER_VELOCITY: number;
-    AMOUNT_PREPICKLIST: number;
     AMOUNT_PICKLIST: number;
-    AMOUNT_PREORDER: number;
+    AMOUNT_REORDER: number;
     AMOUNT_ORDER: number;
-    AMOUNT_PRESOLD: number;
+    AMOUNT_B2B_SOLD: number;
+    AMOUNT_B2B_RESOLD: number;
     AMOUNT_B2B_RETURN: number;
     COSTPRICE_CONSIGNMENT: number;
     COSTPRICE_SOLD: number;
-    COSTPRICE_PREPICKLIST: number;
     COSTPRICE_PICKLIST: number;
-    COSTPRICE_PREORDER: number;
+    COSTPRICE_REORDER: number;
     COSTPRICE_ORDER: number;
-    COSTPRICE_PRESOLD: number;
+    COSTPRICE_B2B_SOLD: number;
+    COSTPRICE_B2B_RESOLD: number;
     COSTPRICE_B2B_RETURN: number;
     MARGIN: number;
     MAX_RECIEVE_TIMESTAMP: number;
@@ -81,11 +81,11 @@ declare const _default: {
     QTY_TRANSACTION: number;
     QTY_TRANSIT: number;
     QTY_TURNOVER_VELOCITY: number;
-    QTY_PREPICKLIST: number;
     QTY_PICKLIST: number;
-    QTY_PREORDER: number;
+    QTY_REORDER: number;
     QTY_ORDER: number;
-    QTY_PRESOLD: number;
+    QTY_B2B_SOLD: number;
+    QTY_B2B_RESOLD: number;
     QTY_B2B_RETURN: number;
     RETURN_PERCENTAGE: number;
     ROI: number;

package/dist/articleStatus.js

@@ -8,8 +8,8 @@ const types_1 = require("./types");
 const transaction_1 = __importDefault(require("./transaction"));
 const date_fns_1 = require("date-fns");
 // fields in Vector
-const { QTY_TRANSACTION, QTY_STOCK, AMOUNT_STOCK, QTY_SHELF_STOCK, AMOUNT_SHELF_STOCK, AMOUNT_REVALUATE, QTY_RECIEVED, AMOUNT_RECIEVED, QTY_SOLD, AMOUNT_SOLD, AMOUNT_SOLD_EXCL, COSTPRICE_SOLD, QTY_CHANGE, AMOUNT_CHANGE, QTY_TRANSIT, AMOUNT_TRANSIT, QTY_PO, AMOUNT_PO, QTY_PO_COMPLETE, AMOUNT_PO_COMPLETE, QTY_MINIMUM_STOCK, AMOUNT_MINIMUM_STOCK, QTY_CONSIGNMENT, AMOUNT_CONSIGNMENT, COSTPRICE_CONSIGNMENT, QTY_PREPICKLIST, AMOUNT_PREPICKLIST, COSTPRICE_PREPICKLIST, QTY_PICKLIST, AMOUNT_PICKLIST, COSTPRICE_PICKLIST, QTY_PREORDER, AMOUNT_PREORDER, COSTPRICE_PREORDER, QTY_ORDER, AMOUNT_ORDER, COSTPRICE_ORDER, QTY_PRESOLD, AMOUNT_PRESOLD, COSTPRICE_PRESOLD, QTY_B2B_RETURN, AMOUNT_B2B_RETURN, COSTPRICE_B2B_RETURN, } = transaction_1.default.dbTransactionVector;
-const DATABASE_VECTOR_LENGTH = 40;
+const { QTY_TRANSACTION, QTY_STOCK, AMOUNT_STOCK, QTY_SHELF_STOCK, AMOUNT_SHELF_STOCK, AMOUNT_REVALUATE, QTY_RECIEVED, AMOUNT_RECIEVED, QTY_SOLD, AMOUNT_SOLD, AMOUNT_SOLD_EXCL, COSTPRICE_SOLD, QTY_CHANGE, AMOUNT_CHANGE, QTY_TRANSIT, AMOUNT_TRANSIT, QTY_PO, AMOUNT_PO, QTY_PO_COMPLETE, AMOUNT_PO_COMPLETE, QTY_MINIMUM_STOCK, AMOUNT_MINIMUM_STOCK, QTY_CONSIGNMENT, AMOUNT_CONSIGNMENT, COSTPRICE_CONSIGNMENT, QTY_PICKLIST, AMOUNT_PICKLIST, COSTPRICE_PICKLIST, QTY_REORDER, AMOUNT_REORDER, COSTPRICE_REORDER, QTY_ORDER, AMOUNT_ORDER, COSTPRICE_ORDER, QTY_B2B_RESOLD, AMOUNT_B2B_RESOLD, COSTPRICE_B2B_RESOLD, QTY_B2B_RETURN, AMOUNT_B2B_RETURN, COSTPRICE_B2B_RETURN, QTY_B2B_SOLD, AMOUNT_B2B_SOLD, COSTPRICE_B2B_SOLD, } = transaction_1.default.dbTransactionVector;
+const DATABASE_VECTOR_LENGTH = 43;
 // DERIVED FIELDS
 const AMOUNT_SOLD_MAX = DATABASE_VECTOR_LENGTH + 0;
 const AMOUNT_SOLD_DISCOUNT = DATABASE_VECTOR_LENGTH + 1;
@@ -250,9 +250,17 @@ function whichShardsToProcess(dateRange, granularity) {
  * Calculate all derived columns on a given vector.
  */
 function postAgg(v, timeFrame) {
-    v[QTY_END_STOCK] = v[QTY_STOCK] + v[QTY_RECIEVED] - v[QTY_SOLD] + v[QTY_CHANGE] + v[QTY_TRANSIT] - v[QTY_PRESOLD] + v[QTY_B2B_RETURN];
+    v[QTY_END_STOCK] = v[QTY_STOCK] + v[QTY_RECIEVED] - v[QTY_SOLD] + v[QTY_CHANGE] + v[QTY_TRANSIT] - v[QTY_B2B_SOLD] - v[QTY_B2B_RESOLD] + v[QTY_B2B_RETURN];
     v[AMOUNT_END_STOCK] =
-        v[AMOUNT_STOCK] + v[AMOUNT_RECIEVED] - v[COSTPRICE_SOLD] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - v[COSTPRICE_PRESOLD] + v[COSTPRICE_B2B_RETURN];
+        v[AMOUNT_STOCK] +
+            v[AMOUNT_RECIEVED] -
+            v[COSTPRICE_SOLD] +
+            v[AMOUNT_CHANGE] +
+            v[AMOUNT_TRANSIT] +
+            v[AMOUNT_REVALUATE] -
+            v[COSTPRICE_B2B_SOLD] -
+            v[COSTPRICE_B2B_RESOLD] +
+            v[COSTPRICE_B2B_RETURN];
     v[QTY_END_SHELF_STOCK] = v[QTY_END_STOCK] - v[QTY_CONSIGNMENT];
     v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_END_STOCK] - v[COSTPRICE_CONSIGNMENT];
     v[SELLOUT_PERCENTAGE] = (v[QTY_SOLD] / (v[QTY_SOLD] + v[QTY_END_STOCK])) * 100;
@@ -388,19 +396,19 @@ exports.default = {
     AMOUNT_STOCK,
     AMOUNT_TRANSIT,
     AMOUNT_TURNOVER_VELOCITY,
-    AMOUNT_PREPICKLIST,
     AMOUNT_PICKLIST,
-    AMOUNT_PREORDER,
+    AMOUNT_REORDER,
     AMOUNT_ORDER,
-    AMOUNT_PRESOLD,
+    AMOUNT_B2B_SOLD,
+    AMOUNT_B2B_RESOLD,
     AMOUNT_B2B_RETURN,
     COSTPRICE_CONSIGNMENT,
     COSTPRICE_SOLD,
-    COSTPRICE_PREPICKLIST,
     COSTPRICE_PICKLIST,
-    COSTPRICE_PREORDER,
+    COSTPRICE_REORDER,
     COSTPRICE_ORDER,
-    COSTPRICE_PRESOLD,
+    COSTPRICE_B2B_SOLD,
+    COSTPRICE_B2B_RESOLD,
     COSTPRICE_B2B_RETURN,
     MARGIN,
     MAX_RECIEVE_TIMESTAMP,
@@ -423,11 +431,11 @@ exports.default = {
     QTY_TRANSACTION,
     QTY_TRANSIT,
     QTY_TURNOVER_VELOCITY,
-    QTY_PREPICKLIST,
     QTY_PICKLIST,
-    QTY_PREORDER,
+    QTY_REORDER,
     QTY_ORDER,
-    QTY_PRESOLD,
+    QTY_B2B_SOLD,
+    QTY_B2B_RESOLD,
     QTY_B2B_RETURN,
     RETURN_PERCENTAGE,
     ROI,

package/dist/transaction.d.ts

@@ -26,24 +26,24 @@ declare const _default: {
         QTY_CONSIGNMENT: number;
         AMOUNT_CONSIGNMENT: number;
         COSTPRICE_CONSIGNMENT: number;
-        QTY_PREPICKLIST: number;
-        AMOUNT_PREPICKLIST: number;
-        COSTPRICE_PREPICKLIST: number;
         QTY_PICKLIST: number;
         AMOUNT_PICKLIST: number;
         COSTPRICE_PICKLIST: number;
-        QTY_PREORDER: number;
-        AMOUNT_PREORDER: number;
-        COSTPRICE_PREORDER: number;
+        QTY_REORDER: number;
+        AMOUNT_REORDER: number;
+        COSTPRICE_REORDER: number;
         QTY_ORDER: number;
         AMOUNT_ORDER: number;
         COSTPRICE_ORDER: number;
-        QTY_PRESOLD: number;
-        AMOUNT_PRESOLD: number;
-        COSTPRICE_PRESOLD: number;
+        QTY_B2B_RESOLD: number;
+        AMOUNT_B2B_RESOLD: number;
+        COSTPRICE_B2B_RESOLD: number;
         QTY_B2B_RETURN: number;
         AMOUNT_B2B_RETURN: number;
         COSTPRICE_B2B_RETURN: number;
+        QTY_B2B_SOLD: number;
+        AMOUNT_B2B_SOLD: number;
+        COSTPRICE_B2B_SOLD: number;
     };
     buildTransaction: (transaction: TransactionI) => dbTransactionI | undefined;
 };

package/dist/transaction.js

@@ -29,24 +29,24 @@ const dbTransactionVector = {
     QTY_CONSIGNMENT: 22,
     AMOUNT_CONSIGNMENT: 23,
     COSTPRICE_CONSIGNMENT: 24,
-    QTY_PREPICKLIST: 22,
-    AMOUNT_PREPICKLIST: 23,
-    COSTPRICE_PREPICKLIST: 24,
     QTY_PICKLIST: 25,
     AMOUNT_PICKLIST: 26,
     COSTPRICE_PICKLIST: 27,
-    QTY_PREORDER: 28,
-    AMOUNT_PREORDER: 29,
-    COSTPRICE_PREORDER: 30,
+    QTY_REORDER: 28,
+    AMOUNT_REORDER: 29,
+    COSTPRICE_REORDER: 30,
     QTY_ORDER: 31,
     AMOUNT_ORDER: 32,
     COSTPRICE_ORDER: 33,
-    QTY_PRESOLD: 34,
-    AMOUNT_PRESOLD: 35,
-    COSTPRICE_PRESOLD: 36,
+    QTY_B2B_RESOLD: 34,
+    AMOUNT_B2B_RESOLD: 35,
+    COSTPRICE_B2B_RESOLD: 36,
     QTY_B2B_RETURN: 37,
     AMOUNT_B2B_RETURN: 38,
     COSTPRICE_B2B_RETURN: 39,
+    QTY_B2B_SOLD: 40,
+    AMOUNT_B2B_SOLD: 41,
+    COSTPRICE_B2B_SOLD: 42,
 };
 const tv = dbTransactionVector;
 /**

package/package.json

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

package/src/articleStatus.ts

@@ -30,27 +30,27 @@ const {
   QTY_CONSIGNMENT,
   AMOUNT_CONSIGNMENT,
   COSTPRICE_CONSIGNMENT,
-  QTY_PREPICKLIST,
-  AMOUNT_PREPICKLIST,
-  COSTPRICE_PREPICKLIST,
   QTY_PICKLIST,
   AMOUNT_PICKLIST,
   COSTPRICE_PICKLIST,
-  QTY_PREORDER,
-  AMOUNT_PREORDER,
-  COSTPRICE_PREORDER,
+  QTY_REORDER,
+  AMOUNT_REORDER,
+  COSTPRICE_REORDER,
   QTY_ORDER,
   AMOUNT_ORDER,
   COSTPRICE_ORDER,
-  QTY_PRESOLD,
-  AMOUNT_PRESOLD,
-  COSTPRICE_PRESOLD,
+  QTY_B2B_RESOLD,
+  AMOUNT_B2B_RESOLD,
+  COSTPRICE_B2B_RESOLD,
   QTY_B2B_RETURN,
   AMOUNT_B2B_RETURN,
   COSTPRICE_B2B_RETURN,
+  QTY_B2B_SOLD,
+  AMOUNT_B2B_SOLD,
+  COSTPRICE_B2B_SOLD,
 } = transaction.dbTransactionVector
 
-const DATABASE_VECTOR_LENGTH = 40
+const DATABASE_VECTOR_LENGTH = 43
 
 // DERIVED FIELDS
 const AMOUNT_SOLD_MAX = DATABASE_VECTOR_LENGTH + 0
@@ -315,9 +315,17 @@ function whichShardsToProcess(dateRange: any, granularity: 'year' | 'month'): an
  * Calculate all derived columns on a given vector.
  */
 function postAgg(v: any, timeFrame: number): void {
-  v[QTY_END_STOCK] = v[QTY_STOCK] + v[QTY_RECIEVED] - v[QTY_SOLD] + v[QTY_CHANGE] + v[QTY_TRANSIT] - v[QTY_PRESOLD] + v[QTY_B2B_RETURN]
+  v[QTY_END_STOCK] = v[QTY_STOCK] + v[QTY_RECIEVED] - v[QTY_SOLD] + v[QTY_CHANGE] + v[QTY_TRANSIT] - v[QTY_B2B_SOLD] - v[QTY_B2B_RESOLD] + v[QTY_B2B_RETURN]
   v[AMOUNT_END_STOCK] =
-    v[AMOUNT_STOCK] + v[AMOUNT_RECIEVED] - v[COSTPRICE_SOLD] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - v[COSTPRICE_PRESOLD] + v[COSTPRICE_B2B_RETURN]
+    v[AMOUNT_STOCK] +
+    v[AMOUNT_RECIEVED] -
+    v[COSTPRICE_SOLD] +
+    v[AMOUNT_CHANGE] +
+    v[AMOUNT_TRANSIT] +
+    v[AMOUNT_REVALUATE] -
+    v[COSTPRICE_B2B_SOLD] -
+    v[COSTPRICE_B2B_RESOLD] +
+    v[COSTPRICE_B2B_RETURN]
   v[QTY_END_SHELF_STOCK] = v[QTY_END_STOCK] - v[QTY_CONSIGNMENT]
   v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_END_STOCK] - v[COSTPRICE_CONSIGNMENT]
   v[SELLOUT_PERCENTAGE] = (v[QTY_SOLD] / (v[QTY_SOLD] + v[QTY_END_STOCK])) * 100
@@ -459,19 +467,19 @@ export default {
   AMOUNT_STOCK,
   AMOUNT_TRANSIT,
   AMOUNT_TURNOVER_VELOCITY,
-  AMOUNT_PREPICKLIST,
   AMOUNT_PICKLIST,
-  AMOUNT_PREORDER,
+  AMOUNT_REORDER,
   AMOUNT_ORDER,
-  AMOUNT_PRESOLD,
+  AMOUNT_B2B_SOLD,
+  AMOUNT_B2B_RESOLD,
   AMOUNT_B2B_RETURN,
   COSTPRICE_CONSIGNMENT,
   COSTPRICE_SOLD,
-  COSTPRICE_PREPICKLIST,
   COSTPRICE_PICKLIST,
-  COSTPRICE_PREORDER,
+  COSTPRICE_REORDER,
   COSTPRICE_ORDER,
-  COSTPRICE_PRESOLD,
+  COSTPRICE_B2B_SOLD,
+  COSTPRICE_B2B_RESOLD,
   COSTPRICE_B2B_RETURN,
   MARGIN,
   MAX_RECIEVE_TIMESTAMP,
@@ -494,11 +502,11 @@ export default {
   QTY_TRANSACTION,
   QTY_TRANSIT,
   QTY_TURNOVER_VELOCITY,
-  QTY_PREPICKLIST,
   QTY_PICKLIST,
-  QTY_PREORDER,
+  QTY_REORDER,
   QTY_ORDER,
-  QTY_PRESOLD,
+  QTY_B2B_SOLD,
+  QTY_B2B_RESOLD,
   QTY_B2B_RETURN,
   RETURN_PERCENTAGE,
   ROI,

package/src/transaction.ts

@@ -25,28 +25,28 @@ const dbTransactionVector = {
   AMOUNT_PO_COMPLETE: 19,
   QTY_MINIMUM_STOCK: 20,
   AMOUNT_MINIMUM_STOCK: 21,
-  QTY_CONSIGNMENT: 22, // Used in retail
-  AMOUNT_CONSIGNMENT: 23, // Used in retail
-  COSTPRICE_CONSIGNMENT: 24, // Used in retail
+  QTY_CONSIGNMENT: 22,
+  AMOUNT_CONSIGNMENT: 23,
+  COSTPRICE_CONSIGNMENT: 24,
 
-  QTY_PREPICKLIST: 22, // Used in wholesale
-  AMOUNT_PREPICKLIST: 23, // Used in wholesale
-  COSTPRICE_PREPICKLIST: 24, // Used in wholesale
   QTY_PICKLIST: 25,
   AMOUNT_PICKLIST: 26,
   COSTPRICE_PICKLIST: 27,
-  QTY_PREORDER: 28,
-  AMOUNT_PREORDER: 29,
-  COSTPRICE_PREORDER: 30,
+  QTY_REORDER: 28,
+  AMOUNT_REORDER: 29,
+  COSTPRICE_REORDER: 30,
   QTY_ORDER: 31,
   AMOUNT_ORDER: 32,
   COSTPRICE_ORDER: 33,
-  QTY_PRESOLD: 34,
-  AMOUNT_PRESOLD: 35,
-  COSTPRICE_PRESOLD: 36,
+  QTY_B2B_RESOLD: 34,
+  AMOUNT_B2B_RESOLD: 35,
+  COSTPRICE_B2B_RESOLD: 36,
   QTY_B2B_RETURN: 37,
   AMOUNT_B2B_RETURN: 38,
   COSTPRICE_B2B_RETURN: 39,
+  QTY_B2B_SOLD: 40,
+  AMOUNT_B2B_SOLD: 41,
+  COSTPRICE_B2B_SOLD: 42,
 }
 const tv = dbTransactionVector
 

package/test/articleStatus.spec.js

@@ -4,11 +4,11 @@ const { expect } = require('chai')
 const articleStatus = core.articleStatus
 describe('#articleStatus', () => {
   describe('#constants', () => {
-    it('QTY_SOLD_BEFORE_RETURNS should be 61', () => {
-      expect(articleStatus.QTY_SOLD_BEFORE_RETURNS).to.equal(61)
+    it('QTY_SOLD_BEFORE_RETURNS should be 64', () => {
+      expect(articleStatus.QTY_SOLD_BEFORE_RETURNS).to.equal(64)
     })
-    it('AMOUNT_RETURN should be 46', () => {
-      expect(articleStatus.AMOUNT_RETURN).to.equal(46)
+    it('AMOUNT_RETURN should be 49', () => {
+      expect(articleStatus.AMOUNT_RETURN).to.equal(49)
     })
   })
 })