From dd6b8b1b825ff4ca316f3f5703b87c8644f09a73 Mon Sep 17 00:00:00 2001 From: Vivek Teega Date: Thu, 24 Mar 2022 18:10:22 +0530 Subject: [PATCH] 1.0.1 Registered FLOBNB as a Standard Ops app and its subadmins Co-authored-by: Sai Raj --- index.html | 10530 +++++++++++++++++++++++---------------------------- 1 file changed, 4824 insertions(+), 5706 deletions(-) diff --git a/index.html b/index.html index f4f3fcb..09591ac 100644 --- a/index.html +++ b/index.html @@ -78,7 +78,7 @@

-

customer tokens

+

Customer tokens

-

@@ -102,7 +102,7 @@

-

Ranchimall's Ownership

+

Service provider tokens

-

@@ -113,7 +113,7 @@

User info

-

Lorem ipsum dolor sit amet consectetur adipisicing elit.

+

first option @@ -146,7 +146,7 @@

Subadmin input

-

Lorem ipsum dolor sit amet consectetur adipisicing elit.

+

first option @@ -157,12 +157,11 @@

Flobnb Details

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Esse, sint. Aperiam ipsum expedita - tenetur - quasi, repellat ea. Laboriosam, earum ratione!

+

- - + + @@ -202,7 +201,7 @@ "https://testnet.flocha.in/", ], }, - adminID: "FKAEdnPfjXLHSYwrXQu377ugN4tXU7VGdf", + adminID: "FBxdZoWdn7fZMLFmwyyVCwbqhVZKuKW8r3", sendAmt: 0.001, fee: 0.0005, @@ -212,7 +211,7 @@ //for cloud apps subAdmins: [], - application: "TEST_MODE", + application: "FLOBNB", appObjects: {}, generalData: {}, lastVC: {}, @@ -371,13 +370,21 @@ return range_detail_list } + function findCurrentAmount(){ + let cur_amt = 0; + let fk = floCloudAPI.util.filterKey('flobnb_data', {}); + for(let d in floGlobals.generalData[fk]) + cur_amt += floGlobals.generalData[fk][d].message.consumer_amount; + return cur_amt; + } + function processData(data) { return new Promise((resolve, reject) => { if (!floGlobals.subAdmins.includes(myFloID)) return reject("Access denied"); - // calculations based on the customer amount - let current_amount = parseFloat(localStorage.getItem('total_amount')) || 0; - let tentative_amount = current_amount + parseFloat(data.customer_amount) + // calculations based on the consumer amount + let current_amount = findCurrentAmount(); + let tentative_amount = current_amount + parseFloat(data.consumer_amount) let range_details = find_range_details1(current_amount, tentative_amount) let flobnb_tokens_tobereleased = 0 range_details.forEach(element => { @@ -388,63 +395,97 @@ split_info = floGlobals.appObjects.flobnb_base.splits.without_referrer; else split_info = floGlobals.appObjects.flobnb_base.splits.with_referrer; - data.customer_split = split_info.customer * flobnb_tokens_tobereleased; + data.consumer_split = split_info.consumer * flobnb_tokens_tobereleased; data.producer_split = split_info.producer * flobnb_tokens_tobereleased; data.investor_split = split_info.investor * flobnb_tokens_tobereleased; data.referrer_split = split_info.referrer * flobnb_tokens_tobereleased; data.technology_provider_split = split_info.technology_provider * flobnb_tokens_tobereleased; - data.flobnb_distributed = flobnb_tokens_tobereleased; - let rmtID = floGlobals.appObjects["flobnb_base"]["rmt_ownerID"]; - let receivers = { - [rmtID]: data.technology_provider_split, - [data.property_floid]: data.producer_split, - [data.customer_floid]: data.customer_split, - [data.investor_floid]: data.investor_split - }; + let receivers = {}; + receivers[rmtID] = data.technology_provider_split; + receivers[data.property_floid] = (receivers[data.property_floid] || 0) + data.producer_split; + receivers[data.consumer_floid] = (receivers[data.consumer_floid] || 0) + data.consumer_split; + receivers[data.investor_floid] = (receivers[data.investor_floid] || 0) + data.investor_split; + if (data.referrer_split) - receivers[data.referrer_floid] = data.referrer_split; - console.debug(receivers, data); - //return resolve(receivers); - //floExchangeAPI.transferToken(receivers, 'rupee', myFloID, myPrivKey).then(txid => { - floCloudAPI.sendGeneralData(data, "flobnb_data") + receivers[data.referrer_floid] = (receivers[data.referrer_floid] || 0) + data.referrer_split; + floExchangeAPI.transferToken(receivers, 'flobnb', myFloID, myPrivKey).then(txid => { + + let sensitiveData = { + consumer_name: data.consumer_name, + consumer_upi_address: data.consumer_upi_address, + consumer_email: data.consumer_email, + referrer_name: data.referrer_name + } + + let cloudData = { + privacy_data: floCrypto.encryptData(JSON.stringify(sensitiveData), floGlobals.appObjects['flobnb_base']['encrypt_key']), + + consumer_floid: data.consumer_floid, + consumer_amount: data.consumer_amount, + consumer_split: data.consumer_split, + + investor_floid: data.investor_floid, + investor_split: data.investor_split, + + property_floid: data.property_floid, + producer_split: data.producer_split, + + referrer_floid: data.referrer_floid, + referrer_split: data.referrer_split, + + technology_provider_split: data.technology_provider_split, + flobnb_distributed: flobnb_tokens_tobereleased, + txid: txid, + + from_date: data.from_date, + to_date: data.to_date, + days_stayed: data.days_stayed + } + floCloudAPI.sendGeneralData(cloudData, "flobnb_data") .then(result => resolve(result)) .catch(error => reject(error)) - //}).catch(error => reject(error)) + }).catch(error => reject(error)) }) } function submit_customer_form() { console.log('clicked'); - - data = { - customer_floid: document.getElementById('subadmin-form-floID').value, - customer_name: document.getElementById('subadmin-form-name').value, - customer_upi_address: document.getElementById('subadmin-form-upiID').value, - customer_email: document.getElementById('subadmin-form-email').value, - customer_amount: document.getElementById('subadmin-form-amount').value, - investor_floid: document.getElementById('subadmin-form-investorFLOID').value, - property_floid: document.getElementById('subadmin-form-propertyFLOID').value, - days_stayed: document.getElementById('subadmin-form-numberOfDays').value, - referrer_floid: document.getElementById('subadmin-form-referrerFLOID').value, - referrer_name: document.getElementById('subadmin-form-referrerName').value, - from_date: document.getElementById('subadmin-form-fromDate').value, - to_date: document.getElementById('subadmin-form-toDate').value - } - processData(data) + data = { + consumer_floid: document.getElementById('subadmin-form-floID').value, + consumer_name: document.getElementById('subadmin-form-name').value, + consumer_upi_address: document.getElementById('subadmin-form-upiID').value, + consumer_email: document.getElementById('subadmin-form-email').value, + consumer_amount: parseFloat(document.getElementById('subadmin-form-amount').value), + investor_floid: document.getElementById('subadmin-form-investorFLOID').value, + property_floid: document.getElementById('subadmin-form-propertyFLOID').value, + days_stayed: document.getElementById('subadmin-form-numberOfDays').value, + referrer_floid: document.getElementById('subadmin-form-referrerFLOID').value, + referrer_name: document.getElementById('subadmin-form-referrerName').value, + from_date: document.getElementById('subadmin-form-fromDate').value, + to_date: document.getElementById('subadmin-form-toDate').value + } + + processData(data).then(result => { + console.log(result) + document.getElementById('subadmin-form').reset() + }).catch(error => { + console.error(error); + alert(error); + }) } function update_element(id, value) { document.getElementById(id).innerText = value } - function update_overview_ui_data(){ + function update_overview_ui_data() { // overview document.getElementById('total-amount-issued').innerText = `Rs. ${localStorage.getItem('total_amount')}` - update_element('total-customer-tokens', localStorage.getItem('customer_split')) + update_element('total-customer-tokens', localStorage.getItem('consumer_split')) update_element('total-producer-tokens', localStorage.getItem('producer_split')) update_element('total-investor-tokens', localStorage.getItem('investor_split')) update_element('total-referrer-tokens', localStorage.getItem('referrer_split')) @@ -457,7 +498,7 @@ Promise.all([promise1, promise2]).then((results) => { update_element('exchange-flobnb-balance', results[0].balance) results[1].json().then(blockchain_data => { - if(blockchain_data['balance'] == null) + if (blockchain_data['balance'] == null) blockchain_data['balance'] = 0 update_element('blockchain-flobnb-balance', blockchain_data['balance']) update_element('total-flobnb-balance', blockchain_data['balance'] + results[0].balance) @@ -475,7 +516,7 @@ //floDapps.setMidStartup(getEconomicSystemDetails) await floExchangeAPI.init("FMxYC7gYZhouzqtHZukGnPiQ8nvG4CMzXM", "exchange") document.getElementById('subadmin-form-submit-button').addEventListener("click", submit_customer_form) - + floDapps.launchStartUp().then((result) => { console.log(result); alert(`Welcome FLO_ID: ${myFloID}`); @@ -485,104 +526,69 @@ let promise2 = floCloudAPI.requestGeneralData('flobnb_data', { senderID: floGlobals.subAdmins, callback: (d, e) => { + console.log("CALLBACK"); if (e) return; - let customer_split = parseFloat( localStorage.getItem('customer_split')) || 0, + let consumer_split = parseFloat(localStorage.getItem('consumer_split')) || 0, producer_split = parseFloat(localStorage.getItem('producer_split')) || 0, - investor_split = parseFloat(localStorage.getItem('investor_split') )|| 0, - referrer_split =parseFloat( localStorage.getItem('referrer_split'))|| 0, + investor_split = parseFloat(localStorage.getItem('investor_split')) || 0, + referrer_split = parseFloat(localStorage.getItem('referrer_split')) || 0, technology_provider_split = parseFloat(localStorage.getItem('technology_provider_split')) || 0, total_amount = parseFloat(localStorage.getItem('total_amount')) || 0; + for (let v in d) { - customer_split += d[v].message.customer_split; + consumer_split += d[v].message.consumer_split; producer_split += d[v].message.producer_split; investor_split += d[v].message.investor_split; referrer_split += d[v].message.referrer_split; technology_provider_split += d[v].message.technology_provider_split; - total_amount += d[v].message.customer_amount; + total_amount += d[v].message.consumer_amount; } - - localStorage.setItem("customer_split", customer_split); + + + localStorage.setItem("consumer_split", consumer_split); localStorage.setItem("producer_split", producer_split); localStorage.setItem("investor_split", investor_split); localStorage.setItem("referrer_split", referrer_split); localStorage.setItem("technology_provider_split", technology_provider_split); localStorage.setItem("total_amount", total_amount); + + update_overview_ui_data() } }); Promise.all([promise1, promise2]).then((values) => { - update_overview_ui_data() + }); }).catch((error) => console.error(error)); } - + + + + + - - - - -