diff --git a/src/components/offers/OffersCom.jsx b/src/components/offers/OffersCom.jsx index 7b724ed..de4695a 100644 --- a/src/components/offers/OffersCom.jsx +++ b/src/components/offers/OffersCom.jsx @@ -44,7 +44,10 @@ export default function OffersCom() { - + - + @@ -70,9 +76,14 @@ export default function OffersCom() { {(data && data.length > 0) ? data?.map((item, index) => ( + - + {loans?.map((item, index) => ( - - + - + - - - - - + + + + + + + + + + + + )) }
+ + ID + Name @@ -53,9 +56,12 @@ export default function OffersCom() { Insurance Rate + Mgt. Rate + Vat. Rate + Max/Min Amount
+
+
{item?.id || ''}
+
+
- Jese image + {/*Jese image*/}
{item?.product_id || ''}
{/*
{item?.description}
*/} @@ -89,11 +100,16 @@ export default function OffersCom() {
{formatNumber(item?.insurance_rate)}
 +
{formatNumber(item?.management_rate)}
 +
+
{formatNumber(item?.vat_rate)}
+
+
{formatNumber(item?.max_amount)}
diff --git a/src/components/transactionDetails/LoanDetails.jsx b/src/components/transactionDetails/LoanDetails.jsx index 24f60d3..b213340 100644 --- a/src/components/transactionDetails/LoanDetails.jsx +++ b/src/components/transactionDetails/LoanDetails.jsx @@ -8,6 +8,7 @@ import queryKeys from '../../services/queryKeys' import {getLoans} from '../../services/siteServices' import getDateFromDateString from '../../helpers/GetDateFromDateString'; import formatNumber from '../../helpers/formatNumber' +import getTimeFromDateString from "../../helpers/GetTimeFromDateString"; export default function LoanDetails({transactionID}) { @@ -53,86 +54,97 @@ export default function LoanDetails({transactionID}) { Added/Due
- Action + Status
-
- Jese image -
-
{item?.account_id || ''}
-
{item?.id} : {item?.transaction_id}
-
ORIGIN - : {item?.original_transaction}
-
OFFER - : {item?.offer_id}
+ <> +
+
+ Jese image +
+
{item?.account_id || ''}
+
{item?.id} : {item?.transaction_id}
+
ORIGIN + : {item?.original_transaction}
+
OFFER + : {item?.offer_id}
+
- - 		-
- {/*
{formatNumber(item?.initial_loan_amount)}
*/} -
{formatNumber(item?.initial_loan_amount)}
-
{formatNumber(item?.eligible_amount)}
+
+
+ {/*
{formatNumber(item?.initial_loan_amount)}
*/} +
{formatNumber(item?.initial_loan_amount)}
+
{formatNumber(item?.eligible_amount)}
-
- 		-
-
{formatNumber(item?.product_id)}
-
{item?.tenor} days
-
- 		-
-
{formatNumber(item?.repayment_amount)}
-
{formatNumber(item?.installment_amount)}
-
- 		-
-
{getDateFromDateString(item?.created_at)}
-
{getDateFromDateString(item?.due_date)}
-
- 		-
-
-
-
-
+
+
{formatNumber(item?.product_id)}
+
{item?.tenor} days
+
+ 		+
+
{formatNumber(item?.repayment_amount)}
+
{formatNumber(item?.installment_amount)}
+
+ 		+
+
{getDateFromDateString(item?.created_at)}
+
{getDateFromDateString(item?.due_date)}
+
+ 		+
{item?.status}
+
+
+

Loans Disbursement + Details

+
Disburse Date + : {getDateFromDateString(item?.disburseDate)} {getTimeFromDateString(item?.disburseDate)}
+
Disburse Description + : {item?.disburseDescription}
+
Disburse Result + : {item?.disburseResult}
+

+
Disburse Verify + Date: {getDateFromDateString(item?.disburseVerify)} {getTimeFromDateString(item?.disburseVerify)}
+
Verify Description + : {item?.verifyDescription}
+
Verify Result + : {item?.verifyResult}
+
+
-
-

Loans Disbursement Details

-
Disburse Date : {item?.disburseDate}
-
Disburse Description - : {item?.disburseDescription}
-
Disburse Result : {item?.disburseResult}
-

-
Disburse Verify DAte: {item?.disburseVerify}
-
Verify Description - : {item?.verifyDescription}
-
Verify Result : {item?.verifyResult}
-
+ : null diff --git a/src/components/transactionDetails/TransactionDetails.jsx b/src/components/transactionDetails/TransactionDetails.jsx index 3e83062..09b8dd1 100644 --- a/src/components/transactionDetails/TransactionDetails.jsx +++ b/src/components/transactionDetails/TransactionDetails.jsx @@ -43,10 +43,10 @@ export default function TransactionDetails({transactionID}) { Account - Activity + Customer - Action + Channel @@ -70,18 +70,11 @@ export default function TransactionDetails({transactionID}) {
-
50%
-
-
-
+
{item?.customer_id}
-
-
- -
-
+
{item?.channel}
)) diff --git a/src/helpers/GetDateFromDateString.js b/src/helpers/GetDateFromDateString.js index 667a4ca..42d7536 100644 --- a/src/helpers/GetDateFromDateString.js +++ b/src/helpers/GetDateFromDateString.js @@ -1,6 +1,8 @@ function getDateFromDateString(dateString) { const date = new Date(dateString); - + + if (dateString == null || dateString.trim() === '' ) return ''; + // Ensure the date is valid if (isNaN(date)) { return "Invalid date string"; diff --git a/src/helpers/GetTimeFromDateString.js b/src/helpers/GetTimeFromDateString.js index 4d33ce7..5a40829 100644 --- a/src/helpers/GetTimeFromDateString.js +++ b/src/helpers/GetTimeFromDateString.js @@ -1,6 +1,8 @@ function getTimeFromDateString(dateString) { const date = new Date(dateString); - + + if (dateString == null || dateString.trim() === '' ) return ''; + // Ensure the date is valid if (isNaN(date)) { return "Invalid date string";