diff --git a/packages/plugin-loans-ui/src/contracts/components/list/ClassificationForm.tsx b/packages/plugin-loans-ui/src/contracts/components/list/ClassificationForm.tsx index 683a162054..be4f8bc32f 100755 --- a/packages/plugin-loans-ui/src/contracts/components/list/ClassificationForm.tsx +++ b/packages/plugin-loans-ui/src/contracts/components/list/ClassificationForm.tsx @@ -78,13 +78,15 @@ function generateList(contractTypes, contracts) { currentContracts.map(contract => { let newClassification = 'NORMAL'; - if (type.config.badExpirationDay < (contract.expiredDays || 0)) + if (type?.config?.badExpirationDay < (contract.expiredDays || 0)) newClassification = 'BAD'; - else if (type.config.negativeExpirationDay < (contract.expiredDays || 0)) + else if ( + type?.config?.negativeExpirationDay < (contract.expiredDays || 0) + ) newClassification = 'NEGATIVE'; - else if (type.config.doubtExpirationDay < (contract.expiredDays || 0)) + else if (type?.config?.doubtExpirationDay < (contract.expiredDays || 0)) newClassification = 'DOUBTFUL'; - else if (type.config.expiredExpirationDay < (contract.expiredDays || 0)) + else if (type?.config?.expiredExpirationDay < (contract.expiredDays || 0)) newClassification = 'EXPIRED'; addClassification( diff --git a/packages/plugin-loans-ui/src/contracts/components/list/ContractRow.tsx b/packages/plugin-loans-ui/src/contracts/components/list/ContractRow.tsx index bcf378d97a..77aa087e94 100755 --- a/packages/plugin-loans-ui/src/contracts/components/list/ContractRow.tsx +++ b/packages/plugin-loans-ui/src/contracts/components/list/ContractRow.tsx @@ -49,8 +49,10 @@ function ContractRow({ contract, history, isChecked, toggleBulk }: Props) { {displayValue(contract, 'number')} - {displayValue(contract, 'marginAmount')} {displayValue(contract, 'leaseAmount')} + + {displayValue(contract, 'loanBalanceAmount')} + {displayValue(contract, 'status')} {displayValue(contract, 'tenor')} {displayValue(contract, 'interestRate')} diff --git a/packages/plugin-loans-ui/src/contracts/components/list/ContractsList.tsx b/packages/plugin-loans-ui/src/contracts/components/list/ContractsList.tsx index 1e1eed0fe8..abcbb7aea0 100755 --- a/packages/plugin-loans-ui/src/contracts/components/list/ContractsList.tsx +++ b/packages/plugin-loans-ui/src/contracts/components/list/ContractsList.tsx @@ -142,16 +142,17 @@ class ContractsList extends React.Component { label={__('Contract Number')} /> + diff --git a/packages/plugin-loans-ui/src/locales/mn.json b/packages/plugin-loans-ui/src/locales/mn.json index dd508b1571..60cb666880 100644 --- a/packages/plugin-loans-ui/src/locales/mn.json +++ b/packages/plugin-loans-ui/src/locales/mn.json @@ -156,5 +156,6 @@ "Tenor must greater than": "Хугацаа бага байна", "Tenor must less than": "Хугацаа их байна", "Interest must greater than": "Хүү бага байна", - "Interest must less than": "Хүү их байна" + "Interest must less than": "Хүү их байна", + "balanceAmount": "Үлдэгдэл дүн" }