diff --git a/ordest700-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html b/ordest700-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html
index da2ede4..75d1dab 100644
--- a/ordest700-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html
+++ b/ordest700-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html
@@ -1,27 +1,27 @@
-<ol class="breadcrumb breadcrumb-arrow font-trirong">
-  <li><a href="javascript://"> Customer Information</a></li>
-</ol>
-<div class="dg-wrapper">
-  <div class="clr-row">
-    <div class="clr-col-8">
-      <h3>Customer Information </h3>
-    </div>
-    <div class="clr-col-4" style="text-align: right;">
- <button *ngIf="cardButton" id="add" class="btn btn-primary btn-icon" (click)="changeView()" >
-        <clr-icon *ngIf="!isCardview" shape="grid-view"></clr-icon>    <clr-icon *ngIf="isCardview" shape="bars"></clr-icon>
+<ol class="breadcrumb breadcrumb-arrow font-trirong">
+  <li><a href="javascript://"> Customer Information</a></li>
+</ol>
+<div class="dg-wrapper">
+  <div class="clr-row">
+    <div class="clr-col-8">
+      <h3>Customer Information </h3>
+    </div>
+    <div class="clr-col-4" style="text-align: right;">
+ <button *ngIf="cardButton" id="add" class="btn btn-primary btn-icon" (click)="changeView()" >
+        <clr-icon *ngIf="!isCardview" shape="grid-view"></clr-icon>    <clr-icon *ngIf="isCardview" shape="bars"></clr-icon>
       </button>
-        <!-- button -->
-     <button id="add" class="btn btn-primary" (click)="goToAdd(product)" >
-        <clr-icon shape="plus"></clr-icon>ADD
-      </button>
-    </div></div>
-  <ng-container *ngIf="!isCardview">   <!-- GET ALL -->     <clr-datagrid [clrDgLoading]="loading" [(clrDgSelected)]="selected">
-    <clr-dg-placeholder>
-        <ng-template #loadingSpinner>
-            <clr-spinner>Loading ... </clr-spinner>
-        </ng-template>
-        <div *ngIf="error;else loadingSpinner">{{error}}</div>
-    </clr-dg-placeholder>
+        <!-- button -->
+     <button id="add" class="btn btn-primary" (click)="goToAdd(product)" >
+        <clr-icon shape="plus"></clr-icon>ADD
+      </button>
+    </div></div>
+  <ng-container *ngIf="!isCardview">   <!-- GET ALL -->     <clr-datagrid [clrDgLoading]="loading" [(clrDgSelected)]="selected">
+    <clr-dg-placeholder>
+        <ng-template #loadingSpinner>
+            <clr-spinner>Loading ... </clr-spinner>
+        </ng-template>
+        <div *ngIf="error;else loadingSpinner">{{error}}</div>
+    </clr-dg-placeholder>
 
 <clr-dg-column [clrDgField]="'company_name'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Company Name
 						    </ng-container></clr-dg-column>
@@ -139,13 +139,13 @@
 
 
  
- <!-- who column -->
-      <clr-dg-column> <ng-container *clrDgHideableColumn="{hidden: false}">
-        <clr-icon shape="bars"></clr-icon> Action
-      </ng-container></clr-dg-column>
+ <!-- who column -->
+      <clr-dg-column> <ng-container *clrDgHideableColumn="{hidden: false}">
+        <clr-icon shape="bars"></clr-icon> Action
+      </ng-container></clr-dg-column>
       <!-- end --> 
 
- <clr-dg-row *clrDgItems="let user of product" [clrDgItem]="user">
+ <clr-dg-row *clrDgItems="let user of product" [clrDgItem]="user">
 
 <clr-dg-cell>{{user.company_name }}</clr-dg-cell>
 
@@ -240,157 +240,157 @@
 
 
  
