QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-14 11:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Subscription active detarminer

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-08-30 17:52:53 +02:00
parent ee2d8d3065
commit 410c4ea3e2
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/server/src/system/models/Subscriptions/PlanSubscription.ts
View File

@@ -84,7 +84,7 @@ export default class PlanSubscription extends mixin(SystemModel) {
/**
* Filter the failed payment.
* @param builder
* @param builder
*/
failedPayment(builder) {
builder.where('payment_status', SubscriptionPaymentStatus.Failed);
@@ -92,7 +92,7 @@ export default class PlanSubscription extends mixin(SystemModel) {
/**
* Filter the succeed payment.
* @param builder
* @param builder
*/
succeedPayment(builder) {
builder.where('payment_status', SubscriptionPaymentStatus.Succeed);
@@ -136,14 +136,13 @@ export default class PlanSubscription extends mixin(SystemModel) {
/**
* Check if the subscription is active.
* Crtiria should be:
* - During the trial period and NOT canceled.
* - Not ended.
*
* Crtiria should be active:
* - During the trial period should NOT be canceled.
* - Out of trial period should NOT be ended.
* @return {Boolean}
*/
public active() {
return this.onTrial() || !this.ended();
return this.onTrial() ? !this.canceled() : !this.ended();
}
/**