0.0.55
This commit is contained in:
sairaj mote
parent
1ed2a4f462
commit
22a5d1806a
@ -254,8 +254,7 @@ border: none;
|
|||||||
min-width: 0;
|
min-width: 0;
|
||||||
}
|
}
|
||||||
.input.readonly .clear{
|
.input.readonly .clear{
|
||||||
opacity: 0 !important;
|
display: none;
|
||||||
pointer-events: none !important;
|
|
||||||
}
|
}
|
||||||
.readonly{
|
.readonly{
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
|||||||
36
css/main.css
36
css/main.css
@ -854,7 +854,9 @@ sm-panel {
|
|||||||
.request .flex {
|
.request .flex {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
margin-top: 1.5rem;
|
margin-top: auto;
|
||||||
|
padding-top: 1.5rem;
|
||||||
|
justify-self: flex-end;
|
||||||
}
|
}
|
||||||
.request .flex h5 {
|
.request .flex h5 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
@ -1195,6 +1197,38 @@ sm-panel {
|
|||||||
width: max-content;
|
width: max-content;
|
||||||
margin-left: 0.4rem;
|
margin-left: 0.4rem;
|
||||||
}
|
}
|
||||||
|
.activity.placeholder {
|
||||||
|
animation: pulse infinite 0.6s alternate;
|
||||||
|
}
|
||||||
|
.activity.placeholder .activity-type,
|
||||||
|
.activity.placeholder .activity-receiver {
|
||||||
|
background: rgba(var(--text-color), 0.06);
|
||||||
|
padding: 0.5rem 0;
|
||||||
|
}
|
||||||
|
.activity.placeholder .activity-type {
|
||||||
|
width: 50%;
|
||||||
|
}
|
||||||
|
.activity.placeholder:nth-of-type(2) {
|
||||||
|
animation-delay: 0.1s;
|
||||||
|
}
|
||||||
|
.activity.placeholder:nth-of-type(3) {
|
||||||
|
animation-delay: 0.2s;
|
||||||
|
}
|
||||||
|
.activity.placeholder:nth-of-type(4) {
|
||||||
|
animation-delay: 0.3s;
|
||||||
|
}
|
||||||
|
.activity.placeholder:nth-of-type(5) {
|
||||||
|
animation-delay: 0.4s;
|
||||||
|
}
|
||||||
|
.activity.placeholder:nth-of-type(6) {
|
||||||
|
animation-delay: 0.5s;
|
||||||
|
}
|
||||||
|
.activity.placeholder:nth-of-type(7) {
|
||||||
|
animation-delay: 0.6s;
|
||||||
|
}
|
||||||
|
.activity.placeholder:nth-of-type(8) {
|
||||||
|
animation-delay: 0.7s;
|
||||||
|
}
|
||||||
|
|
||||||
.back-arrow {
|
.back-arrow {
|
||||||
stroke-width: 10;
|
stroke-width: 10;
|
||||||
|
|||||||
2
css/main.min.css
vendored
2
css/main.min.css
vendored
File diff suppressed because one or more lines are too long
@ -879,8 +879,9 @@ sm-panel{
|
|||||||
.flex {
|
.flex {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
margin-top: 1.5rem;
|
margin-top: auto;
|
||||||
|
padding-top: 1.5rem;
|
||||||
|
justify-self: flex-end;
|
||||||
h5 {
|
h5 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
@ -1250,6 +1251,38 @@ sm-panel{
|
|||||||
width: max-content;
|
width: max-content;
|
||||||
margin-left: 0.4rem;
|
margin-left: 0.4rem;
|
||||||
}
|
}
|
||||||
|
&.placeholder{
|
||||||
|
animation: pulse infinite 0.6s alternate;
|
||||||
|
.activity-type,
|
||||||
|
.activity-receiver{
|
||||||
|
background: rgba(var(--text-color), 0.06);
|
||||||
|
padding: 0.5rem 0;
|
||||||
|
}
|
||||||
|
.activity-type{
|
||||||
|
width: 50%;
|
||||||
|
}
|
||||||
|
&:nth-of-type(2){
|
||||||
|
animation-delay: 0.1s;
|
||||||
|
}
|
||||||
|
&:nth-of-type(3){
|
||||||
|
animation-delay: 0.2s;
|
||||||
|
}
|
||||||
|
&:nth-of-type(4){
|
||||||
|
animation-delay: 0.3s;
|
||||||
|
}
|
||||||
|
&:nth-of-type(5){
|
||||||
|
animation-delay: 0.4s;
|
||||||
|
}
|
||||||
|
&:nth-of-type(6){
|
||||||
|
animation-delay: 0.5s;
|
||||||
|
}
|
||||||
|
&:nth-of-type(7){
|
||||||
|
animation-delay: 0.6s;
|
||||||
|
}
|
||||||
|
&:nth-of-type(8){
|
||||||
|
animation-delay: 0.7s;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.back-arrow{
|
.back-arrow{
|
||||||
stroke-width: 10;
|
stroke-width: 10;
|
||||||
|
|||||||
86
index.html
86
index.html
@ -358,7 +358,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
</header>
|
</header>
|
||||||
<sm-input id="add_upi_input" placeholder="UPI address" pattern="^[a-zA-z0-9]+@[a-zA-z0-9]+" required animate>
|
<sm-input id="add_upi_input" placeholder="UPI address" pattern="^[a-zA-z0-9\-]+@[a-zA-z0-9]+" required animate>
|
||||||
</sm-input>
|
</sm-input>
|
||||||
</sm-popup>
|
</sm-popup>
|
||||||
|
|
||||||
@ -1085,7 +1085,7 @@
|
|||||||
return card;
|
return card;
|
||||||
},
|
},
|
||||||
activityCard(obj) {
|
activityCard(obj) {
|
||||||
let { type, amount, timeStamp, receiver, upi_txid, receiverUPI, pending } = obj;
|
let { type, amount, timeStamp, receiver, upi_txid, receiverUPI, processed } = obj;
|
||||||
let card = document.createElement('div'),
|
let card = document.createElement('div'),
|
||||||
composition = ``,
|
composition = ``,
|
||||||
icon,
|
icon,
|
||||||
@ -1100,7 +1100,7 @@
|
|||||||
'data-amount': amount,
|
'data-amount': amount,
|
||||||
'data-upi-txid': upi_txid,
|
'data-upi-txid': upi_txid,
|
||||||
'data-receiver-upi': receiverUPI,
|
'data-receiver-upi': receiverUPI,
|
||||||
'data-pending': pending
|
'data-pending': processed
|
||||||
})
|
})
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case 'sent':
|
case 'sent':
|
||||||
@ -1141,7 +1141,7 @@
|
|||||||
sign = '+'
|
sign = '+'
|
||||||
className = 'deposited'
|
className = 'deposited'
|
||||||
transaction = 'Deposited'
|
transaction = 'Deposited'
|
||||||
if (pending)
|
if (processed === false)
|
||||||
transaction = 'deposit'
|
transaction = 'deposit'
|
||||||
break;
|
break;
|
||||||
case 'withdraw':
|
case 'withdraw':
|
||||||
@ -1161,7 +1161,7 @@
|
|||||||
sign = '-'
|
sign = '-'
|
||||||
className = 'withdrawn'
|
className = 'withdrawn'
|
||||||
transaction = 'withdrawn to'
|
transaction = 'withdrawn to'
|
||||||
if (pending)
|
if (processed === false)
|
||||||
transaction = 'withdraw'
|
transaction = 'withdraw'
|
||||||
break;
|
break;
|
||||||
case 'payCashier':
|
case 'payCashier':
|
||||||
@ -1174,12 +1174,12 @@
|
|||||||
sign = '-'
|
sign = '-'
|
||||||
className = 'withdrawn'
|
className = 'withdrawn'
|
||||||
transaction = 'Paid to'
|
transaction = 'Paid to'
|
||||||
if (pending)
|
if (processed === false)
|
||||||
transaction = 'payment'
|
transaction = 'payment'
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
let status = ''
|
let status = ''
|
||||||
if (pending) {
|
if (processed === false) {
|
||||||
status = '<div class="pending">pending</div>'
|
status = '<div class="pending">pending</div>'
|
||||||
icon = `<svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
icon = `<svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
<title>pending</title>
|
<title>pending</title>
|
||||||
@ -1201,6 +1201,18 @@
|
|||||||
card.innerHTML = composition;
|
card.innerHTML = composition;
|
||||||
return card;
|
return card;
|
||||||
},
|
},
|
||||||
|
activityPlaceholder(){
|
||||||
|
let card = document.createElement('div'),
|
||||||
|
composition = ``
|
||||||
|
card.classList.add('activity', 'placeholder')
|
||||||
|
composition += `
|
||||||
|
<div class="icon"></div>
|
||||||
|
<h4 class="activity-type"></h4>
|
||||||
|
<h4 class="activity-receiver"></h4>
|
||||||
|
`
|
||||||
|
card.innerHTML = composition;
|
||||||
|
return card;
|
||||||
|
},
|
||||||
paymentRequest(time, senderAddress, amount, id, enableActions) {
|
paymentRequest(time, senderAddress, amount, id, enableActions) {
|
||||||
let card = document.createElement('div')
|
let card = document.createElement('div')
|
||||||
card.classList.add('request'),
|
card.classList.add('request'),
|
||||||
@ -1941,7 +1953,7 @@
|
|||||||
receiver: currentRequest.dataset.receiver,
|
receiver: currentRequest.dataset.receiver,
|
||||||
upiTxId: currentRequest.dataset.upiTxid,
|
upiTxId: currentRequest.dataset.upiTxid,
|
||||||
receiverUPI: currentRequest.dataset.receiverUpi,
|
receiverUPI: currentRequest.dataset.receiverUpi,
|
||||||
pending: currentRequest.dataset.pending
|
processed: currentRequest.dataset.pending
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -2056,7 +2068,7 @@
|
|||||||
showReportButton = document.getElementById('show_report_btn')
|
showReportButton = document.getElementById('show_report_btn')
|
||||||
|
|
||||||
function showTransactionDetails(obj) {
|
function showTransactionDetails(obj) {
|
||||||
let { type, timeStamp, amount, receiver, upiTxId, receiverUPI, pending } = obj;
|
let { type, timeStamp, amount, receiver, upiTxId, receiverUPI, processed } = obj;
|
||||||
let composition = ``,
|
let composition = ``,
|
||||||
icon,
|
icon,
|
||||||
transaction,
|
transaction,
|
||||||
@ -2095,7 +2107,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
`
|
`
|
||||||
type = 'deposited'
|
type = 'deposited'
|
||||||
if (pending === 'true')
|
if (processed === 'false')
|
||||||
type = 'deposit'
|
type = 'deposit'
|
||||||
transaction = 'Deposited to'
|
transaction = 'Deposited to'
|
||||||
break;
|
break;
|
||||||
@ -2114,7 +2126,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
`
|
`
|
||||||
type = 'withdrawn'
|
type = 'withdrawn'
|
||||||
if (pending === 'true')
|
if (processed === 'false')
|
||||||
type = 'Withdraw'
|
type = 'Withdraw'
|
||||||
transaction = 'withdrawn to'
|
transaction = 'withdrawn to'
|
||||||
break;
|
break;
|
||||||
@ -2128,12 +2140,12 @@
|
|||||||
className = 'withdrawn'
|
className = 'withdrawn'
|
||||||
transaction = 'Paid to'
|
transaction = 'Paid to'
|
||||||
type = 'Paid through cashier'
|
type = 'Paid through cashier'
|
||||||
if (pending === 'true')
|
if (processed === 'false')
|
||||||
type = 'Paying through cashier'
|
type = 'Paying through cashier'
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pending === 'true') {
|
if (processed === 'false') {
|
||||||
icon = `<svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
icon = `<svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
<title>pending</title>
|
<title>pending</title>
|
||||||
<circle cx="32" cy="32" r="31.5"/>
|
<circle cx="32" cy="32" r="31.5"/>
|
||||||
@ -11856,13 +11868,11 @@
|
|||||||
},
|
},
|
||||||
"FTpxFWdBDvYARGZuPWDhw9gke72J2pruvv": {
|
"FTpxFWdBDvYARGZuPWDhw9gke72J2pruvv": {
|
||||||
"upi_id": "aakriti1705sinha@okicici"
|
"upi_id": "aakriti1705sinha@okicici"
|
||||||
}
|
},
|
||||||
}`
|
|
||||||
/*
|
|
||||||
"FQ6udJuTbGDa2kWZAkmNpwgHaUEeYLPAtt": {
|
"FQ6udJuTbGDa2kWZAkmNpwgHaUEeYLPAtt": {
|
||||||
"upi_id": "krishraj1012-2@okicici"
|
"upi_id": "krishraj1012-2@okicici"
|
||||||
}
|
}
|
||||||
*/
|
}`
|
||||||
text = removeWhiteSpaces(text);
|
text = removeWhiteSpaces(text);
|
||||||
return text;
|
return text;
|
||||||
const master_data = await ajaxGet(
|
const master_data = await ajaxGet(
|
||||||
@ -12005,19 +12015,19 @@
|
|||||||
renderUserUPI()
|
renderUserUPI()
|
||||||
renderAllContacts()
|
renderAllContacts()
|
||||||
|
|
||||||
show_all_user_activities()
|
|
||||||
show_payment_requests()
|
|
||||||
showPage('home_page', 'home_page_btn')
|
showPage('home_page', 'home_page_btn')
|
||||||
|
show_payment_requests()
|
||||||
|
|
||||||
withdraw_token_to_get_cash();
|
withdraw_token_to_get_cash();
|
||||||
|
|
||||||
transferTokensManually();
|
transferTokensManually();
|
||||||
|
|
||||||
pay_through_cashier();
|
pay_through_cashier();
|
||||||
|
|
||||||
getSentRupeeList()
|
getSentRupeeList()
|
||||||
|
|
||||||
getReceivedRupeeList()
|
getReceivedRupeeList()
|
||||||
|
show_all_user_activities()
|
||||||
}
|
}
|
||||||
this.retrieveLatestContent();
|
this.retrieveLatestContent();
|
||||||
},
|
},
|
||||||
@ -12801,7 +12811,7 @@
|
|||||||
hidePopup()
|
hidePopup()
|
||||||
showTransactionStatus('success', 'Deposit request sent.', 'It may take upto 48 hours for deposited amount to be reflected in your account.')
|
showTransactionStatus('success', 'Deposit request sent.', 'It may take upto 48 hours for deposited amount to be reflected in your account.')
|
||||||
btnLoading('request_tokens_btn', 'stop')
|
btnLoading('request_tokens_btn', 'stop')
|
||||||
depositActivityContainer.prepend(render.activityCard({ type: 'deposit', amount: request_object.deposit_amount, timeStamp: `${Date.now()}_${myFloID}}`, upi_txid, receiver: cashier_upi, pending: true }))
|
depositActivityContainer.prepend(render.activityCard({ type: 'deposit', amount: request_object.deposit_amount, timeStamp: `${Date.now()}_${myFloID}}`, upi_txid, receiver: cashier_upi, processed: true }))
|
||||||
})
|
})
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -12869,7 +12879,7 @@
|
|||||||
});
|
});
|
||||||
hidePopup()
|
hidePopup()
|
||||||
showTransactionStatus('success', 'Withdraw request sent.', 'It may take upto 48 working hours to process your withdrawal request.')
|
showTransactionStatus('success', 'Withdraw request sent.', 'It may take upto 48 working hours to process your withdrawal request.')
|
||||||
withdrawActivityContainer.prepend(render.activityCard({ type: 'withdraw', amount: withdraw_cash_amount, timeStamp: `${Date.now()}_${myFloID}`, token_txid: flo_txid, receiver: user_withdraw_upi, pending: true }))
|
withdrawActivityContainer.prepend(render.activityCard({ type: 'withdraw', amount: withdraw_cash_amount, timeStamp: `${Date.now()}_${myFloID}`, token_txid: flo_txid, receiver: user_withdraw_upi, processed: true }))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
showTransactionStatus('failure', 'Failed to send withdraw request.');
|
showTransactionStatus('failure', 'Failed to send withdraw request.');
|
||||||
@ -12923,7 +12933,7 @@
|
|||||||
showTransactionStatus('success', 'Pay through cashier Request sent.', `Sent to: <b class="breakable">${recvr_id}</b><br>
|
showTransactionStatus('success', 'Pay through cashier Request sent.', `Sent to: <b class="breakable">${recvr_id}</b><br>
|
||||||
through cashier UPI: <b>${cashier_upi}</b>.<br><br>
|
through cashier UPI: <b>${cashier_upi}</b>.<br><br>
|
||||||
Once the cashier receives your payment, they will transfer it to intended receiver.`);
|
Once the cashier receives your payment, they will transfer it to intended receiver.`);
|
||||||
payCashierActivityContainer.prepend(render.activityCard({ type: 'payCashier', amount: amount_to_pay, timeStamp: `${Date.now()}_${myFloID}`, receiver: recvr_id, receiverUPI: req_object.upi_txid, pending: true }))
|
payCashierActivityContainer.prepend(render.activityCard({ type: 'payCashier', amount: amount_to_pay, timeStamp: `${Date.now()}_${myFloID}`, receiver: recvr_id, receiverUPI: req_object.upi_txid, processed: true }))
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@ -12940,6 +12950,22 @@
|
|||||||
|
|
||||||
async function show_all_user_activities() {
|
async function show_all_user_activities() {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
depositActivityContainer.innerHTML = ''
|
||||||
|
withdrawActivityContainer.innerHTML = ''
|
||||||
|
payCashierActivityContainer.innerHTML = ''
|
||||||
|
|
||||||
|
for(let i = 0; i < 8; i++){
|
||||||
|
frag.append(render.activityPlaceholder())
|
||||||
|
}
|
||||||
|
let frag1 = frag.cloneNode(true)
|
||||||
|
let frag2 = frag.cloneNode(true)
|
||||||
|
depositActivityContainer.append(frag)
|
||||||
|
|
||||||
|
withdrawActivityContainer.append(frag1)
|
||||||
|
|
||||||
|
payCashierActivityContainer.append(frag2)
|
||||||
|
|
||||||
await token_app.actions.retrieveLatestContent();
|
await token_app.actions.retrieveLatestContent();
|
||||||
|
|
||||||
const deposit_msg = removeDuplicates(floDapps.getNextGeneralData(token_app.master_configurations.TYPE_DEPOSITS, "0")
|
const deposit_msg = removeDuplicates(floDapps.getNextGeneralData(token_app.master_configurations.TYPE_DEPOSITS, "0")
|
||||||
@ -12970,7 +12996,7 @@
|
|||||||
// SaiRajM: Use deposit_request_processed to display status of deposit
|
// SaiRajM: Use deposit_request_processed to display status of deposit
|
||||||
frag.append(render.activityCard({
|
frag.append(render.activityCard({
|
||||||
type: 'deposit', amount: deposit_amount, timeStamp: usr_deposits.vectorClock,
|
type: 'deposit', amount: deposit_amount, timeStamp: usr_deposits.vectorClock,
|
||||||
upi_txid, receiver: cashier_upi, deposit_request_processed, pending: deposit_request_processed
|
upi_txid, receiver: cashier_upi, deposit_request_processed, processed: deposit_request_processed
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -12999,7 +13025,7 @@
|
|||||||
timeStamp: usr_withdraws.vectorClock,
|
timeStamp: usr_withdraws.vectorClock,
|
||||||
token_txid,
|
token_txid,
|
||||||
receiver: withdrawer_upi,
|
receiver: withdrawer_upi,
|
||||||
pending: withdraw_request_processed
|
processed: withdraw_request_processed
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
withdrawActivityContainer.innerHTML = ``;
|
withdrawActivityContainer.innerHTML = ``;
|
||||||
@ -13027,7 +13053,7 @@
|
|||||||
timeStamp: cashier_message.vectorClock,
|
timeStamp: cashier_message.vectorClock,
|
||||||
receiver: receiver_flo_id,
|
receiver: receiver_flo_id,
|
||||||
receiverUPI: upi_txid,
|
receiverUPI: upi_txid,
|
||||||
pending: ptc_request_processed
|
processed: ptc_request_processed
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user