Merge branch 'main' of https://github.com/appwrite/console into 1.6.x

This commit is contained in:
Torsten Dittmann committed 2024-08-14 11:35:06 +02:00
commit a97db4bb33
6 files changed
+10 -10

No files matched your search

@@ -16,7 +16,7 @@
}
</script>
{#if $paymentMissingMandate && $paymentMissingMandate.country === 'in' && $paymentMissingMandate.mandateId === null && !hideBillingHeaderRoutes.includes($page.url.pathname)}
{#if $paymentMissingMandate && $paymentMissingMandate?.country?.toLowerCase() === 'in' && $paymentMissingMandate.mandateId === null && !hideBillingHeaderRoutes.includes($page.url.pathname)}
<HeaderAlert title="Authorization required" type="info">
The payment method for {$organization.name} needs to be verified.
<svelte:fragment slot="buttons">
@@ -44,7 +44,7 @@
</script>
{#if filteredMethods?.length}
{#if selectedPaymentMethod?.country === 'in'}
{#if selectedPaymentMethod?.country?.toLowerCase() === 'in'}
<Alert type="warning">
<svelte:fragment slot="title">Indian credit or debit card-holders</svelte:fragment>
To comply with RBI regulations in India, Appwrite will ask for verification to charge up
+1 -1
View File
@@ -362,7 +362,7 @@ export async function checkForMandate(org: Organization) {
const paymentId = org.paymentMethodId ?? org.backupPaymentMethodId;
if (!paymentId) return;
const paymentMethod = await sdk.forConsole.billing.getPaymentMethod(paymentId);
if (paymentMethod.mandateId === null && paymentMethod.country === 'in') {
if (paymentMethod?.mandateId === null && paymentMethod?.country.toLowerCase() === 'in') {
headerAlert.add({
id: 'paymentMandate',
component: PaymentMandate,
@@ -125,7 +125,7 @@
{/if}
</TableCell>
<TableCellText title="due">
{formatCurrency(invoice.amount)}
{formatCurrency(invoice.grossAmount)}
</TableCellText>
<TableCell showOverflow right>
<DropList
@@ -19,6 +19,7 @@
import { paymentMethods } from '$lib/stores/billing';
import { onMount } from 'svelte';
import { getApiEndpoint, sdk } from '$lib/stores/sdk';
import { formatCurrency } from '$lib/helpers/numbers';
export let show = false;
export let invoice: Invoice;
@@ -121,9 +122,9 @@
title="Retry payment">
<!-- TODO: format currency -->
<p class="text">
Your payment of <span class="inline-tag">${invoice.amount}</span> due on {toLocaleDate(
invoice.dueAt
)} has failed. Retry your payment to avoid service interruptions with your projects.
Your payment of <span class="inline-tag">${formatCurrency(invoice.grossAmount)}</span> due
on {toLocaleDate(invoice.dueAt)} has failed. Retry your payment to avoid service interruptions
with your projects.
</p>
<Button
@@ -2,7 +2,6 @@
import Modal from '$lib/components/modal.svelte';
import Button from '$lib/elements/forms/button.svelte';
import { sdk } from '$lib/stores/sdk';
import { goto } from '$app/navigation';
import { page } from '$app/stores';
export let showGitInstall: boolean;
@@ -15,7 +14,7 @@
target.searchParams.set('success', redirect.toString());
target.searchParams.set('failure', redirect.toString());
target.searchParams.set('mode', 'admin');
goto(target);
return target;
}
</script>
@@ -23,7 +22,7 @@
<p>Select a provider to import an existing git repositories.</p>
<div class="u-flex u-cross-center u-flex-vertical u-gap-16">
<Button on:click={connectGitHub} fullWidth secondary>
<Button href={connectGitHub().toString()} fullWidth secondary>
<span class="icon-github" aria-hidden="true" />
<span class="text">GitHub</span>
</Button>