docs: update .all-contributorsrc [skip ci]

.all-contributorsrc

@@ -96,15 +96,6 @@
       "contributions": [
         "bug"
       ]
-    },
-    {
-      "login": "asenawritescode",
-      "name": "Asena",
-      "avatar_url": "https://avatars.githubusercontent.com/u/67445192?v=4",
-      "profile": "https://github.com/asenawritescode",
-      "contributions": [
-        "bug"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -57,10 +57,4 @@ GOTENBERG_DOCS_URL=http://server:3000/public/
 
 # Gotenberg API - (development)
 # GOTENBERG_URL=http://localhost:9000
-# GOTENBERG_DOCS_URL=http://host.docker.internal:3000/public/
-
-# Exchange Rate Service
-EXCHANGE_RATE_SERVICE=open-exchange-rate
-
-# Open Exchange Rate
-OPEN_EXCHANGE_RATE_APP_ID=
+# GOTENBERG_DOCS_URL=http://host.docker.internal:3000/public/

CHANGELOG.md

@@ -2,27 +2,6 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
-## [0.14.0] - 30-01-2024
-
-* feat: purchases by items exporting by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/327
-* fix: expense amounts should not be rounded by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/339
-* feat: get latest exchange rate from third party services by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/340
-* fix(webapp): inconsistency in currency of universal search items by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/335
-* hotfix: editing sales and expense transactions don't reflect GL entries by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/342
-
-## [0.13.3] - 22-01-2024
-
-* hotfix(server): Unhandled thrown errors of services by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/329
-
-## [0.13.2] - 21-01-2024
-
-* feat: show customer / vendor balance. by @asenawritescode in https://github.com/bigcapitalhq/bigcapital/pull/311
-* feat: inventory valuation csv and xlsx export by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/308
-* feat: sales by items export csv & xlsx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/310
-* fix(server): the invoice and payment receipt printing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/315
-* fix: get cashflow transaction broken cause transaction type by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/318
-* fix: `AccountActivateAlert` import by @xprnio in https://github.com/bigcapitalhq/bigcapital/pull/322
-
 ## [0.13.1] - 15-01-2024
 
 * feat(webapp): add approve/reject to action bar of estimate details dr… by @ANasouf in https://github.com/bigcapitalhq/bigcapital/pull/304

README.md

@@ -117,7 +117,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="http://cschuijt.nl"><img src="https://avatars.githubusercontent.com/u/5460015?v=4?s=100" width="100px;" alt="Casper Schuijt"/><br /><sub><b>Casper Schuijt</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Acschuijt" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ANasouf"><img src="https://avatars.githubusercontent.com/u/19536487?v=4?s=100" width="100px;" alt="ANasouf"/><br /><sub><b>ANasouf</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=ANasouf" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://ragnarlaud.dev"><img src="https://avatars.githubusercontent.com/u/3042904?v=4?s=100" width="100px;" alt="Ragnar Laud"/><br /><sub><b>Ragnar Laud</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Axprnio" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/asenawritescode"><img src="https://avatars.githubusercontent.com/u/67445192?v=4?s=100" width="100px;" alt="Asena"/><br /><sub><b>Asena</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Aasenawritescode" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
 </table>

packages/server/src/api/controllers/ExchangeRates.ts

@@ -1,16 +1,19 @@
 import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
-import { query, oneOf } from 'express-validator';
+import { check, param, query } from 'express-validator';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseController from './BaseController';
 import { ServiceError } from '@/exceptions';
-import { EchangeRateErrors } from '@/lib/ExchangeRate/types';
-import { ExchangeRateApplication } from '@/services/ExchangeRates/ExchangeRateApplication';
+import ExchangeRatesService from '@/services/ExchangeRates/ExchangeRatesService';
+import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 
 @Service()
 export default class ExchangeRatesController extends BaseController {
   @Inject()
-  private exchangeRatesApp: ExchangeRateApplication;
+  exchangeRatesService: ExchangeRatesService;
+
+  @Inject()
+  dynamicListService: DynamicListingService;
 
   /**
    * Constructor method.
@@ -19,40 +22,164 @@ export default class ExchangeRatesController extends BaseController {
     const router = Router();
 
     router.get(
-      '/latest',
-      [
-        oneOf([
-          query('to_currency').exists().isString().isISO4217(),
-          query('from_currency').exists().isString().isISO4217(),
-        ]),
-      ],
+      '/',
+      [...this.exchangeRatesListSchema],
       this.validationResult,
-      asyncMiddleware(this.latestExchangeRate.bind(this)),
+      asyncMiddleware(this.exchangeRates.bind(this)),
+      this.dynamicListService.handlerErrorsToResponse,
+      this.handleServiceError,
+    );
+    router.post(
+      '/',
+      [...this.exchangeRateDTOSchema],
+      this.validationResult,
+      asyncMiddleware(this.addExchangeRate.bind(this)),
+      this.handleServiceError
+    );
+    router.post(
+      '/:id',
+      [...this.exchangeRateEditDTOSchema, ...this.exchangeRateIdSchema],
+      this.validationResult,
+      asyncMiddleware(this.editExchangeRate.bind(this)),
+      this.handleServiceError
+    );
+    router.delete(
+      '/:id',
+      [...this.exchangeRateIdSchema],
+      this.validationResult,
+      asyncMiddleware(this.deleteExchangeRate.bind(this)),
       this.handleServiceError
     );
     return router;
   }
 
+  get exchangeRatesListSchema() {
+    return [
+      query('page').optional().isNumeric().toInt(),
+      query('page_size').optional().isNumeric().toInt(),
+
+      query('column_sort_by').optional(),
+      query('sort_order').optional().isIn(['desc', 'asc']),
+    ];
+  }
+
+  get exchangeRateDTOSchema() {
+    return [
+      check('exchange_rate').exists().isNumeric().toFloat(),
+      check('currency_code').exists().trim().escape(),
+      check('date').exists().isISO8601(),
+    ];
+  }
+
+  get exchangeRateEditDTOSchema() {
+    return [check('exchange_rate').exists().isNumeric().toFloat()];
+  }
+
+  get exchangeRateIdSchema() {
+    return [param('id').isNumeric().toInt()];
+  }
+
+  get exchangeRatesIdsSchema() {
+    return [
+      query('ids').isArray({ min: 2 }),
+      query('ids.*').isNumeric().toInt(),
+    ];
+  }
+
   /**
    * Retrieve exchange rates.
    * @param {Request} req
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async latestExchangeRate(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
+  async exchangeRates(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
-    const exchangeRateQuery = this.matchedQueryData(req);
+    const filter = {
+      page: 1,
+      pageSize: 12,
+      filterRoles: [],
+      columnSortBy: 'created_at',
+      sortOrder: 'asc',
+      ...this.matchedQueryData(req),
+    };
+    if (filter.stringifiedFilterRoles) {
+      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
+    }
+    try {
+      const exchangeRates = await this.exchangeRatesService.listExchangeRates(
+        tenantId,
+        filter
+      );
+      return res.status(200).send({ exchange_rates: exchangeRates });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Adds a new exchange rate on the given date.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  async addExchangeRate(req: Request, res: Response, next: NextFunction) {
+    const { tenantId } = req;
+    const exchangeRateDTO = this.matchedBodyData(req);
 
     try {
-      const exchangeRate = await this.exchangeRatesApp.latest(
+      const exchangeRate = await this.exchangeRatesService.newExchangeRate(
         tenantId,
-        exchangeRateQuery
+        exchangeRateDTO
       );
-      return res.status(200).send(exchangeRate);
+      return res.status(200).send({ id: exchangeRate.id });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Edit the given exchange rate.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  async editExchangeRate(req: Request, res: Response, next: NextFunction) {
+    const { tenantId } = req;
+    const { id: exchangeRateId } = req.params;
+    const exchangeRateDTO = this.matchedBodyData(req);
+
+    try {
+      const exchangeRate = await this.exchangeRatesService.editExchangeRate(
+        tenantId,
+        exchangeRateId,
+        exchangeRateDTO
+      );
+
+      return res.status(200).send({
+        id: exchangeRateId,
+        message: 'The exchange rate has been edited successfully.',
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Delete the given exchange rate from the storage.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  async deleteExchangeRate(req: Request, res: Response, next: NextFunction) {
+    const { tenantId } = req;
+    const { id: exchangeRateId } = req.params;
+
+    try {
+      await this.exchangeRatesService.deleteExchangeRate(
+        tenantId,
+        exchangeRateId
+      );
+      return res.status(200).send({ id: exchangeRateId });
     } catch (error) {
       next(error);
     }
@@ -65,56 +192,26 @@ export default class ExchangeRatesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private handleServiceError(
+  handleServiceError(
     error: Error,
     req: Request,
     res: Response,
     next: NextFunction
   ) {
     if (error instanceof ServiceError) {
-      if (EchangeRateErrors.EX_RATE_INVALID_BASE_CURRENCY === error.errorType) {
-        return res.status(400).send({
-          errors: [
-            {
-              type: EchangeRateErrors.EX_RATE_INVALID_BASE_CURRENCY,
-              code: 100,
-              message: 'The given base currency is invalid.',
-            },
-          ],
+      if (error.errorType === 'EXCHANGE_RATE_NOT_FOUND') {
+        return res.status(404).send({
+          errors: [{ type: 'EXCHANGE.RATE.NOT.FOUND', code: 200 }],
         });
-      } else if (
-        EchangeRateErrors.EX_RATE_SERVICE_NOT_ALLOWED === error.errorType
-      ) {
+      }
+      if (error.errorType === 'NOT_FOUND_EXCHANGE_RATES') {
         return res.status(400).send({
-          errors: [
-            {
-              type: EchangeRateErrors.EX_RATE_SERVICE_NOT_ALLOWED,
-              code: 200,
-              message: 'The service is not allowed',
-            },
-          ],
+          errors: [{ type: 'EXCHANGE.RATES.IS.NOT.FOUND', code: 100 }],
         });
-      } else if (
-        EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED === error.errorType
-      ) {
+      }
+      if (error.errorType === 'EXCHANGE_RATE_PERIOD_EXISTS') {
         return res.status(400).send({
-          errors: [
-            {
-              type: EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED,
-              code: 300,
-              message: 'The API key is required',
-            },
-          ],
-        });
-      } else if (EchangeRateErrors.EX_RATE_LIMIT_EXCEEDED === error.errorType) {
-        return res.status(400).send({
-          errors: [
-            {
-              type: EchangeRateErrors.EX_RATE_LIMIT_EXCEEDED,
-              code: 400,
-              message: 'The API rate limit has been exceeded',
-            },
-          ],
+          errors: [{ type: 'EXCHANGE.RATE.PERIOD.EXISTS', code: 300 }],
         });
       }
     }

packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts

@@ -1,18 +1,17 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
+import moment from 'moment';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from './BaseFinancialReportController';
-import { PurchasesByItemsService } from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService';
+import PurchasesByItemsService from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { PurcahsesByItemsApplication } from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication';
 
 @Service()
 export default class PurchasesByItemReportController extends BaseFinancialReportController {
   @Inject()
-  private purchasesByItemsApp: PurcahsesByItemsApplication;
+  purchasesByItemsService: PurchasesByItemsService;
 
   /**
    * Router constructor.
@@ -64,47 +63,20 @@ export default class PurchasesByItemReportController extends BaseFinancialReport
    * @param {Request} req -
    * @param {Response} res -
    */
-  public async purchasesByItems(req: Request, res: Response) {
+  async purchasesByItems(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const filter = this.matchedQueryData(req);
 
-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_CSV,
-    ]);
-
-    // JSON table response format.
-    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.purchasesByItemsApp.table(tenantId, filter);
-
-      return res.status(200).send(table);
-      // CSV response format.
-    } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-      const buffer = await this.purchasesByItemsApp.csv(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-      res.setHeader('Content-Type', 'text/csv');
-
-      return res.send(buffer);
-      // Xlsx response format.
-    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-      const buffer = await this.purchasesByItemsApp.xlsx(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
-      res.setHeader(
-        'Content-Type',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-      );
-      return res.send(buffer);
-      // Json response format.
-    } else {
-      const sheet = await this.purchasesByItemsApp.sheet(tenantId, filter);
-
-      return res.status(200).send(sheet);
+    try {
+      const { data, query, meta } =
+        await this.purchasesByItemsService.purchasesByItems(tenantId, filter);
+      return res.status(200).send({
+        meta: this.transfromToResponse(meta),
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
+      });
+    } catch (error) {
+      next(error);
     }
   }
 }

packages/server/src/api/controllers/Purchases/Bills.ts

@@ -303,7 +303,7 @@ export default class BillsController extends BaseController {
     try {
       const bill = await this.billsApplication.getBill(tenantId, billId);
 
-      return res.status(200).send({ bill });
+      return res.status(200).send(this.transfromToResponse({ bill }));
     } catch (error) {
       next(error);
     }
@@ -348,11 +348,14 @@ export default class BillsController extends BaseController {
     };
 
     try {
-      const billsWithPagination = await this.billsApplication.getBills(
-        tenantId,
-        filter
-      );
-      return res.status(200).send(billsWithPagination);
+      const { bills, pagination, filterMeta } =
+        await this.billsApplication.getBills(tenantId, filter);
+
+      return res.status(200).send({
+        bills: this.transfromToResponse(bills),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
     } catch (error) {
       next(error);
     }

packages/server/src/api/controllers/Purchases/BillsPayments.ts

@@ -158,11 +158,15 @@ export default class BillsPayments extends BaseController {
     const { tenantId } = req;
     const { vendorId } = this.matchedQueryData(req);
 
-    const entries = await this.billPaymentsPages.getNewPageEntries(
-      tenantId,
-      vendorId
-    );
-    return res.status(200).send({ entries });
+    try {
+      const entries = await this.billPaymentsPages.getNewPageEntries(
+        tenantId,
+        vendorId
+      );
+      return res.status(200).send({
+        entries: this.transfromToResponse(entries),
+      });
+    } catch (error) {}
   }
 
   /**
@@ -179,12 +183,16 @@ export default class BillsPayments extends BaseController {
     const { id: paymentReceiveId } = req.params;
 
     try {
-      const billPaymentsWithEditEntries =
+      const { billPayment, entries } =
         await this.billPaymentsPages.getBillPaymentEditPage(
           tenantId,
           paymentReceiveId
         );
-      return res.status(200).send(billPaymentsWithEditEntries);
+
+      return res.status(200).send({
+        bill_payment: this.transfromToResponse(billPayment),
+        entries: this.transfromToResponse(entries),
+      });
     } catch (error) {
       next(error);
     }
@@ -296,7 +304,9 @@ export default class BillsPayments extends BaseController {
         tenantId,
         billPaymentId
       );
-      return res.status(200).send({ billPayment });
+      return res.status(200).send({
+        bill_payment: this.transfromToResponse(billPayment),
+      });
     } catch (error) {
       next(error);
     }
@@ -349,12 +359,17 @@ export default class BillsPayments extends BaseController {
     };
 
     try {
-      const billPaymentsWithPagination =
+      const { billPayments, pagination, filterMeta } =
         await this.billPaymentsApplication.getBillPayments(
           tenantId,
           billPaymentsFilter
         );
-      return res.status(200).send(billPaymentsWithPagination);
+
+      return res.status(200).send({
+        bill_payments: this.transfromToResponse(billPayments),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
     } catch (error) {
       next(error);
     }

packages/server/src/api/controllers/Purchases/VendorCredit.ts

@@ -320,19 +320,20 @@ export default class VendorCreditController extends BaseController {
     res: Response,
     next: NextFunction
   ) => {
-    const { id: vendorCreditId } = req.params;
+    const { id: billId } = req.params;
     const { tenantId, user } = req;
     const vendorCreditEditDTO: IVendorCreditEditDTO = this.matchedBodyData(req);
 
     try {
       await this.editVendorCreditService.editVendorCredit(
         tenantId,
-        vendorCreditId,
-        vendorCreditEditDTO
+        billId,
+        vendorCreditEditDTO,
+        user
       );
 
       return res.status(200).send({
-        id: vendorCreditId,
+        id: billId,
         message: 'The vendor credit has been edited successfully.',
       });
     } catch (error) {

packages/server/src/api/controllers/Sales/CreditNotes.ts

@@ -26,7 +26,6 @@ import GetCreditNoteAssociatedInvoicesToApply from '@/services/CreditNotes/GetCr
 import GetCreditNoteAssociatedAppliedInvoices from '@/services/CreditNotes/GetCreditNoteAssociatedAppliedInvoices';
 import GetRefundCreditTransaction from '@/services/CreditNotes/GetRefundCreditNoteTransaction';
 import GetCreditNotePdf from '../../../services/CreditNotes/GetCreditNotePdf';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 /**
  * Credit notes controller.
  * @service
@@ -294,7 +293,7 @@ export default class PaymentReceivesController extends BaseController {
     return [
       check('from_account_id').exists().isNumeric().toInt(),
       check('description').optional(),
-
+      
       check('amount').exists().isNumeric().toFloat(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
 
@@ -439,7 +438,7 @@ export default class PaymentReceivesController extends BaseController {
   };
 
   /**
-   * Retrieve the credit note details.
+   * Retrieve the payment receive details.
    * @param {Request} req
    * @param {Response} res
    * @param {NextFunction} next
@@ -452,28 +451,38 @@ export default class PaymentReceivesController extends BaseController {
     const { tenantId } = req;
     const { id: creditNoteId } = req.params;
 
-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.creditNotePdf.getCreditNotePdf(
-        tenantId,
-        creditNoteId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-    } else {
+    try {
       const creditNote = await this.getCreditNoteService.getCreditNote(
         tenantId,
         creditNoteId
       );
-      return res.status(200).send({ creditNote });
+      const ACCEPT_TYPE = {
+        APPLICATION_PDF: 'application/pdf',
+        APPLICATION_JSON: 'application/json',
+      };
+      // Response formatter.
+      res.format({
+        // Json content type.
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res
+            .status(200)
+            .send({ credit_note: this.transfromToResponse(creditNote) });
+        },
+        // Pdf content type.
+        [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+          const pdfContent = await this.creditNotePdf.getCreditNotePdf(
+            tenantId,
+            creditNote
+          );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
+      });
+    } catch (error) {
+      next(error);
     }
   };
 

packages/server/src/api/controllers/Sales/PaymentReceives.ts

@@ -14,7 +14,6 @@ import DynamicListingService from '@/services/DynamicListing/DynamicListService'
 import { PaymentReceivesApplication } from '@/services/Sales/PaymentReceives/PaymentReceivesApplication';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { ServiceError } from '@/exceptions';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
 @Service()
 export default class PaymentReceivesController extends BaseController {
@@ -349,12 +348,17 @@ export default class PaymentReceivesController extends BaseController {
     };
 
     try {
-      const paymentsReceivedWithPagination =
+      const { paymentReceives, pagination, filterMeta } =
         await this.paymentReceiveApplication.getPaymentReceives(
           tenantId,
           filter
         );
-      return res.status(200).send(paymentsReceivedWithPagination);
+
+      return res.status(200).send({
+        payment_receives: this.transfromToResponse(paymentReceives),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
     } catch (error) {
       next(error);
     }
@@ -431,34 +435,37 @@ export default class PaymentReceivesController extends BaseController {
     const { tenantId } = req;
     const { id: paymentReceiveId } = req.params;
 
-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Response in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent =
-        await this.paymentReceiveApplication.getPaymentReceivePdf(
-          tenantId,
-          paymentReceiveId
-        );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-      // Response in json format.
-    } else {
-      const paymentReceive =
-        await this.paymentReceiveApplication.getPaymentReceive(
-          tenantId,
-          paymentReceiveId
-        );
-      return res.status(200).send({
-        payment_receive: paymentReceive,
+    try {
+      const ACCEPT_TYPE = {
+        APPLICATION_PDF: 'application/pdf',
+        APPLICATION_JSON: 'application/json',
+      };
+      res.format({
+        [ACCEPT_TYPE.APPLICATION_JSON]: async () => {
+          const paymentReceive =
+            await this.paymentReceiveApplication.getPaymentReceive(
+              tenantId,
+              paymentReceiveId
+            );
+          return res.status(200).send({
+            payment_receive: paymentReceive,
+          });
+        },
+        [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+          const pdfContent =
+            await this.paymentReceiveApplication.getPaymentReceivePdf(
+              tenantId,
+              paymentReceiveId
+            );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
       });
+    } catch (error) {
+      next(error);
     }
   }
 
@@ -492,7 +499,7 @@ export default class PaymentReceivesController extends BaseController {
   };
 
   /**
-   * Retrieves the sms details of the given payment receive.
+   *
    * @param {Request} req
    * @param {Response} res
    * @param {NextFunction} next
@@ -581,10 +588,10 @@ export default class PaymentReceivesController extends BaseController {
 
   /**
    * Handles service errors.
-   * @param {Error} error
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
+   * @param error
+   * @param req
+   * @param res
+   * @param next
    */
   private handleServiceErrors(
     error: Error,

packages/server/src/api/controllers/Sales/SalesEstimates.ts

@@ -334,6 +334,7 @@ export default class SalesEstimatesController extends BaseController {
         tenantId,
         estimateId
       );
+
       return res.status(200).send({
         id: estimateId,
         message: 'The sale estimate has been approved successfully.',
@@ -362,6 +363,7 @@ export default class SalesEstimatesController extends BaseController {
         tenantId,
         estimateId
       );
+
       return res.status(200).send({
         id: estimateId,
         message: 'The sale estimate has been rejected successfully.',
@@ -381,30 +383,33 @@ export default class SalesEstimatesController extends BaseController {
     const { id: estimateId } = req.params;
     const { tenantId } = req;
 
-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves estimate in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF == acceptType) {
-      const pdfContent = await this.saleEstimatesApplication.getSaleEstimatePdf(
-        tenantId,
-        estimateId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
+    try {
+      // Response formatter.
+      res.format({
+        // JSON content type.
+        [ACCEPT_TYPE.APPLICATION_JSON]: async () => {
+          const estimate = await this.saleEstimatesApplication.getSaleEstimate(
+            tenantId,
+            estimateId
+          );
+          return res.status(200).send({ estimate });
+        },
+        // PDF content type.
+        [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+          const pdfContent =
+            await this.saleEstimatesApplication.getSaleEstimatePdf(
+              tenantId,
+              estimateId
+            );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
       });
-      res.send(pdfContent);
-      // Retrieves estimates in json format.
-    } else {
-      const estimate = await this.saleEstimatesApplication.getSaleEstimate(
-        tenantId,
-        estimateId
-      );
-      return res.status(200).send({ estimate });
+    } catch (error) {
+      next(error);
     }
   }
 
@@ -422,11 +427,22 @@ export default class SalesEstimatesController extends BaseController {
       pageSize: 12,
       ...this.matchedQueryData(req),
     };
+
     try {
-      const salesEstimatesWithPagination =
+      const { salesEstimates, pagination, filterMeta } =
         await this.saleEstimatesApplication.getSaleEstimates(tenantId, filter);
 
-      return res.status(200).send(salesEstimatesWithPagination);
+      res.format({
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res.status(200).send(
+            this.transfromToResponse({
+              salesEstimates,
+              pagination,
+              filterMeta,
+            })
+          );
+        },
+      });
     } catch (error) {
       next(error);
     }

packages/server/src/api/controllers/Sales/SalesInvoices.ts

@@ -14,8 +14,11 @@ import {
 } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { SaleInvoiceApplication } from '@/services/Sales/Invoices/SaleInvoicesApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
+const ACCEPT_TYPE = {
+  APPLICATION_PDF: 'application/pdf',
+  APPLICATION_JSON: 'application/json',
+};
 @Service()
 export default class SaleInvoicesController extends BaseController {
   @Inject()
@@ -400,6 +403,7 @@ export default class SaleInvoicesController extends BaseController {
         saleInvoiceId,
         user
       );
+
       return res.status(200).send({
         id: saleInvoiceId,
         message: 'The sale invoice has been deleted successfully.',
@@ -418,32 +422,30 @@ export default class SaleInvoicesController extends BaseController {
     const { id: saleInvoiceId } = req.params;
     const { tenantId, user } = req;
 
-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves invoice in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF == acceptType) {
-      const pdfContent = await this.saleInvoiceApplication.saleInvoicePdf(
-        tenantId,
-        saleInvoiceId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-      // Retrieves invoice in json format.
-    } else {
-      const saleInvoice = await this.saleInvoiceApplication.getSaleInvoice(
-        tenantId,
-        saleInvoiceId,
-        user
-      );
-      return res.status(200).send({ saleInvoice });
-    }
+    // Response formatter.
+    return res.format({
+      // JSON content type.
+      [ACCEPT_TYPE.APPLICATION_JSON]: async () => {
+        const saleInvoice = await this.saleInvoiceApplication.getSaleInvoice(
+          tenantId,
+          saleInvoiceId,
+          user
+        );
+        return res.status(200).send(this.transfromToResponse({ saleInvoice }));
+      },
+      // PDF content type.
+      [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+        const pdfContent = await this.saleInvoiceApplication.saleInvoicePdf(
+          tenantId,
+          saleInvoiceId
+        );
+        res.set({
+          'Content-Type': 'application/pdf',
+          'Content-Length': pdfContent.length,
+        });
+        res.send(pdfContent);
+      },
+    });
   }
   /**
    * Retrieve paginated sales invoices with custom view metadata.
@@ -465,10 +467,14 @@ export default class SaleInvoicesController extends BaseController {
       ...this.matchedQueryData(req),
     };
     try {
-      const salesInvoicesWithPagination =
+      const { salesInvoices, filterMeta, pagination } =
         await this.saleInvoiceApplication.getSaleInvoices(tenantId, filter);
 
-      return res.status(200).send(salesInvoicesWithPagination);
+      return res.status(200).send({
+        sales_invoices: this.transfromToResponse(salesInvoices),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
     } catch (error) {
       next(error);
     }
@@ -495,7 +501,9 @@ export default class SaleInvoicesController extends BaseController {
           tenantId,
           customerId
         );
-      return res.status(200).send({ salesInvoices });
+      return res.status(200).send({
+        sales_invoices: this.transfromToResponse(salesInvoices),
+      });
     } catch (error) {
       next(error);
     }
@@ -523,6 +531,7 @@ export default class SaleInvoicesController extends BaseController {
         invoiceId,
         writeoffDTO
       );
+
       return res.status(200).send({
         id: saleInvoice.id,
         message: 'The given sale invoice has been written-off successfully.',

packages/server/src/api/controllers/Sales/SalesReceipts.ts

@@ -3,17 +3,12 @@ import { body, check, param, query } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseController from '../BaseController';
-import {
-  ISaleReceiptDTO,
-  SaleReceiptMailOpts,
-  SaleReceiptMailOptsDTO,
-} from '@/interfaces/SaleReceipt';
+import { ISaleReceiptDTO, SaleReceiptMailOpts, SaleReceiptMailOptsDTO } from '@/interfaces/SaleReceipt';
 import { ServiceError } from '@/exceptions';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, SaleReceiptAction } from '@/interfaces';
 import { SaleReceiptApplication } from '@/services/Sales/Receipts/SaleReceiptApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
 @Service()
 export default class SalesReceiptsController extends BaseController {
@@ -67,7 +62,9 @@ export default class SalesReceiptsController extends BaseController {
     );
     router.get(
       '/:id/mail',
-      [...this.specificReceiptValidationSchema],
+      [
+        ...this.specificReceiptValidationSchema,
+      ],
       this.validationResult,
       asyncMiddleware(this.getSaleReceiptMail.bind(this)),
       this.handleServiceErrors
@@ -231,6 +228,7 @@ export default class SalesReceiptsController extends BaseController {
         tenantId,
         saleReceiptId
       );
+
       return res.status(200).send({
         id: saleReceiptId,
         message: 'Sale receipt has been deleted successfully.',
@@ -319,10 +317,15 @@ export default class SalesReceiptsController extends BaseController {
       ...this.matchedQueryData(req),
     };
     try {
-      const salesReceiptsWithPagination =
+      const { data, pagination, filterMeta } =
         await this.saleReceiptsApplication.getSaleReceipts(tenantId, filter);
 
-      return res.status(200).send(salesReceiptsWithPagination);
+      const response = this.transfromToResponse({
+        data,
+        pagination,
+        filterMeta,
+      });
+      return res.status(200).send(response);
     } catch (error) {
       next(error);
     }
@@ -334,34 +337,34 @@ export default class SalesReceiptsController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  public async getSaleReceipt(req: Request, res: Response) {
+  public async getSaleReceipt(req: Request, res: Response, next: NextFunction) {
     const { id: saleReceiptId } = req.params;
     const { tenantId } = req;
 
-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves receipt in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF == acceptType) {
-      const pdfContent = await this.saleReceiptsApplication.getSaleReceiptPdf(
-        tenantId,
-        saleReceiptId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
+    try {
+      res.format({
+        'application/json': async () => {
+          const saleReceipt = await this.saleReceiptsApplication.getSaleReceipt(
+            tenantId,
+            saleReceiptId
+          );
+          return res.status(200).send({ saleReceipt });
+        },
+        'application/pdf': async () => {
+          const pdfContent =
+            await this.saleReceiptsApplication.getSaleReceiptPdf(
+              tenantId,
+              saleReceiptId
+            );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
       });
-      res.send(pdfContent);
-      // Retrieves receipt in json format.
-    } else {
-      const saleReceipt = await this.saleReceiptsApplication.getSaleReceipt(
-        tenantId,
-        saleReceiptId
-      );
-      return res.status(200).send({ saleReceipt });
+    } catch (error) {
+      next(error);
     }
   }
 

packages/server/src/config/index.ts

@@ -169,14 +169,4 @@ module.exports = {
    * to application detarmines to upgrade.
    */
   databaseBatch: 4,
-
-  /**
-   * Exchange rate.
-   */
-  exchangeRate: {
-    service: 'open-exchange-rate',
-    openExchangeRate: {
-      appId: process.env.OPEN_EXCHANGE_RATE_APP_ID,
-    }
-  }
 };

packages/server/src/interfaces/APAgingSummaryReport.ts

@@ -1,10 +1,13 @@
 import {
   IAgingPeriod,
+  IAgingPeriodTotal,
+  IAgingAmount,
   IAgingSummaryQuery,
   IAgingSummaryTotal,
   IAgingSummaryContact,
   IAgingSummaryData,
 } from './AgingReport';
+import { INumberFormatQuery } from './FinancialStatements';
 import { IFinancialTable } from './Table';
 
 export interface IAPAgingSummaryQuery extends IAgingSummaryQuery {

packages/server/src/interfaces/ExchangeRate.ts

@@ -1,10 +1,36 @@
-export interface ExchangeRateLatestDTO {
-  toCurrency: string;
-  fromCurrency: string;
-}
+import { IFilterRole } from './DynamicFilter';
 
-export interface EchangeRateLatestPOJO {
-  baseCurrency: string;
-  toCurrency: string;
-  exchangeRate: number;
-}
+export interface IExchangeRate {
+  id: number,
+  currencyCode: string,
+  exchangeRate: number,
+  date: Date,
+  createdAt: Date,
+  updatedAt: Date,
+};
+
+export interface IExchangeRateDTO {
+  currencyCode: string,
+  exchangeRate: number,
+  date: Date,
+};
+
+export interface IExchangeRateEditDTO {
+  exchangeRate: number,
+};
+
+export interface IExchangeRateFilter {
+  page: number,
+  pageSize: number,
+  filterRoles?: IFilterRole[];
+  columnSortBy: string;
+  sortOrder: string;
+};
+
+export interface IExchangeRatesService {
+  newExchangeRate(tenantId: number, exchangeRateDTO: IExchangeRateDTO): Promise<IExchangeRate>;
+  editExchangeRate(tenantId: number, exchangeRateId: number, editExRateDTO: IExchangeRateEditDTO): Promise<void>;
+
+  deleteExchangeRate(tenantId: number, exchangeRateId: number): Promise<void>;
+  listExchangeRates(tenantId: number, exchangeRateFilter: IExchangeRateFilter): Promise<void>;
+};

packages/server/src/interfaces/PurchasesByItemsSheet.ts

@@ -1,54 +0,0 @@
-import { INumberFormatQuery } from './FinancialStatements';
-import { IFinancialTable } from './Table';
-
-export interface IPurchasesByItemsReportQuery {
-  fromDate: Date | string;
-  toDate: Date | string;
-  itemsIds: number[];
-  numberFormat: INumberFormatQuery;
-  noneTransactions: boolean;
-  onlyActive: boolean;
-}
-
-export interface IPurchasesByItemsSheetMeta {
-  organizationName: string;
-  baseCurrency: string;
-}
-
-export interface IPurchasesByItemsItem {
-  id: number;
-  name: string;
-  code: string;
-  quantitySold: number;
-  soldCost: number;
-  averageSellPrice: number;
-
-  quantitySoldFormatted: string;
-  soldCostFormatted: string;
-  averageSellPriceFormatted: string;
-  currencyCode: string;
-}
-
-export interface IPurchasesByItemsTotal {
-  quantitySold: number;
-  soldCost: number;
-  quantitySoldFormatted: string;
-  soldCostFormatted: string;
-  currencyCode: string;
-}
-
-export type IPurchasesByItemsSheetData = {
-  items: IPurchasesByItemsItem[];
-  total: IPurchasesByItemsTotal;
-};
-
-export interface IPurchasesByItemsSheet {
-  data: IPurchasesByItemsSheetData;
-  query: IPurchasesByItemsReportQuery;
-  meta: IPurchasesByItemsSheetMeta;
-}
-
-export interface IPurchasesByItemsTable extends IFinancialTable {
-  query: IPurchasesByItemsReportQuery;
-  meta: IPurchasesByItemsSheetMeta;
-}

packages/server/src/lib/ExchangeRate/ExchangeRate.ts

@@ -1,45 +0,0 @@
-import { OpenExchangeRate } from './OpenExchangeRate';
-import { ExchangeRateServiceType, IExchangeRateService } from './types';
-
-export class ExchangeRate {
-  private exchangeRateService: IExchangeRateService;
-  private exchangeRateServiceType: ExchangeRateServiceType;
-
-  /**
-   * Constructor method.
-   * @param {ExchangeRateServiceType} service
-   */
-  constructor(service: ExchangeRateServiceType) {
-    this.exchangeRateServiceType = service;
-    this.initService();
-  }
-
-  /**
-   * Initialize the exchange rate service based on the service type.
-   */
-  private initService() {
-    if (
-      this.exchangeRateServiceType === ExchangeRateServiceType.OpenExchangeRate
-    ) {
-      this.setExchangeRateService(new OpenExchangeRate());
-    }
-  }
-
-  /**
-   * Sets the exchange rate service.
-   * @param {IExchangeRateService} service
-   */
-  private setExchangeRateService(service: IExchangeRateService) {
-    this.exchangeRateService = service;
-  }
-
-  /**
-   * Gets the latest exchange rate.
-   * @param {string} baseCurrency
-   * @param {string} toCurrency
-   * @returns {number}
-   */
-  public latest(baseCurrency: string, toCurrency: string): Promise<number> {
-    return this.exchangeRateService.latest(baseCurrency, toCurrency);
-  }
-}

packages/server/src/lib/ExchangeRate/OpenExchangeRate.ts

@@ -1,81 +0,0 @@
-import Axios, { AxiosError } from 'axios';
-import {
-  EchangeRateErrors,
-  IExchangeRateService,
-  OPEN_EXCHANGE_RATE_LATEST_URL,
-} from './types';
-import config from '@/config';
-import { ServiceError } from '@/exceptions';
-
-export class OpenExchangeRate implements IExchangeRateService {
-  /**
-   * Gets the latest exchange rate.
-   * @param {string} baseCurrency
-   * @param {string} toCurrency
-   * @returns {Promise<number}
-   */
-  public async latest(
-    baseCurrency: string,
-    toCurrency: string
-  ): Promise<number> {
-    // Vaclidates the Open Exchange Rate api id early.
-    this.validateApiIdExistance();
-
-    try {
-      const result = await Axios.get(OPEN_EXCHANGE_RATE_LATEST_URL, {
-        params: {
-          app_id: config.exchangeRate.openExchangeRate.appId,
-          base: baseCurrency,
-          symbols: toCurrency,
-        },
-      });
-      return result.data.rates[toCurrency] || (1 as number);
-    } catch (error) {
-      this.handleLatestErrors(error);
-    }
-  }
-
-  /**
-   * Validates the Open Exchange Rate api id.
-   * @throws {ServiceError}
-   */
-  private validateApiIdExistance() {
-    const apiId = config.exchangeRate.openExchangeRate.appId;
-
-    if (!apiId) {
-      throw new ServiceError(
-        EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED,
-        'Invalid App ID provided. Please sign up at https://openexchangerates.org/signup, or contact support@openexchangerates.org.'
-      );
-    }
-  }
-
-  /**
-   * Handles the latest errors.
-   * @param {any} error
-   * @throws {ServiceError}
-   */
-  private handleLatestErrors(error: any) {
-    if (error.response.data?.message === 'missing_app_id') {
-      throw new ServiceError(
-        EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED,
-        'Invalid App ID provided. Please sign up at https://openexchangerates.org/signup, or contact support@openexchangerates.org.'
-      );
-    } else if (error.response.data?.message === 'invalid_app_id') {
-      throw new ServiceError(
-        EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED,
-        'Invalid App ID provided. Please sign up at https://openexchangerates.org/signup, or contact support@openexchangerates.org.'
-      );
-    } else if (error.response.data?.message === 'not_allowed') {
-      throw new ServiceError(
-        EchangeRateErrors.EX_RATE_SERVICE_NOT_ALLOWED,
-        'Getting the exchange rate from the given base currency to the given currency is not allowed.'
-      );
-    } else if (error.response.data?.message === 'invalid_base') {
-      throw new ServiceError(
-        EchangeRateErrors.EX_RATE_INVALID_BASE_CURRENCY,
-        'The given base currency is invalid.'
-      );
-    }
-  }
-}

packages/server/src/lib/ExchangeRate/types.ts

@@ -1,17 +0,0 @@
-export interface IExchangeRateService {
-  latest(baseCurrency: string, toCurrency: string): Promise<number>;
-}
-
-export enum ExchangeRateServiceType {
-  OpenExchangeRate = 'OpenExchangeRate',
-}
-
-export enum EchangeRateErrors {
-  EX_RATE_SERVICE_NOT_ALLOWED = 'EX_RATE_SERVICE_NOT_ALLOWED',
-  EX_RATE_LIMIT_EXCEEDED = 'EX_RATE_LIMIT_EXCEEDED',
-  EX_RATE_SERVICE_API_KEY_REQUIRED = 'EX_RATE_SERVICE_API_KEY_REQUIRED',
-  EX_RATE_INVALID_BASE_CURRENCY = 'EX_RATE_INVALID_BASE_CURRENCY',
-}
-
-export const OPEN_EXCHANGE_RATE_LATEST_URL =
-  'https://openexchangerates.org/api/latest.json';

packages/server/src/models/ExpenseCategory.ts

@@ -2,8 +2,6 @@ import { Model } from 'objection';
 import TenantModel from 'models/TenantModel';
 
 export default class ExpenseCategory extends TenantModel {
-  amount: number;
-  
   /**
    * Table name
    */

packages/server/src/services/Accounts/AccountsApplication.ts

@@ -3,10 +3,8 @@ import {
   IAccount,
   IAccountCreateDTO,
   IAccountEditDTO,
-  IAccountResponse,
   IAccountsFilter,
   IAccountsTransactionsFilter,
-  IFilterMeta,
   IGetAccountTransactionPOJO,
 } from '@/interfaces';
 import { CreateAccount } from './CreateAccount';
@@ -16,7 +14,6 @@ import { ActivateAccount } from './ActivateAccount';
 import { GetAccounts } from './GetAccounts';
 import { GetAccount } from './GetAccount';
 import { GetAccountTransactions } from './GetAccountTransactions';
-
 @Service()
 export class AccountsApplication {
   @Inject()
@@ -116,22 +113,19 @@ export class AccountsApplication {
 
   /**
    * Retrieves the accounts list.
-   * @param {number} tenantId
-   * @param {IAccountsFilter} filterDTO
-   * @returns {Promise<{ accounts: IAccountResponse[]; filterMeta: IFilterMeta }>}
+   * @param   {number} tenantId
+   * @param   {IAccountsFilter} filterDTO
+   * @returns
    */
-  public getAccounts = (
-    tenantId: number,
-    filterDTO: IAccountsFilter
-  ): Promise<{ accounts: IAccountResponse[]; filterMeta: IFilterMeta }> => {
+  public getAccounts = (tenantId: number, filterDTO: IAccountsFilter) => {
     return this.getAccountsService.getAccountsList(tenantId, filterDTO);
   };
 
   /**
    * Retrieves the given account transactions.
-   * @param {number} tenantId
-   * @param {IAccountsTransactionsFilter} filter
-   * @returns {Promise<IGetAccountTransactionPOJO[]>}
+   * @param    {number} tenantId
+   * @param    {IAccountsTransactionsFilter} filter
+   * @returns  {Promise<IGetAccountTransactionPOJO[]>}
    */
   public getAccountsTransactions = (
     tenantId: number,

packages/server/src/services/CreditNotes/EditCreditNote.ts

@@ -80,7 +80,7 @@ export default class EditCreditNote extends BaseCreditNotes {
       } as ICreditNoteEditingPayload);
 
       // Saves the credit note graph to the storage.
-      const creditNote = await CreditNote.query(trx).upsertGraphAndFetch({
+      const creditNote = await CreditNote.query(trx).upsertGraph({
         id: creditNoteId,
         ...creditNoteModel,
       });

packages/server/src/services/CreditNotes/GetCreditNotePdf.ts

@@ -1,7 +1,6 @@
 import { Inject, Service } from 'typedi';
 import { ChromiumlyTenancy } from '../ChromiumlyTenancy/ChromiumlyTenancy';
 import { TemplateInjectable } from '../TemplateInjectable/TemplateInjectable';
-import GetCreditNote from './GetCreditNote';
 
 @Service()
 export default class GetCreditNotePdf {
@@ -11,19 +10,11 @@ export default class GetCreditNotePdf {
   @Inject()
   private templateInjectable: TemplateInjectable;
 
-  @Inject()
-  private getCreditNoteService: GetCreditNote;
-
   /**
    * Retrieve sale invoice pdf content.
-   * @param {number} tenantId - Tenant id.
-   * @param {number} creditNoteId - Credit note id.
+   * @param {} saleInvoice -
    */
-  public async getCreditNotePdf(tenantId: number, creditNoteId: number) {
-    const creditNote = await this.getCreditNoteService.getCreditNote(
-      tenantId,
-      creditNoteId
-    );
+  public async getCreditNotePdf(tenantId: number, creditNote) {
     const htmlContent = await this.templateInjectable.render(
       tenantId,
       'modules/credit-note-standard',

packages/server/src/services/ExchangeRates/ExchangeRateApplication.ts

@@ -1,21 +0,0 @@
-import { Inject } from 'typedi';
-import { ExchangeRatesService } from './ExchangeRatesService';
-import { EchangeRateLatestPOJO, ExchangeRateLatestDTO } from '@/interfaces';
-
-export class ExchangeRateApplication {
-  @Inject()
-  private exchangeRateService: ExchangeRatesService;
-
-  /**
-   * Gets the latest exchange rate.
-   * @param {number} tenantId
-   * @param {ExchangeRateLatestDTO} exchangeRateLatestDTO
-   * @returns {Promise<EchangeRateLatestPOJO>}
-   */
-  public latest(
-    tenantId: number,
-    exchangeRateLatestDTO: ExchangeRateLatestDTO
-  ): Promise<EchangeRateLatestPOJO> {
-    return this.exchangeRateService.latest(tenantId, exchangeRateLatestDTO);
-  }
-}

packages/server/src/services/ExchangeRates/ExchangeRatesService.ts

@@ -1,37 +1,193 @@
-import { Service } from 'typedi';
-import { ExchangeRate } from '@/lib/ExchangeRate/ExchangeRate';
-import { ExchangeRateServiceType } from '@/lib/ExchangeRate/types';
-import { EchangeRateLatestPOJO, ExchangeRateLatestDTO } from '@/interfaces';
-import { TenantMetadata } from '@/system/models';
+import moment from 'moment';
+import { difference } from 'lodash';
+import { Service, Inject } from 'typedi';
+import { ServiceError } from '@/exceptions';
+import DynamicListingService from '@/services/DynamicListing/DynamicListService';
+import {
+  EventDispatcher,
+  EventDispatcherInterface,
+} from 'decorators/eventDispatcher';
+import {
+  IExchangeRateDTO,
+  IExchangeRate,
+  IExchangeRatesService,
+  IExchangeRateEditDTO,
+  IExchangeRateFilter,
+} from '@/interfaces';
+import TenancyService from '@/services/Tenancy/TenancyService';
+
+const ERRORS = {
+  NOT_FOUND_EXCHANGE_RATES: 'NOT_FOUND_EXCHANGE_RATES',
+  EXCHANGE_RATE_PERIOD_EXISTS: 'EXCHANGE_RATE_PERIOD_EXISTS',
+  EXCHANGE_RATE_NOT_FOUND: 'EXCHANGE_RATE_NOT_FOUND',
+};
 
 @Service()
-export class ExchangeRatesService {
+export default class ExchangeRatesService implements IExchangeRatesService {
+  @Inject('logger')
+  logger: any;
+
+  @EventDispatcher()
+  eventDispatcher: EventDispatcherInterface;
+
+  @Inject()
+  tenancy: TenancyService;
+
+  @Inject()
+  dynamicListService: DynamicListingService;
+
   /**
-   * Gets the latest exchange rate.
+   * Creates a new exchange rate.
    * @param {number} tenantId
-   * @param {number} exchangeRateLatestDTO
-   * @returns {EchangeRateLatestPOJO}
+   * @param {IExchangeRateDTO} exchangeRateDTO
+   * @returns {Promise<IExchangeRate>}
    */
-  public async latest(
+  public async newExchangeRate(
     tenantId: number,
-    exchangeRateLatestDTO: ExchangeRateLatestDTO
-  ): Promise<EchangeRateLatestPOJO> {
-    const organization = await TenantMetadata.query().findOne({ tenantId });
+    exchangeRateDTO: IExchangeRateDTO
+  ): Promise<IExchangeRate> {
+    const { ExchangeRate } = this.tenancy.models(tenantId);
 
-    // Assign the organization base currency as a default currency
-    // if no currency is provided
-    const fromCurrency =
-      exchangeRateLatestDTO.fromCurrency || organization.baseCurrency;
-    const toCurrency =
-      exchangeRateLatestDTO.toCurrency || organization.baseCurrency;
+    this.logger.info('[exchange_rates] trying to insert new exchange rate.', {
+      tenantId,
+      exchangeRateDTO,
+    });
+    await this.validateExchangeRatePeriodExistance(tenantId, exchangeRateDTO);
 
-    const exchange = new ExchangeRate(ExchangeRateServiceType.OpenExchangeRate);
-    const exchangeRate = await exchange.latest(fromCurrency, toCurrency);
+    const exchangeRate = await ExchangeRate.query().insertAndFetch({
+      ...exchangeRateDTO,
+      date: moment(exchangeRateDTO.date).format('YYYY-MM-DD'),
+    });
+    this.logger.info('[exchange_rates] inserted successfully.', {
+      tenantId,
+      exchangeRateDTO,
+    });
+    return exchangeRate;
+  }
 
-    return {
-      baseCurrency: fromCurrency,
-      toCurrency: exchangeRateLatestDTO.toCurrency,
-      exchangeRate,
-    };
+  /**
+   * Edits the exchange rate details.
+   * @param {number} tenantId - Tenant id.
+   * @param {number} exchangeRateId - Exchange rate id.
+   * @param {IExchangeRateEditDTO} editExRateDTO - Edit exchange rate DTO.
+   */
+  public async editExchangeRate(
+    tenantId: number,
+    exchangeRateId: number,
+    editExRateDTO: IExchangeRateEditDTO
+  ): Promise<void> {
+    const { ExchangeRate } = this.tenancy.models(tenantId);
+
+    this.logger.info('[exchange_rates] trying to edit exchange rate.', {
+      tenantId,
+      exchangeRateId,
+      editExRateDTO,
+    });
+    await this.validateExchangeRateExistance(tenantId, exchangeRateId);
+
+    await ExchangeRate.query()
+      .where('id', exchangeRateId)
+      .update({ ...editExRateDTO });
+    this.logger.info('[exchange_rates] exchange rate edited successfully.', {
+      tenantId,
+      exchangeRateId,
+      editExRateDTO,
+    });
+  }
+
+  /**
+   * Deletes the given exchange rate.
+   * @param {number} tenantId - Tenant id.
+   * @param {number} exchangeRateId - Exchange rate id.
+   */
+  public async deleteExchangeRate(
+    tenantId: number,
+    exchangeRateId: number
+  ): Promise<void> {
+    const { ExchangeRate } = this.tenancy.models(tenantId);
+    await this.validateExchangeRateExistance(tenantId, exchangeRateId);
+
+    await ExchangeRate.query().findById(exchangeRateId).delete();
+  }
+
+  /**
+   * Listing exchange rates details.
+   * @param {number} tenantId - Tenant id.
+   * @param {IExchangeRateFilter} exchangeRateFilter - Exchange rates list filter.
+   */
+  public async listExchangeRates(
+    tenantId: number,
+    exchangeRateFilter: IExchangeRateFilter
+  ): Promise<void> {
+    const { ExchangeRate } = this.tenancy.models(tenantId);
+    const dynamicFilter = await this.dynamicListService.dynamicList(
+      tenantId,
+      ExchangeRate,
+      exchangeRateFilter
+    );
+    // Retrieve exchange rates by the given query.
+    const exchangeRates = await ExchangeRate.query()
+      .onBuild((query) => {
+        dynamicFilter.buildQuery()(query);
+      })
+      .pagination(exchangeRateFilter.page - 1, exchangeRateFilter.pageSize);
+
+    return exchangeRates;
+  }
+
+  /**
+   * Validates period of the exchange rate existance.
+   * @param {number} tenantId - Tenant id.
+   * @param {IExchangeRateDTO} exchangeRateDTO - Exchange rate DTO.
+   * @return {Promise<void>}
+   */
+  private async validateExchangeRatePeriodExistance(
+    tenantId: number,
+    exchangeRateDTO: IExchangeRateDTO
+  ): Promise<void> {
+    const { ExchangeRate } = this.tenancy.models(tenantId);
+
+    this.logger.info('[exchange_rates] trying to validate period existance.', {
+      tenantId,
+    });
+    const foundExchangeRate = await ExchangeRate.query()
+      .where('currency_code', exchangeRateDTO.currencyCode)
+      .where('date', exchangeRateDTO.date);
+
+    if (foundExchangeRate.length > 0) {
+      this.logger.info('[exchange_rates] given exchange rate period exists.', {
+        tenantId,
+      });
+      throw new ServiceError(ERRORS.EXCHANGE_RATE_PERIOD_EXISTS);
+    }
+  }
+
+  /**
+   * Validate the given echange rate id existance.
+   * @param {number} tenantId - Tenant id.
+   * @param {number} exchangeRateId - Exchange rate id.
+   * @returns {Promise<void>}
+   */
+  private async validateExchangeRateExistance(
+    tenantId: number,
+    exchangeRateId: number
+  ) {
+    const { ExchangeRate } = this.tenancy.models(tenantId);
+
+    this.logger.info(
+      '[exchange_rates] trying to validate exchange rate id existance.',
+      { tenantId, exchangeRateId }
+    );
+    const foundExchangeRate = await ExchangeRate.query().findById(
+      exchangeRateId
+    );
+
+    if (!foundExchangeRate) {
+      this.logger.info('[exchange_rates] exchange rate not found.', {
+        tenantId,
+        exchangeRateId,
+      });
+      throw new ServiceError(ERRORS.EXCHANGE_RATE_NOT_FOUND);
+    }
   }
 }

packages/server/src/services/Expenses/CRUD/EditExpense.ts

@@ -136,7 +136,7 @@ export class EditExpense {
       } as IExpenseEventEditingPayload);
 
       // Upsert the expense object with expense entries.
-      const expense: IExpense = await Expense.query(trx).upsertGraphAndFetch({
+      const expense: IExpense = await Expense.query(trx).upsertGraph({
         id: expenseId,
         ...expenseObj,
       });

packages/server/src/services/Expenses/CRUD/ExpenseCategoryTransformer.ts

@@ -1,25 +0,0 @@
-import { Transformer } from '@/lib/Transformer/Transformer';
-import { ExpenseCategory } from '@/models';
-import { formatNumber } from '@/utils';
-
-export class ExpenseCategoryTransformer extends Transformer {
-  /**
-   * Include these attributes to expense object.
-   * @returns {Array}
-   */
-  public includeAttributes = (): string[] => {
-    return ['amountFormatted'];
-  };
-
-  /**
-   * Retrieves the formatted amount.
-   * @param {ExpenseCategory} category
-   * @returns {string}
-   */
-  protected amountFormatted(category: ExpenseCategory) {
-    return formatNumber(category.amount, {
-      currencyCode: this.context.currencyCode,
-      money: false,
-    });
-  }
-}

packages/server/src/services/Expenses/CRUD/ExpenseTransformer.ts

@@ -1,7 +1,6 @@
 import { Transformer } from '@/lib/Transformer/Transformer';
 import { formatNumber } from 'utils';
 import { IExpense } from '@/interfaces';
-import { ExpenseCategoryTransformer } from './ExpenseCategoryTransformer';
 
 export class ExpenseTransfromer extends Transformer {
   /**
@@ -13,8 +12,7 @@ export class ExpenseTransfromer extends Transformer {
       'formattedAmount',
       'formattedLandedCostAmount',
       'formattedAllocatedCostAmount',
-      'formattedDate',
-      'categories',
+      'formattedDate'
     ];
   };
 
@@ -58,16 +56,5 @@ export class ExpenseTransfromer extends Transformer {
    */
   protected formattedDate = (expense: IExpense): string => {
     return this.formatDate(expense.paymentDate);
-  };
-
-  /**
-   * Retrieves the transformed expense categories.
-   * @param {IExpense} expense
-   * @returns {}
-   */
-  protected categories = (expense: IExpense) => {
-    return this.item(expense.categories, new ExpenseCategoryTransformer(), {
-      currencyCode: expense.currencyCode,
-    });
-  };
+  }
 }

packages/server/src/services/Expenses/ExpenseGLEntriesStorage.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
-import { Service, Inject } from 'typedi';
 import LedgerStorageService from '@/services/Accounting/LedgerStorageService';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
+import { Service, Inject } from 'typedi';
 import { ExpenseGLEntries } from './ExpenseGLEntries';
 
 @Service()

packages/server/src/services/Expenses/ExpenseGLEntriesSubscriber.ts

@@ -70,10 +70,10 @@ export class ExpensesWriteGLSubscriber {
     authorizedUser,
     trx,
   }: IExpenseEventEditPayload) => {
-    // Cannot continue if the expense is not published.
-    if (!expense.publishedAt) return;
+    // In case expense published, write journal entries.
+    if (expense.publishedAt) return;
 
-    await this.expenseGLEntries.rewriteExpenseGLEntries(
+    await this.expenseGLEntries.writeExpenseGLEntries(
       tenantId,
       expense.id,
       trx

packages/server/src/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheet.ts

@@ -259,6 +259,6 @@ export class InventoryValuationSheet extends FinancialSheet {
     const items = this.itemsSection();
     const total = this.totalSection(items);
 
-    return { items, total };
+    return items.length > 0 ? { items, total } : {};
   }
 }

packages/server/src/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetTable.ts

@@ -84,9 +84,7 @@ export class InventoryValuationSheetTable extends R.compose(
     const itemsRows = this.itemsRowsMapper(this.data.items);
     const totalRow = this.totalRowMapper(this.data.total);
 
-    return R.compose(
-      R.when(R.always(R.not(R.isEmpty(itemsRows))), R.append(totalRow))
-    )([...itemsRows]) as ITableRow[];
+    return [...itemsRows, totalRow];
   }
 
   /**

packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItems.ts

@@ -2,34 +2,36 @@ import { get, isEmpty, sumBy } from 'lodash';
 import * as R from 'ramda';
 import FinancialSheet from '../FinancialSheet';
 import { allPassedConditionsPass, transformToMap } from 'utils';
-import { IAccountTransaction, IItem } from '@/interfaces';
 import {
-  IPurchasesByItemsItem,
-  IPurchasesByItemsReportQuery,
-  IPurchasesByItemsSheetData,
-  IPurchasesByItemsTotal,
-} from '@/interfaces/PurchasesByItemsSheet';
+  IAccountTransaction,
+  IInventoryValuationTotal,
+  IInventoryValuationItem,
+  IInventoryValuationReportQuery,
+  IInventoryValuationStatement,
+  IItem,
+} from '@/interfaces';
 
-export class PurchasesByItems extends FinancialSheet {
+export default class InventoryValuationReport extends FinancialSheet {
   readonly baseCurrency: string;
   readonly items: IItem[];
   readonly itemsTransactions: Map<number, IAccountTransaction>;
-  readonly query: IPurchasesByItemsReportQuery;
+  readonly query: IInventoryValuationReportQuery;
 
   /**
    * Constructor method.
-   * @param {IPurchasesByItemsReportQuery} query
+   * @param {IInventoryValuationReportQuery} query
    * @param {IItem[]} items
    * @param {IAccountTransaction[]} itemsTransactions
    * @param {string} baseCurrency
    */
   constructor(
-    query: IPurchasesByItemsReportQuery,
+    query: IInventoryValuationReportQuery,
     items: IItem[],
     itemsTransactions: IAccountTransaction[],
     baseCurrency: string
   ) {
     super();
+
     this.baseCurrency = baseCurrency;
     this.items = items;
     this.itemsTransactions = transformToMap(itemsTransactions, 'itemId');
@@ -96,7 +98,7 @@ export class PurchasesByItems extends FinancialSheet {
    * @param {IInventoryValuationItem} item
    * @returns
    */
-  private itemSectionMapper = (item: IItem): IPurchasesByItemsItem => {
+  private itemSectionMapper = (item: IItem): IInventoryValuationItem => {
     const meta = this.getItemTransaction(item.id);
 
     return {
@@ -143,9 +145,9 @@ export class PurchasesByItems extends FinancialSheet {
 
   /**
    * Retrieve the items sections.
-   * @returns {IPurchasesByItemsItem[]}
+   * @returns {IInventoryValuationItem[]}
    */
-  private itemsSection = (): IPurchasesByItemsItem[] => {
+  private itemsSection = (): IInventoryValuationItem[] => {
     return R.compose(
       R.when(this.isItemsPostFilter, this.itemsFilter),
       this.itemsMapper
@@ -154,10 +156,10 @@ export class PurchasesByItems extends FinancialSheet {
 
   /**
    * Retrieve the total section of the sheet.
-   * @param {IPurchasesByItemsItem[]} items
-   * @returns {IPurchasesByItemsTotal}
+   * @param {IInventoryValuationItem[]} items
+   * @returns {IInventoryValuationTotal}
    */
-  private totalSection(items: IPurchasesByItemsItem[]): IPurchasesByItemsTotal {
+  totalSection(items: IInventoryValuationItem[]): IInventoryValuationTotal {
     const quantityPurchased = sumBy(items, (item) => item.quantityPurchased);
     const purchaseCost = sumBy(items, (item) => item.purchaseCost);
 
@@ -174,12 +176,12 @@ export class PurchasesByItems extends FinancialSheet {
 
   /**
    * Retrieve the sheet data.
-   * @returns {IInventoryValuationStatement}
+   * @returns
    */
-  public reportData(): IPurchasesByItemsSheetData {
+  reportData(): IInventoryValuationStatement {
     const items = this.itemsSection();
     const total = this.totalSection(items);
 
-    return { items, total };
+    return items.length > 0 ? { items, total } : {};
   }
 }

packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts

@@ -1,73 +0,0 @@
-import { Service, Inject } from 'typedi';
-import { PurchasesByItemsExport } from './PurchasesByItemsExport';
-import {
-  IPurchasesByItemsReportQuery,
-  IPurchasesByItemsSheet,
-  IPurchasesByItemsTable,
-} from '@/interfaces/PurchasesByItemsSheet';
-import { PurchasesByItemsTableInjectable } from './PurchasesByItemsTableInjectable';
-import { PurchasesByItemsService } from './PurchasesByItemsService';
-
-@Service()
-export class PurcahsesByItemsApplication {
-  @Inject()
-  private purchasesByItemsSheet: PurchasesByItemsService;
-
-  @Inject()
-  private purchasesByItemsTable: PurchasesByItemsTableInjectable;
-
-  @Inject()
-  private purchasesByItemsExport: PurchasesByItemsExport;
-
-  /**
-   * Retrieves the purchases by items in json format.
-   * @param {number} tenantId
-   * @param {IPurchasesByItemsReportQuery} query
-   * @returns
-   */
-  public sheet(
-    tenantId: number,
-    query: IPurchasesByItemsReportQuery
-  ): Promise<IPurchasesByItemsSheet> {
-    return this.purchasesByItemsSheet.purchasesByItems(tenantId, query);
-  }
-
-  /**
-   * Retrieves the purchases by items in table format.
-   * @param {number} tenantId
-   * @param {IPurchasesByItemsReportQuery} query
-   * @returns {Promise<IPurchasesByItemsTable>}
-   */
-  public table(
-    tenantId: number,
-    query: IPurchasesByItemsReportQuery
-  ): Promise<IPurchasesByItemsTable> {
-    return this.purchasesByItemsTable.table(tenantId, query);
-  }
-
-  /**
-   * Retrieves the purchases by items in csv format.
-   * @param {number} tenantId
-   * @param {IPurchasesByItemsReportQuery} query
-   * @returns {Promise<string>}
-   */
-  public csv(
-    tenantId: number,
-    query: IPurchasesByItemsReportQuery
-  ): Promise<string> {
-    return this.purchasesByItemsExport.csv(tenantId, query);
-  }
-
-  /**
-   * Retrieves the purchases by items in xlsx format.
-   * @param {number} tenantId
-   * @param {IPurchasesByItemsReportQuery} query
-   * @returns {Promise<Buffer>}
-   */
-  public xlsx(
-    tenantId: number,
-    query: IPurchasesByItemsReportQuery
-  ): Promise<Buffer> {
-    return this.purchasesByItemsExport.xlsx(tenantId, query);
-  }
-}

packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsExport.ts

@@ -1,46 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { TableSheet } from '@/lib/Xlsx/TableSheet';
-import { PurchasesByItemsTableInjectable } from './PurchasesByItemsTableInjectable';
-import { IPurchasesByItemsReportQuery } from '@/interfaces/PurchasesByItemsSheet';
-
-@Service()
-export class PurchasesByItemsExport {
-  @Inject()
-  private purchasesByItemsTable: PurchasesByItemsTableInjectable;
-
-  /**
-   * Retrieves the purchases by items sheet in XLSX format.
-   * @param {number} tenantId
-   * @param {IPurchasesByItemsReportQuery} query
-   * @returns {Promise<Buffer>}
-   */
-  public async xlsx(
-    tenantId: number,
-    query: IPurchasesByItemsReportQuery
-  ): Promise<Buffer> {
-    const table = await this.purchasesByItemsTable.table(tenantId, query);
-
-    const tableSheet = new TableSheet(table.table);
-    const tableCsv = tableSheet.convertToXLSX();
-
-    return tableSheet.convertToBuffer(tableCsv, 'xlsx');
-  }
-
-  /**
-   * Retrieves the purchases by items sheet in CSV format.
-   * @param {number} tenantId
-   * @param {IPurchasesByItemsReportQuery} query
-   * @returns {Promise<Buffer>}
-   */
-  public async csv(
-    tenantId: number,
-    query: IPurchasesByItemsReportQuery
-  ): Promise<string> {
-    const table = await this.purchasesByItemsTable.table(tenantId, query);
-
-    const tableSheet = new TableSheet(table.table);
-    const tableCsv = tableSheet.convertToCSV();
-
-    return tableCsv;
-  }
-}

packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts

@@ -1,24 +1,24 @@
-import moment from 'moment';
 import { Service, Inject } from 'typedi';
-import TenancyService from '@/services/Tenancy/TenancyService';
-import { PurchasesByItems } from './PurchasesByItems';
-import { Tenant } from '@/system/models';
+import moment from 'moment';
 import {
-  IPurchasesByItemsReportQuery,
-  IPurchasesByItemsSheet,
-  IPurchasesByItemsSheetMeta,
-} from '@/interfaces/PurchasesByItemsSheet';
+  IInventoryValuationReportQuery,
+  IInventoryValuationStatement,
+  IInventoryValuationSheetMeta,
+} from '@/interfaces';
+import TenancyService from '@/services/Tenancy/TenancyService';
+import PurchasesByItems from './PurchasesByItems';
+import { Tenant } from '@/system/models';
 
 @Service()
-export class PurchasesByItemsService {
+export default class InventoryValuationReportService {
   @Inject()
   private tenancy: TenancyService;
 
   /**
-   * Defaults purchases by items filter query.
-   * @return {IPurchasesByItemsReportQuery}
+   * Defaults balance sheet filter query.
+   * @return {IBalanceSheetQuery}
    */
-  get defaultQuery(): IPurchasesByItemsReportQuery {
+  get defaultQuery(): IInventoryValuationReportQuery {
     return {
       fromDate: moment().startOf('month').format('YYYY-MM-DD'),
       toDate: moment().format('YYYY-MM-DD'),
@@ -40,7 +40,7 @@ export class PurchasesByItemsService {
    * @param {number} tenantId -
    * @returns {IBalanceSheetMeta}
    */
-  reportMetadata(tenantId: number): IPurchasesByItemsSheetMeta {
+  reportMetadata(tenantId: number): IInventoryValuationSheetMeta {
     const settings = this.tenancy.settings(tenantId);
 
     const organizationName = settings.get({
@@ -62,13 +62,18 @@ export class PurchasesByItemsService {
    * Retrieve balance sheet statement.
    * -------------
    * @param {number} tenantId
-   * @param {IPurchasesByItemsReportQuery} query
-   * @return {Promise<IPurchasesByItemsSheet>}
+   * @param {IBalanceSheetQuery} query
+   *
+   * @return {IBalanceSheetStatement}
    */
   public async purchasesByItems(
     tenantId: number,
-    query: IPurchasesByItemsReportQuery
-  ): Promise<IPurchasesByItemsSheet> {
+    query: IInventoryValuationReportQuery
+  ): Promise<{
+    data: IInventoryValuationStatement;
+    query: IInventoryValuationReportQuery;
+    meta: IInventoryValuationSheetMeta;
+  }> {
     const { Item, InventoryTransaction } = this.tenancy.models(tenantId);
 
     const tenant = await Tenant.query()
@@ -101,6 +106,7 @@ export class PurchasesByItemsService {
         builder.modify('filterDateRange', filter.fromDate, filter.toDate);
       }
     );
+
     const purchasesByItemsInstance = new PurchasesByItems(
       filter,
       inventoryItems,

packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts

@@ -1,111 +0,0 @@
-import * as R from 'ramda';
-import { ITableColumn, ITableColumnAccessor, ITableRow } from '@/interfaces';
-import { ROW_TYPE } from './_types';
-import { tableRowMapper } from '@/utils';
-import { FinancialTable } from '../FinancialTable';
-import { FinancialSheetStructure } from '../FinancialSheetStructure';
-import FinancialSheet from '../FinancialSheet';
-import {
-  IPurchasesByItemsItem,
-  IPurchasesByItemsSheetData,
-  IPurchasesByItemsTotal,
-} from '@/interfaces/PurchasesByItemsSheet';
-
-export class PurchasesByItemsTable extends R.compose(
-  FinancialTable,
-  FinancialSheetStructure
-)(FinancialSheet) {
-  private data: IPurchasesByItemsSheetData;
-
-  /**
-   * Constructor method.
-   * @param data
-   */
-  constructor(data) {
-    super();
-    this.data = data;
-  }
-
-  /**
-   * Retrieves thge common table accessors.
-   * @returns {ITableColumnAccessor[]}
-   */
-  private commonTableAccessors(): ITableColumnAccessor[] {
-    return [
-      { key: 'item_name', accessor: 'name' },
-      { key: 'quantity_purchases', accessor: 'quantityPurchasedFormatted' },
-      { key: 'purchase_amount', accessor: 'purchaseCostFormatted' },
-      { key: 'average_cost', accessor: 'averageCostPriceFormatted' },
-    ];
-  }
-
-  /**
-   * Retrieves the common table columns.
-   * @returns {ITableColumn[]}
-   */
-  private commonTableColumns(): ITableColumn[] {
-    return [
-      { label: 'Item name', key: 'item_name' },
-      { label: 'Quantity Purchased', key: 'quantity_purchases' },
-      { label: 'Purchase Amount', key: 'purchase_amount' },
-      { label: 'Average Price', key: 'average_cost' },
-    ];
-  }
-
-  /**
-   * Maps the given item node to table row.
-   * @param {IPurchasesByItemsItem} item
-   * @returns {ITableRow}
-   */
-  private itemMap = (item: IPurchasesByItemsItem): ITableRow => {
-    const columns = this.commonTableAccessors();
-    const meta = {
-      rowTypes: [ROW_TYPE.ITEM],
-    };
-    return tableRowMapper(item, columns, meta);
-  };
-
-  /**
-   * Maps the given items nodes to table rows.
-   * @param {IPurchasesByItemsItem[]} items - Items nodes.
-   * @returns {ITableRow[]}
-   */
-  private itemsMap = (items: IPurchasesByItemsItem[]): ITableRow[] => {
-    return R.map(this.itemMap)(items);
-  };
-
-  /**
-   * Maps the given total node to table rows.
-   * @param {IPurchasesByItemsTotal} total
-   * @returns {ITableRow}
-   */
-  private totalNodeMap = (total: IPurchasesByItemsTotal): ITableRow => {
-    const columns = this.commonTableAccessors();
-    const meta = {
-      rowTypes: [ROW_TYPE.TOTAL],
-    };
-    return tableRowMapper(total, columns, meta);
-  };
-
-  /**
-   * Retrieves the table columns.
-   * @returns {ITableColumn[]}
-   */
-  public tableColumns(): ITableColumn[] {
-    const columns = this.commonTableColumns();
-    return R.compose(this.tableColumnsCellIndexing)(columns);
-  }
-
-  /**
-   * Retrieves the table rows.
-   * @returns {ITableRow[]}
-   */
-  public tableData(): ITableRow[] {
-    const itemsRows = this.itemsMap(this.data.items);
-    const totalRow = this.totalNodeMap(this.data.total);
-
-    return R.compose(
-      R.when(R.always(R.not(R.isEmpty(itemsRows))), R.append(totalRow))
-    )(itemsRows) as ITableRow[];
-  }
-}

packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTableInjectable.ts

@@ -1,38 +0,0 @@
-import {
-  IPurchasesByItemsReportQuery,
-  IPurchasesByItemsTable,
-} from '@/interfaces/PurchasesByItemsSheet';
-import { Inject, Service } from 'typedi';
-import { PurchasesByItemsService } from './PurchasesByItemsService';
-import { PurchasesByItemsTable } from './PurchasesByItemsTable';
-
-@Service()
-export class PurchasesByItemsTableInjectable {
-  @Inject()
-  private purchasesByItemsSheet: PurchasesByItemsService;
-
-  /**
-   * Retrieves the purchases by items table format.
-   * @param {number} tenantId
-   * @param {IPurchasesByItemsReportQuery} filter
-   * @returns {Promise<IPurchasesByItemsTable>}
-   */
-  public async table(
-    tenantId: number,
-    filter: IPurchasesByItemsReportQuery
-  ): Promise<IPurchasesByItemsTable> {
-    const { data, query, meta } =
-      await this.purchasesByItemsSheet.purchasesByItems(tenantId, filter);
-
-    const table = new PurchasesByItemsTable(data);
-
-    return {
-      table: {
-        columns: table.tableColumns(),
-        rows: table.tableData(),
-      },
-      meta,
-      query,
-    };
-  }
-}

packages/server/src/services/FinancialStatements/PurchasesByItems/_types.ts

@@ -1,5 +0,0 @@
-
-export enum ROW_TYPE {
-  TOTAL = 'TOTAL',
-  ITEM = 'ITEM'
-}

packages/server/src/services/FinancialStatements/SalesByItems/SalesByItems.ts

@@ -7,7 +7,7 @@ import {
   IAccountTransaction,
   ISalesByItemsItem,
   ISalesByItemsTotal,
-  ISalesByItemsSheetData,
+  ISalesByItemsSheetStatement,
   IItem,
 } from '@/interfaces';
 
@@ -146,7 +146,7 @@ export default class SalesByItemsReport extends FinancialSheet {
    * @param {IInventoryValuationItem[]} items
    * @returns {IInventoryValuationTotal}
    */
-  private totalSection(items: ISalesByItemsItem[]): ISalesByItemsTotal {
+  totalSection(items: ISalesByItemsItem[]): ISalesByItemsTotal {
     const quantitySold = sumBy(items, (item) => item.quantitySold);
     const soldCost = sumBy(items, (item) => item.soldCost);
 
@@ -163,12 +163,12 @@ export default class SalesByItemsReport extends FinancialSheet {
 
   /**
    * Retrieve the sheet data.
-   * @returns {ISalesByItemsSheetData}
+   * @returns {ISalesByItemsSheetStatement}
    */
-  public reportData(): ISalesByItemsSheetData {
+  reportData(): ISalesByItemsSheetStatement {
     const items = this.itemsSection();
     const total = this.totalSection(items);
 
-    return { items, total };
+    return items.length > 0 ? { items, total } : {};
   }
 }

packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsTable.ts

@@ -83,9 +83,7 @@ export class SalesByItemsTable extends R.compose(
     const itemsRows = this.itemsMap(this.data.items);
     const totalRow = this.totalMap(this.data.total);
 
-    return R.compose(
-      R.when(R.always(R.not(R.isEmpty(itemsRows))), R.append(totalRow))
-    )([...itemsRows]) as ITableRow[];
+    return [...itemsRows, totalRow];
   }
 
   /**

packages/server/src/services/Purchases/BillPayments/BillPaymentValidators.ts

@@ -10,6 +10,7 @@ import {
 import TenancyService from '@/services/Tenancy/TenancyService';
 import { ServiceError } from '@/exceptions';
 import { ACCOUNT_TYPE } from '@/data/AccountTypes';
+import { BillPayment } from '@/models';
 import { ERRORS } from './constants';
 
 @Service()
@@ -17,6 +18,19 @@ export class BillPaymentValidators {
   @Inject()
   private tenancy: TenancyService;
 
+  /**
+   * Validates the payment existance.
+   * @param {BillPayment | undefined | null} payment
+   * @throws {ServiceError(ERRORS.PAYMENT_MADE_NOT_FOUND)}
+   */
+  public async validateBillPaymentExistance(
+    payment: BillPayment | undefined | null
+  ) {
+    if (!payment) {
+      throw new ServiceError(ERRORS.PAYMENT_MADE_NOT_FOUND);
+    }
+  }
+
   /**
    * Validates the bill payment existance.
    * @param {Request} req

packages/server/src/services/Purchases/BillPayments/DeleteBillPayment.ts

@@ -1,5 +1,6 @@
 import { Knex } from 'knex';
 import UnitOfWork from '@/services/UnitOfWork';
+import { BillPaymentValidators } from './BillPaymentValidators';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { Inject, Service } from 'typedi';
@@ -20,6 +21,9 @@ export class DeleteBillPayment {
   @Inject()
   private uow: UnitOfWork;
 
+  @Inject()
+  private validators: BillPaymentValidators;
+
   /**
    * Deletes the bill payment and associated transactions.
    * @param  {number} tenantId - Tenant id.
@@ -32,8 +36,10 @@ export class DeleteBillPayment {
     // Retrieve the bill payment or throw not found service error.
     const oldBillPayment = await BillPayment.query()
       .withGraphFetched('entries')
-      .findById(billPaymentId)
-      .throwIfNotFound();
+      .findById(billPaymentId);
+
+    // Validates the bill payment existance.
+    this.validators.validateBillPaymentExistance(oldBillPayment);
 
     // Deletes the bill transactions with associated transactions under
     // unit-of-work envirement.

packages/server/src/services/Purchases/BillPayments/EditBillPayment.ts

@@ -57,12 +57,12 @@ export class EditBillPayment {
 
     const tenantMeta = await TenantMetadata.query().findOne({ tenantId });
 
-    const oldBillPayment = await BillPayment.query()
-      .findById(billPaymentId)
-      .withGraphFetched('entries')
-      .throwIfNotFound();
+    const oldBillPayment = await BillPayment.query().findById(billPaymentId);
 
-    // Retrieves the bill payment vendor or throw not found error.
+    // Validates the bill payment existance.
+    this.validators.validateBillPaymentExistance(oldBillPayment);
+
+    //
     const vendor = await Contact.query()
       .modify('vendor')
       .findById(billPaymentDTO.vendorId)
@@ -126,7 +126,7 @@ export class EditBillPayment {
         trx,
       } as IBillPaymentEditingPayload);
 
-      // Edits the bill payment transaction graph on the storage.
+      // Deletes the bill payment transaction graph from the storage.
       const billPayment = await BillPayment.query(trx).upsertGraphAndFetch({
         id: billPaymentId,
         ...billPaymentObj,

packages/server/src/services/Purchases/BillPayments/GetBillPayment.ts

@@ -1,8 +1,12 @@
 import { IBillPayment } from '@/interfaces';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { Inject, Service } from 'typedi';
+import { ERRORS } from './constants';
+import { ServiceError } from '@/exceptions';
 import { BillPaymentTransformer } from './BillPaymentTransformer';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
+import { BillsValidators } from '../Bills/BillsValidators';
+import { BillPaymentValidators } from './BillPaymentValidators';
 
 @Service()
 export class GetBillPayment {
@@ -12,6 +16,9 @@ export class GetBillPayment {
   @Inject()
   private transformer: TransformerInjectable;
 
+  @Inject()
+  private validators: BillPaymentValidators;
+
   /**
    * Retrieve bill payment.
    * @param {number} tenantId
@@ -30,8 +37,10 @@ export class GetBillPayment {
       .withGraphFetched('paymentAccount')
       .withGraphFetched('transactions')
       .withGraphFetched('branch')
-      .findById(billPyamentId)
-      .throwIfNotFound();
+      .findById(billPyamentId);
+
+    // Validates the bill payment existance.
+    this.validators.validateBillPaymentExistance(billPayment);
 
     return this.transformer.transform(
       tenantId,

packages/server/src/services/Purchases/BillPayments/GetPaymentBills.ts

@@ -18,9 +18,10 @@ export class GetPaymentBills {
   public async getPaymentBills(tenantId: number, billPaymentId: number) {
     const { Bill, BillPayment } = this.tenancy.models(tenantId);
 
-    const billPayment = await BillPayment.query()
-      .findById(billPaymentId)
-      .throwIfNotFound();
+    const billPayment = await BillPayment.query().findById(billPaymentId);
+
+    // Validates the bill payment existance.
+    this.validators.validateBillPaymentExistance(billPayment);
 
     const paymentBillsIds = billPayment.entries.map((entry) => entry.id);
 

packages/server/src/services/Purchases/Bills/PurchaseInvoiceTransformer.ts

@@ -13,7 +13,6 @@ export class PurchaseInvoiceTransformer extends Transformer {
     return [
       'formattedBillDate',
       'formattedDueDate',
-      'formattedAmount',
       'formattedPaymentAmount',
       'formattedBalance',
       'formattedDueAmount',

packages/server/src/services/Purchases/VendorCredits/EditVendorCredit.ts

@@ -9,7 +9,6 @@ import UnitOfWork from '@/services/UnitOfWork';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import ItemsEntriesService from '@/services/Items/ItemsEntriesService';
 import events from '@/subscribers/events';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
 
 @Service()
 export default class EditVendorCredit extends BaseVendorCredit {
@@ -22,9 +21,6 @@ export default class EditVendorCredit extends BaseVendorCredit {
   @Inject()
   private itemsEntriesService: ItemsEntriesService;
 
-  @Inject()
-  private tenancy: HasTenancyService;
-
   /**
    * Deletes the given vendor credit.
    * @param {number} tenantId - Tenant id.
@@ -35,7 +31,7 @@ export default class EditVendorCredit extends BaseVendorCredit {
     vendorCreditId: number,
     vendorCreditDTO: IVendorCreditEditDTO
   ) => {
-    const { VendorCredit, Contact } = this.tenancy.models(tenantId);
+    const { VendorCredit } = this.tenancy.models(tenantId);
 
     // Retrieve the vendor credit or throw not found service error.
     const oldVendorCredit = await this.getVendorCreditOrThrowError(

packages/server/src/services/Sales/PaymentReceives/EditPaymentReceive.ts

@@ -61,8 +61,7 @@ export class EditPaymentReceive {
     // Validate the payment receive existance.
     const oldPaymentReceive = await PaymentReceive.query()
       .withGraphFetched('entries')
-      .findById(paymentReceiveId)
-      .throwIfNotFound();
+      .findById(paymentReceiveId);
 
     // Validates the payment existance.
     this.validators.validatePaymentExistance(oldPaymentReceive);

packages/server/src/services/Sales/Receipts/SaleReceiptGLEntries.ts

@@ -32,7 +32,7 @@ export class SaleReceiptGLEntries {
   ): Promise<void> => {
     const { SaleReceipt } = this.tenancy.models(tenantId);
 
-    const saleReceipt = await SaleReceipt.query(trx)
+    const saleReceipt = await SaleReceipt.query()
       .findById(saleReceiptId)
       .withGraphFetched('entries.item');
 

packages/server/src/system/models/TenantMetadata.ts

@@ -1,8 +1,6 @@
 import BaseModel from 'models/Model';
 
 export default class TenantMetadata extends BaseModel {
-  baseCurrency: string;
-
   /**
    * Table name.
    */

packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerFooter.tsx

@@ -9,7 +9,7 @@ import {
   TotalLineTextStyle,
 } from '@/components';
 import { useExpenseDrawerContext } from './ExpenseDrawerProvider';
-import { TotalLine } from '@/components';
+import { FormatNumber, TotalLine } from '@/components';
 
 /**
  * Footer details of expense readonly details.
@@ -22,12 +22,12 @@ export default function ExpenseDrawerFooter() {
       <ExpenseTotalLines labelColWidth={'180px'} amountColWidth={'180px'}>
         <TotalLine
           title={<T id={'expense.details.subtotal'} />}
-          value={expense.formatted_amount}
+          value={<FormatNumber value={expense.total_amount} />}
           borderStyle={TotalLineBorderStyle.SingleDark}
         />
         <TotalLine
           title={<T id={'expense.details.total'} />}
-          value={expense.formatted_amount}
+          value={<FormatNumber value={expense.formatted_amount} />}
           borderStyle={TotalLineBorderStyle.DoubleDark}
           textStyle={TotalLineTextStyle.Bold}
         />

packages/webapp/src/containers/Drawers/ExpenseDrawer/utils.tsx

@@ -36,7 +36,8 @@ export const useExpenseReadEntriesColumns = () => {
       },
       {
         Header: intl.get('amount'),
-        accessor: 'amount_formatted',
+        accessor: 'amount',
+        Cell: FormatNumberCell,
         width: getColumnWidth(categories, 'amount', {
           minWidth: 60,
           magicSpacing: 5,

packages/webapp/src/containers/Entries/AutoExchangeProvider.tsx

@@ -1,5 +1,6 @@
+import { useExchangeRate } from '@/hooks/query';
+import { useCurrentOrganization } from '@/hooks/state';
 import React from 'react';
-import { useLatestExchangeRate } from '@/hooks/query';
 
 interface AutoExchangeRateProviderProps {
   children: React.ReactNode;
@@ -17,19 +18,16 @@ const AutoExchangeRateContext = React.createContext(
 function AutoExchangeRateProvider({ children }: AutoExchangeRateProviderProps) {
   const [autoExRateCurrency, setAutoExRateCurrency] =
     React.useState<string>('');
+  const currentOrganization = useCurrentOrganization();
 
   // Retrieves the exchange rate.
   const { data: autoExchangeRate, isLoading: isAutoExchangeRateLoading } =
-    useLatestExchangeRate(
-      { fromCurrency: autoExRateCurrency },
-      {
-        enabled: Boolean(autoExRateCurrency),
-        refetchOnWindowFocus: false,
-        staleTime: 0,
-        cacheTime: 0,
-        retry: 0,
-      },
-    );
+    useExchangeRate(autoExRateCurrency, currentOrganization.base_currency, {
+      enabled: Boolean(currentOrganization.base_currency && autoExRateCurrency),
+      refetchOnWindowFocus: false,
+      staleTime: 0,
+      cacheTime: 0,
+    });
 
   const value = {
     autoExRateCurrency,

packages/webapp/src/containers/Entries/withExRateItemEntriesPriceRecalc.tsx

@@ -98,30 +98,24 @@ interface UseSyncExRateToFormProps {
  */
 export const useSyncExRateToForm = ({ onSynced }: UseSyncExRateToFormProps) => {
   const { setFieldValue, values } = useFormikContext();
-  const { autoExRateCurrency, autoExchangeRate, isAutoExchangeRateLoading } =
-    useAutoExRateContext();
+  const { autoExRateCurrency, autoExchangeRate } = useAutoExRateContext();
   const updateEntriesOnExChange = useUpdateEntriesOnExchangeRateChange();
 
   // Sync the fetched real-time exchanage rate to the form.
   useEffect(() => {
-    if (!isAutoExchangeRateLoading && autoExRateCurrency) {
-      // Sets a default ex. rate to 1 in case the exchange rate service wasn't configured.
-      // or returned an error from the server-side.
-      const exchangeRate = autoExchangeRate?.exchange_rate || 1;
-
-      setFieldValue('exchange_rate', exchangeRate + '');
+    if (autoExchangeRate?.exchange_rate && autoExRateCurrency) {
+      setFieldValue('exchange_rate', autoExchangeRate?.exchange_rate + '');
       setFieldValue(
         'entries',
-        updateEntriesOnExChange(values.exchange_rate, exchangeRate),
+        updateEntriesOnExChange(
+          values.exchange_rate,
+          autoExchangeRate?.exchange_rate,
+        ),
       );
       onSynced?.();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    autoExchangeRate?.exchange_rate,
-    autoExRateCurrency,
-    isAutoExchangeRateLoading,
-  ]);
+  }, [autoExchangeRate?.exchange_rate, autoExRateCurrency]);
 
   return null;
 };

packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsActionsBar.tsx

@@ -18,7 +18,6 @@ import withPurchasesByItems from './withPurchasesByItems';
 import withPurchasesByItemsActions from './withPurchasesByItemsActions';
 import { compose, saveInvoke } from '@/utils';
 import { usePurchaseByItemsContext } from './PurchasesByItemsProvider';
-import { PurchasesByItemsExportMenu } from './components';
 
 function PurchasesByItemsActionsBar({
   // #withPurchasesByItems
@@ -107,18 +106,11 @@ function PurchasesByItemsActionsBar({
           icon={<Icon icon="print-16" iconSize={16} />}
           text={<T id={'print'} />}
         />
-        <Popover
-          content={<PurchasesByItemsExportMenu />}
-          interactionKind={PopoverInteractionKind.CLICK}
-          placement="bottom-start"
-          minimal
-        >
-          <Button
-            className={Classes.MINIMAL}
-            icon={<Icon icon="file-export-16" iconSize={16} />}
-            text={<T id={'export'} />}
-          />
-        </Popover>
+        <Button
+          className={Classes.MINIMAL}
+          icon={<Icon icon="file-export-16" iconSize={16} />}
+          text={<T id={'export'} />}
+        />
       </NavbarGroup>
     </DashboardActionsBar>
   );

packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsProvider.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React, { createContext, useContext } from 'react';
 import FinancialReportPage from '../FinancialReportPage';
-import { usePurchasesByItemsTable } from '@/hooks/query';
+import { usePurchasesByItems } from '@/hooks/query';
 import { transformFilterFormToQuery } from '../common';
 
 const PurchasesByItemsContext = createContext();
@@ -13,7 +13,7 @@ function PurchasesByItemsProvider({ query, ...props }) {
     isFetching,
     isLoading,
     refetch,
-  } = usePurchasesByItemsTable(
+  } = usePurchasesByItems(
     {
       ...transformFilterFormToQuery(query),
     },
@@ -26,6 +26,7 @@ function PurchasesByItemsProvider({ query, ...props }) {
     purchaseByItems,
     isFetching,
     isLoading,
+
     refetchSheet: refetch,
   };
   return (

packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.tsx

@@ -6,10 +6,10 @@ import styled from 'styled-components';
 import { ReportDataTable, FinancialSheet } from '@/components';
 
 import { usePurchaseByItemsContext } from './PurchasesByItemsProvider';
+import { usePurchasesByItemsTableColumns } from './components';
 
 import { tableRowTypesToClassnames } from '@/utils';
 import { TableStyle } from '@/constants';
-import { usePurchasesByItemsTableColumns } from './dynamicColumns';
 
 /**
  * Purchases by items data table.
@@ -17,7 +17,7 @@ import { usePurchasesByItemsTableColumns } from './dynamicColumns';
 export default function PurchasesByItemsTable({ companyName }) {
   // Purchases by items context.
   const {
-    purchaseByItems: { table, query },
+    purchaseByItems: { tableRows, query },
   } = usePurchaseByItemsContext();
 
   // Purchases by items table columns.
@@ -32,7 +32,7 @@ export default function PurchasesByItemsTable({ companyName }) {
     >
       <PurchasesByItemsDataTable
         columns={columns}
-        data={table.rows}
+        data={tableRows}
         expandable={true}
         expandToggleColumn={1}
         expandColumnSpace={1}
@@ -58,7 +58,7 @@ const PurchasesByItemsDataTable = styled(ReportDataTable)`
         padding-top: 0.36rem;
         padding-bottom: 0.36rem;
       }
-      .tr.row_type--TOTAL .td {
+      .tr.row_type--total .td {
         border-top: 1px solid #bbb;
         font-weight: 500;
         border-bottom: 3px double #000;

packages/webapp/src/containers/FinancialStatements/PurchasesByItems/components.tsx

@@ -1,22 +1,69 @@
 // @ts-nocheck
-import { useRef } from 'react';
-import classNames from 'classnames';
-import {
-  Classes,
-  Intent,
-  Menu,
-  MenuItem,
-  ProgressBar,
-  Text,
-} from '@blueprintjs/core';
+import React from 'react';
+import intl from 'react-intl-universal';
 
-import { AppToaster, If, Stack } from '@/components';
+import { If } from '@/components';
+import { Align } from '@/constants';
+import { CellTextSpan } from '@/components/Datatable/Cells';
 import { usePurchaseByItemsContext } from './PurchasesByItemsProvider';
+import { getColumnWidth } from '@/utils';
 import FinancialLoadingBar from '../FinancialLoadingBar';
-import {
-  usePurchasesByItemsCsvExport,
-  usePurchasesByItemsXlsxExport,
-} from '@/hooks/query';
+
+/**
+ * Retrieve purchases by items table columns.
+ */
+export const usePurchasesByItemsTableColumns = () => {
+  // purchases by items context.
+  const {
+    purchaseByItems: { tableRows },
+  } = usePurchaseByItemsContext();
+
+  return React.useMemo(
+    () => [
+      {
+        Header: intl.get('item_name'),
+        accessor: (row) => (row.code ? `${row.name} - ${row.code}` : row.name),
+        className: 'name',
+        width: 180,
+        textOverview: true,
+      },
+      {
+        Header: intl.get('quantity_purchased'),
+        accessor: 'quantity_purchased_formatted',
+        Cell: CellTextSpan,
+        className: 'quantity_purchased_formatted',
+        width: getColumnWidth(tableRows, `quantity_purchased_formatted`, {
+          minWidth: 150,
+        }),
+        textOverview: true,
+        align: Align.Right,
+      },
+      {
+        Header: intl.get('purchase_amount'),
+        accessor: 'purchase_cost_formatted',
+        Cell: CellTextSpan,
+        className: 'purchase_cost_formatted',
+        width: getColumnWidth(tableRows, `purchase_cost_formatted`, {
+          minWidth: 150,
+        }),
+        textOverview: true,
+        align: Align.Right,
+      },
+      {
+        Header: intl.get('average_price'),
+        accessor: 'average_cost_price_formatted',
+        Cell: CellTextSpan,
+        className: 'average_cost_price_formatted',
+        width: getColumnWidth(tableRows, `average_cost_price_formatted`, {
+          minWidth: 180,
+        }),
+        textOverview: true,
+        align: Align.Right,
+      },
+    ],
+    [tableRows],
+  );
+};
 
 /**
  * Purchases by items progress loading bar.
@@ -30,88 +77,3 @@ export function PurchasesByItemsLoadingBar() {
     </If>
   );
 }
-
-/**
- * Retrieves the purchases by items export menu.
- * @returns {JSX.Element}
- */
-export const PurchasesByItemsExportMenu = () => {
-  const toastKey = useRef(null);
-  const commonToastConfig = {
-    isCloseButtonShown: true,
-    timeout: 2000,
-  };
-  const { query } = usePurchaseByItemsContext();
-
-  const openProgressToast = (amount: number) => {
-    return (
-      <Stack spacing={8}>
-        <Text>The report has been exported successfully.</Text>
-        <ProgressBar
-          className={classNames('toast-progress', {
-            [Classes.PROGRESS_NO_STRIPES]: amount >= 100,
-          })}
-          intent={amount < 100 ? Intent.PRIMARY : Intent.SUCCESS}
-          value={amount / 100}
-        />
-      </Stack>
-    );
-  };
-
-  // Export the report to xlsx.
-  const { mutateAsync: xlsxExport } = usePurchasesByItemsXlsxExport(query, {
-    onDownloadProgress: (xlsxExportProgress: number) => {
-      if (!toastKey.current) {
-        toastKey.current = AppToaster.show({
-          message: openProgressToast(xlsxExportProgress),
-          ...commonToastConfig,
-        });
-      } else {
-        AppToaster.show(
-          {
-            message: openProgressToast(xlsxExportProgress),
-            ...commonToastConfig,
-          },
-          toastKey.current,
-        );
-      }
-    },
-  });
-  // Export the report to csv.
-  const { mutateAsync: csvExport } = usePurchasesByItemsCsvExport(query, {
-    onDownloadProgress: (xlsxExportProgress: number) => {
-      if (!toastKey.current) {
-        toastKey.current = AppToaster.show({
-          message: openProgressToast(xlsxExportProgress),
-          ...commonToastConfig,
-        });
-      } else {
-        AppToaster.show(
-          {
-            message: openProgressToast(xlsxExportProgress),
-            ...commonToastConfig,
-          },
-          toastKey.current,
-        );
-      }
-    },
-  });
-  // Handle csv export button click.
-  const handleCsvExportBtnClick = () => {
-    csvExport();
-  };
-  // Handle xlsx export button click.
-  const handleXlsxExportBtnClick = () => {
-    xlsxExport();
-  };
-
-  return (
-    <Menu>
-      <MenuItem
-        text={'XLSX (Microsoft Excel)'}
-        onClick={handleXlsxExportBtnClick}
-      />
-      <MenuItem text={'CSV'} onClick={handleCsvExportBtnClick} />
-    </Menu>
-  );
-};

packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dynamicColumns.ts

@@ -1,89 +0,0 @@
-// @ts-nocheck
-import { getColumnWidth } from '@/utils';
-import * as R from 'ramda';
-import { Align } from '@/constants';
-import { usePurchaseByItemsContext } from './PurchasesByItemsProvider';
-
-const getTableCellValueAccessor = (index) => `cells[${index}].value`;
-
-const getReportColWidth = (data, accessor, headerText) => {
-  return getColumnWidth(
-    data,
-    accessor,
-    { magicSpacing: 10, minWidth: 100 },
-    headerText,
-  );
-};
-
-/**
- * Account name column mapper.
- */
-const commonColumnMapper = R.curry((data, column) => {
-  const accessor = getTableCellValueAccessor(column.cell_index);
-
-  return {
-    key: column.key,
-    Header: column.label,
-    accessor,
-    className: column.key,
-    textOverview: true,
-  };
-});
-
-/**
- * Numeric columns accessor.
- */
-const numericColumnAccessor = R.curry((data, column) => {
-  const accessor = getTableCellValueAccessor(column.cell_index);
-  const width = getReportColWidth(data, accessor, column.label);
-
-  return {
-    ...column,
-    align: Align.Right,
-    width,
-  };
-});
-
-/**
- * Item name column accessor.
- */
-const itemNameColumnAccessor = R.curry((data, column) => {
-  return {
-    ...column,
-    width: 180,
-  };
-});
-
-const dynamiColumnMapper = R.curry((data, column) => {
-  const _numericColumnAccessor = numericColumnAccessor(data);
-  const _itemNameColumnAccessor = itemNameColumnAccessor(data);
-
-  return R.compose(
-    R.when(R.pathEq(['key'], 'item_name'), _itemNameColumnAccessor),
-    R.when(R.pathEq(['key'], 'quantity_purchases'), _numericColumnAccessor),
-    R.when(R.pathEq(['key'], 'purchase_amount'), _numericColumnAccessor),
-    R.when(R.pathEq(['key'], 'average_cost'), _numericColumnAccessor),
-    commonColumnMapper(data),
-  )(column);
-});
-
-/**
- * Composes the dynamic columns that fetched from request to columns to table component.
- */
-export const dynamicColumns = R.curry((data, columns) => {
-  return R.map(dynamiColumnMapper(data), columns);
-});
-
-/**
- * Retrieves the purchases by items sheet table columns for table component.
- */
-export const usePurchasesByItemsTableColumns = () => {
-  const { purchaseByItems } = usePurchaseByItemsContext();
-
-  if (!purchaseByItems) {
-    throw new Error('Purchases by items context not found');
-  }
-  const { table } = purchaseByItems;
-
-  return dynamicColumns(table.rows, table.columns);
-};

packages/webapp/src/containers/Purchases/CreditNotes/VendorCreditIUniversalSearchBind.tsx

@@ -22,7 +22,7 @@ function VendorCreditUniversalSearchSelectComponent({
   openDrawer,
 }) {
   if (resourceType === RESOURCES_TYPES.VENDOR_CREDIT) {
-    openDrawer(DRAWERS.VENDOR_CREDIT_DETAILS, {
+    openDrawer(DRAWERS.VENDOR_CREDIT_DETAIL_DRAWER, {
       vendorCreditId: resourceId,
     });
     onAction && onAction();
@@ -83,7 +83,7 @@ export function VendorCreditUniversalSearchItem(
       }
       label={
         <>
-          <div class="amount">{item.reference.formatted_amount}</div>
+          <div class="amount">${item.reference.amount}</div>
           <VendorCreditUniversalSearchStatus receipt={item.reference} />
         </>
       }

packages/webapp/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.tsx

@@ -7,7 +7,6 @@ import { Icon } from '@/components';
 import { RESOURCES_TYPES } from '@/constants/resourcesTypes';
 import { highlightText } from '@/utils';
 import { AbilitySubject, PaymentMadeAction } from '@/constants/abilityOption';
-import { DRAWERS } from '@/constants/drawers';
 import withDrawerActions from '@/containers/Drawer/withDrawerActions';
 
 /**

packages/webapp/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.tsx

@@ -82,7 +82,7 @@ export function CreditNoteUniversalSearchItem(
       }
       label={
         <>
-          <div class="amount">{item.reference.formatted_amount}</div>
+          <div class="amount">${item.reference.amount}</div>
           <CreditNoteUniversalSearchStatus receipt={item.reference} />
         </>
       }

packages/webapp/src/containers/Sales/Invoices/InvoiceUniversalSearch.tsx

@@ -83,13 +83,13 @@ export function InvoiceUniversalSearchItem(
           <span class="bp4-text-muted">
             {highlightText(item.reference.invoice_no, query)}{' '}
             <Icon icon={'caret-right-16'} iconSize={16} />
-            {item.reference.invoice_date_formatted}
+            {item.reference.formatted_invoice_date}
           </span>
         </div>
       }
       label={
         <>
-          <div class="amount">{item.reference.total_formatted}</div>
+          <div class="amount">${item.reference.balance}</div>
           <InvoiceStatus customer={item.reference} />
         </>
       }

packages/webapp/src/containers/Sales/Receipts/ReceiptUniversalSearch.tsx

@@ -75,7 +75,7 @@ export function ReceiptUniversalSearchItem(
       }
       label={
         <>
-          <div class="amount">{item.reference.formatted_amount}</div>
+          <div class="amount">${item.reference.amount}</div>
           <ReceiptStatus receipt={item.reference} />
         </>
       }

packages/webapp/src/containers/Vendors/VendorsUniversalSearch.tsx

@@ -34,7 +34,7 @@ const VendorUniversalSearchSelectAction = withDrawerActions(
 const vendorToSearch = (contact) => ({
   id: contact.id,
   text: contact.display_name,
-  label: contact.formatted_balance,
+  label: contact.balance > 0 ? contact.formatted_balance + '' : '',
   reference: contact,
 });
 

packages/webapp/src/hooks/query/bills.tsx

@@ -32,9 +32,6 @@ const commonInvalidateQueries = (queryClient) => {
   // Invalidate financial reports.
   queryClient.invalidateQueries(t.FINANCIAL_REPORT);
 
-  // Invalidate the transactions by reference.
-  queryClient.invalidateQueries(t.TRANSACTIONS_BY_REFERENCE);
-
   // Invalidate items associated bills transactions.
   queryClient.invalidateQueries(t.ITEMS_ASSOCIATED_WITH_BILLS);
 

packages/webapp/src/hooks/query/creditNote.tsx

@@ -44,9 +44,6 @@ const commonInvalidateQueries = (queryClient) => {
   // Invalidate financial reports.
   queryClient.invalidateQueries(t.FINANCIAL_REPORT);
 
-  // Invalidate transactions by reference.
-  queryClient.invalidateQueries(t.TRANSACTIONS_BY_REFERENCE);
-
   // Invalidate mutate base currency abilities.
   queryClient.invalidateQueries(t.ORGANIZATION_MUTATE_BASE_CURRENCY_ABILITIES);
 };

packages/webapp/src/hooks/query/exchangeRates.tsx

@@ -1,36 +1,34 @@
 // @ts-nocheck
 import { useQuery } from 'react-query';
 import QUERY_TYPES from './types';
-import useApiRequest from '../useRequest';
 
-interface LatestExchangeRateQuery {
-  fromCurrency?: string;
-  toCurrency?: string;
+function getRandomItemFromArray(arr) {
+  const randomIndex = Math.floor(Math.random() * arr.length);
+  return arr[randomIndex];
+}
+function delay(t, val) {
+  return new Promise((resolve) => setTimeout(resolve, t, val));
 }
-
 /**
- * Retrieves latest exchange rate.
+ * Retrieves tax rates.
  * @param {number} customerId - Customer id.
  */
-export function useLatestExchangeRate(
-  { toCurrency, fromCurrency }: LatestExchangeRateQuery,
+export function useExchangeRate(
+  fromCurrency: string,
+  toCurrency: string,
   props,
 ) {
-  const apiRequest = useApiRequest();
-
   return useQuery(
-    [QUERY_TYPES.EXCHANGE_RATE, toCurrency, fromCurrency],
-    () =>
-      apiRequest
-        .http({
-          url: `/api/exchange_rates/latest`,
-          method: 'get',
-          params: {
-            to_currency: toCurrency,
-            from_currency: fromCurrency,
-          },
-        })
-        .then((res) => res.data),
+    [QUERY_TYPES.EXCHANGE_RATE, fromCurrency, toCurrency],
+    async () => {
+      await delay(100);
+
+      return {
+        from_currency: fromCurrency,
+        to_currency: toCurrency,
+        exchange_rate: 1.00,
+      };
+    },
     props,
   );
 }

packages/webapp/src/hooks/query/financialReports.tsx

@@ -426,58 +426,20 @@ export function usePurchasesByItems(query, props) {
       params: query,
     },
     {
-      select: (res) => res.data,
+      select: (res) => ({
+        tableRows: purchasesByItemsReducer(res.data.data),
+        ...res.data,
+      }),
+      defaultData: {
+        tableRows: [],
+        data: [],
+        query: {},
+      },
       ...props,
     },
   );
 }
 
-export function usePurchasesByItemsTable(query, props) {
-  return useRequestQuery(
-    [t.FINANCIAL_REPORT, t.PURCHASES_BY_ITEMS, query],
-    {
-      method: 'get',
-      url: '/financial_statements/purchases-by-items',
-      params: query,
-      headers: {
-        accept: 'application/json+table',
-      },
-    },
-    {
-      select: (res) => res.data,
-      ...props,
-    },
-  );
-}
-
-export const usePurchasesByItemsCsvExport = (query, args) => {
-  return useDownloadFile({
-    url: '/financial_statements/purchases-by-items',
-    config: {
-      headers: {
-        accept: 'application/csv',
-      },
-      params: query,
-    },
-    filename: 'purchases_by_items.csv',
-    ...args,
-  });
-};
-
-export const usePurchasesByItemsXlsxExport = (query, args) => {
-  return useDownloadFile({
-    url: '/financial_statements/purchases-by-items',
-    config: {
-      headers: {
-        accept: 'application/xlsx',
-      },
-      params: query,
-    },
-    filename: 'purchases_by_items.xlsx',
-    ...args,
-  });
-};
-
 /**
  * Retrieve sales by items.
  */

packages/webapp/src/hooks/query/invoices.tsx

@@ -24,9 +24,6 @@ const commonInvalidateQueries = (queryClient) => {
 
   // Invalidate financial reports.
   queryClient.invalidateQueries(t.FINANCIAL_REPORT);
-  
-  // Invalidate transactions by reference.
-  queryClient.invalidateQueries(t.TRANSACTIONS_BY_REFERENCE);
 
   // Invalidate accounts.
   queryClient.invalidateQueries(t.ACCOUNTS);

packages/webapp/src/hooks/query/paymentReceives.tsx

@@ -24,9 +24,6 @@ const commonInvalidateQueries = (client) => {
   // Invalidate financial reports.
   client.invalidateQueries(t.FINANCIAL_REPORT);
 
-  // Invalidate transactions by reference.
-  client.invalidateQueries(t.TRANSACTIONS_BY_REFERENCE);
-
   // Invalidate customers.
   client.invalidateQueries(t.CUSTOMERS);
   client.invalidateQueries(t.CUSTOMER);

packages/webapp/src/hooks/query/receipts.tsx

@@ -21,9 +21,6 @@ const commonInvalidateQueries = (queryClient) => {
   // Invalidate financial reports.
   queryClient.invalidateQueries(t.FINANCIAL_REPORT);
 
-  // Invalidate the transactions by reference.
-  queryClient.invalidateQueries(t.TRANSACTIONS_BY_REFERENCE);
-
   // Invalidate the cashflow transactions.
   queryClient.invalidateQueries(t.CASH_FLOW_TRANSACTIONS);
   queryClient.invalidateQueries(t.CASHFLOW_ACCOUNT_TRANSACTIONS_INFINITY);

packages/webapp/src/hooks/query/vendorCredit.tsx

@@ -43,9 +43,6 @@ const commonInvalidateQueries = (queryClient) => {
   // Invalidate financial reports.
   queryClient.invalidateQueries(t.FINANCIAL_REPORT);
 
-  // Invalidate the transactions by reference.
-  queryClient.invalidateQueries(t.TRANSACTIONS_BY_REFERENCE);
-
   // Invalidate mutate base currency abilities.
   queryClient.invalidateQueries(t.ORGANIZATION_MUTATE_BASE_CURRENCY_ABILITIES);
 };