RanchiMall/flopay
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
sairaj mote 2023-01-06 19:15:13 +05:30
parent 6d363b0054
commit 17cdeee969
4 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
css/main.css
View File

@ -1525,6 +1525,9 @@ fieldset legend {
#payment_request_history {
padding-bottom: 3rem;
}
#payment_request_history .payment-request {
margin: 0 -1rem;
}
.payment-request {
display: grid;

2
css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

3
css/main.scss
View File

@ -1405,6 +1405,9 @@ fieldset {
}
#payment_request_history {
padding-bottom: 3rem;
.payment-request {
margin: 0 -1rem;
}
}
.payment-request {
display: grid;

47
index.html
View File

@ -361,7 +361,7 @@
</a>
<details class="grid gap-1"
style="border-top: solid thin rgba(var(--text-color), 0.5); padding-top: 1rem" open>
<summary>
<summary style="margin-bottom: 1.5rem;">
<h4 style="font-weight: 500;">Send Rupee tokens to other
RanchiMall products</h4>
<svg class="icon down-arrow" xmlns="http://www.w3.org/2000/svg" height="24px"
@ -2108,6 +2108,33 @@
${shouldRender.txNote ? html`<div id="transaction__note" class="flex flex-direction-column gap-0-5">${shouldRender.txNote}</div>` : ''}
`)
break;
case 'wallet':
const walletTransactions = []
if (walletHistoryLoader)
walletHistoryLoader.clear()
const pendingWalletTransactions = document.createDocumentFragment()
let areTransactionsPending = false
for (const transactionId in User.cashierRequests) {
if (!User.cashierRequests[transactionId].note) {
areTransactionsPending = true
pendingWalletTransactions.prepend(render.walletRequestCard(User.cashierRequests[transactionId]))
} else {
walletTransactions.unshift(User.cashierRequests[transactionId])
}
}
if (walletHistoryLoader) {
walletHistoryLoader.update(walletTransactions)
} else {
walletHistoryLoader = new LazyLoader('#wallet_history', walletTransactions, render.walletRequestCard);
pendingTransactionsObserver.observe(getRef('pending_wallet_transactions'), { childList: true });
}
if (areTransactionsPending) {
getRef('pending_wallet_transactions').innerHTML = ''
getRef('pending_wallet_transactions').append(pendingWalletTransactions)
}
walletHistoryLoader.init()
removeNotificationBadge('wallet_history_button')
break;
}
if (pageId !== 'history') {
if (transactionsHistoryLoader)
@ -2751,6 +2778,13 @@
});
}
}
if (appState.lastPage !== 'wallet') {
if (processedRequests === 0)
removeNotificationBadge('wallet_history_button');
else {
addNotificationBadge('wallet_history_button', processedRequests)
}
}
};
userUI.renderMoneyRequests = function (requests, error = null) {
@ -2793,6 +2827,16 @@
removeNotificationBadge('requests_notification_button')
}
};
const pendingTransactionsObserver = new MutationObserver((mutations) => {
mutations.forEach(mutation => {
if (mutation.type === 'childList') {
if (mutation.target.children.length)
mutation.target.parentNode.classList.remove('hidden')
else
mutation.target.parentNode.classList.add('hidden')
}
})
});
function toggleNotificationPanel() {
const animOptions = {
@ -3158,7 +3202,6 @@
return clone;
},
walletRequestCard(details) {
console.log(details);
const { time, message: { mode, amount }, note, tag, vectorClock } = details;
const clone = getRef('wallet_request_template').content.cloneNode(true).firstElementChild.firstElementChild;
const type = mode === 'cash-to-token' ? 'Top-up' : 'Withdraw';