-  <!-- who column -->
-<clr-dg-cell>
-  <clr-signpost>
-   <span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success" style="color: rgb(0, 130, 236);"></clr-icon></span>
-   <clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
-     <h5 style="margin-top: 0">Who Column</h5>
-           <div>Account ID: <code class="clr-code">{{user.accountId}}</code></div>
-           <div>Created At: <code class="clr-code">{{user.createdAt| date}}</code></div>
-           <div>Created By: <code class="clr-code">{{user.createdBy}}</code></div>
-           <div>Updated At: <code class="clr-code">{{user.updatedAt | date}}</code></div>
-           <div>Updated By: <code class="clr-code">{{user.updatedBy}}</code></div>
-   </clr-signpost-content>
- </clr-signpost>
- </clr-dg-cell>
- 
+  <!-- who column -->
+<clr-dg-cell>
+  <clr-signpost>
+   <span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success" style="color: rgb(0, 130, 236);"></clr-icon></span>
+   <clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
+     <h5 style="margin-top: 0">Who Column</h5>
+           <div>Account ID: <code class="clr-code">{{user.accountId}}</code></div>
+           <div>Created At: <code class="clr-code">{{user.createdAt| date}}</code></div>
+           <div>Created By: <code class="clr-code">{{user.createdBy}}</code></div>
+           <div>Updated At: <code class="clr-code">{{user.updatedAt | date}}</code></div>
+           <div>Updated By: <code class="clr-code">{{user.updatedBy}}</code></div>
+   </clr-signpost-content>
+ </clr-signpost>
+ </clr-dg-cell>
+ 
  <!-- who colmn --> 
  
