fix: Date format in sales/purchases APIs.

fix: Algorithm FIFO cost calculate method.

server/package.json

@@ -7,7 +7,7 @@
     "build": "webpack",
     "start": "npm-run-all --parallel watch:server watch:build",
     "watch:build": "webpack --watch",
-    "watch:server": "nodemon  \"./dist/bundle.js\" --watch \"./dist\" ",
+    "watch:server": "nodemon  --inspect=\"9229\" \"./dist/bundle.js\" --watch \"./dist\" ",
     "test": "cross-env NODE_ENV=test mocha-webpack --webpack-config webpack.config.js \"tests/**/*.test.js\"",
     "test:watch": "cross-env NODE_ENV=test mocha-webpack --watch --webpack-config webpack.config.js --timeout=30000 tests/**/*.test.js"
   },

server/src/database/migrations/20200715193633_create_sale_invoices_table.js

@@ -15,6 +15,7 @@ exports.up = function(knex) {
     table.decimal('balance', 13, 3);
     table.decimal('payment_amount', 13, 3);
 
+    table.string('inv_lot_number');
     table.timestamps();
   });  
 };

server/src/database/migrations/20200719152005_create_bills_table.js

@@ -13,6 +13,7 @@ exports.up = function(knex) {
     table.decimal('amount', 13, 3).defaultTo(0);
     table.decimal('payment_amount', 13, 3).defaultTo(0);
 
+    table.string('inv_lot_number');
     table.timestamps();
   });
 };

server/src/database/migrations/20200722164251_create_inventory_transactions_table.js

