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

Increment challenge score #186

Merged
merged 12 commits into from
Jun 16, 2023
+49 −18
Merged

Increment challenge score #186

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
16f5084
Increment challenge score when a whitelisted product is ordered & pai…
ithiame Jun 15, 2023
e37cec8
Merge branch 'main' of https://github.com/B2Bitcoin/B2BitcoinBootik i…
ithiame Jun 16, 2023
facfbb0
Increment challenge score when a whitelisted product is ordered & pai…
ithiame Jun 16, 2023
7b8dcb4
Increment challenge score when a whitelisted product is ordered & pai…
ithiame Jun 16, 2023
5a482d6
Increment challenge score when a whitelisted product is ordered & pai…
ithiame Jun 16, 2023
50846b2
Increment challenge score when a whitelisted product is ordered & pai…
ithiame Jun 16, 2023
e57e5ed
Increment challenge score when a whitelisted product is ordered & pai…
ithiame Jun 16, 2023
8b70f7b
Increment challenge score when a whitelisted product is ordered & pai…
ithiame Jun 16, 2023
2325922
Update src/lib/server/orders.ts
ithiame Jun 16, 2023
3989b45
Increment challenge score when a whitelisted product is ordered & pai…
ithiame Jun 16, 2023
0b36845
Increment challenge score when a whitelisted product is ordered & pai…
ithiame Jun 16, 2023
1cf1ed5
Increment challenge score when a whitelisted product is ordered & pai…
ithiame Jun 16, 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
16 changes: 6 additions & 10 deletions src/lib/components/ChallengeWidget.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,21 @@
</div>
<GoalProgress
class="font-bold mt-3"
text="{Number(challenge.progress.amount).toLocaleString('en', {
text="{Number(challenge.progress).toLocaleString('en', {
style: 'currency',
currency: challenge.progress.currency,
currency: challenge.goal.currency,
minimumFractionDigits: 0
})} 🙂"
percentage={(challenge.progress.amount / challenge.goal.amount) * 100}
percentage={(challenge.progress / challenge.goal.amount) * 100}
/>
<div class="flex justify-between mt-1 items-center">
<a href="/" class="text-blue underline">How can I contribute?</a>
{#if challenge.progress.amount == challenge.goal.amount}
{#if challenge.progress == challenge.goal.amount}
<p>Good job guys! 👏👏</p>
{:else if challenge.progress.amount > challenge.goal.amount}
{:else if challenge.progress > challenge.goal.amount}
<p>You are amazing guys! 🤭</p>
{:else}
<PriceTag
amount={challenge.goal.amount}
class="text-gray-800 text-base"
currency={challenge.goal.currency}
/>
<PriceTag amount={challenge.goal.amount} class="text-gray-800 text-base" currency="SAT" />
{/if}
</div>
</div>
18 changes: 17 additions & 1 deletion src/lib/server/orders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,23 @@ export async function onOrderPaid(order: Order, session: ClientSession) {
productId: { $in: order.items.map((item) => item.product._id) }
})
.toArray();

const challenges = await collections.challenges
.find({
$or: [{beginsAt: {$exists: false}}, {beginsAt: {$lt: new Date()}}]
endsAt: { $gt: new Date() }
})
.toArray();
for (const challenge of challenges) {
await collections.challenges.updateOne(
{ _id: challenge._id },
{
$inc: {
progress: toSatoshis(order.totalPrice.amount, order.totalPrice.currency)
}
},
{ session }
);
}
for (const subscription of order.items.filter((item) => item.product.type === 'subscription')) {
const existingSubscription = subscriptions.find(
(sub) => sub.productId === subscription.product._id
Expand Down
10 changes: 3 additions & 7 deletions src/routes/admin/challenge/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,16 @@
</div>
<GoalProgress
class="font-bold mt-3"
text="{Number(challenge.progress.amount).toLocaleString('en', {
text="{Number(challenge.progress).toLocaleString('en', {
style: 'currency',
currency: challenge.goal.currency,
minimumFractionDigits: 0
})} 🙂"
percentage={(challenge.progress.amount / challenge.goal.amount) * 100}
percentage={(challenge.progress / challenge.goal.amount) * 100}
/>
<div class="flex justify-between mt-1 items-center">
<a href="/" class="text-blue underline">How can I contribute?</a>
<PriceTag
amount={challenge.goal.amount}
class="text-gray-800 text-base"
currency={challenge.goal.currency}
/>
<PriceTag amount={challenge.goal.amount} class="text-gray-800 text-base" currency="SAT" />
</div>
</div>
{:else}
Expand Down