- <clr-dg-action-overflow>
-        <button class="action-item" (click)="onEdit(user)">Edit</button>
-        <button class="action-item" (click)="onDelete(user)">Delete</button>
-      </clr-dg-action-overflow>
-         </clr-dg-row>
-    <clr-dg-footer>
-      <clr-dg-pagination #pagination [clrDgPageSize]="10">
-        <clr-dg-page-size [clrPageSizeOptions]="[10,20,50,100]">Users per page</clr-dg-page-size>
-        {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}}
-        of {{pagination.totalItems}} users
-      </clr-dg-pagination>
-    </clr-dg-footer>
-  </clr-datagrid> </ng-container>
-<ng-template #showInfo>
-  <div class="alert alert-info" role="alert">
-      <div class="alert-items">
-          <div class="alert-item static">
-              <span class="alert-text">
-                <clr-icon class="alert-icon" shape="info-circle"></clr-icon>
-                    Data could be found. Loading..
-                  <clr-spinner [clrMedium]="true">Loading ...</clr-spinner>
-              </span>
-          </div>
-      </div>
-  </div>
-</ng-template><ng-container *ngIf="isCardview">
-  <div *ngIf="product; else showInfo" class="clr-row clr-align-items-start clr-justify-content-start">
-    <div *ngFor="let app of product| filter:search; let index = i" class="clr-col-auto" >
-      <div class="clr-row">
-        <div class="clr-col-lg-12 clr-col-md-4 clr-col-sm-4 clr-col-12" style="width: 410px;">
-  <div class="card" style="padding: 10px; "[style.background-color]="cardmodal.cardColor !== '' ? cardmodal.cardColor : 'white'">
-    <div class="card-body" style="display: grid; grid-template-columns: repeat(13, 1fr); grid-template-rows: repeat(7, 1fr); gap: 5px;">
-      <ng-container *ngFor="let item of dashboardArray">
-        <div [style.gridColumn]="item.x + 1" [style.gridRow]="item.y + 1" [style.gridColumnEnd]="item.x + item.cols + 1"
-          [style.gridRowEnd]="item.y + item.rows + 1">
-          <div *ngIf="item.name === 'textField'" class="title-card card-title"
-          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
-          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
-          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
-          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
-          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
-          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
-          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
-          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
-          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"     	 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
-          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
-           {{beforeText(item.fieldtext)}}
-          {{ app[transform(item.fieldtext) ] }}
-          {{afterText(item.fieldtext)}}
-          </div>
-
-          <div *ngIf="item.name === 'dateField'" class="title-card card-title"
-          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
-          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
-          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
-          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
-          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
-          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
-          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
-          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
-          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"			 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
-          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
-          {{beforeText(item.fieldtext)}}
-          {{ app[transform(item.fieldtext) ] | date}}
-          {{afterText(item.fieldtext)}}
-          </div>
-          <div *ngIf="item.name === 'numberField'" class="title-card card-title"
-          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
-          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
-          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
-          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
-          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
-          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
-          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
-          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
-          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"			 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
-          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
-          {{beforeText(item.fieldtext)}}
-          {{ app[transform(item.fieldtext) ]}}
-          {{afterText(item.fieldtext)}}
-          </div>
-
-          <div *ngIf="item.name === 'Line'" class="title-card card-title"
-          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
-          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
-          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
-          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
-          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
-          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
-          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
-          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
-          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'">
-          <hr>
-          </div>
-
-          
-          <div *ngIf="item.name === 'Icon'" class="icon-card"
-          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
-          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
-          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
-          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
-          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
-          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
-          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
-          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
-          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"
-          >
-            <clr-icon [attr.shape]="item.iconName"></clr-icon>
-          </div>
-
-          <div *ngIf="item.name == 'Image'"
-          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
-          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
-          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
-          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
-          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
-          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
-          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
-          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
-          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"
-          [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
-          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">			 <img id="filePreview" [src]="item.imageURL" alt="File Preview"
-            [style.width]="item.imagewidth !== '' ? item.imagewidth + 'px' : '100px'"
-            [style.height]="item.imagewidth !== '' ? item.imagewidth + 'px' : '100px'"></div>
-        </div>
-      </ng-container>
-    </div>
-  </div>
-  </div>
-  </div>
-  </div>
-  </div>
-  </ng-container>
-</div>
+ <clr-dg-action-overflow>
+        <button class="action-item" (click)="onEdit(user)">Edit</button>
+        <button class="action-item" (click)="onDelete(user)">Delete</button>
+      </clr-dg-action-overflow>
+         </clr-dg-row>
+    <clr-dg-footer>
+      <clr-dg-pagination #pagination [clrDgPageSize]="10">
+        <clr-dg-page-size [clrPageSizeOptions]="[10,20,50,100]">Users per page</clr-dg-page-size>
+        {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}}
+        of {{pagination.totalItems}} users
+      </clr-dg-pagination>
+    </clr-dg-footer>
+  </clr-datagrid> </ng-container>
+<ng-template #showInfo>
+  <div class="alert alert-info" role="alert">
+      <div class="alert-items">
+          <div class="alert-item static">
+              <span class="alert-text">
+                <clr-icon class="alert-icon" shape="info-circle"></clr-icon>
+                    Data could be found. Loading..
+                  <clr-spinner [clrMedium]="true">Loading ...</clr-spinner>
+              </span>
+          </div>
+      </div>
+  </div>
+</ng-template><ng-container *ngIf="isCardview">
+  <div *ngIf="product; else showInfo" class="clr-row clr-align-items-start clr-justify-content-start">
+    <div *ngFor="let app of product| filter:search; let index = i" class="clr-col-auto" >
+      <div class="clr-row">
+        <div class="clr-col-lg-12 clr-col-md-4 clr-col-sm-4 clr-col-12" style="width: 410px;">
+  <div class="card" style="padding: 10px; "[style.background-color]="cardmodal.cardColor !== '' ? cardmodal.cardColor : 'white'">
+    <div class="card-body" style="display: grid; grid-template-columns: repeat(13, 1fr); grid-template-rows: repeat(7, 1fr); gap: 5px;">
+      <ng-container *ngFor="let item of dashboardArray">
+        <div [style.gridColumn]="item.x + 1" [style.gridRow]="item.y + 1" [style.gridColumnEnd]="item.x + item.cols + 1"
+          [style.gridRowEnd]="item.y + item.rows + 1">
+          <div *ngIf="item.name === 'textField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"     	 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+           {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ] }}
+          {{afterText(item.fieldtext)}}
+          </div>
+
+          <div *ngIf="item.name === 'dateField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"			 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+          {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ] | date}}
+          {{afterText(item.fieldtext)}}
+          </div>
+          <div *ngIf="item.name === 'numberField'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"			 [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">
+          {{beforeText(item.fieldtext)}}
+          {{ app[transform(item.fieldtext) ]}}
+          {{afterText(item.fieldtext)}}
+          </div>
+
+          <div *ngIf="item.name === 'Line'" class="title-card card-title"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'">
+          <hr>
+          </div>
+
+          
+          <div *ngIf="item.name === 'Icon'" class="icon-card"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"
+          >
+            <clr-icon [attr.shape]="item.iconName"></clr-icon>
+          </div>
+
+          <div *ngIf="item.name == 'Image'"
+          [style.text-align]="item.alignment !== '' ? item.alignment : 'left'"
+          [style.line-height]="item.textlineheight !== '' ? item.textlineheight : '1'"
+          [style.font-family]="item.fontName !== '' ? item.fontName : 'Metropolis'"
+          [style.font-size]="item.fontSize !== '' ? item.fontSize : '100%'"
+          [style.font-style]="item.italic == true ? 'Italic' : 'normal'"
+          [style.font-weight]="item.bold == true ? 'bold' : 'normal'" [style.text-decoration]="(item.underline && item.strikethough) ? 'underline line-through' : 
+          (item.underline ? 'underline' : (item.strikethough ? 'line-through' : 'none'))"
+          [style.background-color]="item.backgroundcolor !== '' ? item.backgroundcolor : 'white'"
+          [style.color]="item.textcolor !== '' ? item.textcolor : 'black'"
+          [style.background-color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditionbackgroundcolor : item.backgroundcolor"
+          [style.color]="item.conditionValue ==  app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor">			 <img id="filePreview" [src]="item.imageURL" alt="File Preview"
+            [style.width]="item.imagewidth !== '' ? item.imagewidth + 'px' : '100px'"
+            [style.height]="item.imagewidth !== '' ? item.imagewidth + 'px' : '100px'"></div>
+        </div>
+      </ng-container>
+    </div>
+  </div>
+  </div>
+  </div>
+  </div>
+  </div>
+  </ng-container>
+</div>
 
 
 
@@ -433,8 +433,8 @@
 
 
 
-<!-- //		EDIT DATA......... -->
-<clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+<!-- //		EDIT DATA......... -->
+<clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
   <h3 class="modal-title">Update Customer Information
  <!--update button -->
 
@@ -466,11 +466,11 @@
 
 
 
-</h3>
-  <div class="modal-body" *ngIf="rowSelected.id">
-    <h2 class="heading">{{rowSelected.id}}</h2>
+</h3>
+  <div class="modal-body" *ngIf="rowSelected.id">
+    <h2 class="heading">{{rowSelected.id}}</h2>
 <!-- button -->
-    <form >
+    <form >
 <div class="clr-row"> 
 <div class="clr-col-sm-12">       
 <label>Company Name</label>
@@ -773,49 +773,49 @@
 </div>
 <!-- one to many code end here -->
 
-<!-- form code start -->
-  <div *ngIf="checkFormCode">
-    <h4 style="font-weight: 300;display: inline;">Extension</h4>
-    <br>
-    <hr>
-    <div class="clr-row">
-      <div class="clr-col-4" *ngFor="let field of additionalFieldsFromBackend">
-        <ng-container *ngIf="field.formCode === formcode" [ngSwitch]="field.fieldType">
-          <!-- Text Input -->    <label  *ngSwitchCase="'text'">{{ field.fieldName }}</label>
-          <input *ngSwitchCase="'text'" [type]="field.fieldType"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]" class="clr-input" />
-  
-          <!-- Date Input -->    <label  *ngSwitchCase="'date'">{{ field.fieldName }}</label>
-          <input *ngSwitchCase="'date'" [type]="field.fieldType"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  class="clr-input" />
-  
-          <!-- Textarea -->    <label  *ngSwitchCase="'textarea'">{{ field.fieldName }}</label>
-          <textarea *ngSwitchCase="'textarea'"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  col="10" row="2"></textarea>
-  
-          <!-- Checkbox -->    <label  *ngSwitchCase="'checkbox'">{{ field.fieldName }}</label><br>
-          <input *ngSwitchCase="'checkbox'" [type]="field.fieldType" name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  class="clr-checkbox" />
-        </ng-container>
-  </div>
-  </div>
-</div>
-
-  <!-- form code end -->  <div class="modal-footer">
-      <button type="button" class="btn btn-outline" (click)="modalEdit = false">Cancel</button>
-      <button type="submit" class="btn btn-primary"  (click)="onUpdate(rowSelected.id)">Update</button>
-      </div>
-    </form>
-  </div>
-</clr-modal>
-<clr-modal [(clrModalOpen)]="modaldelete" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
-  <div class="modal-body" *ngIf="rowSelected.id">
-    <h1 class="delete">Are You Sure Want to delete?</h1>
-    <h2 class="heading">{{rowSelected.id}}</h2>
-    <div class="modal-footer">
-      <button type="button" class="btn btn-outline" (click)="modaldelete = false">Cancel</button>
-    <button type="button" (click)="delete(rowSelected.id)" class="btn btn-primary" >Delete</button>
-    </div>
-  </div>
-</clr-modal>
-<!-- ADD FORM ..... -->
-<clr-modal [(clrModalOpen)]="modalAdd" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+<!-- form code start -->
+  <div *ngIf="checkFormCode">
+    <h4 style="font-weight: 300;display: inline;">Extension</h4>
+    <br>
+    <hr>
+    <div class="clr-row">
+      <div class="clr-col-4" *ngFor="let field of additionalFieldsFromBackend">
+        <ng-container *ngIf="field.formCode === formcode" [ngSwitch]="field.fieldType">
+          <!-- Text Input -->    <label  *ngSwitchCase="'text'">{{ field.fieldName }}</label>
+          <input *ngSwitchCase="'text'" [type]="field.fieldType"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]" class="clr-input" />
+  
+          <!-- Date Input -->    <label  *ngSwitchCase="'date'">{{ field.fieldName }}</label>
+          <input *ngSwitchCase="'date'" [type]="field.fieldType"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  class="clr-input" />
+  
+          <!-- Textarea -->    <label  *ngSwitchCase="'textarea'">{{ field.fieldName }}</label>
+          <textarea *ngSwitchCase="'textarea'"  name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  col="10" row="2"></textarea>
+  
+          <!-- Checkbox -->    <label  *ngSwitchCase="'checkbox'">{{ field.fieldName }}</label><br>
+          <input *ngSwitchCase="'checkbox'" [type]="field.fieldType" name="{{ field.extValue }}" [(ngModel)]="rowSelected[field.extValue]"  class="clr-checkbox" />
+        </ng-container>
+  </div>
+  </div>
+</div>
+
+  <!-- form code end -->  <div class="modal-footer">
+      <button type="button" class="btn btn-outline" (click)="modalEdit = false">Cancel</button>
+      <button type="submit" class="btn btn-primary"  (click)="onUpdate(rowSelected.id)">Update</button>
+      </div>
+    </form>
+  </div>
+</clr-modal>
+<clr-modal [(clrModalOpen)]="modaldelete" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
+  <div class="modal-body" *ngIf="rowSelected.id">
+    <h1 class="delete">Are You Sure Want to delete?</h1>
+    <h2 class="heading">{{rowSelected.id}}</h2>
+    <div class="modal-footer">
+      <button type="button" class="btn btn-outline" (click)="modaldelete = false">Cancel</button>
+    <button type="button" (click)="delete(rowSelected.id)" class="btn btn-primary" >Delete</button>
+    </div>
+  </div>
+</clr-modal>
+<!-- ADD FORM ..... -->
+<clr-modal [(clrModalOpen)]="modalAdd" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
   <h3 class="modal-title">Add Customer Information 
 
 
