b2adminui 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "b2adminui",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "private": false,
   "description": "B2AdminUI project.",
   "scripts": {

package/src/app/customer-management/customer-registration/components/customer-registration.component.ts

@@ -6,9 +6,9 @@ import { Constants } from '../../../shared/constants/constants';
 import { WalletRegistrationModel, ContactModel, CustomerModel, WalletModel, MailingAddressModel, CompanyAddressModel, CardModel, AttachFileModel, AttachFileListModel, DownloadFileModel, AddWalletAuditLogModel } from '../models/index';
 import { Alerts } from '../../../shared/alerts/alerts';
 import { AuditLogInsertModel } from '../../../models/audit-log-insert.model';
-import { AddCardAuditLogMoel, AddWalletModel, CustomerDipChipModel, UpdateStatus } from "../models/wallet-registration.model";
+import { AddCardAuditLogMoel, AddWalletModel, BankLinkAccountModel, CustomerDipChipModel, UpdateStatus } from "../models/wallet-registration.model";
 import { CustomerPersonalDetailsComponent } from '../../customer-personal-details/components/customer-personal-details.component';
-import { CompanyModel } from '../../../fee-management/company/models'; 
+import { CompanyModel } from '../../../fee-management/company/models';
 
 @Component({
     selector: 'customer-registration',
@@ -96,9 +96,10 @@ export class CustomerRegistrationComponent implements OnInit, AfterViewInit {
     public displayKycValidation: Boolean = false;
     public walletStatusDisabled: boolean = false;
     private disableWalletProfile: Boolean = false;
-    private showApprovalIcon: boolean = false; 
+    private showApprovalIcon: boolean = false;
     private autoApprove: boolean = true;
     private companyModel: CompanyModel;
+    public BankAccountNumber: string;
 
     constructor(public sharedService: SharedService, public common: Common,
         private router: Router, private route: ActivatedRoute, private alert: Alerts,
@@ -130,6 +131,7 @@ export class CustomerRegistrationComponent implements OnInit, AfterViewInit {
         this.actualObject.MailingAddress = new MailingAddressModel();
         this.actualObject.CompanyAddress = new CompanyAddressModel();
         this.actualObject.AttachFileListModel = new AttachFileListModel();
+        this.actualObject.BankLinkAccount = new BankLinkAccountModel();
         this.sharedService.disableButton = false;
         this.addWalletModel = new AddWalletModel();
         this.addWalletAuditLogModel = new AddWalletAuditLogModel();
@@ -146,7 +148,7 @@ export class CustomerRegistrationComponent implements OnInit, AfterViewInit {
         this.dateFormat = Constants.DATE_FORMAT;
         this.todayDate = new Date();
         this.showApprovalIcon = this.sharedService.CanChecker();
-        
+
         // get page name and wallet Id from url 
         let urlSegment = this.route.snapshot.url[0];
         if (urlSegment) {
@@ -513,7 +515,7 @@ export class CustomerRegistrationComponent implements OnInit, AfterViewInit {
                     this.duplicateMobileModal.open();
                     this.confirmMessage = response.responseDescription;
                 }
-                else  if (requestType == Constants.POST_REQUEST) {
+                else if (requestType == Constants.POST_REQUEST) {
                     this.alert.error(response.responseDescription);
                 }
                 break;
@@ -563,6 +565,7 @@ export class CustomerRegistrationComponent implements OnInit, AfterViewInit {
                 case Constants.GET_REQUEST:
                     if (response && response.Wallet) {
                         this.walletRegistrationModel.Wallet = response.Wallet;
+                        this.walletRegistrationModel.BankLinkAccount = response.Wallet;
                         this.isWalletPresent = true;
 
                         if (this.common.getCompanyId() != Constants.COMPANY_ID_2C2P && this.walletRegistrationModel.Wallet.WalletTypeId == 2) {
@@ -664,6 +667,10 @@ export class CustomerRegistrationComponent implements OnInit, AfterViewInit {
                         this.walletId = ` ${this.common.maskString(6, 4, this.walletRegistrationModel.Wallet.WalletId.toString(), Constants.ASTERISK_SYMBOL)}`;
                     }
 
+                    if (this.walletRegistrationModel.BankLinkAccount.BankAccountNumber) {
+                        this.BankAccountNumber = ` ${this.common.maskStringBank(this.walletRegistrationModel.BankLinkAccount.BankAccountNumber.toString(), Constants.ASTERISK_SYMBOL)}`;
+                    }
+
                     this.custPersonalDetailsComp.afterDataLoad();
 
                     if (this.walletRegistrationModel.Contact.StateId > 0) {
@@ -903,6 +910,9 @@ export class CustomerRegistrationComponent implements OnInit, AfterViewInit {
         if (this.actualObject.Wallet.WalletId)
             Description += `${this.actualObject.Wallet.WalletId} `
 
+        if (this.actualObject.BankLinkAccount.BankAccountNumber)
+            Description += `${this.actualObject.BankLinkAccount.BankAccountNumber} `
+
         return Description;
     }
 
@@ -951,6 +961,12 @@ export class CustomerRegistrationComponent implements OnInit, AfterViewInit {
             description += ` ${this.common.maskString(6, 4, walletId, Constants.ASTERISK_SYMBOL)}`;
         }
 
+        if (this.walletRegistrationModel.BankLinkAccount.BankAccountNumber) {
+            let bankaccountnumber = this.walletRegistrationModel.BankLinkAccount.BankAccountNumber ? this.walletRegistrationModel.BankLinkAccount.BankAccountNumber.toString() : '';
+
+            description += ` ${this.common.maskStringBank(bankaccountnumber, Constants.ASTERISK_SYMBOL)}`;
+        }
+
         return description;
     }
 
@@ -1260,6 +1276,18 @@ export class CustomerRegistrationComponent implements OnInit, AfterViewInit {
             this.alert.error(this.common.permissionMessage);
         }
     }
+    public getFullBankAccount() {
+        if (!this.walletRegistrationModel.BankLinkAccount.BankAccountNumber) {
+            return;
+        }
+
+        if (this.fullPanRights) {
+            this.walletId = this.walletRegistrationModel.BankLinkAccount.BankAccountNumber.toString();
+        }
+        else {
+            this.alert.error(this.common.permissionMessage);
+        }
+    }
 
     public getDistrictList(stateChanged?: boolean) {
         if (stateChanged) {

package/src/app/customer-management/customer-registration/customer-registration.component.html

@@ -51,7 +51,7 @@
                                                 <input [disabled]="pageName == 'view'"
                                                     (keypress)="common.onlyNumberKey($event)" maxlength="50" type="text"
                                                     class="form-control" placeholder="Mobile Number" name="telNumber"
-                                                    #telNumber="ngModel" 
+                                                    #telNumber="ngModel"
                                                     [(ngModel)]="walletRegistrationModel.Contact.MobileNo"
                                                     [required]="walletRegistrationModel.Customer.CustomerTypeId == 1 && 
                                                     custPersonalDetailsComp.kycVerificationRequired && 
@@ -79,11 +79,10 @@
                                         </label>
                                         <div class="col-sm-6">
                                             <input type="text" [disabled]="pageName == 'view'" name="email"
-                                                #email="ngModel" placeholder="Email Address" maxlength="50" 
+                                                #email="ngModel" placeholder="Email Address" maxlength="50"
                                                 [(ngModel)]="walletRegistrationModel.Contact.Email" class="form-control"
                                                 pattern="^\w+([\.-]?\w+[+0-9]?)*@\w+([\.-]?\w+)*(\.\w{2,3})+$"
-                                                [title]="walletRegistrationModel.Contact.Email"
-                                                [required]="(!walletRegistrationModel.Contact.Email || 
+                                                [title]="walletRegistrationModel.Contact.Email" [required]="(!walletRegistrationModel.Contact.Email || 
                                                 (walletRegistrationModel.Contact.Email && !walletRegistrationModel.Contact.Email.trim())) &&
                                                 ((walletRegistrationModel.Customer.CustomerTypeId === 2) ||
                                                 (walletRegistrationModel.Customer.CustomerTypeId == 1 && 
@@ -823,11 +822,28 @@
                                                 [disabled]="pageName == 'view' || is2C2PAdmin == false"
                                                 [data]="walletTypeListData" [filterable]="true"
                                                 [textField]="'walletType'" [valueField]="'walletTypeId'"
-                                                (filterChange)="walletTypesSearchFilter($event)" [valuePrimitive]="true">
+                                                (filterChange)="walletTypesSearchFilter($event)"
+                                                [valuePrimitive]="true">
                                             </kendo-dropdownlist>
                                         </div>
                                     </div>
                                 </div>
+
+                                <div class="row">
+                                    <div class="form-group">
+                                        <label class="col-md-4 control-label">Bank Account Number
+                                            <span>:</span>
+                                        </label>
+                                        <div class="col-md-4 control-label text-left">
+                                            {{ BankAccountNumber }}
+                                        </div>
+                                        <div class="col-md-4 m-l-none p-l-none">
+                                            <a (click)="getFullBankAccount()">
+                                                <i class="fa fa-eye eye-icon-style col-md-3"></i>
+                                            </a>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
 
                             <div class="col-md-6">
@@ -896,6 +912,19 @@
                                         </a>
                                     </div>
                                 </div>
+
+                                <div class="row">
+                                    <div class="form-group">
+                                        <label class="col-md-4 control-label">Bank Link Status
+                                            <span>:</span>
+                                        </label>
+                                        <div class="col-md-4 control-label text-left">
+                                            Link or Unlink
+                                            <span class="m-l-sm">{{ walletRegistrationModel.Wallet.CurrencyCode
+                                                }}</span>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
 
@@ -1002,7 +1031,7 @@
                                     class="btn btn-primary m-l-md">Cancel</button>
                             </div>
                             <div class="col-sm-12 text-center" *ngIf="pageName =='view'">
-                               <button type="button" [disabled]="disableEdit" (click)="onEditClick()"
+                                <button type="button" [disabled]="disableEdit" (click)="onEditClick()"
                                     class="btn btn-primary m-l-md">Edit</button>
                                 <!-- <button type="button" *ngIf="!isUserTerminated" (click)="resetPassCode()"
                                     class="m-l-md btn btn-primary">Reset Passcode

package/src/app/customer-management/customer-registration/models/wallet-registration.model.ts

@@ -14,6 +14,7 @@ export class WalletRegistrationModel {
     public FileName2: string;
     public CustomerDipChip: CustomerDipChipModel;
     public RiskLevel: string;
+    public BankLinkAccount: BankLinkAccountModel;
 }
 
 export class CustomerModel {
@@ -188,4 +189,10 @@ export class UpdateStatus {
 export class CustomerDipChipModel {
     public ExpiryDate: string;
     public NfcStatus: number;
+}
+
+export class BankLinkAccountModel {
+    public BankName: string;
+    public BankAccountNumber: number;
+    public LinkStatus: string;
 }

package/src/app/customer-management/customer-registration-list/customer-registration-list.component.html

@@ -309,11 +309,15 @@
                         </kendo-grid-column>
                         <kendo-grid-column field="ProfileName" title="Wallet Profile" width="100">
                         </kendo-grid-column>
-                        <kendo-grid-column field="BankName" title="Bank Name" width="100">
+                        <!-- <kendo-grid-column field="BankName" title="Bank BankName" width="101">
+                        </kendo-grid-column> -->
+                        <kendo-grid-column field="BankAccountCurrent" title="Current Account Number" width="101">
                         </kendo-grid-column>
-                        <kendo-grid-column field="BankAccountNumber" title="Bank Account Number" width="100">
+                        <kendo-grid-column field="BankStatusCurrent" title="Current Account Status" width="100">
                         </kendo-grid-column>
-                        <kendo-grid-column field="LinkStatus" title="Link Status" width="100">
+                        <kendo-grid-column field="BankAccountSaving" title="Saving Account Number" width="101">
+                        </kendo-grid-column>
+                        <kendo-grid-column field="BankStatusSaving" title="Saving Account Status" width="100">
                         </kendo-grid-column>
 
                         <!--Edit column-->

package/src/app/customer-management/customer-registration-list/models/wallet-list.model.ts

@@ -31,9 +31,11 @@ export class WalletSearchModel extends SearchModel {
     public WalletProfileId: number;
     public WalletId: string;
     public BankName: string;
-    public LinkStatus: string;
-    public BankAccountNumber: string;
-    
+    public BankAccountSaving: string;
+    public BankStatusSaving: string;
+    public BankAccountCurrent: string;
+    public BankStatusCurrent: string;
+
     constructor(companyUniqueId: number, companyId: string) {
         super();
         this.CompanyUniqueId = companyId != Constants.COMPANY_ID_2C2P ? companyUniqueId : null;

package/src/app/shared/common/common.ts

@@ -124,15 +124,15 @@ export class Common {
         }
     }
 
-    public setPageTitle(rootPageTitle: string, 
-        rootPageURL: string, 
-        currentPageTitle: string, 
-        currentPageURL: string, 
+    public setPageTitle(rootPageTitle: string,
+        rootPageURL: string,
+        currentPageTitle: string,
+        currentPageURL: string,
         childPageTitle?: string,
-        childPageURL?: string, 
-        backPageURL?: string, 
-        isPreviousPageURL?: boolean, 
-        subChildPageTitle?: string, 
+        childPageURL?: string,
+        backPageURL?: string,
+        isPreviousPageURL?: boolean,
+        subChildPageTitle?: string,
         subChildPageURL?: string) {
         // set page title and url
         this.sharedService.rootPageTitle = rootPageTitle;
@@ -464,14 +464,14 @@ export class Common {
         return updateUrl;
     }
 
-    public exportToCSVFile(url?: string, 
-        fileName?: string, 
-        model?: any, 
+    public exportToCSVFile(url?: string,
+        fileName?: string,
+        model?: any,
         toggleColumnModel?: any,
-        isFromSearch?: boolean, 
-        requestType?: string, 
-        baseUrl?: string, 
-        filterModel?: any, 
+        isFromSearch?: boolean,
+        requestType?: string,
+        baseUrl?: string,
+        filterModel?: any,
         summaryModel?: any) {
         let dataURI = Constants.CSV_DATA_URI_FORMAT + encodeBase64('');
         let token = (this.getToken() && !baseUrl) ?
@@ -604,6 +604,18 @@ export class Common {
         }
         return value;
     }
+    public maskStringBank(value: string, maskBy: string): string {
+        if (!value) return value;
+
+        const len = value.length;
+
+        if (len <= 4) return value; // 4 လုံးထက်နည်းရင် no mask 
+
+        const maskedPart = maskBy.repeat(len - 4); // ကျန်တဲ့လုံးအတွက် * ထားမယ်
+        const last4 = value.slice(-4); // နောက်ဆုံး 4 လုံး
+
+        return maskedPart + last4;
+    }
 
     // This method will verify the model object. If any property has blank value then it will replace it with undefined.
     // This method will be used to for search models.
@@ -618,9 +630,8 @@ export class Common {
             let key = keys[i];
             if (skipDefaultInteger) {
                 model[key] = model[key] === 0 ? model[key] : (model[key] ? model[key] : undefined);
-            } 
-            else if (model[key] === false)
-            {
+            }
+            else if (model[key] === false) {
                 model[key] = model[key];
             }
             else {
@@ -1333,7 +1344,7 @@ export class Common {
     public validateAlphaNumericLength(event: any, maxLength: number) {
         let value = event.currentTarget.value;
         if (value) {
-            if(value.length >  maxLength){
+            if (value.length > maxLength) {
                 return false;
             }
         }