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(ui): Misc UI fixes #2418

Merged
merged 2 commits into from
Jan 14, 2025
Merged

fix(ui): Misc UI fixes #2418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64754a4
fix(billing-ui): Watch and reset credits instead of default value
shadrak98 Jan 13, 2025
3ba8b95
fix(partner-ui): Fix column width to avoid horizontal scroll
shadrak98 Jan 13, 2025
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
6 changes: 5 additions & 1 deletion dashboard/src2/components/billing/PrepaidCreditsForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ import BuyCreditsRazorpay from './BuyCreditsRazorpay.vue';
import RazorpayLogo from '../../logo/RazorpayLogo.vue';
import StripeLogo from '../../logo/StripeLogo.vue';
import { FormControl, Button, createResource } from 'frappe-ui';
import { ref, computed, inject } from 'vue';
import { ref, computed, inject, watch } from 'vue';

const emit = defineEmits(['success']);

Expand All @@ -111,6 +111,10 @@ const minimumAmount = computed(() => {
const creditsToBuy = ref(minimumAmount.value);
const paymentGateway = ref('');

watch(minimumAmount, () => {
creditsToBuy.value = minimumAmount.value;
});

const totalAmount = computed(() => {
const _creditsToBuy = creditsToBuy.value || 0;

Expand Down
17 changes: 12 additions & 5 deletions dashboard/src2/components/partners/PartnerContribution.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ export default {
},
{
label: 'Status',
fieldname: 'status'
fieldname: 'status',
width: 0.5
},
{
label: 'Date',
Expand All @@ -63,12 +64,14 @@ export default {
month: 'short',
day: 'numeric'
}).format(new Date(value));
}
},
width: 0.8
},
{
label: 'Currency',
fieldname: 'currency',
width: 0.5
width: 0.5,
align: 'center'
},
{
label: 'Total',
Expand All @@ -78,14 +81,18 @@ export default {
return '';
}
return currency(value, columns.currency);
}
},
align: 'right',
width: 0.8
},
{
label: 'Partner Total',
fieldname: 'partner_total',
format(value) {
return userCurrency(value);
}
},
align: 'right',
width: 0.8
}
]
};
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src2/components/partners/PartnerOverview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<Dialog
:show="showPartnerContributionDialog"
v-model="showPartnerContributionDialog"
:options="{ size: '3xl', title: 'Contributions of this month' }"
:options="{ size: '5xl', title: 'Contributions of this month' }"
>
<template #body-content>
<PartnerContribution :partnerEmail="team.doc.partner_email" />
Expand Down
Loading