@@ -847,70 +847,34 @@
 
 
 
-  <!-- aeroplane icon -->
-    &nbsp; &nbsp; &nbsp; &nbsp;
-    <a *ngIf="userrole?.includes('ADMIN')" style="float: right;" href="javascript:void(0)" role="tooltip" aria-haspopup="true"
-      class="tooltip tooltip-sm tooltip-bottom-left">
-      <a id="build_extension" [routerLink]="['../extension/all']" [queryParams]="{ formCode: 'Customer_information_formCode' }">
-        <clr-icon shape="airplane" size="32"></clr-icon>
-      </a>
-      <span class="tooltip-content">Form Extension</span>
-    </a> </h3>
-  <div class="modal-body">
-     <form [formGroup]="entryForm" >
-   <div class="clr-row" style="height: fit-content;">
+  <!-- aeroplane icon -->
+    &nbsp; &nbsp; &nbsp; &nbsp;
+    <a *ngIf="userrole?.includes('ADMIN')" style="float: right;" href="javascript:void(0)" role="tooltip" aria-haspopup="true"
+      class="tooltip tooltip-sm tooltip-bottom-left">
+      <a id="build_extension" [routerLink]="['../extension/all']" [queryParams]="{ formCode: 'Customer_information_formCode' }">
+        <clr-icon shape="airplane" size="32"></clr-icon>
+      </a>
+      <span class="tooltip-content">Form Extension</span>
+    </a> </h3>
+  <div class="modal-body">
+     <form [formGroup]="entryForm" >
+   <div class="clr-row" style="height: fit-content;">
 
 <div class="clr-col-sm-12">
