Merge pull request #629 from bigcapitalhq/details-subscription

fix: Add subscription plans offer text

.all-contributorsrc

@@ -150,6 +150,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "Champetaman",
+      "name": "Camilo Oviedo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/64604272?v=4",
+      "profile": "https://www.camilooviedo.com/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
+## [0.19.4] - 18-08-2024
+
+* fix: Allow multi-lines to statements transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/594
+* feat: Add amount comparators to amount bank rule field by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/595
+* fix: Transaction type and description do not show in general ledger. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/596
+* fix: Refresh accounts and account transactions. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/597
+* fix: Typo payments made by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/598
+* fix: Typo categories list by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/600
+* fix: Autofill the quick created customer/vendor by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/601
+* fix: Remove views tabs from receipts list by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/602
+* fix: Typo payment receive messages by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/599
+* fix: Enhance Dropzone visual of  accept and reject modes by @Champetaman in https://github.com/bigcapitalhq/bigcapital/pull/603
+* fix:  Matching bank transactions should create associate payment transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/606
+* fix: Change Dropzone title and subtitle by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/607
+* fix: Inconsistance page size of paginated data tables by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/604
+* fix: Database connection lost error by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/611
+* fix: Language typos by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/613
+* Fix: Correctly display Date, Published At, and Created At in ExpenseDrawerHeader by @Champetaman in https://github.com/bigcapitalhq/bigcapital/pull/612
+* fix: Delete bank account with uncategorized transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/614
+* feat: activate/inactivate account from drawer details by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/615
+
 ## [v0.18.0] - 10-08-2024
 
 * feat: Bank rules for automated categorization by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/511

README.md

@@ -129,6 +129,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/oleynikd"><img src="https://avatars.githubusercontent.com/u/3976868?v=4?s=100" width="100px;" alt="Denis"/><br /><sub><b>Denis</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Aoleynikd" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://myself.vercel.app/"><img src="https://avatars.githubusercontent.com/u/42431274?v=4?s=100" width="100px;" alt="Sachin Mittal"/><br /><sub><b>Sachin Mittal</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Amittalsam98" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.camilooviedo.com/"><img src="https://avatars.githubusercontent.com/u/64604272?v=4?s=100" width="100px;" alt="Camilo Oviedo"/><br /><sub><b>Camilo Oviedo</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=Champetaman" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

packages/server/package.json

@@ -69,9 +69,8 @@
     "is-my-json-valid": "^2.20.5",
     "js-money": "^0.6.3",
     "jsonwebtoken": "^8.5.1",
-    "knex": "^0.95.15",
+    "knex": "^3.1.0",
     "knex-cleaner": "^1.3.0",
-    "knex-db-manager": "^0.6.1",
     "libphonenumber-js": "^1.9.6",
     "lodash": "^4.17.15",
     "lru-cache": "^6.0.0",

packages/server/src/api/controllers/Banking/ExcludeBankTransactionsController.ts

@@ -46,6 +46,10 @@ export class ExcludeBankTransactionsController extends BaseController {
         query('account_id').optional().isNumeric().toInt(),
         query('page').optional().isNumeric().toInt(),
         query('page_size').optional().isNumeric().toInt(),
+        query('min_date').optional({ nullable: true }).isISO8601().toDate(),
+        query('max_date').optional({ nullable: true }).isISO8601().toDate(),
+        query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
+        query('max_amount').optional({ nullable: true }).isFloat().toFloat(),
       ],
       this.validationResult,
       this.getExcludedBankTransactions.bind(this)

packages/server/src/api/controllers/Banking/RecognizedTransactionsController.ts

@@ -21,6 +21,10 @@ export class RecognizedTransactionsController extends BaseController {
         query('page').optional().isNumeric().toInt(),
         query('page_size').optional().isNumeric().toInt(),
         query('account_id').optional().isNumeric().toInt(),
+        query('min_date').optional({ nullable: true }).isISO8601().toDate(),
+        query('max_date').optional({ nullable: true }).isISO8601().toDate(),
+        query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
+        query('max_amount').optional({ nullable: true }).isFloat().isFloat(),
       ],
       this.validationResult,
       this.getRecognizedTransactions.bind(this)

packages/server/src/api/controllers/Cashflow/NewCashflowTransaction.ts

@@ -84,6 +84,10 @@ export default class NewCashflowTransactionController extends BaseController {
       param('id').exists().isNumeric().toInt(),
       query('page').optional().isNumeric().toInt(),
       query('page_size').optional().isNumeric().toInt(),
+      query('min_date').optional({ nullable: true }).isISO8601().toDate(),
+      query('max_date').optional({ nullable: true }).isISO8601().toDate(),
+      query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
+      query('max_amount').optional({ nullable: true }).isFloat().toFloat(),
     ];
   }
 

packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts

