merged SM code 9 Sept

This commit is contained in:
Abhishek Sinha 2020-09-09 15:36:46 +05:30
parent 2e2bf33ad5
commit 90029eb711

View File

@ -11576,20 +11576,20 @@
let n=1; let n=1;
(async function validateDepositTxidInBlockchain() { (async function validateDepositTxidInBlockchain() {
notify('Txid '+flo_txid+' validation in process. Please do not close the app until directed.'); notify('Txid '+flo_txid+' validation in process. Please do not close the app until directed.');
//let validate_txid = await ajaxGet(`https://ranchimallflo.duckdns.org/api/v1.0/getTransactionDetails/${flo_txid}`); let validate_txid = await ajaxGet(`https://ranchimallflo.duckdns.org/api/v1.0/getTransactionDetails/${flo_txid}`);
// if(typeof validate_txid=="object" && validate_txid.result=="ok") { if(typeof validate_txid=="object" && validate_txid.result=="ok") {
// // tx registered // tx registered. Do nothing
// } else if(n<=30) { } else if(n<=30) {
// validateDepositTxidInBlockchain(); validateDepositTxidInBlockchain();
// n++; n++;
// } else { } else {
floGlobals.appObjects["unconfirmed_rupee_deposits"][flo_txid] = input_data; floGlobals.appObjects["unconfirmed_rupee_deposits"][flo_txid] = input_data;
let receiverID = floGlobals.adminID; let receiverID = floGlobals.adminID;
let senderIDs = [myFloID]; let senderIDs = [myFloID];
floCloudAPI.updateObjectData("unconfirmed_rupee_deposits", { receiverID, senderIDs }); floCloudAPI.updateObjectData("unconfirmed_rupee_deposits", { receiverID, senderIDs });
notify('Txid '+flo_txid+' added in Unconfirmed Rupee Deposits.', 'error'); notify('Txid '+flo_txid+' added in Unconfirmed Rupee Deposits.', 'error');
//} }
})(); })();
@ -12321,7 +12321,7 @@
tokens_transfers_tx_list = Object.keys(tokens_transfers_tx_list.transactions); tokens_transfers_tx_list = Object.keys(tokens_transfers_tx_list.transactions);
let receiverID = floGlobals.adminID; let receiverID = floGlobals.adminID;
let senderIDs = Object.keys(token_app.master_configurations.cashiers); let senderIDs = Object.keys(token_app.master_configurations.cashiers);
await floCloudAPI.requestObjectData("unconfirmed_rupee_deposits", { receiverID, senderIDs }) await floCloudAPI.requestObjectData("unconfirmed_rupee_deposits", { receiverID, senderIDs });
let unconfirmed_tx_list = Object.keys(floGlobals.appObjects["unconfirmed_rupee_deposits"]); let unconfirmed_tx_list = Object.keys(floGlobals.appObjects["unconfirmed_rupee_deposits"]);
//console.log(unconfirmed_tx_list); //console.log(unconfirmed_tx_list);
//console.log(tokens_transfers_tx_list); //console.log(tokens_transfers_tx_list);