- <label>  Company Name</label>
+ <label>  Customer Name</label>
  <input class="clr-input"  type="text"  formControlName="company_name" />       
  </div>
 
+ <div class="clr-col-sm-12">        
+ <label>Description</label>      
+   <input class="form-control" type="Text" formControlName="description" style="border: none; outline: none; height:33px !important;" />
+	      </div>
+
 <div class="clr-col-sm-12">             
  <label>  Contact Person</label>             
  <textarea cols="10" rows="2" formControlName="contact_person" placeholder="Textarea">  </textarea>
 	            </div>
 
-
- 
-<div class="clr-col-sm-12">
-	          <label>  Manufacturer</label> 
-<select  formControlName="manufacturer">  
-  <option [value]="null">Choose Manufacturer</option>
-				<option *ngFor="let item of selectmanufacturer" [value]="item.manufacturer_name">{{item.manufacturer_name}}</option>
-	      </select>          </div>
- 
-
-
-<!-- dependent dropdown field start -->
-						   
-
- 
-
-<div class="clr-col-sm-12">
-						    <label> Type</label>  <select formControlName="type" class="clr-dropdown">    
- <option [ngValue]="null">Select Option</option>
-						     <option *ngFor="let entity of typedependentData" [value]="entity.type_name">{{ entity.type_name}}</option>
-						     </select>
-  </div> 
- 
-
-<!-- dependent dropdown field end -->
-
-<!-- dependent dropdown field start -->
-						   
-
- 
-
-<div class="clr-col-sm-12">
-						    <label> Product</label>  <select formControlName="product" class="clr-dropdown">    
- <option [ngValue]="null">Select Option</option>
-						     <option *ngFor="let entity of productdependentData" [value]="entity.product_name">{{ entity.product_name}}</option>
-						     </select>
-  </div> 
- 
-
-<!-- dependent dropdown field end -->
-
 <div class="clr-col-sm-12">
 						<label> Email Address</label>
 <input class="clr-input" type="email" formControlName="email_address" pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$">
