fix: now we can create standing instruction by using both destinantion

openMF · Dec 15, 2023 · 11098c6 · 11098c6
1 parent b03b172
commit 11098c6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/...ccount-transfers/create-standing-instructions/create-standing-instructions.component.html b/...ccount-transfers/create-standing-instructions/create-standing-instructions.component.html
@@ -95,7 +95,7 @@
 
           <mat-form-field fxFlex="48%">
             <mat-label>{{"labels.inputs.To Office" | translate}}</mat-label>
-            <mat-select required formControlName="toOfficeId" (selectionChange)="changeEvent()">
+            <mat-select [disabled]="ToOfficeId" required formControlName="toOfficeId" (selectionChange)="changeEvent()">
               <mat-option *ngFor="let toOfficeType of toOfficeTypeData" [value]="toOfficeType.id">
                 {{ toOfficeType.name }}
               </mat-option>
@@ -107,7 +107,7 @@
 
           <mat-form-field fxFlex="48%">
             <mat-label>{{"labels.inputs.Beneficiary" | translate}}</mat-label>
-            <mat-select required formControlName="toClientId" (selectionChange)="changeEvent()">
+            <mat-select [disabled]="ToClientId" required formControlName="toClientId" (selectionChange)="changeEvent()">
               <mat-option *ngFor="let toClientType of toClientTypeData" [value]="toClientType.id">
                 {{ toClientType.displayName }}
               </mat-option>
@@ -234,7 +234,7 @@
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">{{"labels.buttons.Cancel" | translate}}</button>
         <button mat-raised-button color="primary" [disabled]="!createStandingInstructionsForm.valid" *mifosxHasPermission="'CREATE_STANDINGINSTRUCTION'"
-          (click)="submit()">{{"labels.buttons.Submit | translate}}</button>
+          (click)="submit()">{{"labels.buttons.Submit" | translate}}</button>
       </mat-card-actions>
 
     </form>

diff --git a/.../account-transfers/create-standing-instructions/create-standing-instructions.component.ts b/.../account-transfers/create-standing-instructions/create-standing-instructions.component.ts
@@ -58,6 +58,10 @@ export class CreateStandingInstructionsComponent implements OnInit {
   accountTypeId: any;
   /** Office Id */
   officeId: any;
+  /** ToOffice Id Boolean for disabling the officeId formControl */
+  ToOfficeId: any;
+  /** ToClient Id Boolean for disabling the officeId formControl */
+  ToClientId: any;
   /** Account Type */
   accountType: any;
   /** Client Id */
@@ -119,7 +123,7 @@ export class CreateStandingInstructionsComponent implements OnInit {
   createCreateStandingInstructionsForm() {
     this.createStandingInstructionsForm = this.formBuilder.group({
       'name': ['', Validators.required],
-      'applicant': [{value: '', disabled: true}],
+      'applicant': [{ value: '', disabled: true }],
       'transferType': ['', Validators.required],
       'priority': ['', Validators.required],
       'status': ['', Validators.required],
@@ -169,8 +173,8 @@ export class CreateStandingInstructionsComponent implements OnInit {
           'toOfficeId': this.officeId,
           'toClientId': this.clientId
         });
-        this.createStandingInstructionsForm.controls['toOfficeId'].disable();
-        this.createStandingInstructionsForm.controls['toClientId'].disable();
+        this.ToOfficeId = true;
+        this.ToClientId = true;
         this.changeEvent();
       } else {
         this.allowclientedit = true;