From e3e94ede65e597aa32bfa8879c2059a3e79c6126 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 20 Jul 2018 12:16:41 -0400
Subject: [PATCH] allow custom plans to download license

---
 .../organization-billing.component.html       |  2 +-
 .../organization-billing.component.ts         | 12 +++++-----
 src/app/settings/user-billing.component.html  | 22 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/app/organizations/settings/organization-billing.component.html b/src/app/organizations/settings/organization-billing.component.html
index 926a83aeab5..ec3e300718d 100644
--- a/src/app/organizations/settings/organization-billing.component.html
+++ b/src/app/organizations/settings/organization-billing.component.html
@@ -80,7 +80,7 @@
                 {{'changeBillingPlan' | i18n}}
             </button>
             <button type="button" class="btn btn-outline-secondary btn-submit ml-1" #licenseBtn [appApiAction]="licensePromise" [disabled]="licenseBtn.loading"
-                (click)="downloadLicense()" *ngIf="subscription && !subscription.cancelled">
+                (click)="downloadLicense()" *ngIf="canDownloadLicense">
                 <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
                 <span>{{'downloadLicense' | i18n}}</span>
             </button>
diff --git a/src/app/organizations/settings/organization-billing.component.ts b/src/app/organizations/settings/organization-billing.component.ts
index c5c71d4772c..222b1dc37b7 100644
--- a/src/app/organizations/settings/organization-billing.component.ts
+++ b/src/app/organizations/settings/organization-billing.component.ts
@@ -2,10 +2,7 @@ import {
     Component,
     OnInit,
 } from '@angular/core';
-import {
-    ActivatedRoute,
-    Router,
-} from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 
 import { ToasterService } from 'angular2-toaster';
 import { Angulartics2 } from 'angulartics2';
@@ -51,7 +48,7 @@ export class OrganizationBillingComponent implements OnInit {
     constructor(private tokenService: TokenService, private apiService: ApiService,
         private platformUtilsService: PlatformUtilsService, private i18nService: I18nService,
         private analytics: Angulartics2, private toasterService: ToasterService,
-        private router: Router, private route: ActivatedRoute) {
+        private route: ActivatedRoute) {
         this.selfHosted = platformUtilsService.isSelfHost();
     }
 
@@ -270,4 +267,9 @@ export class OrganizationBillingComponent implements OnInit {
             this.billing.planType === PlanType.EnterpriseAnnually ||
             this.billing.planType === PlanType.TeamsMonthly || this.billing.planType === PlanType.TeamsAnnually;
     }
+
+    get canDownloadLicense() {
+        return (this.billing.planType !== PlanType.Free && this.subscription == null) ||
+            (this.subscription != null && !this.subscription.cancelled);
+    }
 }
diff --git a/src/app/settings/user-billing.component.html b/src/app/settings/user-billing.component.html
index 640b6f17b41..546e9563ed2 100644
--- a/src/app/settings/user-billing.component.html
+++ b/src/app/settings/user-billing.component.html
@@ -73,18 +73,16 @@
         </div>
     </ng-container>
     <ng-container *ngIf="!selfHosted">
-        <ng-container *ngIf="subscription && !subscription.cancelled || subscriptionMarkedForCancel">
-            <div class="d-flex">
-                <button type="button" class="btn btn-outline-secondary" (click)="downloadLicense()" *ngIf="!subscription.cancelled">
-                    {{'downloadLicense' | i18n}}
-                </button>
-                <button #cancelBtn type="button" class="btn btn-outline-danger btn-submit ml-auto" (click)="cancel()" [appApiAction]="cancelPromise"
-                    [disabled]="cancelBtn.loading" *ngIf="!subscription.cancelled && !subscriptionMarkedForCancel">
-                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
-                    <span>{{'cancelSubscription' | i18n}}</span>
-                </button>
-            </div>
-        </ng-container>
+        <div class="d-flex">
+            <button type="button" class="btn btn-outline-secondary" (click)="downloadLicense()" *ngIf="!subscription || !subscription.cancelled">
+                {{'downloadLicense' | i18n}}
+            </button>
+            <button #cancelBtn type="button" class="btn btn-outline-danger btn-submit ml-auto" (click)="cancel()" [appApiAction]="cancelPromise"
+                [disabled]="cancelBtn.loading" *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel">
+                <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+                <span>{{'cancelSubscription' | i18n}}</span>
+            </button>
+        </div>
         <h2 class="spaced-header">{{'storage' | i18n}}</h2>
         <p>{{'subscriptionStorage' | i18n : billing.maxStorageGb || 0 : billing.storageName || '0 MB'}}</p>
         <div class="progress">