diff --git a/server/src/database/seeds/core/20200810121809_seed_settings.js b/server/src/database/seeds/core/20200810121809_seed_settings.js index 65f0b0ce4..f6578ba9f 100644 --- a/server/src/database/seeds/core/20200810121809_seed_settings.js +++ b/server/src/database/seeds/core/20200810121809_seed_settings.js @@ -1,22 +1,20 @@ +import Container from 'typedi'; +import TenancyService from 'services/Tenancy/TenancyService'; exports.up = (knex) => { - // Inserts seed entries - return knex('settings').insert([ - { group: 'manual_journals', key: 'next_number', value: 1 }, + const tenancyService = Container.get(TenancyService); + const settings = tenancyService.settings(knex.userParams.tenantId); - { group: 'sales_invoices', key: 'next_number', value: 1}, - { group: 'sales_invoices', key: 'number_prefix', value: 'INV' }, + settings.set({ group: 'manual_journals', key: 'next_number', value: 1 }); + settings.set({ group: 'sales_invoices', key: 'next_number', value: 1 }); + settings.set({ group: 'sales_invoices', key: 'number_prefix', value: 'INV' }); + settings.set({ group: 'sales_receipts', key: 'next_number', value: 1 }); + settings.set({ group: 'sales_receipts', key: 'number_prefix', value: 'REC' }); + settings.set({ group: 'sales_estimates', key: 'next_number', value: 1 }); + settings.set({ group: 'sales_estimates', key: 'number_prefix', value: 'EST' }); + settings.set({ group: 'payment_receives', key: 'next_number', value: 1 }); - { group: 'sales_receipts', key: 'next_number', value: 1 }, - { group: 'sales_receipts', key: 'number_prefix', value: 'REC' }, - - { group: 'sales_estimates', key: 'next_number', value: 1 }, - { group: 'sales_estimates', key: 'number_prefix', value: 'EST' }, - - { group: 'payment_receives', key: 'next_number', value: 1 }, - ]); + return settings.save(); }; -exports.down = (knex) => { - -} \ No newline at end of file +exports.down = (knex) => {}; diff --git a/server/src/lib/Metable/MetableStore.ts b/server/src/lib/Metable/MetableStore.ts index ad1569797..ccf81a14d 100644 --- a/server/src/lib/Metable/MetableStore.ts +++ b/server/src/lib/Metable/MetableStore.ts @@ -201,4 +201,11 @@ export default class MetableStore implements IMetableStore{ return collection; } + + /** + * Reset the momerized metadata. + */ + resetMetadata() { + this.metadata = []; + } } diff --git a/server/src/lib/Metable/MetableStoreDB.ts b/server/src/lib/Metable/MetableStoreDB.ts index d7c303a07..830a07ca2 100644 --- a/server/src/lib/Metable/MetableStoreDB.ts +++ b/server/src/lib/Metable/MetableStoreDB.ts @@ -77,7 +77,7 @@ export default class MetableDBStore extends MetableStore implements IMetableStor this.saveInserted(this.metadata), ]); } - + /** * Saves the updated metadata. * @param {IMetadata[]} metadata - @@ -155,6 +155,8 @@ export default class MetableDBStore extends MetableStore implements IMetableStor const metadata = await this.repository.all(); const mappedMetadata = this.mapMetadataCollection(metadata); + this.resetMetadata(); + mappedMetadata.forEach((meta: IMetadata) => { this.metadata.push(meta); });