From 70c0b9c3e6d7fdaa47c0634dffe9556f182a4eb2 Mon Sep 17 00:00:00 2001
From: sriram-at-840620226347 <bitbucket@venbainfotech.com>
Date: Wed, 27 Nov 2019 17:34:11 +0530
Subject: [PATCH] financial and sales issue fixed

---
 .../financial-info/financial-info.component.html      |  2 +-
 ng6-seed/src/app/sales-pd/sales-pd.component.html     | 11 ++++++++---
 ng6-seed/src/app/sales-pd/sales-pd.component.ts       |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
index 66b941058..c4638dd5d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
@@ -477,7 +477,7 @@
                                                             formControlName="estimate_reason_for_loss">
                                                     </mat-form-field>
                                                 </div>
-                                                <mat-form-field style="width:54%" *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'MWISE' || product_abbr == 'LAEP'">
+                                                <mat-form-field style="width:54%" *ngIf="(lender_short_name == 'CLIX' ? product_abbr !='BL' ? true : false : true) && (lender_short_name == 'MWISE' ? product_abbr != 'BL' ? true : false : true)">
                                                     <input matInput placeholder="Annual Sales through Credit Card / POS machines"
                                                         formControlName="estimate_posmachine_or_cc_annual_sales">
                                                     <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_posmachine_or_cc_annual_sales').value != ''">{{"&#8377;"}}
diff --git a/ng6-seed/src/app/sales-pd/sales-pd.component.html b/ng6-seed/src/app/sales-pd/sales-pd.component.html
index 592875d90..9439827a1 100644
--- a/ng6-seed/src/app/sales-pd/sales-pd.component.html
+++ b/ng6-seed/src/app/sales-pd/sales-pd.component.html
@@ -86,14 +86,19 @@
                         <small mat-line>{{details.sales_pd_id}}</small>
                 </mat-cell>
                     </ng-container>
+                <ng-container matColumnDef="SalesPdSno">
+                    <mat-cell class="cell" *matCellDef="let details;">
+                        <small mat-line>{{details.sales_pd_sno}}</small>
+                </mat-cell>
+                    </ng-container>
             <ng-container matColumnDef="Applicant Name">
                   <mat-cell class="cell" *matCellDef="let details;">
                       <span *ngIf="!details.applicant_name" mat-line>
                           <small>--</small>
-                      </span><br>
+                      </span> 
                       <span *ngIf="details.applicant_name" mat-line>
                           <b>{{details.applicant_name}}</b>
-                      </span><br>
+                      </span> 
                       <span class="fontsize"> {{details.applicant_id}}</span>
                     </mat-cell>
             </ng-container>
@@ -111,7 +116,7 @@
                   <mat-cell  class="cell center" *matCellDef="let details;"> 
                     <span *ngIf="!details.officer_name" mat-line>
                           <small>--</small>
-                      </span><br>
+                      </span> 
                       <span *ngIf="details.applicant_name" mat-line>
                           <small mat-line>{{details.officer_name}}</small> 
                       </span>                    
diff --git a/ng6-seed/src/app/sales-pd/sales-pd.component.ts b/ng6-seed/src/app/sales-pd/sales-pd.component.ts
index f216cf6fc..b65369a23 100644
--- a/ng6-seed/src/app/sales-pd/sales-pd.component.ts
+++ b/ng6-seed/src/app/sales-pd/sales-pd.component.ts
@@ -12,7 +12,7 @@ export class SalesPdComponent implements OnInit {
   public dataLengthTab4: number;
   public dataSourceTab4 = new MatTableDataSource();
   
-  displayedColumns = ['SalesPdId','Applicant Name','Short Name','Abbr','Officer Name','Create On','Action'];
+  displayedColumns = ['SalesPdId','SalesPdSno','Applicant Name','Short Name','Abbr','Officer Name','Create On','Action'];
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;