few fixes to plan changes (#624)

src/app/settings/organization-plans.component.html

@@ -46,7 +46,7 @@
     <div *ngFor="let selectableProduct of selectableProducts" class="form-check form-check-block">
         <input class="form-check-input" type="radio" name="product" id="product{{selectableProduct.product}}"
             [value]="selectableProduct.product" [(ngModel)]="product" (change)="changedProduct()">
-        <label class="form-check-label" for="product">
+        <label class="form-check-label" for="product{{selectableProduct.product}}">
             {{ selectableProduct.nameLocalizationKey | i18n}}
             <small class="mb-1">{{ selectableProduct.descriptionLocalizationKey | i18n : '1'}}</small>
             <small *ngIf="selectableProduct.product == productTypes.Free">•

src/app/settings/organization-plans.component.ts

@@ -54,6 +54,8 @@ export class OrganizationPlansComponent implements OnInit {
     name: string;
     billingEmail: string;
     businessName: string;
+    productTypes = ProductType;
+    formPromise: Promise<any>;
 
     plans: PlanResponse[];
 
@@ -74,10 +76,6 @@ export class OrganizationPlansComponent implements OnInit {
         return this.organizationId == null;
     }
 
-    get productTypes() {
-        return ProductType;
-    }
-
     get selectedPlan() {
         return this.plans.find((plan) => plan.type === this.plan);
     }
@@ -286,8 +284,8 @@ export class OrganizationPlansComponent implements OnInit {
                 }
             };
 
-            const formPromise = doSubmit();
-            await formPromise;
+            this.formPromise = doSubmit();
+            await this.formPromise;
             this.onSuccess.emit();
         } catch { }
     }