@@ -919,20 +883,29 @@
 						            </div>  </div>
 </div>
 
+<div class="clr-col-sm-12">        
+<label>  Phone Number</label>        
+<input class="clr-input" type="text" formControlName="phone_number" pattern="((\+)?([1-9]{2}))?[1-9]{1}[0-9]{9}$" />
+	        <div *ngIf="submitted && entryForm.controls['phone_number'].errors" class="error_mess">
+	          <div *ngIf="submitted && entryForm.controls['phone_number'].hasError('pattern')" class="error_mess">* Please Follow your pattern,+91 Enter 10 digit Mobile Number.
+	          </div>      </div>      </div>
+
+
+
 <div class="clr-col-sm-12">        
  <label>Customer Address</label>      
    <input class="form-control" type="Text" formControlName="customer_address" style="border: none; outline: none; height:33px !important;" />
 	      </div>
 
-
- 
-<div class="clr-col-sm-12">
+        <div class="clr-col-sm-12">
 	          <label>  Deployment Type</label> 
 <select  formControlName="deployment_type">  
   <option [value]="null">Choose Deployment Type</option>
 				<option *ngFor="let item of selectdeployment_type" [value]="item.deployment_type">{{item.deployment_type}}</option>
 	      </select>          </div>
- 
+
+
+
 
 
 <!-- multiselect checkbox field start -->
