contract balance amount and classification bug fix

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(

packages/plugin-loans-ui/src/contracts/components/list/ContractRow.tsx

@@ -49,8 +49,10 @@ function ContractRow({ contract, history, isChecked, toggleBulk }: Props) {
       </td>
 
       <td key={'number'}>{displayValue(contract, 'number')} </td>
-      <td key={'marginAmount'}>{displayValue(contract, 'marginAmount')}</td>
       <td key={'leaseAmount'}>{displayValue(contract, 'leaseAmount')}</td>
+      <td key={'loanBalanceAmount'}>
+        {displayValue(contract, 'loanBalanceAmount')}
+      </td>
       <td key={'status'}>{displayValue(contract, 'status')}</td>
       <td key={'tenor'}>{displayValue(contract, 'tenor')}</td>
       <td key={'interestRate'}>{displayValue(contract, 'interestRate')}</td>

packages/plugin-loans-ui/src/contracts/components/list/ContractsList.tsx

@@ -142,16 +142,17 @@ class ContractsList extends React.Component<IProps, State> {
                   label={__('Contract Number')}
                 />
               </th>
+
               <th>
                 <SortHandler
-                  sortField={'marginAmount'}
-                  label={__('marginAmount')}
+                  sortField={'leaseAmount'}
+                  label={__('leaseAmount')}
                 />
               </th>
               <th>
                 <SortHandler
-                  sortField={'leaseAmount'}
-                  label={__('leaseAmount')}
+                  sortField={'balanceAmount'}
+                  label={__('balanceAmount')}
                 />
               </th>
               <th>

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": "Үлдэгдэл дүн"
 }