@@ -10,6 +10,8 @@ exports.up = function(knex) {
     table.integer('quantity').unsigned();
     table.decimal('rate', 13, 3).unsigned();
 
+    table.integer('lot_number');
+ 
     table.string('transaction_type');
     table.integer('transaction_id');
 

server/src/database/migrations/20200810121807_create_inventory_cost_lot_tracker_table.js

@@ -10,7 +10,7 @@ exports.up = function(knex) {
     table.integer('quantity').unsigned();
     table.decimal('rate', 13, 3);
     table.integer('remaining');
-    table.string('lot_number');
+    table.integer('lot_number');
 
     table.string('transaction_type');
     table.integer('transaction_id');

server/src/http/middleware/prettierMiddleware.ts

@@ -0,0 +1,35 @@
+import { camelCase, snakeCase } from 'lodash';
+
+/**
+ * create a middleware to change json format from snake case to camelcase in request
+ * then change back to snake case in response
+ *
+ */
+export default function createMiddleware() {
+  return function (req, res, next) {
+    /**
+     * camelize req.body
+     */
+    if (req.body && typeof req.body === 'object') {
+      req.body = camelCase(req.body);
+    }
+
+    /**
+     * camelize req.query
+     */
+    if (req.query && typeof req.query === 'object') {
+      req.query = camelCase(req.query);
+    }
+
+    /**
+     * wrap res.json()
+     */
+    const sendJson = res.json;
+
+    res.json = (data) => {
+      return sendJson.call(res, snakeCase(data));
+    }
+
+    return next();
+  }
+}

server/src/jobs/ComputeItemCost.ts

@@ -6,7 +6,14 @@ export default class ComputeItemCostJob {
     const Logger = Container.get('logger');
     const { startingDate, itemId, costMethod } = job.attrs.data;
 
+    try {
       await InventoryService.computeItemCost(startingDate, itemId, costMethod);  
+      Logger.log(`Compute item cost: ${job.attrs.data}`);
       done();
+    } catch(e) {
+      Logger.error(`Compute item cost: ${job.attrs.data}, error: ${e}`);
+      done(e);  
+    }
+    
   }
 }

server/src/models/InventoryTransaction.js

@@ -12,7 +12,7 @@ export default class InventoryTransaction extends TenantModel {
   /**
    * Model timestamps.
    */
-  static get timestamps() {
+  get timestamps() {
     return ['createdAt', 'updatedAt'];
   }
 

server/src/models/index.js

@@ -1,5 +1,6 @@
 import Customer from './Customer';
 import Vendor from './Vendor';
+import Option from './Option';
 import SaleEstimate from './SaleEstimate';
 import SaleEstimateEntry from './SaleEstimateEntry';
 import SaleReceipt from './SaleReceipt';
@@ -44,4 +45,5 @@ export {
   InventoryTransaction,
   InventoryLotCostTracker,
   AccountType,
+  Option,
 };

server/src/services/Accounting/JournalCommands.ts

@@ -45,8 +45,6 @@ export default class JournalCommands{
       .map((groupedTrans: IInventoryTransaction[], transType: string) => [groupedTrans, transType])
       .value();
 
-    console.log(groupedInvTransactions);
-
     return Promise.all(
       groupedInvTransactions.map(async (grouped: [IInventoryTransaction[], string]) => {
         const [invTransGroup, referenceType] = grouped;
@@ -58,8 +56,6 @@ export default class JournalCommands{
           .whereIn('reference_id', referencesIds)
           .withGraphFetched('account.type');
 
-        console.log(_transactions, referencesIds);
-
         if (_transactions.length > 0) {
           this.journal.loadEntries(_transactions);
           this.journal.removeEntries(_transactions.map((t: any) => t.id));

server/src/services/Inventory/Inventory.ts

@@ -1,9 +1,11 @@
 import {
   InventoryTransaction,
-  Item
+  Item,
+  Option,
 } from '@/models';
 import InventoryAverageCost from '@/services/Inventory/InventoryAverageCost';
 import InventoryCostLotTracker from '@/services/Inventory/InventoryCostLotTracker';
+import { option } from 'commander';
 
 type TCostMethod = 'FIFO' | 'LIFO' | 'AVG';
 
@@ -38,10 +40,7 @@ export default class InventoryService {
    */
   static async recordInventoryTransactions(
     entries: [],
-    date: Date,
+    deleteOld: boolean,
-    transactionType: string,
-    transactionId: number,
-    direction: string,
   ) {
     const storedOpers: any = [];
     const entriesItemsIds = entries.map((e: any) => e.item_id);
@@ -56,19 +55,22 @@ export default class InventoryService {
     const inventoryEntries = entries.filter(
       (entry: any) => inventoryItemsIds.indexOf(entry.item_id) !== -1
     );
-    inventoryEntries.forEach((entry: any) => {
+    inventoryEntries.forEach(async (entry: any) => {
+      if (deleteOld) {
+        await this.deleteInventoryTransactions(
+          entry.transactionId,
+          entry.transactionType,
+        );
+      }
       const oper = InventoryTransaction.tenant().query().insert({
-        date,
+        ...entry,
-        direction,
+        lotNumber: entry.lotNumber,
-        item_id: entry.item_id,
-        quantity: entry.quantity,
-        rate: entry.rate,
-        transaction_type: transactionType,
-        transaction_id: transactionId,
       });
       storedOpers.push(oper);
     });    
-    return Promise.all(storedOpers);
+    return Promise.all([
+      ...storedOpers,
+    ]);
   }
 
   /**
@@ -90,4 +92,24 @@ export default class InventoryService {
   revertInventoryLotsCost(fromDate?: Date) {
 
   }
+
+  /**
+   * Retrieve the lot number after the increment.
+   */
+  static async nextLotNumber() {
+    const LOT_NUMBER_KEY = 'lot_number_increment';
+    const effectRows = await Option.tenant().query()
+      .where('key', LOT_NUMBER_KEY)
+      .increment('value', 1);
+
+    if (effectRows) {
+      await Option.tenant().query()
+        .insert({
+          key: LOT_NUMBER_KEY,
+          value: 1,
+        });
+    }
+    const options = await Option.tenant().query();
+    return options.getMeta(LOT_NUMBER_KEY, 1);
+  }
 }

server/src/services/Inventory/InventoryCostLotTracker.ts

@@ -1,5 +1,4 @@
 import { omit, pick, chain } from 'lodash';
-import uniqid from 'uniqid';
 import {
   InventoryTransaction,
   InventoryLotCostTracker,
@@ -62,6 +61,7 @@ export default class InventoryCostLotTracker implements IInventoryCostMethod {
         .query()
         .where('date', '>=', this.startingDate)
         .orderBy('date', 'ASC')
+        .orderBy('lot_number', 'ASC')
         .where('item_id', this.itemId)
         .withGraphFetched('item');
 
@@ -70,6 +70,7 @@ export default class InventoryCostLotTracker implements IInventoryCostMethod {
         .query()
         .where('date', '<', this.startingDate)
         .orderBy('date', 'ASC')
+        .orderBy('lot_number', 'ASC')
         .where('item_id', this.itemId)
         .where('direction', 'IN')
         .whereNot('remaining', 0);
@@ -267,17 +268,16 @@ export default class InventoryCostLotTracker implements IInventoryCostMethod {
           ...commonLotTransaction,
           decrement: 0,
           remaining: commonLotTransaction.remaining || commonLotTransaction.quantity,
-          lotNumber: commonLotTransaction.lotNumber || uniqid.time(),
         };
         costLotsTransactions.push(inventoryINTrans[id]);
 
       // Record inventory 'OUT' cost lots from 'IN' transactions.
       } else if (transaction.direction === 'OUT') {
         let invRemaining = transaction.quantity;
+        const idsShouldDel: number[] = [];
 
         inventoryByItem?.[itemId]?.some((
           _invTransactionId: number,
-          index: number,
         ) => {
           const _invINTransaction = inventoryINTrans[_invTransactionId];
           if (invRemaining <= 0) { return true; }
@@ -285,22 +285,23 @@ export default class InventoryCostLotTracker implements IInventoryCostMethod {
           // Detarmines the 'OUT' lot tranasctions whether bigger than 'IN' remaining transaction.
           const biggerThanRemaining = (_invINTransaction.remaining - transaction.quantity) > 0;
           const decrement = (biggerThanRemaining) ? transaction.quantity : _invINTransaction.remaining;
+          const maxDecrement = Math.min(decrement, invRemaining);
 
-          _invINTransaction.decrement += decrement;
+          _invINTransaction.decrement += maxDecrement;
           _invINTransaction.remaining = Math.max(
-            _invINTransaction.remaining - decrement,
+            _invINTransaction.remaining - maxDecrement,
             0,
           );
-          invRemaining = Math.max(invRemaining - decrement, 0);
+          invRemaining = Math.max(invRemaining - maxDecrement, 0);
 
           costLotsTransactions.push({
             ...commonLotTransaction,
-            quantity: decrement,
+            quantity: maxDecrement,
             lotNumber: _invINTransaction.lotNumber,
           });
           // Pop the 'IN' lots that has zero remaining. 
           if (_invINTransaction.remaining === 0) {
-            inventoryByItem?.[itemId].splice(index, 1);
+            idsShouldDel.push(_invTransactionId);
           }
           return false;
         });
@@ -310,6 +311,9 @@ export default class InventoryCostLotTracker implements IInventoryCostMethod {
             quantity: invRemaining,
           });
         }
+        // Remove the IN transactions that has zero remaining amount.
+        inventoryByItem[itemId] = inventoryByItem?.[itemId]
+          ?.filter((transId: number) => idsShouldDel.indexOf(transId) === -1);
       }
     });
     return costLotsTransactions;

server/src/services/Purchases/BillPayments.js

@@ -14,6 +14,7 @@ import AccountsService from '@/services/Accounts/AccountsService';
 import JournalPoster from '@/services/Accounting/JournalPoster';
 import JournalEntry from '@/services/Accounting/JournalEntry';
 import JournalPosterService from '@/services/Sales/JournalPosterService';
+import { formatDateFields } from '@/utils';
 
 /**
  * Bill payments service.
@@ -32,14 +33,16 @@ export default class BillPaymentsService {
    * - Decrement the vendor balance.
    * - Records payment journal entries.
    *
-   * @param {IBillPayment} billPayment
+   * @param {BillPaymentDTO} billPayment
    */
-  static async createBillPayment(billPayment) {
+  static async createBillPayment(billPaymentDTO) {
-    const amount = sumBy(billPayment.entries, 'payment_amount');
+    const billPayment = {
+      amount: sumBy(billPaymentDTO.entries, 'payment_amount'),
+      ...formatDateFields(billPaymentDTO, ['payment_date']),
+    }
     const storedBillPayment = await BillPayment.tenant()
       .query()
       .insert({
-        amount,
         ...omit(billPayment, ['entries']),
       });
     const storeOpers = [];
@@ -62,7 +65,7 @@ export default class BillPaymentsService {
     // Decrement the vendor balance after bills payments.
     const vendorDecrementOper = Vendor.changeBalance(
       billPayment.vendor_id,
-      amount * -1,
+      billPayment.amount * -1,
     );
     // Records the journal transactions after bills payment
     // and change diff acoount balance.
@@ -92,24 +95,24 @@ export default class BillPaymentsService {
    * - Update the diff bill payment amount.
    *
    * @param {Integer} billPaymentId
-   * @param {IBillPayment} billPayment
+   * @param {BillPaymentDTO} billPayment
    * @param {IBillPayment} oldBillPayment
    */
-  static async editBillPayment(billPaymentId, billPayment, oldBillPayment) {
+  static async editBillPayment(billPaymentId, billPaymentDTO, oldBillPayment) {
-    const amount = sumBy(billPayment.entries, 'payment_amount');
+    const billPayment = {
+      amount: sumBy(billPaymentDTO.entries, 'payment_amount'),
+      ...formatDateFields(billPaymentDTO, ['payment_date']),
+    };
     const updateBillPayment = await BillPayment.tenant()
       .query()
       .where('id', billPaymentId)
       .update({
-        amount,
         ...omit(billPayment, ['entries']),
       });
     const opers = [];
-    const entriesHasIds = billpayment.entries.filter((i) => i.id);
+    const entriesHasIds = billPayment.entries.filter((i) => i.id);
     const entriesHasNoIds = billPayment.entries.filter((e) => !e.id);
 
-    const entriesIds = entriesHasIds.map((e) => e.id);
-
     const entriesIdsShouldDelete = ServiceItemsEntries.entriesShouldDeleted(
       oldBillPayment.entries,
       entriesHasIds

server/src/services/Purchases/Bills.js

@@ -1,4 +1,4 @@
-import { omit, sumBy } from 'lodash';
+import { omit, sumBy, pick } from 'lodash';
 import moment from 'moment';
 import { Container } from 'typedi';
 import {
@@ -7,7 +7,6 @@ import {
   Vendor,
   ItemEntry,
   Item,
-  InventoryTransaction,
   AccountTransaction,
 } from '@/models';
 import JournalPoster from '@/services/Accounting/JournalPoster';
@@ -16,14 +15,16 @@ import AccountsService from '@/services/Accounts/AccountsService';
 import JournalPosterService from '@/services/Sales/JournalPosterService';
 import InventoryService from '@/services/Inventory/Inventory';
 import HasItemsEntries from '@/services/Sales/HasItemsEntries';
+import { formatDateFields } from '@/utils';
 
 /**
  * Vendor bills services.
+ * @service
  */
 export default class BillsService {
   /**
    * Creates a new bill and stored it to the storage.
-   *|
+   *
    * Precedures.
    * ----
    * - Insert bill transactions to the storage.
@@ -35,16 +36,18 @@ export default class BillsService {
    * @param {IBill} bill -
    * @return {void}
    */
-  static async createBill(bill) {
+  static async createBill(billDTO) { 
-    const agenda = Container.get('agenda');
+    const invLotNumber = await InventoryService.nextLotNumber();
-
+    const bill = {
-    const amount = sumBy(bill.entries, 'amount');
+      ...formatDateFields(billDTO, ['bill_date', 'due_date']),
+      amount: sumBy(billDTO.entries, 'amount'),
+      invLotNumber: billDTO.invLotNumber || invLotNumber
+    };
     const saveEntriesOpers = [];
 
     const storedBill = await Bill.tenant()
       .query()
       .insert({
-        amount,
         ...omit(bill, ['entries']),
       });
     bill.entries.forEach((entry) => {
@@ -58,11 +61,11 @@ export default class BillsService {
       saveEntriesOpers.push(oper);
     });
     // Increments vendor balance.
-    const incrementOper = Vendor.changeBalance(bill.vendor_id, amount);
+    const incrementOper = Vendor.changeBalance(bill.vendor_id, bill.amount);
 
     // Rewrite the inventory transactions for inventory items.
-    const writeInvTransactionsOper = InventoryService.recordInventoryTransactions(
+    const writeInvTransactionsOper = this.recordInventoryTransactions(
-      bill.entries, bill.bill_date, 'Bill', storedBill.id, 'IN',
+      bill, storedBill.id
     );
     // Writes the journal entries for the given bill transaction.
     const writeJEntriesOper = this.recordJournalTransactions({
@@ -75,7 +78,6 @@ export default class BillsService {
       writeInvTransactionsOper,
       writeJEntriesOper,
     ]); 
-
     // Schedule bill re-compute based on the item cost
     // method and starting date.
     await this.scheduleComputeItemsCost(bill); 
@@ -83,7 +85,14 @@ export default class BillsService {
     return storedBill;
   }
 
-  scheduleComputeItemCost(bill) {
+  /**
+   * Schedule a job to re-compute the bill's items based on cost method
+   * of the each one.
+   * @param {Bill} bill 
+   */
+  static scheduleComputeItemsCost(bill) {
+    const agenda = Container.get('agenda');
+
     return agenda.schedule('in 1 second', 'compute-item-cost', {
       startingDate: bill.bill_date || bill.billDate,
       itemId: bill.entries[0].item_id || bill.entries[0].itemId,
@@ -91,6 +100,25 @@ export default class BillsService {
     });
   }
 
+  /**
+   * Records the inventory transactions from the given bill input.
+   * @param {Bill} bill 
+   * @param {number} billId 
+   */
+  static recordInventoryTransactions(bill, billId, override) {
+    const inventoryTransactions = bill.entries
+      .map((entry) => ({
+        ...pick(entry, ['item_id', 'quantity', 'rate']),
+        lotNumber: bill.invLotNumber,
+        transactionType: 'Bill',
+        transactionId: billId,
+        direction: 'IN',
+        date: bill.bill_date,
+      }));
+
+    return InventoryService.recordInventoryTransactions(inventoryTransactions, override);
+  }
+
   /**
    * Edits details of the given bill id with associated entries.
    *
@@ -106,19 +134,20 @@ export default class BillsService {
    * @param {Integer} billId - The given bill id.
    * @param {IBill} bill - The given new bill details.
    */
-  static async editBill(billId, bill) {
+  static async editBill(billId, billDTO) {
     const oldBill = await Bill.tenant().query().findById(billId);
-    const amount = sumBy(bill.entries, 'amount');
+    const bill = {
-
+      ...formatDateFields(billDTO, ['bill_date', 'due_date']),
+      amount: sumBy(billDTO.entries, 'amount'),
+      invLotNumber: oldBill.invLotNumber,
+    };
     // Update the bill transaction.
     const updatedBill = await Bill.tenant()
       .query()
       .where('id', billId)
       .update({
-        amount,
+        ...omit(bill, ['entries', 'invLotNumber'])
-        ...omit(bill, ['entries'])
       });
-
     // Old stored entries.
     const storedEntries = await ItemEntry.tenant()
       .query()
@@ -133,17 +162,12 @@ export default class BillsService {
     const changeVendorBalanceOper = Vendor.changeDiffBalance(
       bill.vendor_id,
       oldBill.vendorId,
-      amount,
+      bill.amount,
       oldBill.amount,
     );
     // Re-write the inventory transactions for inventory items.
-    const writeInvTransactionsOper = InventoryService.recordInventoryTransactions(
+    const writeInvTransactionsOper = this.recordInventoryTransactions(bill, billId, true);
-      bill.entries, bill.bill_date, 'Bill', billId, 'IN'
+
-    );
-    // Delete bill associated inventory transactions.
-    const deleteInventoryTransOper = InventoryService.deleteInventoryTransactions(
-      billId, 'Bill'
-    );
     // Writes the journal entries for the given bill transaction.
     const writeJEntriesOper = this.recordJournalTransactions({
       id: billId,
@@ -154,10 +178,8 @@ export default class BillsService {
       patchEntriesOper,
       changeVendorBalanceOper,
       writeInvTransactionsOper,
-      deleteInventoryTransOper,
       writeJEntriesOper,
     ]);
-
     // Schedule sale invoice re-compute based on the item cost
     // method and starting date.
     await this.scheduleComputeItemsCost(bill); 

server/src/services/Sales/PaymentsReceives.ts

@@ -15,6 +15,7 @@ import JournalPosterService from '@/services/Sales/JournalPosterService';
 import ServiceItemsEntries from '@/services/Sales/ServiceItemsEntries';
 import PaymentReceiveEntryRepository from '@/repositories/PaymentReceiveEntryRepository';
 import CustomerRepository from '@/repositories/CustomerRepository';
+import { formatDateFields } from '@/utils';
 
 /**
  * Payment receive service.
@@ -33,7 +34,7 @@ export default class PaymentReceiveService {
       .query()
       .insert({
         amount: paymentAmount,
-        ...omit(paymentReceive, ['entries']),
+        ...formatDateFields(omit(paymentReceive, ['entries']), ['payment_date']),
       });
     const storeOpers: Array<any> = [];
 
@@ -97,7 +98,7 @@ export default class PaymentReceiveService {
       .where('id', paymentReceiveId)
       .update({
         amount: paymentAmount,
-        ...omit(paymentReceive, ['entries']),
+        ...formatDateFields(omit(paymentReceive, ['entries']), ['payment_date']),
       });
     const opers = [];
     const entriesIds = paymentReceive.entries.filter((i: any) => i.id);

server/src/services/Sales/SalesEstimate.ts

@@ -2,21 +2,23 @@ import { omit, difference, sumBy, mixin } from 'lodash';
 import moment from 'moment';
 import { SaleEstimate, ItemEntry } from '@/models';
 import HasItemsEntries from '@/services/Sales/HasItemsEntries';
+import { formatDateFields } from '@/utils';
 
 export default class SaleEstimateService {
   /**
    * Creates a new estimate with associated entries.
    * @async
-   * @param {IEstimate} estimate
+   * @param {EstimateDTO} estimate
    * @return {void}
    */
-  static async createEstimate(estimate: any) {
+  static async createEstimate(estimateDTO: any) {
-    const amount = sumBy(estimate.entries, 'amount');
+    const estimate = {
-
+      amount: sumBy(estimateDTO.entries, 'amount'),
+      ...formatDateFields(estimateDTO, ['estimate_date', 'expiration_date']),
+    };
     const storedEstimate = await SaleEstimate.tenant()
       .query()
       .insert({
-        amount,
         ...omit(estimate, ['entries']),
       });
     const storeEstimateEntriesOpers: any[] = [];
@@ -36,34 +38,21 @@ export default class SaleEstimateService {
     return storedEstimate;
   }
 
-  /**
-   * Deletes the given estimate id with associated entries.
-   * @async
-   * @param {IEstimate} estimateId
-   * @return {void}
-   */
-  static async deleteEstimate(estimateId: number) {
-    await ItemEntry.tenant()
-      .query()
-      .where('reference_id', estimateId)
-      .where('reference_type', 'SaleEstimate')
-      .delete();
-    await SaleEstimate.tenant().query().where('id', estimateId).delete();
-  }
-
   /**
    * Edit details of the given estimate with associated entries.
    * @async
    * @param {Integer} estimateId
-   * @param {IEstimate} estimate
+   * @param {EstimateDTO} estimate
    * @return {void}
    */
-  static async editEstimate(estimateId: number, estimate: any) {
+  static async editEstimate(estimateId: number, estimateDTO: any) {
-    const amount = sumBy(estimate.entries, 'amount');
+    const estimate = {
+      amount: sumBy(estimateDTO.entries, 'amount'),
+      ...formatDateFields(estimateDTO, ['estimate_date', 'expiration_date']),
+    };
     const updatedEstimate = await SaleEstimate.tenant()
       .query()
       .update({
-        amount,
         ...omit(estimate, ['entries']),
       });
     const storedEstimateEntries = await ItemEntry.tenant()
@@ -79,6 +68,26 @@ export default class SaleEstimateService {
     ]);
   }
 
+  /**
+   * Deletes the given estimate id with associated entries.
+   * @async
+   * @param {IEstimate} estimateId
+   * @return {void}
+   */
+  static async deleteEstimate(estimateId: number) {
+    await ItemEntry.tenant()
+      .query()
+      .where('reference_id', estimateId)
+      .where('reference_type', 'SaleEstimate')
+      .delete();
+
+    await SaleEstimate.tenant()
+      .query()
+      .where('id', estimateId)
+      .delete();
+  }
+
+
   /**
    * Validates the given estimate ID exists.
    * @async

server/src/services/Sales/SalesInvoices.ts

@@ -1,4 +1,4 @@
-import { omit, sumBy, difference } from 'lodash';
+import { omit, sumBy, difference, pick } from 'lodash';
 import { Container } from 'typedi';
 import {
   SaleInvoice,
@@ -12,6 +12,7 @@ import JournalPoster from '@/services/Accounting/JournalPoster';
 import HasItemsEntries from '@/services/Sales/HasItemsEntries';
 import CustomerRepository from '@/repositories/CustomerRepository';
 import InventoryService from '@/services/Inventory/Inventory';
+import { formatDateFields } from '@/utils';
 
 /**
  * Sales invoices service
@@ -25,14 +26,19 @@ export default class SaleInvoicesService {
    * @param {ISaleInvoice}
    * @return {ISaleInvoice}
    */
-  static async createSaleInvoice(saleInvoice: any) {
+  static async createSaleInvoice(saleInvoiceDTO: any) {
-    const balance = sumBy(saleInvoice.entries, 'amount');
+    const balance = sumBy(saleInvoiceDTO.entries, 'amount');
+    const invLotNumber = await InventoryService.nextLotNumber();
+    const saleInvoice = {
+      ...formatDateFields(saleInvoiceDTO, ['invoide_date', 'due_date']),
+      balance,
+      paymentAmount: 0,
+      invLotNumber,
+    };
     const storedInvoice = await SaleInvoice.tenant()
       .query()
       .insert({
         ...omit(saleInvoice, ['entries']),
-        balance,
-        payment_amount: 0,
       });
     const opers: Array<any> = [];
 
@@ -52,8 +58,8 @@ export default class SaleInvoicesService {
       balance,
     );
     // Records the inventory transactions for inventory items.
-    const recordInventoryTransOpers = InventoryService.recordInventoryTransactions(
+    const recordInventoryTransOpers = this.recordInventoryTranscactions(
-      saleInvoice.entries, saleInvoice.invoice_date, 'SaleInvoice', storedInvoice.id, 'OUT',
+      saleInvoice, storedInvoice.id
     );
     // Await all async operations.
     await Promise.all([
@@ -79,11 +85,33 @@ export default class SaleInvoicesService {
     
   }
 
+  /**
+   * Records the inventory transactions from the givne sale invoice input.
+   * @param {SaleInvoice} saleInvoice -
+   * @param {number} saleInvoiceId -
+   * @param {boolean} override -
+   */
+  static recordInventoryTranscactions(saleInvoice, saleInvoiceId: number, override?: boolean){
+    const inventortyTransactions = saleInvoice.entries
+      .map((entry) => ({
+        ...pick(entry, ['item_id', 'quantity', 'rate']),
+        lotNumber: saleInvoice.invLotNumber,
+        transactionType: 'SaleInvoice',
+        transactionId: saleInvoiceId,
+        direction: 'OUT',
+        date: saleInvoice.invoice_date,
+      }));
+
+    return InventoryService.recordInventoryTransactions(
+      inventortyTransactions, override,
+    );
+  }
+
   /**
    * Schedule sale invoice re-compute based on the item
    * cost method and starting date
    * 
-   * @param saleInvoice 
+   * @param {SaleInvoice} saleInvoice - 
    * @return {Promise<Agenda>}
    */
   static scheduleComputeItemsCost(saleInvoice) {
@@ -102,18 +130,22 @@ export default class SaleInvoicesService {
    * @param {Number} saleInvoiceId -
    * @param {ISaleInvoice} saleInvoice -
    */
-  static async editSaleInvoice(saleInvoiceId: number, saleInvoice: any) {
+  static async editSaleInvoice(saleInvoiceId: number, saleInvoiceDTO: any) {
-    const balance = sumBy(saleInvoice.entries, 'amount');
+    const balance = sumBy(saleInvoiceDTO.entries, 'amount');
     const oldSaleInvoice = await SaleInvoice.tenant().query()
       .where('id', saleInvoiceId)
       .first();
 
+    const saleInvoice = {
+      ...formatDateFields(saleInvoiceDTO, ['invoice_date', 'due_date']),
+      balance,
+      invLotNumber: oldSaleInvoice.invLotNumber,
+    };
     const updatedSaleInvoices = await SaleInvoice.tenant()
       .query()
       .where('id', saleInvoiceId)
       .update({
-        balance,
+        ...omit(saleInvoice, ['entries', 'invLotNumber']),
-        ...omit(saleInvoice, ['entries']),
       });
     // Fetches the sale invoice items entries.
     const storedEntries = await ItemEntry.tenant()
@@ -132,9 +164,14 @@ export default class SaleInvoicesService {
       balance,
       oldSaleInvoice.balance,
     );
+    // Records the inventory transactions for inventory items.
+    const recordInventoryTransOper = this.recordInventoryTranscactions(
+      saleInvoice, saleInvoiceId, true,
+    );
     await Promise.all([
       patchItemsEntriesOper,
       changeCustomerBalanceOper,
+      recordInventoryTransOper,
     ]);
 
     // Schedule sale invoice re-compute based on the item cost
@@ -221,7 +258,6 @@ export default class SaleInvoicesService {
     const revertInventoryTransactionsOper = this.revertInventoryTransactions(
       inventoryTransactions
     );
-    
     // Await all async operations.
     await Promise.all([
       journal.deleteEntries(),

server/src/services/Sales/SalesReceipts.ts

@@ -7,6 +7,7 @@ import {
 import JournalPoster from '@/services/Accounting/JournalPoster';
 import JournalPosterService from '@/services/Sales/JournalPosterService';
 import HasItemEntries from '@/services/Sales/HasItemsEntries';
+import { formatDateFields } from '@/utils';
 
 export default class SalesReceipt {
   /**
@@ -15,12 +16,14 @@ export default class SalesReceipt {
    * @param {ISaleReceipt} saleReceipt
    * @return {Object}
    */
-  static async createSaleReceipt(saleReceipt: any) {
+  static async createSaleReceipt(saleReceiptDTO: any) {
-    const amount = sumBy(saleReceipt.entries, 'amount');
+    const saleReceipt = {
+      amount: sumBy(saleReceiptDTO.entries, 'amount');
+      ...formatDateFields(saleReceiptDTO, ['receipt_date'])
+    };
     const storedSaleReceipt = await SaleReceipt.tenant()
       .query()
       .insert({
-        amount,
         ...omit(saleReceipt, ['entries']),
       });
     const storeSaleReceiptEntriesOpers: Array<any> = [];
@@ -39,29 +42,21 @@ export default class SalesReceipt {
     return storedSaleReceipt;
   }
 
-  /**
-   * Records journal transactions for sale receipt.
-   * @param {ISaleReceipt} saleReceipt
-   * @return {Promise}
-   */
-  static async _recordJournalTransactions(saleReceipt: any) {
-    const accountsDepGraph = await Account.tenant().depGraph().query();
-    const journalPoster = new JournalPoster(accountsDepGraph);
-  }
-
   /**
    * Edit details sale receipt with associated entries.
    * @param {Integer} saleReceiptId
    * @param {ISaleReceipt} saleReceipt
    * @return {void}
    */
-  static async editSaleReceipt(saleReceiptId: number, saleReceipt: any) {
+  static async editSaleReceipt(saleReceiptId: number, saleReceiptDTO: any) {
-    const amount = sumBy(saleReceipt.entries, 'amount');
+    const saleReceipt = {
+      amount: sumBy(saleReceiptDTO.entries, 'amount'),
+      ...formatDateFields(saleReceiptDTO, ['receipt_date'])
+    };
     const updatedSaleReceipt = await SaleReceipt.tenant()
       .query()
       .where('id', saleReceiptId)
       .update({
-        amount,
         ...omit(saleReceipt, ['entries']),
       });
     const storedSaleReceiptEntries = await ItemEntry.tenant()
@@ -82,7 +77,11 @@ export default class SalesReceipt {
    * @return {void}
    */
   static async deleteSaleReceipt(saleReceiptId: number) {
-    const deleteSaleReceiptOper = SaleReceipt.tenant().query().where('id', saleReceiptId).delete();
+    const deleteSaleReceiptOper = SaleReceipt.tenant()
+      .query()
+      .where('id', saleReceiptId)
+      .delete();
+
     const deleteItemsEntriesOper = ItemEntry.tenant()
       .query()
       .where('reference_id', saleReceiptId)
@@ -148,4 +147,14 @@ export default class SalesReceipt {
 
     return saleReceipt;
   }
+
+  /**
+   * Records journal transactions for sale receipt.
+   * @param {ISaleReceipt} saleReceipt
+   * @return {Promise}
+   */
+  static async _recordJournalTransactions(saleReceipt: any) {
+    const accountsDepGraph = await Account.tenant().depGraph().query();
+    const journalPoster = new JournalPoster(accountsDepGraph);
+  }
 }

server/src/utils/index.js

@@ -144,6 +144,17 @@ function applyMixins(derivedCtor, baseCtors) {
   });
 }
 
+const formatDateFields = (inputDTO, fields, format = 'YYYY-DD-MM') => {
+  const _inputDTO = { ...inputDTO };
+
+  fields.forEach((field) => {
+    if (_inputDTO[field]) {
+      _inputDTO[field] = moment(_inputDTO[field]).format(format);
+    }
+  });
+  return _inputDTO;
+};
+
 export {
   hashPassword,
   origin,
@@ -156,4 +167,5 @@ export {
   itemsStartWith,
   getTotalDeep,
   applyMixins,
+  formatDateFields,
 };

server/tests/routes/accounts.test.js

@@ -204,8 +204,6 @@ describe('routes: /accounts/', () => {
           code: '123',
         });
 
-      console.log(res.body);
-
       expect(res.status).equals(200);
     });
   });

server/tests/routes/views.test.js

@@ -802,8 +802,6 @@ describe('routes: `/views`', () => {
             value: '100',
           }],
         });
-
-      // console.log(res.status, res.body);
       const foundViewColumns = await ViewColumn.tenant().query().where('id', viewColumn.id);
       expect(foundViewColumns.length).equals(0);
     });