QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 04:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: ensure organization tenant configured.

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-09-28 13:30:50 +02:00
parent 9f315ca657
commit d3d772f735
19 changed files with 140 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/system/migrations/20200823235339_create_subscription_licenses_table.js
View File

@@ -9,10 +9,6 @@ exports.up = function(knex) {
table.integer('license_period').unsigned();
table.string('period_interval');
table.boolean('sent').defaultTo(false);
table.boolean('disabled').defaultTo(false);
table.boolean('used').defaultTo(false);
table.dateTime('sent_at');
table.dateTime('disabled_at');
table.dateTime('used_at');

15
server/src/system/models/Subscriptions/License.js
View File

@@ -1,7 +1,6 @@
import { Model, mixin } from 'objection';
import moment from 'moment';
import SystemModel from 'system/models/SystemModel';
import { ILicensesFilter } from 'interfaces';
export default class License extends SystemModel {
/**
@@ -25,8 +24,8 @@ export default class License extends SystemModel {
return {
// Filters active licenses.
filterActiveLicense(query) {
query.where('disabled', false);
query.where('used', false);
query.where('disabled_at', null);
query.where('used_at', null);
},
// Find license by its code or id.
@@ -45,13 +44,13 @@ export default class License extends SystemModel {
builder.modify('filterActiveLicense')
}
if (licensesFilter.disabled) {
builder.where('disabled', true);
builder.whereNot('disabled_at', null);
}
if (licensesFilter.used) {
builder.where('used', true);
builder.whereNot('used_at', null);
}
if (licensesFilter.sent) {
builder.where('sent', true);
builder.whereNot('sent_at', null);
}
}
};
@@ -95,7 +94,6 @@ export default class License extends SystemModel {
return this.query()
.where(viaAttribute, licenseCode)
.patch({
disabled: true,
disabled_at: moment().toMySqlDateTime(),
});
}
@@ -108,7 +106,6 @@ export default class License extends SystemModel {
return this.query()
.where(viaAttribute, licenseCode)
.patch({
sent: true,
sent_at: moment().toMySqlDateTime(),
});
}
@@ -122,7 +119,6 @@ export default class License extends SystemModel {
return this.query()
.where(viaAttribute, licenseCode)
.patch({
used: true,
used_at: moment().toMySqlDateTime()
});
}
@@ -136,5 +132,4 @@ export default class License extends SystemModel {
return (this.invoicePeriod === plan.invoiceInterval &&
license.licensePeriod === license.periodInterval);
}
}