@softwear/latestcollectioncore 1.0.119 → 1.0.121

package/dist/edifact.d.ts

@@ -2,7 +2,7 @@ import { MarkedSkuI, DocumentItemI } from './types';
 declare const _default: {
     skusToPricat: (skus: MarkedSkuI[], fromGLN: string, toGLN: string, supplierGLN: string, refID: number, date: string) => any[];
     pricatToCsv: (pricat: any) => string;
-    itemsToOrdRsp: (items: DocumentItemI[], fromGLN: string, toGLN: string, supplierGLN: string, refID: number, date: string, orderNumber: string) => any[];
+    itemsToOrdRsp: (items: DocumentItemI[], fromGLN: string, toGLN: string, supplierGLN: string, deliveryGLN: string, refID: number, date: string, orderNumber: string) => any[];
     ordRspToCsv: (order: any) => string;
 };
 export default _default;

package/dist/edifact.js

@@ -67,28 +67,6 @@ const pricatToCsv = function (pricat) {
     const env = pricat[0];
     const envValues = ['"ENV"', env.SenderGLN, env.RecipientGLN, env.InterchangeReference, 0, '"FUEB 5.00"', null, null, null, null, null];
     const envString = envValues.join(',') + '\n';
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
     const hdr = pricat[1];
     const hdrValues = [
         '"HDR"',
@@ -141,41 +119,6 @@ const pricatToCsv = function (pricat) {
     ];
     const hdrString = hdrValues.join(',') + '\n';
     const grpString = `"GRP","3",,"91",\n`;
-    //
-    // These comment lines are added to align the linenumbers in the texteditor with positionnumbers in the documentation of Fashion United PRICAT 5.00
-    // This makes it easier to verify if a given value is alligned in the collect position
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
     const lines = [];
     pricat
         .filter((r) => r.Tag == 'LIN')
@@ -334,7 +277,7 @@ const pricatToCsv = function (pricat) {
     const linString = lines.join('\n');
     return envString + hdrString + grpString + linString;
 };
-const itemsToOrdRsp = function (items, fromGLN, toGLN, supplierGLN, refID, date, orderNumber) {
+const itemsToOrdRsp = function (items, fromGLN, toGLN, supplierGLN, deliveryGLN, refID, date, orderNumber) {
     const order = [];
     if (typeof fromGLN != 'string' || fromGLN.length != 13)
         return [];
@@ -360,10 +303,13 @@ const itemsToOrdRsp = function (items, fromGLN, toGLN, supplierGLN, refID, date,
         HeaderCurrency: '"EUR"',
         SupplierGLN: supplierGLN,
         BuyerGLN: toGLN,
+        DocumentDate: date,
+        DeliveryPartyGLN: deliveryGLN,
     };
     order.push(env);
     order.push(hdr);
     let lineNumber = 1;
+    let totalQty = 0;
     items.forEach((item) => {
         const lin = {
             LineTag: 'LIN',
@@ -374,8 +320,14 @@ const itemsToOrdRsp = function (items, fromGLN, toGLN, supplierGLN, refID, date,
             ConfirmedQuantity: item.qty,
             PurchasePriceNet: item.price,
         };
+        totalQty += item.qty;
         order.push(lin);
     });
+    order.push({
+        ControlTag: 'CNT',
+        TotalNumberOfPositions: lineNumber - 1,
+        TotalQty: totalQty,
+    });
     return order;
 };
 const ordRspToCsv = function (order) {
@@ -390,7 +342,7 @@ const ordRspToCsv = function (order) {
         `"${hdr.DocumentType}"`,
         `"${hdr.DocumentFunction}"`,
         `"${hdr.DocumentNumber}"`,
-        null,
+        `${hdr.DocumentDate}`,
         null,
         null,
         null,
@@ -426,6 +378,7 @@ const ordRspToCsv = function (order) {
         null,
         null,
         null,
+        hdr.DeliveryPartyGLN,
         null,
         null,
         null,
@@ -443,8 +396,7 @@ const ordRspToCsv = function (order) {
         null,
         null,
         null,
-        null,
-        null,
+        hdr.DeliveryPartyGLN,
         null,
         null,
         null,
@@ -501,6 +453,7 @@ const ordRspToCsv = function (order) {
             r.LineNumber,
             1,
             r.GTIN,
+            '"EAN"',
             null,
             null,
             null,
@@ -516,6 +469,7 @@ const ordRspToCsv = function (order) {
             null,
             null,
             null,
+            null,
             r.PurchasePriceNet,
             null,
             null,
@@ -543,7 +497,10 @@ const ordRspToCsv = function (order) {
         ];
         lines.push(linValues.join(','));
     });
-    const linString = lines.join('\n');
-    return envString + hdrString + linString;
+    const linString = lines.join('\n') + '\n';
+    const cntRecord = order.filter((r) => r.ControlTag == 'CNT')[0];
+    const cntValues = ['"CNT"', null, null, null, null, null, null, cntRecord.TotalNumberOfPositions, cntRecord.TotalQty];
+    const cntString = cntValues.join(',');
+    return envString + hdrString + linString + cntString;
 };
 exports.default = { skusToPricat, pricatToCsv, itemsToOrdRsp, ordRspToCsv };

package/dist/ensureArray.d.ts

@@ -0,0 +1 @@
+export default function ensureArray(object: any): Array<any>;

package/dist/ensureArray.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/*
+ * Ensure that an object is an array. If so, return object, else return a one-element array with the object
+ */
+function ensureArray(object) {
+    if (!Array.isArray(object))
+        return [object];
+    return object;
+}
+exports.default = ensureArray;

package/dist/index.d.ts

@@ -1,16 +1,17 @@
+export { default as articleStatus } from './articleStatus';
 export { default as buildPropertyMappingFn } from './buildPropertyMappingFn';
 export { default as deepCopy } from './deepCopy';
 export { default as ean13 } from './ean13';
-export { default as isean13 } from './isean13';
+export { default as edifact } from './edifact';
+export { default as ensureArray } from './ensureArray';
+export { default as findSkuByBarcode } from './findSkuByBarcode';
 export { default as getPreferedPropertyMappings } from './getPreferedPropertyMappings';
 export { default as hashBrand } from './hashBrand';
 export { default as hasOnlyDigits } from './hasOnlyDigits';
-export { default as sizeToMap } from './sizeToMap';
-export { default as findSkuByBarcode } from './findSkuByBarcode';
+export { default as isean13 } from './isean13';
+export { default as pivotTable } from './pivotTable';
 export { default as round2 } from './round2';
+export { default as sizeToMap } from './sizeToMap';
 export { default as transaction } from './transaction';
-export { default as articleStatus } from './articleStatus';
-export { default as pivotTable } from './pivotTable';
-export { default as edifact } from './edifact';
 export * from './types';
 export * from './consts';

package/dist/index.js

@@ -17,34 +17,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.edifact = exports.pivotTable = exports.articleStatus = exports.transaction = exports.round2 = exports.findSkuByBarcode = exports.sizeToMap = exports.hasOnlyDigits = exports.hashBrand = exports.getPreferedPropertyMappings = exports.isean13 = exports.ean13 = exports.deepCopy = exports.buildPropertyMappingFn = void 0;
+exports.transaction = exports.sizeToMap = exports.round2 = exports.pivotTable = exports.isean13 = exports.hasOnlyDigits = exports.hashBrand = exports.getPreferedPropertyMappings = exports.findSkuByBarcode = exports.ensureArray = exports.edifact = exports.ean13 = exports.deepCopy = exports.buildPropertyMappingFn = exports.articleStatus = void 0;
+var articleStatus_1 = require("./articleStatus");
+Object.defineProperty(exports, "articleStatus", { enumerable: true, get: function () { return __importDefault(articleStatus_1).default; } });
 var buildPropertyMappingFn_1 = require("./buildPropertyMappingFn");
 Object.defineProperty(exports, "buildPropertyMappingFn", { enumerable: true, get: function () { return __importDefault(buildPropertyMappingFn_1).default; } });
 var deepCopy_1 = require("./deepCopy");
 Object.defineProperty(exports, "deepCopy", { enumerable: true, get: function () { return __importDefault(deepCopy_1).default; } });
 var ean13_1 = require("./ean13");
 Object.defineProperty(exports, "ean13", { enumerable: true, get: function () { return __importDefault(ean13_1).default; } });
-var isean13_1 = require("./isean13");
-Object.defineProperty(exports, "isean13", { enumerable: true, get: function () { return __importDefault(isean13_1).default; } });
+var edifact_1 = require("./edifact");
+Object.defineProperty(exports, "edifact", { enumerable: true, get: function () { return __importDefault(edifact_1).default; } });
+var ensureArray_1 = require("./ensureArray");
+Object.defineProperty(exports, "ensureArray", { enumerable: true, get: function () { return __importDefault(ensureArray_1).default; } });
+var findSkuByBarcode_1 = require("./findSkuByBarcode");
+Object.defineProperty(exports, "findSkuByBarcode", { enumerable: true, get: function () { return __importDefault(findSkuByBarcode_1).default; } });
 var getPreferedPropertyMappings_1 = require("./getPreferedPropertyMappings");
 Object.defineProperty(exports, "getPreferedPropertyMappings", { enumerable: true, get: function () { return __importDefault(getPreferedPropertyMappings_1).default; } });
 var hashBrand_1 = require("./hashBrand");
 Object.defineProperty(exports, "hashBrand", { enumerable: true, get: function () { return __importDefault(hashBrand_1).default; } });
 var hasOnlyDigits_1 = require("./hasOnlyDigits");
 Object.defineProperty(exports, "hasOnlyDigits", { enumerable: true, get: function () { return __importDefault(hasOnlyDigits_1).default; } });
-var sizeToMap_1 = require("./sizeToMap");
-Object.defineProperty(exports, "sizeToMap", { enumerable: true, get: function () { return __importDefault(sizeToMap_1).default; } });
-var findSkuByBarcode_1 = require("./findSkuByBarcode");
-Object.defineProperty(exports, "findSkuByBarcode", { enumerable: true, get: function () { return __importDefault(findSkuByBarcode_1).default; } });
+var isean13_1 = require("./isean13");
+Object.defineProperty(exports, "isean13", { enumerable: true, get: function () { return __importDefault(isean13_1).default; } });
+var pivotTable_1 = require("./pivotTable");
+Object.defineProperty(exports, "pivotTable", { enumerable: true, get: function () { return __importDefault(pivotTable_1).default; } });
 var round2_1 = require("./round2");
 Object.defineProperty(exports, "round2", { enumerable: true, get: function () { return __importDefault(round2_1).default; } });
+var sizeToMap_1 = require("./sizeToMap");
+Object.defineProperty(exports, "sizeToMap", { enumerable: true, get: function () { return __importDefault(sizeToMap_1).default; } });
 var transaction_1 = require("./transaction");
 Object.defineProperty(exports, "transaction", { enumerable: true, get: function () { return __importDefault(transaction_1).default; } });
-var articleStatus_1 = require("./articleStatus");
-Object.defineProperty(exports, "articleStatus", { enumerable: true, get: function () { return __importDefault(articleStatus_1).default; } });
-var pivotTable_1 = require("./pivotTable");
-Object.defineProperty(exports, "pivotTable", { enumerable: true, get: function () { return __importDefault(pivotTable_1).default; } });
-var edifact_1 = require("./edifact");
-Object.defineProperty(exports, "edifact", { enumerable: true, get: function () { return __importDefault(edifact_1).default; } });
 __exportStar(require("./types"), exports);
 __exportStar(require("./consts"), exports);

package/package.json

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

package/src/edifact.ts

@@ -62,28 +62,6 @@ const pricatToCsv = function (pricat: any): string {
   const envValues = ['"ENV"', env.SenderGLN, env.RecipientGLN, env.InterchangeReference, 0, '"FUEB 5.00"', null, null, null, null, null]
   const envString = envValues.join(',') + '\n'
 
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
   const hdr = pricat[1]
   const hdrValues = [
     '"HDR"',
@@ -135,44 +113,7 @@ const pricatToCsv = function (pricat: any): string {
     null,
   ]
   const hdrString = hdrValues.join(',') + '\n'
-
   const grpString = `"GRP","3",,"91",\n`
-  //
-  // These comment lines are added to align the linenumbers in the texteditor with positionnumbers in the documentation of Fashion United PRICAT 5.00
-  // This makes it easier to verify if a given value is alligned in the collect position
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-  //
-
   const lines = [] as string[]
   pricat
     .filter((r) => r.Tag == 'LIN')
@@ -334,7 +275,16 @@ const pricatToCsv = function (pricat: any): string {
   return envString + hdrString + grpString + linString
 }
 
-const itemsToOrdRsp = function (items: DocumentItemI[], fromGLN: string, toGLN: string, supplierGLN: string, refID: number, date: string, orderNumber: string) {
+const itemsToOrdRsp = function (
+  items: DocumentItemI[],
+  fromGLN: string,
+  toGLN: string,
+  supplierGLN: string,
+  deliveryGLN: string,
+  refID: number,
+  date: string,
+  orderNumber: string
+) {
   const order = [] as any[]
 
   if (typeof fromGLN != 'string' || fromGLN.length != 13) return []
@@ -354,11 +304,14 @@ const itemsToOrdRsp = function (items: DocumentItemI[], fromGLN: string, toGLN:
     HeaderCurrency: '"EUR"',
     SupplierGLN: supplierGLN,
     BuyerGLN: toGLN,
+    DocumentDate: date,
+    DeliveryPartyGLN: deliveryGLN,
   }
 
   order.push(env)
   order.push(hdr)
   let lineNumber = 1
+  let totalQty = 0
   items.forEach((item) => {
     const lin = {
       LineTag: 'LIN',
@@ -369,8 +322,14 @@ const itemsToOrdRsp = function (items: DocumentItemI[], fromGLN: string, toGLN:
       ConfirmedQuantity: item.qty,
       PurchasePriceNet: item.price,
     }
+    totalQty += item.qty
     order.push(lin)
   })
+  order.push({
+    ControlTag: 'CNT',
+    TotalNumberOfPositions: lineNumber - 1,
+    TotalQty: totalQty,
+  })
   return order
 }
 
@@ -386,7 +345,7 @@ const ordRspToCsv = function (order: any): string {
     `"${hdr.DocumentType}"`,
     `"${hdr.DocumentFunction}"`,
     `"${hdr.DocumentNumber}"`,
-    null,
+    `${hdr.DocumentDate}`,
     null,
     null,
     null,
@@ -422,6 +381,7 @@ const ordRspToCsv = function (order: any): string {
     null,
     null,
     null,
+    hdr.DeliveryPartyGLN,
     null,
     null,
     null,
@@ -439,8 +399,7 @@ const ordRspToCsv = function (order: any): string {
     null,
     null,
     null,
-    null,
-    null,
+    hdr.DeliveryPartyGLN,
     null,
     null,
     null,
@@ -498,6 +457,7 @@ const ordRspToCsv = function (order: any): string {
         r.LineNumber,
         1,
         r.GTIN,
+        '"EAN"',
         null,
         null,
         null,
@@ -513,6 +473,7 @@ const ordRspToCsv = function (order: any): string {
         null,
         null,
         null,
+        null,
         r.PurchasePriceNet,
         null,
         null,
@@ -542,8 +503,11 @@ const ordRspToCsv = function (order: any): string {
       lines.push(linValues.join(','))
     })
 
-  const linString = lines.join('\n')
-  return envString + hdrString + linString
+  const linString = lines.join('\n') + '\n'
+  const cntRecord = order.filter((r) => r.ControlTag == 'CNT')[0]
+  const cntValues = ['"CNT"', null, null, null, null, null, null, cntRecord.TotalNumberOfPositions, cntRecord.TotalQty]
+  const cntString = cntValues.join(',')
+  return envString + hdrString + linString + cntString
 }
 
 export default { skusToPricat, pricatToCsv, itemsToOrdRsp, ordRspToCsv }

package/src/ensureArray.ts

@@ -0,0 +1,7 @@
+/*
+ * Ensure that an object is an array. If so, return object, else return a one-element array with the object
+ */
+export default function ensureArray(object: any): Array<any> {
+  if (!Array.isArray(object)) return [object]
+  return object
+}

package/src/index.ts

@@ -1,16 +1,17 @@
+export { default as articleStatus } from './articleStatus'
 export { default as buildPropertyMappingFn } from './buildPropertyMappingFn'
 export { default as deepCopy } from './deepCopy'
 export { default as ean13 } from './ean13'
-export { default as isean13 } from './isean13'
+export { default as edifact } from './edifact'
+export { default as ensureArray } from './ensureArray'
+export { default as findSkuByBarcode } from './findSkuByBarcode'
 export { default as getPreferedPropertyMappings } from './getPreferedPropertyMappings'
 export { default as hashBrand } from './hashBrand'
 export { default as hasOnlyDigits } from './hasOnlyDigits'
-export { default as sizeToMap } from './sizeToMap'
-export { default as findSkuByBarcode } from './findSkuByBarcode'
+export { default as isean13 } from './isean13'
+export { default as pivotTable } from './pivotTable'
 export { default as round2 } from './round2'
+export { default as sizeToMap } from './sizeToMap'
 export { default as transaction } from './transaction'
-export { default as articleStatus } from './articleStatus'
-export { default as pivotTable } from './pivotTable'
-export { default as edifact } from './edifact'
 export * from './types'
 export * from './consts'

package/test/edifact.spec.js

@@ -159,7 +159,7 @@ describe('edifact ordrsp', () => {
     expect(itemsToOrdRsp([], '1234567890123', 123, '1122334455667', 3.14, '20240101', 'ORD-12345')).to.be.deep.equal([])
   })
   it('should return a Json version of an edifact ordrsp when items are passed', () => {
-    expect(itemsToOrdRsp(testOrderItems, '1234567890123', '3210987654321', '1122334455667', 12345, '20240315', 'ORD-12345')).to.be.deep.equal([
+    expect(itemsToOrdRsp(testOrderItems, '1234567890123', '3210987654321', '1122334455667', '1231231231231', 12345, '20240315', 'ORD-12345')).to.be.deep.equal([
       { Tag: 'ENV', SenderGLN: '1234567890123', RecipientGLN: '3210987654321', InterchangeReference: 12345 },
       {
         Tag: 'HDR',
@@ -170,20 +170,28 @@ describe('edifact ordrsp', () => {
         HeaderCurrency: '"EUR"',
         SupplierGLN: '1122334455667',
         BuyerGLN: '3210987654321',
+        DocumentDate: '20240315',
+        DeliveryPartyGLN: '1231231231231',
       },
       { LineTag: 'LIN', LineNumber: 1, ActionCode: '"1"', GTIN: '5400977135395', OrderedQuantity: 3, ConfirmedQuantity: 3, PurchasePriceNet: 37.25 },
       { LineTag: 'LIN', LineNumber: 2, ActionCode: '"1"', GTIN: '5400977135326', OrderedQuantity: 2, ConfirmedQuantity: 2, PurchasePriceNet: 37.1 },
+      {
+        ControlTag: 'CNT',
+        TotalNumberOfPositions: 2,
+        TotalQty: 5,
+      },
     ])
   })
   it('should perform csv conversion for a FashionUnited 5.00 ordrsp', () => {
-    const order = itemsToOrdRsp(testOrderItems, '1234567890123', '3210987654321', '1122334455667', 12345, '20240315', 'ORD-12345')
+    const order = itemsToOrdRsp(testOrderItems, '1234567890123', '3210987654321', '1122334455667', '1231231231231', 12345, '20240315', 'ORD-12345')
     const csv = ordRspToCsv(order).split('\n')
     expect(ordRspToCsv([])).to.be.deep.equal('')
     expect(csv[0]).to.be.deep.equal('"ENV",1234567890123,3210987654321,12345,0,"FUEB 5.00",,,,,')
     expect(csv[1]).to.be.deep.equal(
-      '"HDR","231","29","12345",,,,,,,,,"ORD-12345",,,,,,,,,"EUR",1122334455667,,,,,,,,,3210987654321,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+      '"HDR","231","29","12345",20240315,,,,,,,,"ORD-12345",,,,,,,,,"EUR",1122334455667,,,,,,,,,3210987654321,,,,,,,,,1231231231231,,,,,,,,,,,,,,,,,,1231231231231,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
     )
-    expect(csv[2]).to.be.deep.equal('"LIN",1,1,5400977135395,,,,,,3,,3,,,,,,,,37.25,,,,,,,,,,,,,,,,,,,,,,,')
-    expect(csv[3]).to.be.deep.equal('"LIN",2,1,5400977135326,,,,,,2,,2,,,,,,,,37.1,,,,,,,,,,,,,,,,,,,,,,,')
+    expect(csv[2]).to.be.deep.equal('"LIN",1,1,5400977135395,"EAN",,,,,,3,,3,,,,,,,,,37.25,,,,,,,,,,,,,,,,,,,,,,,')
+    expect(csv[3]).to.be.deep.equal('"LIN",2,1,5400977135326,"EAN",,,,,,2,,2,,,,,,,,,37.1,,,,,,,,,,,,,,,,,,,,,,,')
+    expect(csv[4]).to.be.deep.equal('"CNT",,,,,,,2,5')
   })
 })

package/test/ensureArray.spec.js

@@ -0,0 +1,20 @@
+const { ensureArray } = require('../dist/index')
+const { expect } = require('chai')
+
+const input = { foo: { foo: 'bar' }, fooArray: [3.14, 'foo'] }
+describe('ensureArray function', function () {
+  it('should return an array as is', function () {
+    expect(ensureArray([1, 2, 3])).to.deep.eq([1, 2, 3])
+    expect(ensureArray([])).to.deep.eq([])
+  })
+  it('should return any other inport as an array containing that input', function () {
+    expect(ensureArray({ my: 'object' })).to.deep.eq([{ my: 'object' }])
+    expect(ensureArray('1234')).to.deep.eq(['1234'])
+    expect(ensureArray(3.14)).to.deep.eq([3.14])
+  })
+  it('should return an array with a reference to the input object if input is an object', function () {
+    const a = ensureArray(input)
+    input.foo.foo = 'foo'
+    expect(a).to.deep.eq([input])
+  })
+})