@@ -0,0 +1,87 @@
+import { Router, Request, Response, NextFunction } from 'express';
+import { Service, Inject } from 'typedi';
+import { body } from 'express-validator';
+import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import BaseController from '@/api/controllers/BaseController';
+import { OneClickDemoApplication } from '@/services/OneClickDemo/OneClickDemoApplication';
+import config from '@/config';
+@Service()
+export class OneClickDemoController extends BaseController {
+  @Inject()
+  private oneClickDemoApp: OneClickDemoApplication;
+
+  /**
+   * Router constructor method.
+   */
+  router() {
+    const router = Router();
+
+    // Protects the endpoints if the feature is not enabled.
+    const protectMiddleware = (
+      req: Request,
+      res: Response,
+      next: NextFunction
+    ) => {
+      // Add your protection logic here
+      if (config.oneClickDemoAccounts) {
+        next();
+      } else {
+        res.status(403).send({ message: 'Forbidden' });
+      }
+    };
+    router.post(
+      '/one_click',
+      protectMiddleware,
+      asyncMiddleware(this.oneClickDemo.bind(this))
+    );
+    router.post(
+      '/one_click_signin',
+      [body('demo_id').exists()],
+      this.validationResult,
+      protectMiddleware,
+      asyncMiddleware(this.oneClickSignIn.bind(this))
+    );
+    return router;
+  }
+
+  /**
+   * One-click demo application.
+   * @param {Request} req -
+   * @param {Response} res -
+   * @param {NextFunction} next -
+   */
+  private async oneClickDemo(req: Request, res: Response, next: NextFunction) {
+    try {
+      const data = await this.oneClickDemoApp.createOneClick();
+
+      return res.status(200).send({
+        data,
+        message: 'The one-click demo has been created successfully.',
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Sign-in to one-click demo account.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  private async oneClickSignIn(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
+    const { demoId } = this.matchedBodyData(req);
+
+    try {
+      const data = await this.oneClickDemoApp.autoSignIn(demoId);
+
+      return res.status(200).send(data);
+    } catch (error) {
+      next(error);
+    }
+  }
+}

packages/server/src/api/controllers/Subscription/SubscriptionController.ts

@@ -113,7 +113,7 @@ export class SubscriptionController extends BaseController {
     const { tenantId } = req;
 
     try {
-      await this.subscriptionApp.cancelSubscription(tenantId, '455610');
+      await this.subscriptionApp.cancelSubscription(tenantId);
 
       return res.status(200).send({
         status: 200,

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

@@ -35,7 +35,7 @@ export class Webhooks extends BaseController {
    */
   public async lemonWebhooks(req: Request, res: Response, next: NextFunction) {
     const data = req.body;
-    const signature = req.headers['x-signature'] ?? '';
+    const signature = req.headers['x-signature'] as string ?? '';
     const rawBody = req.rawBody;
 
     try {

packages/server/src/api/index.ts

@@ -63,6 +63,7 @@ import { BankingController } from './controllers/Banking/BankingController';
 import { Webhooks } from './controllers/Webhooks/Webhooks';
 import { ExportController } from './controllers/Export/ExportController';
 import { AttachmentsController } from './controllers/Attachments/AttachmentsController';
+import { OneClickDemoController } from './controllers/OneClickDemo/OneClickDemoController';
 
 export default () => {
   const app = Router();
@@ -80,6 +81,7 @@ export default () => {
   app.use('/jobs', Container.get(Jobs).router());
   app.use('/account', Container.get(Account).router());
   app.use('/webhooks', Container.get(Webhooks).router());
+  app.use('/demo', Container.get(OneClickDemoController).router())
 
   // - Dashboard routes.
   // ---------------------------

packages/server/src/api/middleware/SettingsMiddleware.ts

@@ -1,11 +1,21 @@
-import { Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
+import { Request, Response, NextFunction } from 'express';
 import SettingsStore from '@/services/Settings/SettingsStore';
- 
+
 export default async (req: Request, res: Response, next: NextFunction) => {
   const { tenantId } = req.user;
 
-  const Logger = Container.get('logger');
+  const settings = await initializeTenantSettings(tenantId);
+  req.settings = settings;
+
+  res.on('finish', async () => {
+    await settings.save();
+  });
+  next();
+}
+
+
+export const initializeTenantSettings = async (tenantId: number) => {
   const tenantContainer = Container.of(`tenant-${tenantId}`);
 
   if (tenantContainer && !tenantContainer.has('settings')) {
@@ -18,10 +28,5 @@ export default async (req: Request, res: Response, next: NextFunction) => {
 
   await settings.load();
 
-  req.settings = settings;
-
-  res.on('finish', async () => {
-    await settings.save();
-  });
-  next();
+  return settings;
 }

packages/server/src/api/middleware/TenantDependencyInjection.ts

@@ -4,6 +4,7 @@ import { Request } from 'express';
 import TenancyService from '@/services/Tenancy/TenancyService';
 import TenantsManagerService from '@/services/Tenancy/TenantsManager';
 import rtlDetect from 'rtl-detect';
+import { Tenant } from '@/system/models';
 
 export default (req: Request, tenant: ITenant) => {
   const { id: tenantId, organizationId } = tenant;
@@ -16,7 +17,7 @@ export default (req: Request, tenant: ITenant) => {
 
   const tenantContainer = tenantServices.tenantContainer(tenantId);
 
-  tenantContainer.set('i18n', injectI18nUtils(req));
+  tenantContainer.set('i18n', injectI18nUtils());
 
   const knexInstance = tenantServices.knex(tenantId);
   const models = tenantServices.models(tenantId);
@@ -33,14 +34,35 @@ export default (req: Request, tenant: ITenant) => {
 };
 
 export const injectI18nUtils = (req) => {
-  const locale = req.getLocale();
+  const globalI18n = Container.get('i18n');
+  const locale = globalI18n.getLocale();
   const direction = rtlDetect.getLangDir(locale);
 
   return {
     locale,
-    __: req.__,
+    __: globalI18n.__,
     direction,
     isRtl: direction === 'rtl',
     isLtr: direction === 'ltr',
   };
 };
+
+export const initalizeTenantServices = async (tenantId: number) => {
+  const tenant = await Tenant.query()
+    .findById(tenantId)
+    .withGraphFetched('metadata');
+
+  const tenantServices = Container.get(TenancyService);
+  const tenantsManager = Container.get(TenantsManagerService);
+
+  // Initialize the knex instance.
+  tenantsManager.setupKnexInstance(tenant);
+
+  const tenantContainer = tenantServices.tenantContainer(tenantId);
+  tenantContainer.set('i18n', injectI18nUtils());
+
+  tenantServices.knex(tenantId);
+  tenantServices.models(tenantId);
+  tenantServices.repositories(tenantId);
+  tenantServices.cache(tenantId);
+};

packages/server/src/config/index.ts

@@ -32,7 +32,7 @@ module.exports = {
    */
   tenant: {
     db_client: process.env.TENANT_DB_CLIENT || process.env.DB_CLIENT || 'mysql',
-    db_name_prefix: process.env.TENANT_DB_NAME_PERFIX,
+    db_name_prefix: process.env.TENANT_DB_NAME_PERFIX || 'bigcapital_tenant_',
     db_host: process.env.TENANT_DB_HOST || process.env.DB_HOST,
     db_user: process.env.TENANT_DB_USER || process.env.DB_USER,
     db_password: process.env.TENANT_DB_PASSWORD || process.env.DB_PASSWORD,
@@ -245,4 +245,12 @@ module.exports = {
   loops: {
     apiKey: process.env.LOOPS_API_KEY,
   },
+
+  /**
+   * One-click demo accounts.
+   */
+  oneClickDemoAccounts: {
+    enable: parseBoolean(process.env.ONE_CLICK_DEMO_ACCOUNTS, false),
+    demoUrl: process.env.ONE_CLICK_DEMO_ACCOUNTS_URL || '',
+  },
 };

packages/server/src/database/seeds/core/20200810121809_seed_settings.ts

@@ -15,6 +15,7 @@ export default class SeedSettings extends TenantSeeder {
 
       // Manual journals settings.
       { group: 'manual_journals', key: 'next_number', value: '00001' },
+      { group: 'manual_journals', key: 'number_prefix', value: 'J-' },
       { group: 'manual_journals', key: 'auto_increment', value: true },
 
       // Sale invoices settings.

packages/server/src/interfaces/Authentication.ts

@@ -7,7 +7,6 @@ export interface IRegisterDTO {
   lastName: string;
   email: string;
   password: string;
-  organizationName: string;
 }
 
 export interface ILoginDTO {
@@ -77,6 +76,10 @@ export interface IAuthSendedResetPassword {
 
 export interface IAuthGetMetaPOJO {
   signupDisabled: boolean;
+  oneClickDemo: {
+    enable: boolean;
+    demoUrl: string;
+  };
 }
 
 export interface IAuthSignUpVerifingEventPayload {

packages/server/src/interfaces/CashflowService.ts

@@ -167,11 +167,18 @@ export interface CategorizeTransactionAsExpenseDTO {
 export interface IGetUncategorizedTransactionsQuery {
   page?: number;
   pageSize?: number;
+  minDate?: Date;
+  maxDate?: Date;
+  minAmount?: number;
+  maxAmount?: number;
 }
 
-
 export interface IGetRecognizedTransactionsQuery {
   page?: number;
   pageSize?: number;
   accountId?: number;
-}
+  minDate?: Date;
+  maxDate?: Date;
+  minAmount?: number;
+  maxAmount?: number;
+}

packages/server/src/interfaces/PaymentReceive.ts

@@ -67,7 +67,7 @@ export interface IPaymentReceivedEntry {
 export interface IPaymentReceivedEntryDTO {
   id?: number;
   index: number;
-  paymentReceiveId: number;
+  paymentReceiveId?: number;
   invoiceId: number;
   paymentAmount: number;
 }

packages/server/src/interfaces/Setup.ts

@@ -33,3 +33,7 @@ export interface IOrganizationBuildEventPayload {
   buildDTO: IOrganizationBuildDTO;
   systemUser: ISystemUser;
 }
+
+export interface IOrganizationBuiltEventPayload {
+  tenantId: number;
+}

packages/server/src/interfaces/Subscription.ts

@@ -0,0 +1,8 @@
+export interface SubscriptionPayload {
+  lemonSqueezyId?: string;
+}
+
+export enum SubscriptionPaymentStatus {
+  Succeed = 'succeed',
+  Failed = 'failed',
+}

packages/server/src/interfaces/Tenancy.ts

@@ -51,5 +51,4 @@ export interface ISystemService {
   cache();
   repositories();
   knex();
-  dbManager();
 }

packages/server/src/interfaces/index.ts

@@ -75,6 +75,7 @@ export * from './Times';
 export * from './ProjectProfitabilitySummary';
 export * from './TaxRate';
 export * from './Plaid';
+export * from './Subscription';
 
 export interface I18nService {
   __: (input: string) => string;

packages/server/src/jobs/ComputeItemCost.ts

@@ -21,7 +21,7 @@ export default class ComputeItemCostJob {
 
     agenda.define(
       'compute-item-cost',
-      { priority: 'high', concurrency: 1 },
+      { priority: 'high', concurrency: 20 },
       this.handler.bind(this)
     );
     this.agenda.on('start:compute-item-cost', this.onJobStart.bind(this));

packages/server/src/jobs/OrganizationSetup.ts

@@ -8,7 +8,7 @@ export default class OrganizationSetupJob {
   constructor(agenda) {
     agenda.define(
       'organization-setup',
-      { priority: 'high', concurrency: 1 },
+      { priority: 'high', concurrency: 20 },
       this.handler
     );
   }

packages/server/src/jobs/WriteInvoicesJEntries.ts

@@ -15,7 +15,7 @@ export default class WriteInvoicesJournalEntries {
 
     agenda.define(
       eventName,
-      { priority: 'normal', concurrency: 1 },
+      { priority: 'normal', concurrency: 20 },
       this.handler.bind(this)
     );
     agenda.on(`complete:${eventName}`, this.onJobCompleted.bind(this));

packages/server/src/lib/Transformer/Transformer.ts

@@ -164,6 +164,10 @@ export class Transformer {
     return date ? moment(date).format(this.dateFormat) : '';
   }
 
+  protected formatDateFromNow(date){
+    return date ? moment(date).fromNow(true) : '';
+  }
+
   /**
    *
    * @param number

packages/server/src/loaders/dbManager.ts

@@ -1,7 +0,0 @@
-import knexManager from 'knex-db-manager';
-import { systemKnexConfig, systemDbManager } from 'config/knexConfig';
-
-export default () => knexManager.databaseManagerFactory({
-  knex: systemKnexConfig,
-  dbManager: systemDbManager,
-});

packages/server/src/loaders/dependencyInjector.ts

@@ -3,7 +3,6 @@ import LoggerInstance from '@/loaders/logger';
 import agendaFactory from '@/loaders/agenda';
 import SmsClientLoader from '@/loaders/smsClient';
 import mailInstance from '@/loaders/mail';
-import dbManagerFactory from '@/loaders/dbManager';
 import i18n from '@/loaders/i18n';
 import repositoriesLoader from '@/loaders/systemRepositories';
 import Cache from '@/services/Cache';
@@ -16,7 +15,6 @@ export default ({ mongoConnection, knex }) => {
   try {
     const agendaInstance = agendaFactory({ mongoConnection });
     const smsClientInstance = SmsClientLoader(config.easySMSGateway.api_key);
-    const dbManager = dbManagerFactory(knex);
     const cacheInstance = new Cache();
 
     Container.set('logger', LoggerInstance);
@@ -24,7 +22,6 @@ export default ({ mongoConnection, knex }) => {
     Container.set('SMSClient', smsClientInstance);
     Container.set('mail', mailInstance);
   
-    Container.set('dbManager', dbManager);
     LoggerInstance.info(
       '[DI] Database manager has been injected into container.'
     );

packages/server/src/loaders/eventEmitter.ts

@@ -115,6 +115,9 @@ import { DecrementUncategorizedTransactionOnExclude } from '@/services/Banking/E
 import { DecrementUncategorizedTransactionOnCategorize } from '@/services/Cashflow/subscribers/DecrementUncategorizedTransactionOnCategorize';
 import { DisconnectPlaidItemOnAccountDeleted } from '@/services/Banking/BankAccounts/events/DisconnectPlaidItemOnAccountDeleted';
 import { LoopsEventsSubscriber } from '@/services/Loops/LoopsEventsSubscriber';
+import { DeleteUncategorizedTransactionsOnAccountDeleting } from '@/services/Banking/BankAccounts/events/DeleteUncategorizedTransactionsOnAccountDeleting';
+import { SeedInitialDemoAccountDataOnOrgBuild } from '@/services/OneClickDemo/events/SeedInitialDemoAccountData';
+import { TriggerInvalidateCacheOnSubscriptionChange } from '@/services/Subscription/events/TriggerInvalidateCacheOnSubscriptionChange';
 
 export default () => {
   return new EventPublisher();
@@ -245,8 +248,10 @@ export const susbcribers = () => {
     DeleteCashflowTransactionOnUncategorize,
     PreventDeleteTransactionOnDelete,
 
+    // Subscription
     SubscribeFreeOnSignupCommunity,
     SendVerfiyMailOnSignUp,
+    TriggerInvalidateCacheOnSubscriptionChange,
 
     // Attachments
     AttachmentsOnSaleInvoiceCreated,
@@ -277,8 +282,12 @@ export const susbcribers = () => {
     // Plaid
     RecognizeSyncedBankTranasctions,
     DisconnectPlaidItemOnAccountDeleted,
+    DeleteUncategorizedTransactionsOnAccountDeleting,
 
     // Loops
-    LoopsEventsSubscriber
+    LoopsEventsSubscriber,
+
+    // Demo Account
+    SeedInitialDemoAccountDataOnOrgBuild,
   ];
 };

packages/server/src/loaders/i18n.ts

@@ -2,6 +2,7 @@ import { I18n } from 'i18n';
 
 export default () => new I18n({
   locales: ['en', 'ar'],
+  defaultLocale: 'en',
   register: global,
   directory: global.__locales_dir,
   updateFiles: false,

packages/server/src/models/Item.Settings.ts

@@ -257,25 +257,25 @@ export default {
       name: 'item.field.sell_price',
       fieldType: 'number',
     },
-    cost_price: {
+    costPrice: {
       name: 'item.field.cost_price',
       fieldType: 'number',
     },
-    costAccount: {
+    costAccountId: {
       name: 'item.field.cost_account',
       fieldType: 'relation',
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       importHint: 'Matches the account name or code.',
     },
-    sellAccount: {
+    sellAccountId: {
       name: 'item.field.sell_account',
       fieldType: 'relation',
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       importHint: 'Matches the account name or code.',
     },
-    inventoryAccount: {
+    inventoryAccountId: {
       name: 'item.field.inventory_account',
       fieldType: 'relation',
       relationModel: 'Account',

packages/server/src/models/Pagination.ts

@@ -1,4 +1,5 @@
 import { Model } from 'objection';
+import { castArray, omit, pick } from 'lodash';
 import { isEmpty } from 'lodash';
 import { ServiceError } from '@/exceptions';
 
@@ -16,7 +17,15 @@ export default class PaginationQueryBuilder extends Model.QueryBuilder {
     });
   }
 
-  queryAndThrowIfHasRelations = ({ type, message }) => {
+  queryAndThrowIfHasRelations = ({
+    type,
+    message,
+    excludeRelations = [],
+    includedRelations = [],
+  }) => {
+    const _excludeRelations = castArray(excludeRelations);
+    const _includedRelations = castArray(includedRelations);
+
     const model = this.modelClass();
     const modelRelations = Object.keys(model.relationMappings).filter(
       (relation) =>
@@ -25,9 +34,20 @@ export default class PaginationQueryBuilder extends Model.QueryBuilder {
         ) !== -1
     );
     const relations = model.secureDeleteRelations || modelRelations;
+    const filteredByIncluded = relations.filter((r) =>
+      _includedRelations.includes(r)
+    );
+    const filteredByExcluded = relations.filter(
+      (r) => !excludeRelations.includes(r)
+    );
+    const filteredRelations = !isEmpty(_includedRelations)
+      ? filteredByIncluded
+      : !isEmpty(_excludeRelations)
+      ? filteredByExcluded
+      : relations;
 
     this.runAfter((model, query) => {
-      const nonEmptyRelations = relations.filter(
+      const nonEmptyRelations = filteredRelations.filter(
         (relation) => !isEmpty(model[relation])
       );
       if (nonEmptyRelations.length > 0) {
@@ -36,7 +56,7 @@ export default class PaginationQueryBuilder extends Model.QueryBuilder {
       return model;
     });
     return this.onBuild((query) => {
-      relations.forEach((relation) => {
+      filteredRelations.forEach((relation) => {
         query.withGraphFetched(`${relation}(selectId)`).modifiers({
           selectId(builder) {
             builder.select('id');

packages/server/src/models/UncategorizedCashflowTransaction.ts

@@ -1,9 +1,8 @@
 /* eslint-disable global-require */
-import * as R from 'ramda';
-import { Model, ModelOptions, QueryContext, mixin } from 'objection';
+import moment from 'moment';
+import { Model, mixin } from 'objection';
 import TenantModel from 'models/TenantModel';
 import ModelSettings from './ModelSetting';
-import Account from './Account';
 import UncategorizedCashflowTransactionMeta from './UncategorizedCashflowTransaction.meta';
 
 export default class UncategorizedCashflowTransaction extends mixin(
@@ -167,6 +166,28 @@ export default class UncategorizedCashflowTransaction extends mixin(
       pending(query) {
         query.where('pending', true);
       },
+
+      minAmount(query, minAmount) {
+        query.where('amount', '>=', minAmount);
+      },
+
+      maxAmount(query, maxAmount) {
+        query.where('amount', '<=', maxAmount);
+      },
+
+      toDate(query, toDate) {
+        const dateFormat = 'YYYY-MM-DD';
+        const _toDate = moment(toDate).endOf('day').format(dateFormat);
+
+        query.where('date', '<=', _toDate);
+      },
+
+      fromDate(query, fromDate) {
+        const dateFormat = 'YYYY-MM-DD';
+        const _fromDate = moment(fromDate).startOf('day').format(dateFormat);
+
+        query.where('date', '>=', _fromDate);
+      },
     };
   }
 

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

@@ -43,8 +43,8 @@ export class AccountsApplication {
 
   /**
    * Creates a new account.
-   * @param   {number} tenantId
-   * @param   {IAccountCreateDTO} accountDTO
+   * @param {number} tenantId
+   * @param {IAccountCreateDTO} accountDTO
    * @returns {Promise<IAccount>}
    */
   public createAccount = (
@@ -108,8 +108,8 @@ export class AccountsApplication {
 
   /**
    * Retrieves the account details.
-   * @param   {number} tenantId
-   * @param   {number} accountId
+   * @param {number} tenantId
+   * @param {number} accountId
    * @returns {Promise<IAccount>}
    */
   public getAccount = (tenantId: number, accountId: number) => {

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

@@ -73,6 +73,7 @@ export class DeleteAccount {
       .throwIfNotFound()
       .queryAndThrowIfHasRelations({
         type: ERRORS.ACCOUNT_HAS_ASSOCIATED_TRANSACTIONS,
+        excludeRelations: ['uncategorizedTransactions', 'plaidItem']
       });
     // Authorize before delete account.
     await this.authorize(tenantId, accountId, oldAccount);

packages/server/src/services/Authentication/GetAuthMeta.ts

@@ -11,6 +11,10 @@ export class GetAuthMeta {
   public async getAuthMeta(): Promise<IAuthGetMetaPOJO> {
     return {
       signupDisabled: config.signupRestrictions.disabled,
+      oneClickDemo: {
+        enable: config.oneClickDemoAccounts.enable,
+        demoUrl: config.oneClickDemoAccounts.demoUrl,
+      },
     };
   }
 }

packages/server/src/services/Banking/BankAccounts/events/DeleteUncategorizedTransactionsOnAccountDeleting.ts

@@ -0,0 +1,78 @@
+import { Inject, Service } from 'typedi';
+import { initialize } from 'objection';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
+import events from '@/subscribers/events';
+import { IAccountEventDeletePayload } from '@/interfaces';
+import { DeleteBankRulesService } from '../../Rules/DeleteBankRules';
+import { RevertRecognizedTransactions } from '../../RegonizeTranasctions/RevertRecognizedTransactions';
+
+@Service()
+export class DeleteUncategorizedTransactionsOnAccountDeleting {
+  @Inject()
+  private tenancy: HasTenancyService;
+
+  @Inject()
+  private deleteBankRules: DeleteBankRulesService;
+
+  @Inject()
+  private revertRecognizedTransactins: RevertRecognizedTransactions;
+
+  /**
+   * Constructor method.
+   */
+  public attach(bus) {
+    bus.subscribe(
+      events.accounts.onDelete,
+      this.handleDeleteBankRulesOnAccountDeleting.bind(this)
+    );
+  }
+
+  /**
+   * Handles revert the recognized transactions and delete all the bank rules
+   * associated to the deleted bank account.
+   * @param {IAccountEventDeletePayload}
+   */
+  private async handleDeleteBankRulesOnAccountDeleting({
+    tenantId,
+    oldAccount,
+    trx,
+  }: IAccountEventDeletePayload) {
+    const knex = this.tenancy.knex(tenantId);
+    const {
+      BankRule,
+      UncategorizedCashflowTransaction,
+      MatchedBankTransaction,
+      RecognizedBankTransaction,
+    } = this.tenancy.models(tenantId);
+
+    const foundAssociatedRules = await BankRule.query(trx).where(
+      'applyIfAccountId',
+      oldAccount.id
+    );
+    const foundAssociatedRulesIds = foundAssociatedRules.map((rule) => rule.id);
+
+    await initialize(knex, [
+      UncategorizedCashflowTransaction,
+      RecognizedBankTransaction,
+      MatchedBankTransaction,
+    ]);
+    // Revert the recognized transactions of the given bank rules.
+    await this.revertRecognizedTransactins.revertRecognizedTransactions(
+      tenantId,
+      foundAssociatedRulesIds,
+      null,
+      trx
+    );
+    // Delete the associated uncategorized transactions.
+    await UncategorizedCashflowTransaction.query(trx)
+      .where('accountId', oldAccount.id)
+      .delete();
+
+    // Delete the given bank rules.
+    await this.deleteBankRules.deleteBankRules(
+      tenantId,
+      foundAssociatedRulesIds,
+      trx
+    );
+  }
+}

packages/server/src/services/Banking/BankAccounts/events/DisconnectPlaidItemOnAccountDeleted.ts

@@ -51,6 +51,7 @@ export class DisconnectPlaidItemOnAccountDeleted {
       .findOne('plaidItemId', oldAccount.plaidItemId)
       .delete();
 
+    // Remove Plaid item once the transaction resolve.
     if (oldPlaidItem) {
       const plaidInstance = PlaidClientWrapper.getClient();
 

packages/server/src/services/Banking/Exclude/GetExcludedBankTransactions.ts

@@ -1,5 +1,6 @@
-import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { Inject, Service } from 'typedi';
+import moment from 'moment';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { ExcludedBankTransactionsQuery } from './_types';
 import { UncategorizedTransactionTransformer } from '@/services/Cashflow/UncategorizedTransactionTransformer';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
@@ -39,6 +40,18 @@ export class GetExcludedBankTransactionsService {
           if (_query.accountId) {
             q.where('account_id', _query.accountId);
           }
+          if (_query.minDate) {
+            q.modify('fromDate', _query.minDate);
+          }
+          if (_query.maxDate) {
+            q.modify('toDate', _query.maxDate);
+          }
+          if (_query.minAmount) {
+            q.modify('minAmount', _query.minAmount);
+          }
+          if (_query.maxAmount) {
+            q.modify('maxAmount', _query.maxAmount);
+          }
         })
         .pagination(_query.page - 1, _query.pageSize);
 

packages/server/src/services/Banking/Exclude/_types.ts

@@ -4,6 +4,10 @@ export interface ExcludedBankTransactionsQuery {
   page?: number;
   pageSize?: number;
   accountId?: number;
+  minDate?: Date;
+  maxDate?: Date;
+  minAmount?: number;
+  maxAmount?: number;
 }
 
 export interface IBankTransactionUnexcludingEventPayload {

packages/server/src/services/Banking/Matching/GetMatchedTransactionsByBills.ts

@@ -1,18 +1,25 @@
 import { Inject, Service } from 'typedi';
 import { initialize } from 'objection';
+import { Knex } from 'knex';
+import { first } from 'lodash';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
 import { GetMatchedTransactionBillsTransformer } from './GetMatchedTransactionBillsTransformer';
-import { GetMatchedTransactionsFilter, MatchedTransactionPOJO } from './types';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
+import {
+  GetMatchedTransactionsFilter,
+  IMatchTransactionDTO,
+  MatchedTransactionPOJO,
+} from './types';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
+import { CreateBillPayment } from '@/services/Purchases/BillPayments/CreateBillPayment';
+import { IBillPaymentDTO } from '@/interfaces';
 
 @Service()
 export class GetMatchedTransactionsByBills extends GetMatchedTransactionsByType {
   @Inject()
-  private tenancy: HasTenancyService;
+  private transformer: TransformerInjectable;
 
   @Inject()
-  private transformer: TransformerInjectable;
+  private createPaymentMadeService: CreateBillPayment;
 
   /**
    * Retrieves the matched transactions.
@@ -71,4 +78,62 @@ export class GetMatchedTransactionsByBills extends GetMatchedTransactionsByType
       new GetMatchedTransactionBillsTransformer()
     );
   }
+
+  /**
+   * Creates the common matched transaction.
+   * @param {number} tenantId
+   * @param {Array<number>} uncategorizedTransactionIds
+   * @param {IMatchTransactionDTO} matchTransactionDTO
+   * @param {Knex.Transaction} trx
+   */
+  public async createMatchedTransaction(
+    tenantId: number,
+    uncategorizedTransactionIds: Array<number>,
+    matchTransactionDTO: IMatchTransactionDTO,
+    trx?: Knex.Transaction
+  ): Promise<void> {
+    await super.createMatchedTransaction(
+      tenantId,
+      uncategorizedTransactionIds,
+      matchTransactionDTO,
+      trx
+    );
+    const { Bill, UncategorizedCashflowTransaction, MatchedBankTransaction } =
+      this.tenancy.models(tenantId);
+
+    const uncategorizedTransactionId = first(uncategorizedTransactionIds);
+    const uncategorizedTransaction =
+      await UncategorizedCashflowTransaction.query(trx)
+        .findById(uncategorizedTransactionId)
+        .throwIfNotFound();
+
+    const bill = await Bill.query(trx)
+      .findById(matchTransactionDTO.referenceId)
+      .throwIfNotFound();
+
+    const createPaymentMadeDTO: IBillPaymentDTO = {
+      vendorId: bill.vendorId,
+      paymentAccountId: uncategorizedTransaction.accountId,
+      paymentDate: uncategorizedTransaction.date,
+      exchangeRate: 1,
+      entries: [
+        {
+          paymentAmount: bill.dueAmount,
+          billId: bill.id,
+        },
+      ],
+      branchId: bill.branchId,
+    };
+    // Create a new bill payment associated to the matched bill.
+    const billPayment = await this.createPaymentMadeService.createBillPayment(
+      tenantId,
+      createPaymentMadeDTO,
+      trx
+    );
+    // Link the create bill payment with matched transaction.
+    await super.createMatchedTransaction(tenantId, uncategorizedTransactionIds, {
+      referenceType: 'BillPayment',
+      referenceId: billPayment.id,
+    }, trx);
+  }
 }

packages/server/src/services/Banking/Matching/GetMatchedTransactionsByInvoices.ts

@@ -1,22 +1,26 @@
 import { Inject, Service } from 'typedi';
 import { initialize } from 'objection';
+import { Knex } from 'knex';
+import { first } from 'lodash';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
 import { GetMatchedTransactionInvoicesTransformer } from './GetMatchedTransactionInvoicesTransformer';
 import {
   GetMatchedTransactionsFilter,
+  IMatchTransactionDTO,
   MatchedTransactionPOJO,
   MatchedTransactionsPOJO,
 } from './types';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
+import { CreatePaymentReceived } from '@/services/Sales/PaymentReceived/CreatePaymentReceived';
+import { IPaymentReceivedCreateDTO } from '@/interfaces';
 
 @Service()
 export class GetMatchedTransactionsByInvoices extends GetMatchedTransactionsByType {
   @Inject()
-  protected tenancy: HasTenancyService;
+  protected transformer: TransformerInjectable;
 
   @Inject()
-  protected transformer: TransformerInjectable;
+  protected createPaymentReceivedService: CreatePaymentReceived;
 
   /**
    * Retrieves the matched transactions.
@@ -78,4 +82,64 @@ export class GetMatchedTransactionsByInvoices extends GetMatchedTransactionsByTy
       new GetMatchedTransactionInvoicesTransformer()
     );
   }
+
+  /**
+   * Creates the common matched transaction.
+   * @param {number} tenantId
+   * @param {Array<number>} uncategorizedTransactionIds
+   * @param {IMatchTransactionDTO} matchTransactionDTO
+   * @param {Knex.Transaction} trx
+   */
+  public async createMatchedTransaction(
+    tenantId: number,
+    uncategorizedTransactionIds: Array<number>,
+    matchTransactionDTO: IMatchTransactionDTO,
+    trx?: Knex.Transaction
+  ) {
+    await super.createMatchedTransaction(
+      tenantId,
+      uncategorizedTransactionIds,
+      matchTransactionDTO,
+      trx
+    );
+    const { SaleInvoice, UncategorizedCashflowTransaction, MatchedBankTransaction } =
+      this.tenancy.models(tenantId);
+
+    const uncategorizedTransactionId = first(uncategorizedTransactionIds);
+    const uncategorizedTransaction =
+      await UncategorizedCashflowTransaction.query(trx)
+        .findById(uncategorizedTransactionId)
+        .throwIfNotFound();
+
+    const invoice = await SaleInvoice.query(trx)
+      .findById(matchTransactionDTO.referenceId)
+      .throwIfNotFound();
+
+    const createPaymentReceivedDTO: IPaymentReceivedCreateDTO = {
+      customerId: invoice.customerId,
+      paymentDate: uncategorizedTransaction.date,
+      amount: invoice.dueAmount,
+      depositAccountId: uncategorizedTransaction.accountId,
+      entries: [
+        {
+          index: 1,
+          invoiceId: invoice.id,
+          paymentAmount: invoice.dueAmount,
+        },
+      ],
+      branchId: invoice.branchId,
+    };
+    // Create a payment received associated to the matched invoice.
+    const paymentReceived = await this.createPaymentReceivedService.createPaymentReceived(
+      tenantId,
+      createPaymentReceivedDTO,
+      {},
+      trx
+    );
+    // Link the create payment received with matched invoice transaction.
+    await super.createMatchedTransaction(tenantId, uncategorizedTransactionIds, {
+      referenceType: 'PaymentReceive',
+      referenceId: paymentReceived.id,
+    }, trx)
+  }
 }

packages/server/src/services/Banking/Plaid/PlaidUpdateTransactions.ts

@@ -1,10 +1,10 @@
-import HasTenancyService from '@/services/Tenancy/TenancyService';
+import { Knex } from 'knex';
 import { Inject, Service } from 'typedi';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { PlaidClientWrapper } from '@/lib/Plaid/Plaid';
 import { PlaidSyncDb } from './PlaidSyncDB';
 import { PlaidFetchedTransactionsUpdates } from '@/interfaces';
 import UnitOfWork from '@/services/UnitOfWork';
-import { Knex } from 'knex';
 
 @Service()
 export class PlaidUpdateTransactions {
@@ -19,9 +19,9 @@ export class PlaidUpdateTransactions {
 
   /**
    * Handles sync the Plaid item to Bigcaptial under UOW.
-   * @param {number} tenantId
-   * @param {number} plaidItemId
-   * @returns {Promise<{  addedCount: number; modifiedCount: number; removedCount: number; }>}
+   * @param {number} tenantId - Tenant id.
+   * @param {number} plaidItemId - Plaid item id.
+   * @returns {Promise<{ addedCount: number; modifiedCount: number; removedCount: number; }>}
    */
   public async updateTransactions(tenantId: number, plaidItemId: string) {
     return this.uow.withTransaction(tenantId, (trx: Knex.Transaction) => {

packages/server/src/services/Banking/RegonizeTranasctions/events/TriggerRecognizedTransactions.ts

@@ -106,6 +106,9 @@ export class TriggerRecognizedTransactions {
     const batch = importFile.paramsParsed.batch;
     const payload = { tenantId, transactionsCriteria: { batch } };
 
+    // Cannot continue if the imported resource is not bank account transactions.
+    if (importFile.resource !== 'UncategorizedCashflowTransaction') return;
+
     await this.agenda.now('recognize-uncategorized-transactions-job', payload);
   }
 }

packages/server/src/services/Banking/Rules/DeleteBankRule.ts

@@ -26,31 +26,39 @@ export class DeleteBankRuleSerivce {
    * @param {number} ruleId
    * @returns {Promise<void>}
    */
-  public async deleteBankRule(tenantId: number, ruleId: number): Promise<void> {
+  public async deleteBankRule(
+    tenantId: number,
+    ruleId: number,
+    trx?: Knex.Transaction
+  ): Promise<void> {
     const { BankRule, BankRuleCondition } = this.tenancy.models(tenantId);
 
     const oldBankRule = await BankRule.query()
       .findById(ruleId)
       .throwIfNotFound();
 
-    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
-      // Triggers `onBankRuleDeleting` event.
-      await this.eventPublisher.emitAsync(events.bankRules.onDeleting, {
-        tenantId,
-        oldBankRule,
-        ruleId,
-        trx,
-      } as IBankRuleEventDeletingPayload);
+    return this.uow.withTransaction(
+      tenantId,
+      async (trx: Knex.Transaction) => {
+        // Triggers `onBankRuleDeleting` event.
+        await this.eventPublisher.emitAsync(events.bankRules.onDeleting, {
+          tenantId,
+          oldBankRule,
+          ruleId,
+          trx,
+        } as IBankRuleEventDeletingPayload);
 
-      await BankRuleCondition.query(trx).where('ruleId', ruleId).delete();
-      await BankRule.query(trx).findById(ruleId).delete();
+        await BankRuleCondition.query(trx).where('ruleId', ruleId).delete()
+        await BankRule.query(trx).findById(ruleId).delete();
 
-      // Triggers `onBankRuleDeleted` event.
-      await await this.eventPublisher.emitAsync(events.bankRules.onDeleted, {
-        tenantId,
-        ruleId,
-        trx,
-      } as IBankRuleEventDeletedPayload);
-    });
+        // Triggers `onBankRuleDeleted` event.
+        await await this.eventPublisher.emitAsync(events.bankRules.onDeleted, {
+          tenantId,
+          ruleId,
+          trx,
+        } as IBankRuleEventDeletedPayload);
+      },
+      trx
+    );
   }
 }

packages/server/src/services/Banking/Rules/DeleteBankRules.ts

@@ -0,0 +1,34 @@
+import { Knex } from 'knex';
+import { Inject, Service } from 'typedi';
+import PromisePool from '@supercharge/promise-pool';
+import { castArray, uniq } from 'lodash';
+import { DeleteBankRuleSerivce } from './DeleteBankRule';
+
+@Service()
+export class DeleteBankRulesService {
+  @Inject()
+  private deleteBankRuleService: DeleteBankRuleSerivce;
+
+  /**
+   * Delete bank rules.
+   * @param {number} tenantId
+   * @param {number | Array<number>} bankRuleId
+   */
+  async deleteBankRules(
+    tenantId: number,
+    bankRuleId: number | Array<number>,
+    trx?: Knex.Transaction
+  ) {
+    const bankRulesIds = uniq(castArray(bankRuleId));
+
+    const results = await PromisePool.withConcurrency(1)
+      .for(bankRulesIds)
+      .process(async (bankRuleId: number) => {
+        await this.deleteBankRuleService.deleteBankRule(
+          tenantId,
+          bankRuleId,
+          trx
+        );
+      });
+  }
+}

packages/server/src/services/Cashflow/CashflowAccountTransformer.ts

@@ -8,7 +8,12 @@ export class CashflowAccountTransformer extends Transformer {
    * @returns {string[]}
    */
   public includeAttributes = (): string[] => {
-    return ['formattedAmount'];
+    return [
+      'formattedAmount',
+      'lastFeedsUpdatedAt',
+      'lastFeedsUpdatedAtFormatted',
+      'lastFeedsUpdatedFromNow',
+    ];
   };
 
   /**
@@ -29,7 +34,7 @@ export class CashflowAccountTransformer extends Transformer {
 
   /**
    * Retrieve formatted account amount.
-   * @param   {IAccount} invoice
+   * @param {IAccount} invoice
    * @returns {string}
    */
   protected formattedAmount = (account: IAccount): string => {
@@ -37,4 +42,22 @@ export class CashflowAccountTransformer extends Transformer {
       currencyCode: account.currencyCode,
     });
   };
+
+  /**
+   * Retrieves the last feeds update at formatted date.
+   * @param {IAccount} account
+   * @returns {string}
+   */
+  protected lastFeedsUpdatedAtFormatted(account: IAccount): string {
+    return this.formatDate(account.lastFeedsUpdatedAt);
+  }
+
+  /**
+   * Retrieves the last feeds updated from now.
+   * @param {IAccount} account
+   * @returns {string}
+   */
+  protected lastFeedsUpdatedFromNow(account: IAccount): string {
+    return this.formatDateFromNow(account.lastFeedsUpdatedAt);
+  }
 }

packages/server/src/services/Cashflow/GetRecongizedTransactions.ts

@@ -23,7 +23,7 @@ export class GetRecognizedTransactionsService {
   ) {
     const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
 
-    const _filter = {
+    const _query = {
       page: 1,
       pageSize: 20,
       ...filter,
@@ -41,11 +41,26 @@ export class GetRecognizedTransactionsService {
           // Exclude the pending transactions.
           q.modify('notPending');
 
-          if (_filter.accountId) {
-            q.where('accountId', _filter.accountId);
+          if (_query.accountId) {
+            q.where('accountId', _query.accountId);
+          }
+          if (_query.minDate) {
+            q.modify('fromDate', _query.minDate);
+          }
+          if (_query.maxDate) {
+            q.modify('toDate', _query.maxDate);
+          }
+          if (_query.minAmount) {
+            q.modify('minAmount', _query.minAmount);
+          }
+          if (_query.maxAmount) {
+            q.modify('maxAmount', _query.maxAmount);
+          }
+          if (_query.accountId) {
+            q.where('accountId', _query.accountId);
           }
         })
-        .pagination(_filter.page - 1, _filter.pageSize);
+        .pagination(_query.page - 1, _query.pageSize);
 
     const data = await this.transformer.transform(
       tenantId,

packages/server/src/services/Cashflow/GetUncategorizedTransactions.ts

@@ -62,6 +62,19 @@ export class GetUncategorizedTransactions {
 
           q.whereNull('matchedBankTransactions.id');
           q.orderBy('date', 'DESC');
+
+          if (_query.minDate) {
+            q.modify('fromDate', _query.minDate);
+          }
+          if (_query.maxDate) {
+            q.modify('toDate', _query.maxDate);
+          }
+          if (_query.minAmount) {
+            q.modify('minAmount', _query.minAmount);
+          }
+          if (_query.maxAmount) {
+            q.modify('maxAmount', _query.maxAmount);
+          }
         })
         .pagination(_query.page - 1, _query.pageSize);
 

packages/server/src/services/Cashflow/UncategorizedTransactionsImportable.ts

@@ -87,7 +87,7 @@ export class UncategorizedTransactionsImportable extends Importable {
   }
 
   /**
-   * Transformes the import params before storing them.
+   * Transforms the import params before storing them.
    * @param {Record<string, any>} parmas
    */
   public transformParams(parmas: Record<string, any>) {

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

@@ -16,6 +16,7 @@ export class ExpenseTransfromer extends Transformer {
       'formattedAllocatedCostAmount',
       'formattedDate',
       'formattedCreatedAt',
+      'formattedPublishedAt',
       'categories',
       'attachments',
     ];
@@ -91,4 +92,13 @@ export class ExpenseTransfromer extends Transformer {
   protected attachments = (expense: IExpense) => {
     return this.item(expense.attachments, new AttachmentTransformer());
   };
+
+  /**
+   * Retrieve formatted published at date.
+   * @param {IExpense} expense 
+   * @returns {string}
+   */
+  protected formattedPublishedAt = (expense: IExpense): string => {
+    return this.formatDate(expense.publishedAt);
+  }
 }

packages/server/src/services/Import/ImportFileMapping.ts

@@ -23,7 +23,7 @@ export class ImportFileMapping {
    */
   public async mapping(
     tenantId: number,
-    importId: number,
+    importId: string,
     maps: ImportMappingAttr[]
   ): Promise<ImportFileMapPOJO> {
     const importFile = await Import.query()

packages/server/src/services/Import/ImportFilePreview.ts

@@ -19,7 +19,7 @@ export class ImportFilePreview {
    */
   public async preview(
     tenantId: number,
-    importId: number
+    importId: string
   ): Promise<ImportFilePreviewPOJO> {
     const knex = this.tenancy.knex(tenantId);
     const trx = await knex.transaction({ isolationLevel: 'read uncommitted' });

packages/server/src/services/Import/ImportFileProcess.ts

@@ -37,7 +37,7 @@ export class ImportFileProcess {
    */
   public async import(
     tenantId: number,
-    importId: number,
+    importId: string,
     trx?: Knex.Transaction
   ): Promise<ImportFilePreviewPOJO> {
     const importFile = await Import.query()

packages/server/src/services/Import/ImportFileProcessCommit.ts

@@ -25,7 +25,7 @@ export class ImportFileProcessCommit {
    */
   public async commit(
     tenantId: number,
-    importId: number
+    importId: string
   ): Promise<ImportFilePreviewPOJO> {
     const knex = this.tenancy.knex(tenantId);
     const trx = await knex.transaction({ isolationLevel: 'read uncommitted' });

packages/server/src/services/Import/ImportResourceApplication.ts

@@ -55,7 +55,7 @@ export class ImportResourceApplication {
    */
   public async mapping(
     tenantId: number,
-    importId: number,
+    importId: string,
     maps: ImportMappingAttr[]
   ) {
     return this.importMappingService.mapping(tenantId, importId, maps);
@@ -67,7 +67,7 @@ export class ImportResourceApplication {
    * @param {number} importId - Import id.
    * @returns {Promise<ImportFilePreviewPOJO>}
    */
-  public async preview(tenantId: number, importId: number) {
+  public async preview(tenantId: number, importId: string) {
     return this.ImportFilePreviewService.preview(tenantId, importId);
   }
 
@@ -77,7 +77,7 @@ export class ImportResourceApplication {
    * @param {number} importId
    * @returns {Promise<ImportFilePreviewPOJO>}
    */
-  public async process(tenantId: number, importId: number) {
+  public async process(tenantId: number, importId: string) {
     return this.importProcessCommit.commit(tenantId, importId);
   }
 

packages/server/src/services/Items/CreateItem.ts

@@ -43,12 +43,22 @@ export class CreateItem {
         itemDTO.sellAccountId
       );
     }
+    // Validate the income account id existance if the item is sellable.
+    this.validators.validateIncomeAccountExistance(
+      itemDTO.sellable,
+      itemDTO.sellAccountId
+    );
     if (itemDTO.costAccountId) {
       await this.validators.validateItemCostAccountExistance(
         tenantId,
         itemDTO.costAccountId
       );
     }
+    // Validate the cost account id existance if the item is purchasable.
+    this.validators.validateCostAccountExistance(
+      itemDTO.purchasable,
+      itemDTO.costAccountId
+    );
     if (itemDTO.inventoryAccountId) {
       await this.validators.validateItemInventoryAccountExistance(
         tenantId,

packages/server/src/services/Items/EditItem.ts

@@ -55,6 +55,11 @@ export class EditItem {
         itemDTO.categoryId
       );
     }
+    // Validate the income account id existance if the item is sellable.
+    this.validators.validateIncomeAccountExistance(
+      itemDTO.sellable,
+      itemDTO.sellAccountId
+    );
     // Validate the sell account existance on the storage.
     if (itemDTO.sellAccountId) {
       await this.validators.validateItemSellAccountExistance(
@@ -62,6 +67,11 @@ export class EditItem {
         itemDTO.sellAccountId
       );
     }
+    // Validate the cost account id existance if the item is purchasable.
+    this.validators.validateCostAccountExistance(
+      itemDTO.purchasable,
+      itemDTO.costAccountId
+    );
     // Validate the cost account existance on the storage.
     if (itemDTO.costAccountId) {
       await this.validators.validateItemCostAccountExistance(

packages/server/src/services/Items/ItemValidators.ts

@@ -85,6 +85,42 @@ export class ItemsValidators {
     }
   }
 
+  /**
+   * Validates income account existance.
+   * @param {number|null} sellable - Detarmines if the item sellable.
+   * @param {number|null} incomeAccountId - Income account id.
+   * @throws {ServiceError(ERRORS.INCOME_ACCOUNT_REQUIRED_WITH_SELLABLE_ITEM)}
+   */
+  public validateIncomeAccountExistance(
+    sellable?: boolean,
+    incomeAccountId?: number
+  ) {
+    if (sellable && !incomeAccountId) {
+      throw new ServiceError(
+        ERRORS.INCOME_ACCOUNT_REQUIRED_WITH_SELLABLE_ITEM,
+        'Income account is require with sellable item.'
+      );
+    }
+  }
+
+  /**
+   * Validates the cost account existance.
+   * @param {boolean|null} purchasable - Detarmines if the item purchasble.
+   * @param {number|null} costAccountId - Cost account id.
+   * @throws {ServiceError(ERRORS.COST_ACCOUNT_REQUIRED_WITH_PURCHASABLE_ITEM)}
+   */
+  public validateCostAccountExistance(
+    purchasable: boolean,
+    costAccountId?: number
+  ) {
+    if (purchasable && !costAccountId) {
+      throw new ServiceError(
+        ERRORS.COST_ACCOUNT_REQUIRED_WITH_PURCHASABLE_ITEM,
+        'The cost account is required with purchasable item.'
+      );
+    }
+  }
+
   /**
    * Validate item inventory account existance and type.
    * @param {number} tenantId

packages/server/src/services/Items/ItemsEntriesService.ts

@@ -5,6 +5,7 @@ import { ServiceError } from '@/exceptions';
 import TenancyService from '@/services/Tenancy/TenancyService';
 import { ItemEntry } from '@/models';
 import { entriesAmountDiff } from 'utils';
+import { Knex } from 'knex';
 
 const ERRORS = {
   ITEMS_NOT_FOUND: 'ITEMS_NOT_FOUND',
@@ -58,13 +59,14 @@ export default class ItemsEntriesService {
    */
   public async filterInventoryEntries(
     tenantId: number,
-    entries: IItemEntry[]
+    entries: IItemEntry[],
+    trx?: Knex.Transaction
   ): Promise<IItemEntry[]> {
     const { Item } = this.tenancy.models(tenantId);
     const entriesItemsIds = entries.map((e) => e.itemId);
 
     // Retrieve entries inventory items.
-    const inventoryItems = await Item.query()
+    const inventoryItems = await Item.query(trx)
       .whereIn('id', entriesItemsIds)
       .where('type', 'inventory');
 

packages/server/src/services/Items/constants.ts

@@ -26,6 +26,11 @@ export const ERRORS = {
 
   PURCHASE_TAX_RATE_NOT_FOUND: 'PURCHASE_TAX_RATE_NOT_FOUND',
   SELL_TAX_RATE_NOT_FOUND: 'SELL_TAX_RATE_NOT_FOUND',
+
+  INCOME_ACCOUNT_REQUIRED_WITH_SELLABLE_ITEM:
+    'INCOME_ACCOUNT_REQUIRED_WITH_SELLABLE_ITEM',
+  COST_ACCOUNT_REQUIRED_WITH_PURCHASABLE_ITEM:
+    'COST_ACCOUNT_REQUIRED_WITH_PURCHASABLE_ITEM',
 };
 
 export const DEFAULT_VIEW_COLUMNS = [];

packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts

@@ -0,0 +1,74 @@
+import { Inject, Service } from 'typedi';
+import { faker } from '@faker-js/faker';
+import uniqid from 'uniqid';
+import AuthenticationApplication from '../Authentication/AuthApplication';
+import OrganizationService from '../Organization/OrganizationService';
+import { OneClickDemo } from '@/system/models/OneclickDemo';
+import { SystemUser } from '@/system/models';
+import { IAuthSignInPOJO } from '@/interfaces';
+import { ICreateOneClickDemoPOJO } from './interfaces';
+import events from '@/subscribers/events';
+import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
+import { defaultDemoOrganizationDTO } from './_constants';
+
+@Service()
+export class CreateOneClickDemo {
+  @Inject()
+  private authApp: AuthenticationApplication;
+
+  @Inject()
+  private organizationService: OrganizationService;
+
+  @Inject()
+  private eventPublisher: EventPublisher;
+
+
+  /**
+   * Creates one-click demo account.
+   * @returns {Promise<ICreateOneClickDemoPOJO>}
+   */
+  public async createOneClickDemo(): Promise<ICreateOneClickDemoPOJO> {
+    const firstName = faker.person.firstName();
+    const lastName = faker.person.lastName();
+    const email = faker.internet.email();
+    const password = '123123123';
+    const demoId = uniqid();
+
+    await this.authApp.signUp({ firstName, lastName, email, password });
+
+    const signedIn = await this.authApp.signIn(email, password);
+    const tenantId = signedIn.tenant.id;
+    const userId = signedIn.user.id;
+
+    // Creates a new one-click demo.
+    await OneClickDemo.query().insert({ key: demoId, tenantId, userId });
+
+    const buildJob = await this.organizationService.buildRunJob(
+      tenantId,
+      defaultDemoOrganizationDTO,
+      signedIn.user
+    );
+    return { email, demoId, signedIn, buildJob };
+  }
+
+  /**
+   * Sign-in automicatlly using the demo id one creating an account finish.
+   * @param {string} oneClickDemoId -
+   * @returns {Promise<IAuthSignInPOJO>}
+   */
+  async autoSignIn(oneClickDemoId: string): Promise<IAuthSignInPOJO> {
+    const foundOneclickDemo = await OneClickDemo.query()
+      .findOne('key', oneClickDemoId)
+      .throwIfNotFound();
+
+    const userId = foundOneclickDemo.userId;
+    const user = await SystemUser.query().findById(userId);
+
+    const email = user.email;
+    const password = '123123123';
+
+    const signedIn = await this.authApp.signIn(email, password);
+
+    return signedIn;
+  }
+}

packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoAbstract.ts

@@ -0,0 +1,17 @@
+export class SeedDemoAbstract {
+  /**
+   * Retrieves the seeder file mapping.
+   * @returns {Array<>}
+   */
+  get mapping() {
+    return [];
+  }
+
+  /**
+   * Retireves the seeder file import params.
+   * @returns {Record<string, any>}
+   */
+  get importParams() {
+    return {};
+  }
+}

packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoBankTransactions.ts

@@ -0,0 +1,35 @@
+import { SeedDemoAbstract } from './SeedDemoAbstract';
+
+export class SeedDemoBankTransactions extends SeedDemoAbstract {
+  get mapping() {
+    return [
+      { from: 'Date', to: 'date' },
+      { from: 'Payee', to: 'payee' },
+      { from: 'Description', to: 'description' },
+      { from: 'Reference No.', to: 'referenceNo' },
+      { from: 'Amount', to: 'amount' },
+    ];
+  }
+
+  /**
+   * Retrieves the seeder file name.
+   * @returns {string}
+   */
+  get importFileName() {
+    return `bank-transactions.csv`;
+  }
+
+  /**
+   * Retrieve the resource name of the seeder.
+   * @returns {string}
+   */
+  get resource() {
+    return 'UncategorizedCashflowTransaction';
+  }
+
+  get importParams() {
+    return {
+      accountId: 1001,
+    };
+  }
+}

packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoCustomers.ts

@@ -0,0 +1,37 @@
+import { SeedDemoAbstract } from './SeedDemoAbstract';
+
+export class SeedDemoAccountCustomers extends SeedDemoAbstract {
+  /**
+   * Retrieves the seeder file mapping.
+   */
+  get mapping() {
+    return [
+      { from: 'Customer Type', to: 'customerType' },
+      { from: 'First Name', to: 'firstName' },
+      { from: 'Last Name', to: 'lastName' },
+      { from: 'Display Name', to: 'displayName' },
+      { from: 'Email', to: 'email' },
+      { from: 'Work Phone Number', to: 'workPhone' },
+      { from: 'Personal Phone Number', to: 'personalPhone' },
+      { from: 'Company Name', to: 'companyName' },
+      { from: 'Website', to: 'website' },
+      { from: 'Active', to: 'active' },
+    ];
+  }
+
+  /**
+   * Retrieves the seeder file name.
+   * @returns {string}
+   */
+  get importFileName() {
+    return `customers.csv`;
+  }
+
+  /**
+   * Retrieve the resource name of the seeder.
+   * @returns {string}
+   */
+  get resource() {
+    return 'Customer';
+  }
+}

packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoExpenses.ts

@@ -0,0 +1,39 @@
+import { SeedDemoAbstract } from './SeedDemoAbstract';
+
+export class SeedDemoAccountExpenses extends SeedDemoAbstract {
+  /**
+   * Retrieves the seeder file mapping.
+   */
+  get mapping() {
+    return [
+      { from: 'Payment Account', to: 'paymentAccountId' },
+      { from: 'Reference No.', to: 'referenceNo' },
+      { from: 'Payment Date', to: 'paymentDate' },
+      { from: 'Description', to: 'description' },
+      { from: 'Publish', to: 'publish' },
+      {
+        from: 'Expense Account',
+        to: 'expenseAccountId',
+        group: 'categories',
+      },
+      { from: 'Amount', to: 'amount', group: 'categories' },
+      { from: 'Line Description', to: 'description', group: 'categories' },
+    ];
+  }
+
+  /**
+   * Retrieves the seeder file name.
+   * @returns {string}
+   */
+  get importFileName() {
+    return `Expenses.csv`;
+  }
+
+  /**
+   * Retrieve the resource name of the seeder.
+   * @returns {string}
+   */
+  get resource() {
+    return 'Expense';
+  }
+}

packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoItems.ts

@@ -0,0 +1,45 @@
+import { SeedDemoAbstract } from './SeedDemoAbstract';
+
+export class SeedDemoAccountItems extends SeedDemoAbstract {
+  /**
+   * Retrieves the seeder file mapping.
+   */
+  get mapping() {
+    return [
+      { from: 'Item Type', to: 'type' },
+      { from: 'Item Name', to: 'name' },
+      { from: 'Item Code', to: 'code' },
+      { from: 'Sellable', to: 'sellable' },
+      { from: 'Purchasable', to: 'purchasable' },
+      { from: 'Sell Price', to: 'sellPrice' },
+      { from: 'Cost Price', to: 'costPrice' },
+      { from: 'Cost Account', to: 'costAccountId' },
+      { from: 'Sell Account', to: 'sellAccountId' },
+      { from: 'Inventory Account', to: 'inventoryAccountId' },
+      { from: 'Sell Description', to: 'sellDescription' },
+      {
+        from: 'Purchase Description',
+        to: 'purchaseDescription',
+      },
+      { from: 'Note', to: 'note' },
+      { from: 'Category', to: 'category' },
+      { from: 'Active', to: 'active' },
+    ];
+  }
+
+  /**
+   * Retrieves the seeder file name.
+   * @returns {string}
+   */
+  get importFileName() {
+    return `items.csv`;
+  }
+
+  /**
+   * Retrieve the resource name of the seeder.
+   * @returns {string}
+   */
+  get resource() {
+    return 'Item';
+  }
+}

packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoManualJournals.ts

@@ -0,0 +1,36 @@
+import { SeedDemoAbstract } from './SeedDemoAbstract';
+
+export class SeedDemoAccountManualJournals extends SeedDemoAbstract {
+  /**
+   * Retrieves the seeder file mapping.
+   */
+  get mapping() {
+    return [
+      { from: 'Date', to: 'date' },
+      { from: 'Journal No', to: 'journalNumber' },
+      { from: 'Reference No.', to: 'reference' },
+      { from: 'Description', to: 'description' },
+      { from: 'Publish', to: 'publish' },
+      { from: 'Credit', to: 'credit', group: 'entries' },
+      { from: 'Debit', to: 'debit', group: 'entries' },
+      { from: 'Account', to: 'accountId', group: 'entries' },
+      { from: 'Note', to: 'note', group: 'entries' },
+    ];
+  }
+
+  /**
+   * Retrieves the seeder file name.
+   * @returns {string}
+   */
+  get importFileName() {
+    return `manual-journals.csv`;
+  }
+
+  /**
+   * Retrieve the resource name of the seeder.
+   * @returns {string}
+   */
+  get resource() {
+    return 'ManualJournal';
+  }
+}

packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoSaleInvoices.ts

@@ -0,0 +1,37 @@
+import { SeedDemoAbstract } from './SeedDemoAbstract';
+
+export class SeedDemoSaleInvoices extends SeedDemoAbstract {
+  get mapping() {
+    return [
+      { from: 'Invoice Date', to: 'invoiceDate' },
+      { from: 'Due Date', to: 'dueDate' },
+      { from: 'Reference No.', to: 'referenceNo' },
+      { from: 'Invoice No.', to: 'invoiceNo' },
+      { from: 'Customer', to: 'customerId' },
+      { from: 'Exchange Rate', to: 'exchangeRate' },
+      { from: 'Invoice Message', to: 'invoiceMessage' },
+      { from: 'Terms & Conditions', to: 'termsConditions' },
+      { from: 'Delivered', to: 'delivered' },
+      { from: 'Item', to: 'itemId', group: 'entries' },
+      { from: 'Rate', to: 'rate', group: 'entries' },
+      { from: 'Quantity', to: 'quantity', group: 'entries' },
+      { from: 'Description', to: 'description', group: 'entries' },
+    ];
+  }
+
+  /**
+   * Retrieves the seeder file name.
+   * @returns {string}
+   */
+  get importFileName() {
+    return `sale-invoices.csv`;
+  }
+
+  /**
+   * Retrieve the resource name of the seeder.
+   * @returns {string}
+   */
+  get resource() {
+    return 'SaleInvoice';
+  }
+}

packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoVendors.ts

@@ -0,0 +1,36 @@
+import { SeedDemoAbstract } from './SeedDemoAbstract';
+
+export class SeedDemoAccountVendors extends SeedDemoAbstract {
+  /**
+   * Retrieves the seeder file mapping.
+   */
+  get mapping() {
+    return [
+      { from: 'First Name', to: 'firstName' },
+      { from: 'Last Name', to: 'lastName' },
+      { from: 'Display Name', to: 'displayName' },
+      { from: 'Email', to: 'email' },
+      { from: 'Work Phone Number', to: 'workPhone' },
+      { from: 'Personal Phone Number', to: 'personalPhone' },
+      { from: 'Company Name', to: 'companyName' },
+      { from: 'Website', to: 'website' },
+      { from: 'Active', to: 'active' },
+    ];
+  }
+
+  /**
+   * Retrieves the seeder file name.
+   * @returns {string}
+   */
+  get importFileName() {
+    return `vendors.csv`;
+  }
+
+  /**
+   * Retrieve the resource name of the seeder.
+   * @returns {string}
+   */
+  get resource() {
+    return 'Vendor';
+  }
+}

packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts

@@ -0,0 +1,25 @@
+import { Inject, Service } from 'typedi';
+import { CreateOneClickDemo } from './CreateOneClickDemo';
+
+@Service()
+export class OneClickDemoApplication {
+  @Inject()
+  private createOneClickDemoService: CreateOneClickDemo;
+
+  /**
+   * Creates one-click demo account.
+   * @returns {Promise<ICreateOneClickDemoPOJO>}
+   */
+  public createOneClick() {
+    return this.createOneClickDemoService.createOneClickDemo();
+  }
+
+  /**
+   * Auto-sign-in to created demo account.
+   * @param {string} demoId -
+   * @returns {Promise<IAuthSignInPOJO>}
+   */
+  public autoSignIn(demoId: string) {
+    return this.createOneClickDemoService.autoSignIn(demoId);
+  }
+}

packages/server/src/services/OneClickDemo/_constants.ts

@@ -0,0 +1,12 @@
+
+
+export const defaultDemoOrganizationDTO = {
+  name: 'BIGCAPITAL, INC',
+  baseCurrency: 'USD',
+  location: 'US',
+  language: 'en',
+  industry: 'Technology',
+  fiscalYear: 'march',
+  timezone: 'US/Central',
+  dateFormat: 'MM/DD/yyyy',
+}

packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts

@@ -0,0 +1,113 @@
+import { Inject } from 'typedi';
+import { promises as fs } from 'fs';
+import path from 'path';
+import uniqid from 'uniqid';
+import { isEmpty } from 'lodash';
+import events from '@/subscribers/events';
+import { PromisePool } from '@supercharge/promise-pool';
+import { IOrganizationBuiltEventPayload } from '@/interfaces';
+import { SeedDemoAccountItems } from '../DemoSeeders/SeedDemoItems';
+import { ImportResourceApplication } from '@/services/Import/ImportResourceApplication';
+import { getImportsStoragePath } from '@/services/Import/_utils';
+import { OneClickDemo } from '@/system/models/OneclickDemo';
+import { SeedDemoAccountCustomers } from '../DemoSeeders/SeedDemoCustomers';
+import { SeedDemoAccountVendors } from '../DemoSeeders/SeedDemoVendors';
+import { SeedDemoAccountManualJournals } from '../DemoSeeders/SeedDemoManualJournals';
+import { SeedDemoAccountExpenses } from '../DemoSeeders/SeedDemoExpenses';
+import { SeedDemoBankTransactions } from '../DemoSeeders/SeedDemoBankTransactions';
+import { SeedDemoSaleInvoices } from '../DemoSeeders/SeedDemoSaleInvoices';
+
+export class SeedInitialDemoAccountDataOnOrgBuild {
+  @Inject()
+  private importApp: ImportResourceApplication;
+
+  /**
+   * Attaches events with handlers.
+   */
+  public attach = (bus) => {
+    bus.subscribe(
+      events.organization.built,
+      this.seedInitialDemoAccountDataOnOrgBuild.bind(this)
+    );
+  };
+
+  /**
+   * Demo account seeder.
+   */
+  get seedDemoAccountSeeders() {
+    return [
+      SeedDemoAccountItems,
+      SeedDemoBankTransactions,
+      SeedDemoAccountCustomers,
+      SeedDemoAccountVendors,
+      SeedDemoAccountManualJournals,
+      SeedDemoSaleInvoices,
+      SeedDemoAccountExpenses,
+    ];
+  }
+
+  /**
+   * Initialize the seeder sheet file to the import storage first.
+   * @param {string} fileName -
+   * @returns {Promise<void>}
+   */
+  async initiateSeederFile(fileName: string) {
+    const destFileName = uniqid();
+    const source = path.join(global.__views_dir, `/demo-sheets`, fileName);
+    const destination = path.join(getImportsStoragePath(), destFileName);
+
+    // Use the fs.promises.copyFile method to copy the file
+    await fs.copyFile(source, destination);
+
+    return destFileName;
+  }
+
+  /**
+   * Seeds initial demo account data on organization build
+   * @param {IOrganizationBuildEventPayload}
+   */
+  async seedInitialDemoAccountDataOnOrgBuild({
+    tenantId,
+  }: IOrganizationBuiltEventPayload) {
+    const foundDemo = await OneClickDemo.query().findOne('tenantId', tenantId);
+
+    // Can't continue if the found demo is not exists.
+    // Means that account is not demo account.
+    if (!foundDemo) {
+      return null;
+    }
+    const results = await PromisePool.for(this.seedDemoAccountSeeders)
+      .withConcurrency(1)
+      .process(async (SeedDemoAccountSeeder) => {
+        const seederInstance = new SeedDemoAccountSeeder();
+
+        // Initialize the seeder sheet file before importing.
+        const importFileName = await this.initiateSeederFile(seederInstance.importFileName);
+
+        // Import the given seeder file.
+        const importedFile = await this.importApp.import(
+          tenantId,
+          seederInstance.resource,
+          importFileName,
+          seederInstance.importParams
+        );
+        // Mapping the columns with resource fields.
+        await this.importApp.mapping(
+          tenantId,
+          importedFile.import.importId,
+          seederInstance.mapping
+        );
+        await this.importApp.preview(tenantId, importedFile.import.importId);
+
+        // Commit the imported file.
+        await this.importApp.process(
+          tenantId,
+          importedFile.import.importId
+        );
+      });
+
+    if (!isEmpty(results.errors)) {
+      throw results.errors;
+    }
+  }
+}

packages/server/src/services/OneClickDemo/interfaces.ts

@@ -0,0 +1,8 @@
+import { IAuthSignInPOJO } from '@/interfaces';
+
+export interface ICreateOneClickDemoPOJO {
+  email: string;
+  demoId: string;
+  signedIn: IAuthSignInPOJO;
+  buildJob: any;
+}

packages/server/src/services/Organization/OrganizationService.ts

@@ -5,6 +5,7 @@ import { ServiceError } from '@/exceptions';
 import {
   IOrganizationBuildDTO,
   IOrganizationBuildEventPayload,
+  IOrganizationBuiltEventPayload,
   IOrganizationUpdateDTO,
   ISystemUser,
   ITenant,
@@ -17,6 +18,8 @@ import { Tenant } from '@/system/models';
 import OrganizationBaseCurrencyLocking from './OrganizationBaseCurrencyLocking';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { ERRORS } from './constants';
+import { initializeTenantSettings } from '@/api/middleware/SettingsMiddleware';
+import { initalizeTenantServices } from '@/api/middleware/TenantDependencyInjection';
 
 @Service()
 export default class OrganizationService {
@@ -62,6 +65,10 @@ export default class OrganizationService {
     // Migrated tenant.
     const migratedTenant = await tenant.$query().withGraphFetched('metadata');
 
+    // Injects the given tenant IoC services.
+    await initalizeTenantServices(tenantId);
+    await initializeTenantSettings(tenantId);
+
     // Creates a tenancy object from given tenant model.
     const tenancyContext =
       this.tenantsManager.getSeedMigrationContext(migratedTenant);
@@ -82,6 +89,11 @@ export default class OrganizationService {
 
     //
     await this.flagTenantDBBatch(tenantId);
+
+    // Triggers the organization built event.
+    await this.eventPublisher.emitAsync(events.organization.built, {
+      tenantId: tenant.id,
+    } as IOrganizationBuiltEventPayload)
   }
 
   /**

packages/server/src/services/Sales/Invoices/InvoiceGLEntries.ts

@@ -44,7 +44,7 @@ export class SaleInvoiceGLEntries {
 
     // Find or create the A/R account.
     const ARAccount = await accountRepository.findOrCreateAccountReceivable(
-      saleInvoice.currencyCode
+      saleInvoice.currencyCode, {}, trx
     );
     // Find or create tax payable account.
     const taxPayableAccount = await accountRepository.findOrCreateTaxPayable(

packages/server/src/services/Sales/Invoices/InvoiceInventoryTransactions.ts

@@ -32,7 +32,8 @@ export class InvoiceInventoryTransactions {
     const inventoryEntries =
       await this.itemsEntriesService.filterInventoryEntries(
         tenantId,
-        saleInvoice.entries
+        saleInvoice.entries,
+        trx
       );
     const transaction = {
       transactionId: saleInvoice.id,

packages/server/src/services/Subscription/LemonCancelSubscription.ts

@@ -4,8 +4,8 @@ import { configureLemonSqueezy } from './utils';
 import { PlanSubscription } from '@/system/models';
 import { ServiceError } from '@/exceptions';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
+import { ERRORS, IOrganizationSubscriptionCancel } from './types';
 import events from '@/subscribers/events';
-import { ERRORS, IOrganizationSubscriptionCanceled } from './types';
 
 @Service()
 export class LemonCancelSubscription {
@@ -18,12 +18,15 @@ export class LemonCancelSubscription {
    * @param {number} subscriptionId
    * @returns {Promise<void>}
    */
-  public async cancelSubscription(tenantId: number) {
+  public async cancelSubscription(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
     configureLemonSqueezy();
 
     const subscription = await PlanSubscription.query().findOne({
       tenantId,
-      slug: 'main',
+      slug: subscriptionSlug,
     });
     if (!subscription) {
       throw new ServiceError(ERRORS.SUBSCRIPTION_ID_NOT_ASSOCIATED_TO_TENANT);
@@ -35,13 +38,10 @@ export class LemonCancelSubscription {
     if (cancelledSub.error) {
       throw new Error(cancelledSub.error.message);
     }
-    await PlanSubscription.query().findById(subscriptionId).patch({
-      canceledAt: new Date(),
-    });
-    // Triggers `onSubscriptionCanceled` event.
+    // Triggers `onSubscriptionCancelled` event.
     await this.eventPublisher.emitAsync(
-      events.subscription.onSubscriptionCanceled,
-      { tenantId, subscriptionId } as IOrganizationSubscriptionCanceled
+      events.subscription.onSubscriptionCancel,
+      { tenantId, subscriptionId } as IOrganizationSubscriptionCancel
     );
   }
 }

packages/server/src/services/Subscription/LemonChangeSubscriptionPlan.ts

@@ -18,25 +18,30 @@ export class LemonChangeSubscriptionPlan {
    * @param {number} newVariantId - New variant id.
    * @returns {Promise<void>}
    */
-  public async changeSubscriptionPlan(tenantId: number, newVariantId: number) {
+  public async changeSubscriptionPlan(
+    tenantId: number,
+    newVariantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
     configureLemonSqueezy();
 
     const subscription = await PlanSubscription.query().findOne({
       tenantId,
-      slug: 'main',
+      slug: subscriptionSlug,
     });
     const lemonSubscriptionId = subscription.lemonSubscriptionId;
 
     // Send request to Lemon Squeezy to change the subscription.
     const updatedSub = await updateSubscription(lemonSubscriptionId, {
       variantId: newVariantId,
+      invoiceImmediately: true,
     });
     if (updatedSub.error) {
       throw new ServiceError('SOMETHING_WENT_WRONG');
     }
     // Triggers `onSubscriptionPlanChanged` event.
     await this.eventPublisher.emitAsync(
-      events.subscription.onSubscriptionPlanChanged,
+      events.subscription.onSubscriptionPlanChange,
       {
         tenantId,
         lemonSubscriptionId,

packages/server/src/services/Subscription/LemonResumeSubscription.ts

@@ -1,11 +1,11 @@
 import { Inject, Service } from 'typedi';
+import { updateSubscription } from '@lemonsqueezy/lemonsqueezy.js';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import events from '@/subscribers/events';
 import { configureLemonSqueezy } from './utils';
 import { PlanSubscription } from '@/system/models';
 import { ServiceError } from '@/exceptions';
-import { ERRORS, IOrganizationSubscriptionResumed } from './types';
-import { updateSubscription } from '@lemonsqueezy/lemonsqueezy.js';
+import { ERRORS, IOrganizationSubscriptionResume } from './types';
 
 @Service()
 export class LemonResumeSubscription {
@@ -14,15 +14,19 @@ export class LemonResumeSubscription {
 
   /**
    * Resumes the main subscription of the given tenant.
-   * @param {number} tenantId -
+   * @param {number} tenantId - Tenant id.
+   * @param {string} subscriptionSlug - Subscription slug by default main subscription.
    * @returns {Promise<void>}
    */
-  public async resumeSubscription(tenantId: number) {
+  public async resumeSubscription(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
     configureLemonSqueezy();
 
     const subscription = await PlanSubscription.query().findOne({
       tenantId,
-      slug: 'main',
+      slug: subscriptionSlug,
     });
     if (!subscription) {
       throw new ServiceError(ERRORS.SUBSCRIPTION_ID_NOT_ASSOCIATED_TO_TENANT);
@@ -33,16 +37,12 @@ export class LemonResumeSubscription {
       cancelled: false,
     });
     if (returnedSub.error) {
-      throw new ServiceError('');
+      throw new ServiceError(ERRORS.SOMETHING_WENT_WRONG_WITH_LS);
     }
-    // Update the subscription of the organization.
-    await PlanSubscription.query().findById(subscriptionId).patch({
-      canceledAt: null,
-    });
-    // Triggers `onSubscriptionCanceled` event.
+    // Triggers `onSubscriptionResume` event.
     await this.eventPublisher.emitAsync(
-      events.subscription.onSubscriptionResumed,
-      { tenantId, subscriptionId } as IOrganizationSubscriptionResumed
+      events.subscription.onSubscriptionResume,
+      { tenantId, subscriptionId } as IOrganizationSubscriptionResume
     );
   }
 }

packages/server/src/services/Subscription/LemonSqueezyWebhooks.ts

@@ -59,11 +59,25 @@ export class LemonSqueezyWebhooks {
 
     const userId = eventBody.meta.custom_data?.user_id;
     const tenantId = eventBody.meta.custom_data?.tenant_id;
+    const subscriptionSlug = 'main';
 
     if (!webhookHasMeta(eventBody)) {
       throw new Error("Event body is missing the 'meta' property.");
     } else if (webhookHasData(eventBody)) {
       if (webhookEvent.startsWith('subscription_payment_')) {
+        // Marks the main subscription payment as succeed.
+        if (webhookEvent === 'subscription_payment_success') {
+          await this.subscriptionService.markSubscriptionPaymentSucceed(
+            tenantId,
+            subscriptionSlug
+          );
+          // Marks the main subscription payment as failed.
+        } else if (webhookEvent === 'subscription_payment_failed') {
+          await this.subscriptionService.markSubscriptionPaymentFailed(
+            tenantId,
+            subscriptionSlug
+          );
+        }
         // Save subscription invoices; eventBody is a SubscriptionInvoice
         // Not implemented.
       } else if (webhookEvent.startsWith('subscription_')) {
@@ -74,16 +88,39 @@ export class LemonSqueezyWebhooks {
         // We assume that the Plan table is up to date.
         const plan = await Plan.query().findOne('lemonVariantId', variantId);
 
+        // Update the subscription in the database.
+        const priceId = attributes.first_subscription_item.price_id;
+        const subscriptionId = eventBody.data.id;
+
+        // Throw error early if the given lemon variant id is not associated to any plan.
         if (!plan) {
           throw new Error(`Plan with variantId ${variantId} not found.`);
-        } else {
-          // Update the subscription in the database.
-          const priceId = attributes.first_subscription_item.price_id;
-
-          // Create a new subscription of the tenant.
-          if (webhookEvent === 'subscription_created') {
-            await this.subscriptionService.newSubscribtion(tenantId, plan.slug);
-          }
+        }
+        // Create a new subscription of the tenant.
+        if (webhookEvent === 'subscription_created') {
+          await this.subscriptionService.newSubscribtion(
+            tenantId,
+            plan.slug,
+            subscriptionSlug,
+            { lemonSqueezyId: subscriptionId }
+          );
+          // Cancel the given subscription of the organization.
+        } else if (webhookEvent === 'subscription_cancelled') {
+          await this.subscriptionService.cancelSubscription(
+            tenantId,
+            subscriptionSlug
+          );
+        } else if (webhookEvent === 'subscription_plan_changed') {
+          await this.subscriptionService.subscriptionPlanChanged(
+            tenantId,
+            plan.slug,
+            subscriptionSlug
+          );
+        } else if (webhookEvent === 'subscription_resumed') {
+          await this.subscriptionService.resumeSubscription(
+            tenantId,
+            subscriptionSlug
+          );
         }
       } else if (webhookEvent.startsWith('order_')) {
         // Save orders; eventBody is a "Order"

packages/server/src/services/Subscription/Subscription.ts

@@ -1,22 +1,29 @@
-import { Service } from 'typedi';
-import { NotAllowedChangeSubscriptionPlan } from '@/exceptions';
-import { Plan, Tenant } from '@/system/models';
+import { Inject, Service } from 'typedi';
+import { NotAllowedChangeSubscriptionPlan, ServiceError } from '@/exceptions';
+import { Plan, PlanSubscription, Tenant } from '@/system/models';
+import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
+import events from '@/subscribers/events';
+import { SubscriptionPayload, SubscriptionPaymentStatus } from '@/interfaces';
+import { ERRORS } from './types';
 
 @Service()
 export class Subscription {
+  @Inject()
+  private eventPublisher: EventPublisher;
+
   /**
    * Give the tenant a new subscription.
    * @param {number} tenantId - Tenant id.
-   * @param {string} planSlug - Plan slug.
-   * @param {string} invoiceInterval
-   * @param {number} invoicePeriod
-   * @param {string} subscriptionSlug
+   * @param {string} planSlug - Plan slug of the new subscription.
+   * @param {string} subscriptionSlug - Subscription slug by default takes main subscription
+   * @param {SubscriptionPayload} payload - Subscription payload.
    */
   public async newSubscribtion(
     tenantId: number,
     planSlug: string,
-    subscriptionSlug: string = 'main'
-  ) {
+    subscriptionSlug: string = 'main',
+    payload?: SubscriptionPayload
+  ): Promise<void> {
     const tenant = await Tenant.query().findById(tenantId).throwIfNotFound();
     const plan = await Plan.query().findOne('slug', planSlug).throwIfNotFound();
 
@@ -45,8 +52,169 @@ export class Subscription {
         plan.id,
         invoiceInterval,
         invoicePeriod,
-        subscriptionSlug
+        subscriptionSlug,
+        payload
       );
     }
   }
+
+  /**
+   * Cancels the given tenant subscription.
+   * @param {number} tenantId - Tenant id.
+   * @param {string} subscriptionSlug - Subscription slug.
+   */
+  async cancelSubscription(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ): Promise<void> {
+    const tenant = await Tenant.query().findById(tenantId).throwIfNotFound();
+
+    const subscription = await PlanSubscription.query().findOne({
+      tenantId,
+      slug: subscriptionSlug,
+    });
+    // Throw error early if the subscription is not exist.
+    if (!subscription) {
+      throw new ServiceError(ERRORS.SUBSCRIPTION_NOT_EXIST);
+    }
+    // Throw error early if the subscription is already canceled.
+    if (subscription.canceled()) {
+      throw new ServiceError(ERRORS.SUBSCRIPTION_ALREADY_CANCELED);
+    }
+    await subscription.$query().patch({ canceledAt: new Date() });
+
+    // Triggers `onSubscriptionCancelled` event.
+    await this.eventPublisher.emitAsync(
+      events.subscription.onSubscriptionCancelled,
+      {
+        tenantId,
+        subscriptionSlug,
+      }
+    );
+  }
+
+  /**
+   * Resumes the given tenant subscription.
+   * @param {number} tenantId
+   * @param {string} subscriptionSlug  - Subscription slug by deafult main subscription.
+   * @returns {Promise<void>}
+   */
+  async resumeSubscription(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
+    const tenant = await Tenant.query().findById(tenantId).throwIfNotFound();
+
+    const subscription = await PlanSubscription.query().findOne({
+      tenantId,
+      slug: subscriptionSlug,
+    });
+    // Throw error early if the subscription is not exist.
+    if (!subscription) {
+      throw new ServiceError(ERRORS.SUBSCRIPTION_NOT_EXIST);
+    }
+    // Throw error early if the subscription is not cancelled.
+    if (!subscription.canceled()) {
+      throw new ServiceError(ERRORS.SUBSCRIPTION_ALREADY_ACTIVE);
+    }
+    await subscription.$query().patch({ canceledAt: null });
+
+    // Triggers `onSubscriptionResumed` event.
+    await this.eventPublisher.emitAsync(
+      events.subscription.onSubscriptionResumed,
+      { tenantId, subscriptionSlug }
+    );
+  }
+
+  /**
+   * Mark the given subscription payment of the tenant as succeed.
+   * @param {number} tenantId
+   * @param {string} newPlanSlug
+   * @param {string} subscriptionSlug
+   */
+  async subscriptionPlanChanged(
+    tenantId: number,
+    newPlanSlug: string,
+    subscriptionSlug: string = 'main'
+  ): Promise<void> {
+    const tenant = await Tenant.query().findById(tenantId).throwIfNotFound();
+    const newPlan = await Plan.query()
+      .findOne('slug', newPlanSlug)
+      .throwIfNotFound();
+
+    const subscription = await PlanSubscription.query().findOne({
+      tenantId,
+      slug: subscriptionSlug,
+    });
+    if (subscription.planId === newPlan.id) {
+      throw new ServiceError('');
+    }
+    await subscription.$query().patch({ planId: newPlan.id });
+
+    // Triggers `onSubscriptionPlanChanged` event.
+    await this.eventPublisher.emitAsync(
+      events.subscription.onSubscriptionPlanChanged,
+      {
+        tenantId,
+        newPlanSlug,
+        subscriptionSlug,
+      }
+    );
+  }
+
+  /**
+   * Marks the subscription payment as succeed.
+   * @param {number} tenantId - Tenant id.
+   * @param {string} subscriptionSlug - Given subscription slug by default main subscription.
+   * @returns {Promise<void>}
+   */
+  async markSubscriptionPaymentSucceed(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ): Promise<void> {
+    const subscription = await PlanSubscription.query()
+      .findOne({ tenantId, slug: subscriptionSlug })
+      .throwIfNotFound();
+
+    await subscription
+      .$query()
+      .patch({ paymentStatus: SubscriptionPaymentStatus.Succeed });
+
+    // Triggers `onSubscriptionSucceed` event.
+    await this.eventPublisher.emitAsync(
+      events.subscription.onSubscriptionPaymentSucceed,
+      {
+        tenantId,
+        subscriptionSlug,
+      }
+    );
+  }
+
+  /**
+   * Marks the given subscription payment of the tenant as failed.
+   * @param {number} tenantId - Tenant id.
+   * @param {string} subscriptionSlug - Given subscription slug.
+   * @returns {Prmise<void>}
+   */
+  async markSubscriptionPaymentFailed(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ): Promise<void> {
+    const subscription = await PlanSubscription.query()
+      .findOne({ tenantId, slug: subscriptionSlug })
+      .throwIfNotFound();
+
+    await subscription
+      .$query()
+      .patch({ paymentStatus: SubscriptionPaymentStatus.Failed });
+
+    // Triggers `onSubscriptionPaymentFailed` event.
+    await this.eventPublisher.emitAsync(
+      events.subscription.onSubscriptionPaymentFailed,
+      {
+        tenantId,
+        subscriptionSlug,
+      }
+    );
+  }
 }

packages/server/src/services/Subscription/SubscriptionApplication.ts

@@ -20,8 +20,14 @@ export class SubscriptionApplication {
    * @param {string} id
    * @returns {Promise<void>}
    */
-  public cancelSubscription(tenantId: number, id: string) {
-    return this.cancelSubscriptionService.cancelSubscription(tenantId, id);
+  public cancelSubscription(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
+    return this.cancelSubscriptionService.cancelSubscription(
+      tenantId,
+      subscriptionSlug
+    );
   }
 
   /**
@@ -29,8 +35,14 @@ export class SubscriptionApplication {
    * @param {number} tenantId
    * @returns {Promise<void>}
    */
-  public resumeSubscription(tenantId: number) {
-    return this.resumeSubscriptionService.resumeSubscription(tenantId);
+  public resumeSubscription(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
+    return this.resumeSubscriptionService.resumeSubscription(
+      tenantId,
+      subscriptionSlug
+    );
   }
 
   /**

packages/server/src/services/Subscription/events/SubscribeFreeOnSignupCommunity.tsx

@@ -1,8 +1,8 @@
+import { Inject, Service } from 'typedi';
 import { IAuthSignedUpEventPayload } from '@/interfaces';
 import events from '@/subscribers/events';
 import config from '@/config';
 import { Subscription } from '../Subscription';
-import { Inject, Service } from 'typedi';
 
 @Service()
 export class SubscribeFreeOnSignupCommunity {

packages/server/src/services/Subscription/events/TriggerInvalidateCacheOnSubscriptionChange.tsx

@@ -0,0 +1,29 @@
+import events from '@/subscribers/events';
+import Container from 'typedi';
+
+export class TriggerInvalidateCacheOnSubscriptionChange {
+  /**
+   * Attaches events with handlers.
+   */
+  public attach = (bus) => {
+    bus.subscribe(
+      events.subscription.onSubscriptionCancelled,
+      this.triggerInvalidateCache.bind(this)
+    );
+    bus.subscribe(
+      events.subscription.onSubscriptionResumed,
+      this.triggerInvalidateCache.bind(this)
+    );
+    bus.subscribe(
+      events.subscription.onSubscriptionPlanChanged,
+      this.triggerInvalidateCache.bind(this)
+    );
+  };
+
+  private triggerInvalidateCache() {
+    const io = Container.get('socket');
+
+    // Notify the frontend to reflect the new transactions changes.
+    io.emit('SUBSCRIPTION_CHANGED', { subscriptionSlug: 'main' });
+  }
+}

packages/server/src/services/Subscription/types.ts

@@ -1,6 +1,10 @@
 export const ERRORS = {
   SUBSCRIPTION_ID_NOT_ASSOCIATED_TO_TENANT:
     'SUBSCRIPTION_ID_NOT_ASSOCIATED_TO_TENANT',
+  SUBSCRIPTION_NOT_EXIST: 'SUBSCRIPTION_NOT_EXIST',
+  SUBSCRIPTION_ALREADY_CANCELED: 'SUBSCRIPTION_ALREADY_CANCELED',
+  SUBSCRIPTION_ALREADY_ACTIVE: 'SUBSCRIPTION_ALREADY_ACTIVE',
+  SOMETHING_WENT_WRONG_WITH_LS: 'SOMETHING_WENT_WRONG_WITH_LS',
 };
 
 export interface IOrganizationSubscriptionChanged {
@@ -9,11 +13,20 @@ export interface IOrganizationSubscriptionChanged {
   newVariantId: number;
 }
 
-export interface IOrganizationSubscriptionCanceled {
+export interface IOrganizationSubscriptionCancel {
   tenantId: number;
   subscriptionId: string;
 }
 
+export interface IOrganizationSubscriptionCancelled {
+  tenantId: number;
+  subscriptionId: string;
+}
+
+export interface IOrganizationSubscriptionResume {
+  tenantId: number;
+  subscriptionId: number;
+}
 export interface IOrganizationSubscriptionResumed {
   tenantId: number;
   subscriptionId: number;

packages/server/src/services/Tenancy/SystemService.ts

@@ -18,8 +18,4 @@ export default class HasSystemService implements SystemService {
   cache() {
     return this.container('cache');
   }
-
-  dbManager() {
-    return this.container('dbManager');
-  }
 }

packages/server/src/services/Tenancy/TenantDBManager.ts

@@ -1,18 +1,16 @@
 import { Container } from 'typedi';
-import Knex from 'knex';
+import { Knex, knex } from 'knex';
 import { knexSnakeCaseMappers } from 'objection';
 import { tenantKnexConfig, tenantSeedConfig } from '@/config/knexConfig';
 import config from '@/config';
 import { ITenant, ITenantDBManager } from '@/interfaces';
 import SystemService from '@/services/Tenancy/SystemService';
 import { TenantDBAlreadyExists } from '@/exceptions';
+import { sanitizeDatabaseName } from '@/utils/sanitizers';
 
 export default class TenantDBManager implements ITenantDBManager {
   static knexCache: { [key: string]: Knex } = {};
 
-  // System database manager.
-  dbManager: any;
-
   // System knex instance.
   sysKnex: Knex;
 
@@ -23,7 +21,6 @@ export default class TenantDBManager implements ITenantDBManager {
   constructor() {
     const systemService = Container.get(SystemService);
 
-    this.dbManager = systemService.dbManager();
     this.sysKnex = systemService.knex();
   }
 
@@ -32,7 +29,9 @@ export default class TenantDBManager implements ITenantDBManager {
    * @return {string}
    */
   private getDatabaseName(tenant: ITenant) {
-    return `${config.tenant.db_name_prefix}${tenant.organizationId}`;
+    return sanitizeDatabaseName(
+      `${config.tenant.db_name_prefix}${tenant.organizationId}`
+    );
   }
 
   /**
@@ -59,7 +58,9 @@ export default class TenantDBManager implements ITenantDBManager {
     await this.throwErrorIfTenantDBExists(tenant);
 
     const databaseName = this.getDatabaseName(tenant);
-    await this.dbManager.createDb(databaseName);
+    await this.sysKnex.raw(
+      `CREATE DATABASE ${databaseName} DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci`
+    );
   }
 
   /**
@@ -72,7 +73,6 @@ export default class TenantDBManager implements ITenantDBManager {
     if (!isExists) {
       return;
     }
-
     await this.dropDatabase(tenant);
   }
 
@@ -83,7 +83,7 @@ export default class TenantDBManager implements ITenantDBManager {
   public async dropDatabase(tenant: ITenant) {
     const databaseName = this.getDatabaseName(tenant);
 
-    await this.dbManager.dropDb(databaseName);
+    await this.sysKnex.raw(`DROP DATABASE IF EXISTS ${databaseName}`);
   }
 
   /**
@@ -118,7 +118,7 @@ export default class TenantDBManager implements ITenantDBManager {
     let knexInstance = TenantDBManager.knexCache[key];
 
     if (!knexInstance) {
-      knexInstance = Knex({
+      knexInstance = knex({
         ...tenantKnexConfig(tenant),
         ...knexSnakeCaseMappers({ upperCase: true }),
       });

packages/server/src/subscribers/events.ts

@@ -35,6 +35,8 @@ export default {
    */
   organization: {
     build: 'onOrganizationBuild',
+    built: 'onOrganizationBuilt',
+
     seeded: 'onOrganizationSeeded',
 
     baseCurrencyUpdated: 'onOrganizationBaseCurrencyUpdated',
@@ -44,10 +46,19 @@ export default {
    * Organization subscription.
    */
   subscription: {
-    onSubscriptionCanceled: 'onSubscriptionCanceled',
+    onSubscriptionCancel: 'onSubscriptionCancel',
+    onSubscriptionCancelled: 'onSubscriptionCancelled',
+
+    onSubscriptionResume: 'onSubscriptionResume',
     onSubscriptionResumed: 'onSubscriptionResumed',
+
+    onSubscriptionPlanChange: 'onSubscriptionPlanChange',
     onSubscriptionPlanChanged: 'onSubscriptionPlanChanged',
-    onSubscribed: 'onOrganizationSubscribed',
+
+    onSubscriptionSubscribed: 'onSubscriptionSubscribed',
+
+    onSubscriptionPaymentSucceed: 'onSubscriptionPaymentSucceed',
+    onSubscriptionPaymentFailed: 'onSubscriptionPaymentFailed'
   },
 
   /**

packages/server/src/system/migrations/20240819164614_create_oneclick_demos_table.js

@@ -0,0 +1,21 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.createTable('oneclick_demos', (table) => {
+    table.increments('id');
+    table.string('key');
+    table.integer('tenant_id').unsigned();
+    table.integer('user_id').unsigned();
+    table.timestamps();
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.dropTableIfExists('oneclick_demos');
+};

packages/server/src/system/migrations/20240824151006_add_payment_status_to_subscriptions_table.js

@@ -0,0 +1,19 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.table('subscription_plan_subscriptions', (table) => {
+    table.string('payment_status');
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.table('subscription_plan_subscriptions', (table) => {
+    table.dropColumn('payment_status');
+  });
+};

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

@@ -0,0 +1,17 @@
+import SystemModel from '@/system/models/SystemModel';
+
+export class OneClickDemo extends SystemModel {
+  /**
+   * Table name
+   */
+  static get tableName() {
+    return 'oneclick_demos';
+  }
+
+  /**
+   * Timestamps columns.
+   */
+  get timestamps() {
+    return ['createdAt'];
+  }
+}

packages/server/src/system/models/Subscriptions/Plan.ts

@@ -3,6 +3,10 @@ import SystemModel from '@/system/models/SystemModel';
 import { PlanSubscription } from '..';
 
 export default class Plan extends mixin(SystemModel) {
+  price: number;
+  invoiceInternal: number;
+  invoicePeriod: string;
+  
   /**
    * Table name.
    */

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

@@ -198,14 +198,16 @@ export default class Tenant extends BaseModel {
     planId,
     invoiceInterval,
     invoicePeriod,
-    subscriptionSlug
+    subscriptionSlug,
+    payload?,
   ) {
     return Tenant.newSubscription(
       this.id,
       planId,
       invoiceInterval,
       invoicePeriod,
-      subscriptionSlug
+      subscriptionSlug,
+      payload
     );
   }
 
@@ -217,7 +219,8 @@ export default class Tenant extends BaseModel {
     planId: number,
     invoiceInterval: 'month' | 'year',
     invoicePeriod: number,
-    subscriptionSlug: string
+    subscriptionSlug: string,
+    payload?: { lemonSqueezyId: string }
   ) {
     const period = new SubscriptionPeriod(invoiceInterval, invoicePeriod);
 
@@ -227,6 +230,7 @@ export default class Tenant extends BaseModel {
       planId,
       startsAt: period.getStartDate(),
       endsAt: period.getEndDate(),
+      lemonSubscriptionId: payload?.lemonSqueezyId || null,
     });
   }
 }

packages/server/src/utils/sanitizers.ts

@@ -0,0 +1,4 @@
+export function sanitizeDatabaseName(dbName: string) {
+  // Replace any character that is not alphanumeric or an underscore with an underscore
+  return dbName.replace(/[^a-zA-Z0-9_]/g, '');
+}

packages/server/views/demo-sheets/Expenses.csv

@@ -0,0 +1,23 @@
+Payment Date,Reference No.,Payment Account,Description,Currency Code,Exchange Rate,Expense Account,Amount,Line Description,Publish
+2024-03-01,REF-1,Petty Cash,Vel et dolorem architecto veniam.,,,Office expenses,9000,Voluptates voluptas corporis vel.,T
+2024-03-02,REF-2,Petty Cash,Id est molestias.,,,Office expenses,9000,Eos voluptatem cumque et voluptate reiciendis.,T
+2024-03-03,REF-3,Petty Cash,Quam cupiditate at nihil dicta dignissimos non fugit illo.,,,Office expenses,9000,Hic alias rerum sed commodi dolores sint animi perferendis.,T
+2024-03-04,REF-4,Petty Cash,Et voluptatem consequatur corrupti beatae sit.,,,Office expenses,9000,Exercitationem impedit praesentium et eaque.,T
+2024-03-05,REF-5,Petty Cash,Illo aut ad id et non error et reiciendis optio.,,,Office expenses,9000,Accusantium modi consequuntur eaque consequatur deleniti consequuntur et qui.,T
+2024-03-06,REF-6,Petty Cash,Ea consequatur placeat aut et enim.,,,Office expenses,9000,Itaque odio fugiat recusandae.,T
+2024-03-07,REF-7,Petty Cash,A expedita consequatur sequi eveniet quos rerum.,,,Office expenses,9000,Quidem doloremque dignissimos totam dolor iure sed necessitatibus optio.,T
+2024-03-08,REF-8,Petty Cash,Est libero deleniti animi delectus eligendi necessitatibus expedita fugit.,,,Office expenses,9000,Velit rerum aperiam mollitia ut eius error est quo aut.,T
+2024-03-09,REF-9,Petty Cash,Ut dolor tempora quam consequuntur mollitia aut quos consectetur commodi.,,,Office expenses,9000,Culpa architecto ea vero nisi quis voluptas animi.,T
+2024-03-10,REF-10,Petty Cash,Nihil hic soluta.,,,Office expenses,9000,Omnis recusandae ducimus vel.,T
+2024-03-11,REF-11,Petty Cash,Aspernatur placeat odit asperiores et tempora quam.,,,Office expenses,9000,Sit tempora optio ullam velit beatae architecto et.,T
+2024-03-12,REF-12,Petty Cash,Harum soluta sed.,,,Office expenses,9000,Nobis est earum saepe.,T
+2024-03-13,REF-13,Petty Cash,Ea quod mollitia non illo dolores voluptatem distinctio.,,,Office expenses,9000,Sit eos dolores autem rerum voluptate quia ipsam.,T
+2024-03-14,REF-14,Petty Cash,Et quod distinctio atque.,,,Office expenses,9000,Facilis sed expedita reiciendis.,T
+2024-03-15,REF-15,Petty Cash,Omnis delectus tempore.,,,Office expenses,9000,Autem non reprehenderit placeat aut et quo.,T
+2024-03-16,REF-16,Petty Cash,Dolores optio qui dolore quia aut explicabo eaque.,,,Office expenses,9000,Odit dolores ut.,T
+2024-03-17,REF-17,Petty Cash,Odit quibusdam sunt in a quod error.,,,Office expenses,9000,Quo explicabo quae dolor enim nisi voluptas id et temporibus.,T
+2024-03-18,REF-18,Petty Cash,Hic quibusdam officiis voluptatem facilis repellat molestiae non.,,,Office expenses,9000,Quo sit ea et itaque error.,T
+2024-03-19,REF-19,Petty Cash,Dolor doloremque quia qui.,,,Office expenses,9000,Ut deleniti laboriosam et.,T
+2024-03-20,REF-20,Petty Cash,Ad enim repellat sed et vero aliquid.,,,Office expenses,9000,Error in voluptas non quae quibusdam id excepturi illo neque.,T
+2024-03-21,REF-21,Petty Cash,Doloribus ut excepturi.,,,Office expenses,9000,Sint magni et reiciendis harum praesentium vero sit blanditiis.,T
+2024-03-22,REF-22,Petty Cash,Id rerum sunt et.,,,Office expenses,9000,Autem magnam eum error ex sunt temporibus exercitationem ullam est.,T

packages/server/views/demo-sheets/bank-transactions.csv

@@ -0,0 +1,123 @@
+Date,Amount,Description,Payee
+2024-07-23,-48.25,CREDIT CARD PURCHASE SMART AND FINAL #1 ANAHEIM CA DATE 12/14 15277301931256 9 CARD 5,
+2024-08-21,-21.77,PURCHASE AUTHORIZED ON 05/27 ROYAL FARMS 100 MONUMENT AVE A P NATIONAL HARBOR MD 0846248421604 CARD 44,
+2024-08-21,-58,72116609 POS PURCHASE EARNIN RE SC 6 721582259,
+2024-08-21,-70.61,Dunkin' Donuts,
+2024-08-20,-52.34,Uber Eats,
+2024-08-19,-15.47,Panera Bread,
+2024-08-19,-4.79,5 PURCHASE-SIG DENNY'S 366992 EUGENE OR 6 039488,
+2024-08-18,-186,American Airlines,
+2024-08-18,-3,3947558 VISA PURCHASE PLAYSTUD 07057808 TAYLOR MI 8840321 748,
+2024-08-18,-9.95,Bojangles,
+2024-08-15,-134,GrubHub,
+2024-08-15,-91.53,671 POS PURCHASE EARNIN RE SC 9671543 349619,
+2024-08-15,-4.78,Popeyes,
+2024-08-14,496,CASH DEPOSIT,
+2024-08-14,-97.67,APPLE 857979823 NEWKIRK #4,
+2024-08-07,-2.81,POS PUR 449399193 04/07 TIMESTAMP THE PIZZA PLACE 4205 NEW YORK NY 634330,
+2024-08-06,-4.27,QUEENS BAR 35 E GRAND RIVER AVE #9 DETROIT MI CARD 29602991,
+2024-08-06,-6.28,Walmart,
+2024-08-06,-20.52,60904 PURCHASE-SIG 09/21 TIMESTAMP UPLIFT RE 9123348 562542 SC 63432961 3968766,
+2024-08-06,-12.2,UBER 588639690 RIDE 05/12 CA 12095 DEBIT CARD PURCHASE 04/04 TIMESTAMP 8102241,
+2024-08-05,-5.58,WITHDRAWAL 02178293119 POS POUR CHOICES,
+2024-08-05,-25.98,Planet Fitness,
+2024-08-05,-20,CASH APP TRANSFER,
+2024-08-04,-38,WITHDRAWAL DEBIT CARD CONSUMER DEBIT PULSZ 252-291-2362 VA DATE 04/12 23978676735612 63546108 CARD 94353,
+2024-08-04,-19,CASH APP TRANSFER,
+2024-08-04,-3.25,MICROSOFT 979333884,
+2024-08-03,-16,TOPGOLF 1010 GREENWOOD BLVD,
+2024-08-03,-59.52,EFT DEBIT  MICROSOFT XBOX CA 830 08/03 TIMESTAMP,
+2024-08-03,-145.09,Venmo,
+2024-08-03,-76.02,Albertsons,
+2024-08-03,-9.79,STOP & SHOP #25402 WEST CALDWELL MODATE 01/24 31772803806094 17096869 CARD 34321 WITHDRAWAL DEBIT CARD,
+2024-08-02,-103.44,Dunkin' Donuts,
+2024-08-02,-72,Uber Eats,
+2024-08-02,-143.93,Food Lion,
+2024-08-02,-128.12,McDonald's,
+2024-07-31,-37.47,CHECKCARD 538036 CLEO AI IN MOUNTAIN VIEWCA 172788892 RECURRING,
+2024-07-30,-162.69,McDonald's,
+2024-07-29,95,Brigit XX/XX #406735377 PMNT RCVD Brigit,
+2024-07-29,-45.47,Starbucks,
+2024-07-29,-595.11,INTERAC PURCHASE - 67200 TARGET #052,
+2024-07-28,-89,TRANSFER PAYPAL ADD TO BALANCE INTERNET PAYMENT,
+2024-07-27,-6.04,Krispy Kreme,
+2024-07-27,-66.63,McDonald's,
+2024-07-26,-133.56,CARD PURCHASE PAYBYPHONE 804665947 11/19,
+2024-07-26,-10.02,70252237 AMAZON - LEN N,
+2024-07-26,-5,BLAZE PIZZA #31 SIG PUR 9906,
+2024-07-25,-30.9,CITGO,
+2024-07-25,-69,Tropical Smoothie Cafe,
+2024-07-24,-744,Internal Revenue Service,
+2024-07-24,-15.61,Walmart,
+2024-08-04,-38,WITHDRAWAL DEBIT CARD CONSUMER DEBIT,
+2024-08-05,-5.58,WITHDRAWAL POS POUR,
+2024-08-06,-6.28,Walmart,
+2024-07-24,-15.61,Walmart,
+2024-08-03,-145.09,Venmo,
+2024-08-20,-52.34,Uber Eats,
+2024-08-02,-72,Uber Eats,
+2024-07-25,-69,Tropical Smoothie Cafe,
+2024-07-28,-89,TRANSFER ADD TO BALANCE INTERNET PAYMENT,
+2024-08-03,-76.02,Albertsons,
+2024-08-18,-186,American Airlines,
+2024-08-15,-91.53,POS PURCHASE EARNIN RE SC 9671543 349619,
+2024-07-29,-95,PMNT RCVD Brigit,
+2024-08-04,-19,CASH APP TRANSFER,
+2024-08-05,-20,CASH APP TRANSFER,
+2024-08-14,496,CASH DEPOSIT,
+2024-07-31,-37.47,CHECKCARD 538036 CLEO AI IN MOUNTAIN VIEWCA,
+2024-07-25,-30.9,Citgo,
+2024-08-18,-9.95,Bojangles,
+2024-07-24,-744,Internal Revenue Service,
+2024-07-27,-6.04,Krispy Kreme,
+2024-07-27,-66.63,McDonald's,
+2024-07-30,-162.69,McDonald's,
+2024-08-02,-128.12,McDonald's,
+2024-08-04,-3.25,MICROSOFT,
+2024-08-19,-15.47,Panera Bread,
+2024-08-05,-25.98,Planet Fitness,
+2024-08-15,-4.78,Popeyes,
+2024-08-07,-2.81,POS PUR,
+2024-08-21,-21.77,PURCHASE AUTHORIZED ON 05/27,
+2024-07-29,-45.47,Starbucks,
+2024-08-03,-9.79,WITHDRAWAL DEBIT CARD,
+2024-08-03,-16,TOPGOLF 1010 GREENWOOD BLVD,
+2024-08-04,-38,WITHDRAWAL DEBIT CARD CONSUMER DEBIT,
+2024-08-05,-5.58,WITHDRAWAL POS POUR,
+2024-08-06,-6.28,Walmart,
+2024-07-24,-15.61,Walmart,
+2024-08-03,-145.09,Venmo,
+2024-08-20,-52.34,Uber Eats,
+2024-08-02,-72,Uber Eats,
+2024-07-25,-69,Tropical Smoothie Cafe,
+2024-07-28,-89,TRANSFER ADD TO BALANCE INTERNET PAYMENT,
+2024-08-03,-76.02,Albertsons,
+2024-08-18,-186,American Airlines,
+2024-08-15,-91.53,POS PURCHASE EARNIN RE SC 9671543 349619,
+2024-07-29,-95,PMNT RCVD Brigit,
+2024-08-04,-19,CASH APP TRANSFER,
+2024-08-05,-20,CASH APP TRANSFER,
+2024-08-14,496,CASH DEPOSIT,
+2024-07-31,-37.47,CHECKCARD 538036 CLEO AI IN MOUNTAIN VIEWCA,
+2024-07-25,-30.9,Citgo,
+2024-08-18,-9.95,Bojangles,
+2024-07-24,-744,Internal Revenue Service,
+2024-07-27,-6.04,Krispy Kreme,
+2024-07-27,-66.63,McDonald's,
+2024-07-30,-162.69,McDonald's,
+2024-08-02,-128.12,McDonald's,
+2024-08-04,-3.25,MICROSOFT,
+2024-08-19,-15.47,Panera Bread,
+2024-08-05,-25.98,Planet Fitness,
+2024-08-15,-4.78,Popeyes,
+2024-08-07,-2.81,POS PUR,
+2024-08-21,-21.77,PURCHASE AUTHORIZED ON 05/27,
+2024-07-29,-45.47,Starbucks,
+2024-08-03,-9.79,WITHDRAWAL DEBIT CARD,
+2024-08-03,-16,TOPGOLF 1010 GREENWOOD BLVD,
+2024-08-04,-38,WITHDRAWAL DEBIT CARD CONSUMER DEBIT,
+2024-08-05,-5.58,WITHDRAWAL POS POUR,
+2024-08-04,-3.25,MICROSOFT,
+2024-08-07,-2.81,POS PUR,
+2024-08-21,-21.77,PURCHASE AUTHORIZED ON 05/27,
+2024-08-03,-9.79,WITHDRAWAL DEBIT CARD,

packages/server/views/demo-sheets/customers.csv

@@ -0,0 +1,6 @@
+Customer Type,First Name,Last Name,Company Name,Display Name,Email,Personal Phone Number,Work Phone Number,Website,Opening Balance,Opening Balance At,Opening Balance Ex. Rate,Currency,Active,Note,Billing Address 1,Billing Address 2,Billing Address City,Billing Address Country,Billing Address Phone,Billing Address Postcode,Billing Address State,Shipping Address 1,Shipping Address 2,Shipping Address City,Shipping Address Country,Shipping Address Phone,Shipping Address Postcode,Shipping Address State
+Business,Nicolette,Schamberger,Homenick - Hane,Rowland Rowe,cicero86@yahoo.com,811-603-2235,906-993-5190,http://google.com,54302.23,2022-02-02,2,LYD,F,Doloribus autem optio temporibus dolores mollitia sit.,862 Jessika Well,1091 Dorthy Mount,Deckowfort,Ghana,825-011-5207,38228,Oregon,37626 Thiel Villages,132 Batz Avenue,Pagacburgh,Albania,171-546-3701,13709,Georgia
+Business,Hermann,Crooks,Veum - Schaefer,Harley Veum,immanuel56@hotmail.com,449-780-9999,970-473-5785,http://google.com,54302.23,2022-02-02,2,LYD,T,Doloribus dolore dolor dicta vitae in fugit nisi quibusdam.,532 Simonis Spring,3122 Nicolas Inlet,East Matteofort,Holy See (Vatican City State),366-084-8629,41607,Montana,2889 Tremblay Plaza,71355 Kutch Isle,D'Amorehaven,Monaco,614-189-3328,09634-0435,Nevada
+Business,Nellie,Gulgowski,"Boyle, Heller and Jones",Randall Kohler,anibal_frami@yahoo.com,498-578-0740,394-550-6827,http://google.com,54302.23,2022-02-02,2,LYD,T,Vero quibusdam rem fugit aperiam est modi.,214 Sauer Villages,30687 Kacey Square,Jayceborough,Benin,332-820-1127,16425-3887,Mississippi,562 Diamond Loaf,9595 Satterfield Trafficway,Alexandrinefort,Puerto Rico,776-500-8456,30258,South Dakota
+Business,Stone,Jerde,"Cassin, Casper and Maggio",Clint McLaughlin,nathanael22@yahoo.com,562-790-6059,686-838-0027,http://google.com,54302.23,2022-02-02,2,LYD,F,Quis cumque molestias rerum.,22590 Cathy Harbor,24493 Brycen Brooks,Elnorashire,Andorra,701-852-8005,5680,Nevada,5355 Erdman Bridge,421 Jeanette Camp,East Philip,Venezuela,426-119-0858,34929-0501,Tennessee
+Individual,Lempi,Kling,"Schamberger, O'Connell and Bechtelar",Alexie Barton,eulah.kreiger@hotmail.com,745-756-1063,965-150-1945,http://google.com,54302.23,2022-02-02,2,LYD,F,Maxime laboriosam hic voluptate maiores est officia.,0851 Jones Flat,845 Bailee Drives,Kamrenport,Niger,220-125-0608,30311,Delaware,929 Ferry Row,020 Adam Plaza,West Carmellaside,Ghana,053-333-6679,79221-4681,Illinois

packages/server/views/demo-sheets/items.csv

@@ -0,0 +1,61 @@
+Item Type,Item Name,Item Code,Sellable,Purchasable,Cost Price,Sell Price,Cost Account,Sell Account,Inventory Account,Sell Description,Purchase Description,Category,Note,Active
+Inventory,Amoxicillin and Clavulanatea,1000,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,At dolor est non tempore et quisquam.,TRUE
+Inventory,Azithromycin,1001,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Id perspiciatis at adipisci minus accusamus dolor iure dolore.,TRUE
+Inventory,Marks - Carroll,1002,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Odio odio minus similique.,TRUE
+Inventory,"VonRueden, Ruecker and Hettinger",1003,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quibusdam dolores illo.,TRUE
+Inventory,Aimovig SureClick Autoinjector,1004,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Labore atque quo nam natus ducimus.,TRUE
+Inventory,Romaguera Group,1005,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Sit et aut rem necessitatibus.,TRUE
+Inventory,Thompson - Reichert,1006,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Non non fuga esse fugit dolor soluta vel a.,TRUE
+Inventory,AirDuo Digihaler with eModule,1007,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Error ut est soluta quos et qui.,TRUE
+Inventory,"Reichert, Sanford and Shanahan",1008,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Nesciunt laboriosam nobis porro numquam hic expedita vel quod praesentium.,TRUE
+Inventory,Crooks - Fay,1009,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Amet magni architecto voluptas itaque.,TRUE
+Inventory,Becker - Kozey,1010,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Provident consequatur quos qui explicabo dicta nam.,TRUE
+Inventory,Robel - Weber,1011,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quia cum eos rerum odio omnis quasi.,TRUE
+Inventory,"Runte, Johns and Konopelski",1012,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Soluta et et accusantium corrupti autem repellendus assumenda fugit.,TRUE
+Inventory,McCullough - Beer,1013,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quo quod sunt distinctio aliquid accusantium.,TRUE
+Inventory,"Hintz, Wisozk and Mills",1014,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Asperiores esse at quos veritatis voluptas officiis.,TRUE
+Inventory,"Zieme, Crist and Abbott",1015,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Ea ut qui architecto voluptates error.,TRUE
+Inventory,Kiehn - Cormier,1016,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Libero sit impedit sint qui voluptatum id qui sed.,TRUE
+Inventory,"Jast, Carter and Reynolds",1017,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Sint sunt quaerat nisi voluptate praesentium vero labore veniam quia.,TRUE
+Inventory,Stehr Inc,1018,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Voluptas aut ipsum et iste.,TRUE
+Inventory,"Friesen, Hamill and Hessel",1019,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Neque tenetur minima amet aut optio et recusandae vel ad.,TRUE
+Inventory,Lemke - Hayes,1020,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Deleniti enim autem corrupti fuga quibusdam non.,TRUE
+Inventory,Mirtazapine,1021,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Molestiae quia asperiores praesentium et voluptas iste sit et accusantium.,TRUE
+Inventory,Medroxyprogesterone,1022,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Est quia omnis at.,TRUE
+Inventory,Purdy and Sons,1023,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Veniam eos quibusdam neque consectetur eius aliquam.,TRUE
+Inventory,"Zemlak, Kassulke and Veum",1024,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Vitae optio odit.,TRUE
+Inventory,Kris LLC,1025,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Libero voluptatibus voluptatem quo.,TRUE
+Inventory,"Jaskolski, Parker and Blanda",1026,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Laborum optio est voluptas dolores sunt voluptates.,TRUE
+Inventory,Roberts Kilback,1027,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Ut illo molestiae dolore recusandae aut sequi molestiae fugit eum.,TRUE
+Inventory,Olson Daugherty,1028,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Non est aut sit nulla nisi labore commodi delectus.,TRUE
+Inventory,Hermann Inc,1029,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Commodi maxime minus dicta quia.,TRUE
+Inventory,"Rowe, Nolan and Schaefer",1030,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quos et est eum odit quam omnis velit impedit tempora.,TRUE
+Inventory,Cole - Lesch,1031,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Aut accusantium non.,TRUE
+Inventory,"Emmerich, Prohaska and Schimmel",1032,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Doloribus aut qui sequi.,TRUE
+Inventory,"Stracke, Champlin and Bayer",1033,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quisquam odio et et quod eum necessitatibus quaerat.,TRUE
+Inventory,Spinka Okuneva,1034,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Rerum unde neque sit ut aut voluptas eum.,TRUE
+Inventory,Swaniawski Muller,1035,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quia dolore minus voluptatibus modi.,TRUE
+Inventory,Emard Satterfield,1036,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Nobis et nulla alias.,TRUE
+Inventory,"Treutel, Muller and Sipes",1037,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Sit perspiciatis voluptate qui eos.,TRUE
+Inventory,Cole and Sons,1038,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Qui sint ab iusto.,TRUE
+Inventory,"Ullrich, Murazik and Roob",1039,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Explicabo sed maiores.,TRUE
+Inventory,Dare and Sons,1040,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Aut eveniet omnis dolores labore qui delectus repellat.,TRUE
+Inventory,Trantow and Sons,1041,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Animi rerum quaerat qui voluptas.,TRUE
+Inventory,Dooley Price,1042,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Reiciendis beatae delectus qui corporis beatae autem modi laudantium.,TRUE
+Inventory,"Shanahan, Considine and Towne",1043,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Molestiae nihil delectus eos.,TRUE
+Inventory,"Moen, Mohr and Reilly",1044,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Dolor odio soluta eaque consequatur rerum iste vel.,TRUE
+Inventory,Price Bradtke,1045,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Beatae autem illo ea alias ipsum nobis.,TRUE
+Inventory,Fadel Toy,1046,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Et molestiae eum ut dolores.,TRUE
+Inventory,Homenick Inc,1047,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Officia repellendus laboriosam iste quidem explicabo nemo quasi aliquam distinctio.,TRUE
+Inventory,Witting Lemke,1048,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Nihil qui voluptatem unde.,TRUE
+Inventory,Gerlach Thompson,1049,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quo quas debitis vel.,TRUE
+Inventory,Schaefer Thompson,1050,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Minima nobis voluptas autem aut adipisci tenetur.,TRUE
+Inventory,"Kovacek, Schuster and Kemmer",1051,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Aspernatur earum praesentium laudantium velit.,TRUE
+Inventory,Treutel Stanton,1052,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Laboriosam repellendus quisquam labore ipsum et.,TRUE
+Inventory,Bartell and Sons,1053,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Sed voluptatem consequatur reprehenderit ab aut molestiae.,TRUE
+Inventory,"Bergnaum, Murray and McGlynn",1054,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Ullam in ut molestiae non eveniet et totam dolor.,TRUE
+Inventory,"Wilkinson, Schowalter and Lindgren",1055,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Distinctio rerum iusto explicabo fugiat doloremque aut omnis at est.,TRUE
+Inventory,"Glover, Zemlak and Kerluke",1056,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Eum at laboriosam aut.,TRUE
+Inventory,Durgan Kirlin,1057,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Reprehenderit sunt expedita voluptatum nobis deleniti aliquam numquam quas.,TRUE
+Inventory,Towne Crooks,1058,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Aliquam animi libero modi quisquam voluptas fugiat.,TRUE
+Inventory,Wuckert McGlynn,1059,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quidem ut et ut reprehenderit.,TRUE