Compare commits

..

4 Commits

Author SHA1 Message Date
victorAnumudu 1423057bdf added transaction time to request table 2025-05-21 12:45:33 +01:00
ameye 9e4c8271d1 Merge branch 'update-loan-page' of DigiFi/digifi-FirstOffice into master 2025-05-05 16:07:55 +00:00
victorAnumudu 6f8615ebc5 updated loan and loan details page 2025-05-05 12:29:26 +01:00
CHIEFSOFT\ameye dc4b8b67c0 TENOR ADDED 2025-05-03 20:47:44 -04:00
7 changed files with 19 additions and 12 deletions
+2 -1
View File
@@ -9,6 +9,7 @@ import formatNumber from '../../helpers/formatNumber'
import queryKeys from '../../services/queryKeys'
import { getDashData } from '../../services/siteServices'
import getDateFromDateString from '../../helpers/GetDateFromDateString';
import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
import localImgLoader from '../../helpers/localImageLoader';
import RouteLinks from '../../RouteLinks';
@@ -111,7 +112,7 @@ export default function HomeCom() {
<img className="w-10 h-10 rounded-md" src={localImgLoader(`loan_icons/${item?.type}.png`)} alt="Icon" />
<div className="text-left">
<div className="text-base font-semibold">{item?.transaction_id}</div>
<div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
<div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)} {getTimeFromDateString(item?.created_at)}</div>
</div>
</div>
</td>
+1 -1
View File
@@ -83,7 +83,7 @@ export default function LoansCom() {
<td className="px-2">
<div className="text-right">
<div className="font-normal text-gray-500">{formatNumber(item?.product_id)}</div>
<div className="font-normal text-gray-500">{formatNumber(item?.tenor)}</div>
<div className="font-normal text-gray-500">{item?.tenor} days</div>
</div>
</td>
<td className="px-2">
@@ -74,7 +74,7 @@ export default function LoanChargeDetails({transactionID}) {
</td>
<td className="px-2">
<div className="text-right">
<div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
<div className="font-normal text-gray-500">{item?.created_at ? getDateFromDateString(item?.created_at) : 'Not available'}</div>
</div>
</td>
{/* <td className="px-2 text-right">
@@ -41,16 +41,16 @@ export default function LoanDetails({transactionID}) {
Name
</th>
<th scope="col" className="px-2 text-right">
Loan Amount
Loan/Eligible Amount
</th>
<th scope="col" className="px-2 text-right">
Product/Tenor
</th>
<th scope="col" className="px-2 text-right">
Repay/Install Amount
Repay/Install Amount.
</th>
<th scope="col" className="px-2 text-right">
Added
Added/Due
</th>
<th scope="col" className="px-2 text-right">
Action
@@ -66,7 +66,8 @@ export default function LoanDetails({transactionID}) {
<div className="text-left">
<div className="text-base font-semibold">{item?.account_id || ''}</div>
<div className="font-normal text-gray-500">{item?.id} : {item?.transaction_id}</div>
<div className="font-normal text-gray-500">ORIGIN : {item?.original_transaction}</div>
<div className="font-semibold text-red-500">ORIGIN : {item?.original_transaction}</div>
<div className="font-bold text-blue-500">OFFER : {item?.offer_id}</div>
</div>
</div>
</td>
@@ -74,12 +75,14 @@ export default function LoanDetails({transactionID}) {
<div className="text-right">
{/* <div className="text-base font-semibold">{formatNumber(item?.initial_loan_amount)}</div> */}
<div className="font-normal text-gray-500">{formatNumber(item?.initial_loan_amount)}</div>
<div className="font-semibold text-red-500">{formatNumber(item?.eligible_amount)}</div>
</div>
</td>
<td className="px-2">
<div className="text-right">
<div className="font-normal text-gray-500">{formatNumber(item?.product_id)}</div>
<div className="font-normal text-gray-500">{formatNumber(item?.tenor)}</div>
<div className="font-normal text-gray-500">{item?.tenor} days</div>
</div>
</td>
<td className="px-2">
@@ -91,6 +94,7 @@ export default function LoanDetails({transactionID}) {
<td className="px-2">
<div className="text-right">
<div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
<div className="font-semibold text-red-500">{getDateFromDateString(item?.due_date)}</div>
</div>
</td>
<td className="px-2 text-right">
@@ -92,7 +92,7 @@ export default function RepaymentScheduleDetails({transactionID}) {
</td>
<td className="px-2">
<div className="text-right">
<div className="font-normal text-gray-500">{item?.paid_at ? getDateFromDateString(item?.paid_at) : 'NULL'}</div>
<div className="font-normal text-gray-500">{item?.paid_at ? getDateFromDateString(item?.paid_at) : 'Not available'}</div>
</div>
</td>
<td className="px-2 text-right">
@@ -106,7 +106,7 @@ export default function RepaymentScheduleDetails({transactionID}) {
))
:
<tr className="py-2 border-t border-dashed border-slate-300">
<td className="px-3 py-2" colSpan={5}>
<td className="px-3 py-2" colSpan={6}>
<div className="flex justify-center items-center">
No Record Found
</div>
@@ -6,6 +6,7 @@ import Icons from '../Icons'
import queryKeys from '../../services/queryKeys'
import { getTransactions } from '../../services/siteServices'
import getDateFromDateString from '../../helpers/GetDateFromDateString';
import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
import localImgLoader from '../../helpers/localImageLoader';
export default function TransactionDetails({transactionID}) {
@@ -57,7 +58,7 @@ export default function TransactionDetails({transactionID}) {
<img className="w-10 h-10 rounded-md" src={localImgLoader(`loan_icons/${item?.type}.png`)} alt="Icon" />
<div className="text-left">
<div className="text-base font-semibold">{item?.transaction_id}</div>
<div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
<div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)} {getTimeFromDateString(item?.created_at)}</div>
</div>
</div>
</td>
@@ -10,6 +10,7 @@ import Avatar from '../../assets/user_avatar.jpg'
import queryKeys from '../../services/queryKeys'
import { getTransactions } from '../../services/siteServices'
import getDateFromDateString from '../../helpers/GetDateFromDateString';
import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
import localImgLoader from '../../helpers/localImageLoader';
import RouteLinks from '../../RouteLinks';
@@ -67,7 +68,7 @@ export default function TransactionsCom() {
<img className="w-10 h-10 rounded-md" src={localImgLoader(`loan_icons/${item?.type}.png`)} alt="Icon" />
<div className="text-left">
<div className="text-base font-semibold">{item?.transaction_id}</div>
<div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
<div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)} {getTimeFromDateString(item?.created_at)}</div>
</div>
</div>
</td>