@@ -1017,14 +990,53 @@
  </div>       </div>     </div>
 	              <!-- multiselect checkbox field end -->
 
+ 
 <div class="clr-col-sm-12">
- <label>  Quantity</label>
- <input class="clr-input"  type="number"  formControlName="quantity" />      
- <div *ngIf="submitted && entryForm.controls.quantity.errors" class="error_mess">
-  <div *ngIf="submitted && entryForm.controls.quantity.errors.required" class="error_mess">*This field is Required</div>
-</div>  
- </div>
+	          <label>  Manufacturer</label> 
+<select  formControlName="manufacturer">  
+  <option [value]="null">Choose Manufacturer</option>
+				<option *ngFor="let item of selectmanufacturer" [value]="item.manufacturer_name">{{item.manufacturer_name}}</option>
+	      </select>          </div>
+ 
 
+
+<!-- dependent dropdown field start -->
+						   
+
+ 
+
+<div class="clr-col-sm-12">
+						    <label> Type</label>  <select formControlName="type" class="clr-dropdown">    
+ <option [ngValue]="null">Select Option</option>
+						     <option *ngFor="let entity of typedependentData" [value]="entity.type_name">{{ entity.type_name}}</option>
+						     </select>
+  </div> 
+ 
+
+<!-- dependent dropdown field end -->
+
+<!-- dependent dropdown field start -->
+						   
+
+ 
+
+<div class="clr-col-sm-12">
+						    <label> Product</label>  <select formControlName="product" class="clr-dropdown">    
+ <option [ngValue]="null">Select Option</option>
+						     <option *ngFor="let entity of productdependentData" [value]="entity.product_name">{{ entity.product_name}}</option>
+						     </select>
+  </div> 
+ 
+
+<!-- dependent dropdown field end -->
+
+
+
+
+
+ 
+
+ 
 <div class="clr-col-sm-12">
  <label>  Price</label>
  <input class="clr-input"  type="number"  formControlName="price" />      
@@ -1033,22 +1045,24 @@
 </div>  
  </div>
 
+<div class="clr-col-sm-12">
+ <label>  Quantity</label>
+ <input class="clr-input"  type="number"  formControlName="quantity" />      
+ <div *ngIf="submitted && entryForm.controls.quantity.errors" class="error_mess">
+  <div *ngIf="submitted && entryForm.controls.quantity.errors.required" class="error_mess">*This field is Required</div>
+</div>  
+ </div>
+
+
+
  <div class="clr-col-sm-12">
           <label>total</label>
           <input class="clr-input" type="text" [value]="totaltotal" readonly />
         </div>
 
-<div class="clr-col-sm-12">        
- <label>Description</label>      
-   <input class="form-control" type="Text" formControlName="description" style="border: none; outline: none; height:33px !important;" />
-	      </div>
 
-<div class="clr-col-sm-12">        
-<label>  Phone Number</label>        
-<input class="clr-input" type="text" formControlName="phone_number" pattern="((\+)?([1-9]{2}))?[1-9]{1}[0-9]{9}$" />
-	        <div *ngIf="submitted && entryForm.controls['phone_number'].errors" class="error_mess">
-	          <div *ngIf="submitted && entryForm.controls['phone_number'].hasError('pattern')" class="error_mess">* Please Follow your pattern,+91 Enter 10 digit Mobile Number.
-	          </div>      </div>      </div>
+
+
 
 
 
