gemcap-be-common 1.5.74 → 1.5.75

package/classes/sales-item.d.ts

@@ -17,6 +17,8 @@ export declare class SalesItem implements ISalesLocal {
     unitSalePrice: number;
     salesPeriodStart: Date | null;
     salesPeriodEnd: Date | null;
-    constructor(item: Partial<SalesItem>, bbcDate?: any);
+    constructor(item: Partial<SalesItem>, bbcDate: any, options: {
+        [extraOption: string]: string;
+    });
 }
 export {};

package/classes/sales-item.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SalesItem = void 0;
 const lodash_1 = __importDefault(require("lodash"));
+const dayjs_1 = __importDefault(require("dayjs"));
 const column_desciptions_helper_1 = require("../helpers/column-desciptions.helper");
 const collaterals_enum_1 = require("../enums/collaterals.enum");
 class SalesItem {
@@ -16,7 +17,13 @@ class SalesItem {
     unitSalePrice = 0;
     salesPeriodStart = null;
     salesPeriodEnd = null;
-    constructor(item, bbcDate = null) {
+    constructor(item, bbcDate = null, options) {
+        if (options && options.salesPeriodStart) {
+            item.salesPeriodStart = dayjs_1.default.utc(options.salesPeriodStart).toDate();
+        }
+        if (options && options.salesPeriodEnd) {
+            item.salesPeriodEnd = dayjs_1.default.utc(options.salesPeriodEnd).toDate();
+        }
         const itemWithDates = (0, column_desciptions_helper_1.convertIntoDates)(item, collaterals_enum_1.ECollaterals.SALES);
         const itemWithoutNulls = lodash_1.default.omitBy(itemWithDates, (value) => value === null);
         Object.assign(this, itemWithoutNulls);

package/classes/sales-item.ts

@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import dayjs from 'dayjs';
 
 import { convertIntoDates } from '../helpers/column-desciptions.helper';
 import { ECollaterals } from '../enums/collaterals.enum';
@@ -25,7 +26,13 @@ export class SalesItem implements ISalesLocal {
   salesPeriodStart: Date | null = null;
   salesPeriodEnd: Date | null = null;
 
-  constructor(item: Partial<SalesItem>, bbcDate = null) {
+  constructor(item: Partial<SalesItem>, bbcDate = null, options: { [extraOption: string]: string }) {
+    if (options && options.salesPeriodStart) {
+      item.salesPeriodStart = dayjs.utc(options.salesPeriodStart).toDate();
+    }
+    if (options && options.salesPeriodEnd) {
+      item.salesPeriodEnd = dayjs.utc(options.salesPeriodEnd).toDate();
+    }
     const itemWithDates = convertIntoDates(item, ECollaterals.SALES);
     const itemWithoutNulls = _.omitBy(itemWithDates, (value) => value === null);
     Object.assign(this, itemWithoutNulls);

package/helpers/column-desciptions.helper.js

@@ -260,14 +260,14 @@ exports.COLLATERALS = {
             title: 'Sales period start',
             required: true,
             items: [],
-            validators: [validators_enums_1.EValidators.NOT_EMPTY, validators_enums_1.EValidators.IS_DATE],
+            validators: [validators_enums_1.EValidators.IS_DATE],
         },
         {
             db_title: 'salesPeriodEnd',
             title: 'Sales period end',
             required: true,
             items: [],
-            validators: [validators_enums_1.EValidators.NOT_EMPTY, validators_enums_1.EValidators.IS_DATE],
+            validators: [validators_enums_1.EValidators.IS_DATE],
         },
     ],
     [collaterals_enum_1.ECollaterals.LOAN_TRANSACTIONS]: [

package/helpers/column-desciptions.helper.ts

@@ -260,14 +260,14 @@ COLLATERALS = {
       title: 'Sales period start',
       required: true,
       items: [],
-      validators: [EValidators.NOT_EMPTY, EValidators.IS_DATE],
+      validators: [EValidators.IS_DATE],
     },
     {
       db_title: 'salesPeriodEnd',
       title: 'Sales period end',
       required: true,
       items: [],
-      validators: [EValidators.NOT_EMPTY, EValidators.IS_DATE],
+      validators: [EValidators.IS_DATE],
     },
   ],
   [ECollaterals.LOAN_TRANSACTIONS]: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.5.74",
+  "version": "1.5.75",
   "description": "",
   "main": "index.js",
   "scripts": {

package/services/uploads.service.js

@@ -458,7 +458,7 @@ class UploadsService {
                     [collaterals_enum_1.ECollaterals.INVENTORY]: () => new inventory_item_1.InventoryItem(row, bbcDate, skuDates),
                     [collaterals_enum_1.ECollaterals.RECEIVABLE]: () => new receivable_item_1.ReceivableItem(row, bbcDate),
                     [collaterals_enum_1.ECollaterals.ACCOUNT_PAYABLE]: () => new payable_account_item_1.PayableAccountItem(row, bbcDate),
-                    [collaterals_enum_1.ECollaterals.SALES]: () => new sales_item_1.SalesItem(row, bbcDate),
+                    [collaterals_enum_1.ECollaterals.SALES]: () => new sales_item_1.SalesItem(row, bbcDate, mapData.extraOptions),
                     [collaterals_enum_1.ECollaterals.LOAN_TRANSACTIONS]: async () => {
                         const newItem = new bank_transaction_item_1.LoanTransactionItem(row, this.borrowersDB);
                         const classErrors = await newItem.initialize();

package/services/uploads.service.ts

@@ -515,7 +515,7 @@ export class UploadsService {
           [ECollaterals.INVENTORY]: () => new InventoryItem(row, bbcDate, skuDates),
           [ECollaterals.RECEIVABLE]: () => new ReceivableItem(row, bbcDate),
           [ECollaterals.ACCOUNT_PAYABLE]: () => new PayableAccountItem(row, bbcDate),
-          [ECollaterals.SALES]: () => new SalesItem(row, bbcDate),
+          [ECollaterals.SALES]: () => new SalesItem(row, bbcDate, mapData.extraOptions),
           [ECollaterals.LOAN_TRANSACTIONS]: async () => {
             const newItem = new LoanTransactionItem(row, this.borrowersDB);
             const classErrors = await newItem.initialize();