Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Bug in pricing calculator #1233

Merged
merged 10 commits into from
Oct 19, 2023
Merged

Fix Bug in pricing calculator #1233

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9be0b79
rename to pricing calculator
AlaaElattar Oct 17, 2023
1fcbec9
fix bug
AlaaElattar Oct 18, 2023
c093a4a
add link to manual for more info
AlaaElattar Oct 18, 2023
81e6745
update width of alert
AlaaElattar Oct 18, 2023
eab787e
fix typo
AlaaElattar Oct 18, 2023
e4187f8
remove color as it's white by default
AlaaElattar Oct 18, 2023
4591434
disable input when toggle current balance
AlaaElattar Oct 18, 2023
c3bbf57
fix light mode
AlaaElattar Oct 19, 2023
b2dd243
handle state of current balance
AlaaElattar Oct 19, 2023
eb2f52f
remove unused var
AlaaElattar Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions packages/playground/src/calculator/resource_pricing.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
<template>
<v-container class="custom-container">
<v-card color="title" class="d-flex justify-center items-center mt-3 pa-3 text-center">
<v-icon size="30" class="pr-3" color="white">mdi-calculator</v-icon>
<v-card-title class="pa-0" lor="white">Resource Pricing Calculator</v-card-title>
<v-card color="primary" class="d-flex justify-center items-center mt-3 pa-3 text-center">
<v-icon size="30" class="pr-3">mdi-calculator</v-icon>
<v-card-title class="pa-0">Pricing Calculator</v-card-title>
</v-card>
<v-card class="pa-3">
<v-row class="mt-3 px-3 pl-6" style="max-width: 74.7rem">
<v-alert type="info" variant="tonal">
For more information about Threefold Pricing check <a class="app-link" @click="openManual()">here</a>
</v-alert>
</v-row>
<v-row class="mt-3 px-3">
<v-col cols="6">
<input-validator
Expand Down Expand Up @@ -103,17 +108,14 @@
<v-row class="px-3">
<v-col cols="12">
<input-validator
:rules="[
validators.required('Balance is required.'),
validators.required('Balance is required.'),
validators.min('Balance should be a positive integer.', 1),
]"
:rules="[validators.min('Balance should be a positive integer.', 1)]"
:value="balance"
#="{ props }"
>
<input-tooltip tooltip="The amount of TFT to calculate discount.">
<v-text-field
label="Balance"
:disabled="currentbalance"
suffix="TFT"
type="number"
v-bind="props"
Expand Down Expand Up @@ -230,6 +232,7 @@ watch([CRU, MRU, SRU, HRU, balance, isCertified, ipv4, currentbalance], async ()
certified: isCertified.value,
});
} else {
if (!balance.value) balance.value = 0;
pkgs = await grid.value.calculator.calculate({
cru: CRU.value,
mru: MRU.value,
Expand All @@ -245,6 +248,12 @@ watch([CRU, MRU, SRU, HRU, balance, isCertified, ipv4, currentbalance], async ()
}
});

watch(currentbalance, (newCurrentBalance, oldCurrentBalance) => {
if (oldCurrentBalance && !newCurrentBalance) {
balance.value = 0;
}
});

async function setPriceList(pkgs: any): Promise<PriceType[]> {
TFTPrice.value = await grid.value.calculator.tftPrice();
prices.value = [
Expand Down Expand Up @@ -289,6 +298,10 @@ onMounted(async () => {
console.error("Error fetching the grid:", error);
});
});

function openManual() {
window.open("https://manual.grid.tf/cloud/cloudunits_pricing.html", "_blank");
}
</script>

<style>
Expand Down