@@ -1058,30 +1072,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 <!-- one to many code start here -->
 <div style="margin-top: 30px;"><h4 style="display: inline;">order summary </h4>
 </div>
@@ -1159,37 +1149,37 @@
 </div>
 <!-- one to many code end here -->
 
-
-
-      <!-- form code start -->
-      <div *ngIf="checkFormCode">
-        <h4 style="font-weight: 300;display: inline;">Extension</h4>
-        <br>
-        <hr>
-        <div class="clr-row">
-          <div class="clr-col-4" *ngFor="let field of additionalFieldsFromBackend">
-            <ng-container *ngIf="field.formCode === formcode" [ngSwitch]="field.fieldType">
-              <!-- Text Input --> <label *ngSwitchCase="'text'">{{ field.fieldName }}</label>
-              <input *ngSwitchCase="'text'" [type]="field.fieldType" [formControlName]="field.extValue"
-                class="clr-input" />
-              <!-- Date Input --> <label *ngSwitchCase="'date'">{{ field.fieldName }}</label>
-              <input *ngSwitchCase="'date'" [type]="field.fieldType" [formControlName]="field.extValue"
-                class="clr-input" />
-              <!-- Textarea --> <label *ngSwitchCase="'textarea'">{{ field.fieldName }}</label>
-              <textarea *ngSwitchCase="'textarea'" [formControlName]="field.extValue" col="10" row="2"></textarea>
-              <!-- Checkbox --> <label *ngSwitchCase="'checkbox'">{{ field.fieldName }}</label><br>
-              <input *ngSwitchCase="'checkbox'" [type]="field.fieldType" [formControlName]="field.extValue"
-                class="clr-checkbox" />
-            </ng-container>
-          </div>
-        </div>
-      </div>
-      <!-- form code end --> <div class="modal-footer">
-<button type="button" class="btn btn-outline" (click)="modalAdd = false">Cancel</button>
-        <button type="submit" class="btn btn-primary" (click)="onSubmit()">ADD</button>
-        </div>
-</form>
-  </div>
+
+
+      <!-- form code start -->
+      <div *ngIf="checkFormCode">
+        <h4 style="font-weight: 300;display: inline;">Extension</h4>
+        <br>
+        <hr>
+        <div class="clr-row">
+          <div class="clr-col-4" *ngFor="let field of additionalFieldsFromBackend">
+            <ng-container *ngIf="field.formCode === formcode" [ngSwitch]="field.fieldType">
+              <!-- Text Input --> <label *ngSwitchCase="'text'">{{ field.fieldName }}</label>
+              <input *ngSwitchCase="'text'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-input" />
+              <!-- Date Input --> <label *ngSwitchCase="'date'">{{ field.fieldName }}</label>
+              <input *ngSwitchCase="'date'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-input" />
+              <!-- Textarea --> <label *ngSwitchCase="'textarea'">{{ field.fieldName }}</label>
+              <textarea *ngSwitchCase="'textarea'" [formControlName]="field.extValue" col="10" row="2"></textarea>
+              <!-- Checkbox --> <label *ngSwitchCase="'checkbox'">{{ field.fieldName }}</label><br>
+              <input *ngSwitchCase="'checkbox'" [type]="field.fieldType" [formControlName]="field.extValue"
+                class="clr-checkbox" />
+            </ng-container>
+          </div>
+        </div>
+      </div>
+      <!-- form code end --> <div class="modal-footer">
+<button type="button" class="btn btn-outline" (click)="modalAdd = false">Cancel</button>
+        <button type="submit" class="btn btn-primary" (click)="onSubmit()">ADD</button>
+        </div>
+</form>
+  </div>
 </clr-modal>
 
 
@@ -1221,4 +1211,4 @@
 
 
 
-  <!-- htmlpopup -->
+  <!-- htmlpopup -->