2
0
mirror of https://github.com/frappe/books.git synced 2025-02-02 12:08:27 +00:00

Merge pull request #990 from AbleKSaju/fix-ui-update

fix: UI updates
This commit is contained in:
Akshay 2024-10-22 16:11:25 +05:30 committed by GitHub
commit 2fdaef3a9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 7 deletions

View File

@ -30,7 +30,10 @@
</div>
</Row>
<div class="overflow-y-auto" style="height: 50vh">
<div
class="overflow-y-auto overflow-x-auto custom-scroll custom-scroll-thumb1"
style="height: 50vh"
>
<Row
v-for="row in sinvDoc.items"
:ratio="ratio"

View File

@ -14,7 +14,7 @@
platform !== 'Windows' ? 'window-drag' : '',
]"
>
<Transition name="spacer">
<Transition name="spacer" class="border-none">
<div
v-if="!showSidebar && platform === 'Mac' && languageDirection !== 'rtl'"
class="h-full"

View File

@ -33,7 +33,7 @@
<div class="row-start-6 grid grid-cols-2 gap-4 mt-auto mb-2 px-10">
<div class="col-span-2">
<Button
class="w-full bg-green-500"
class="w-full bg-green-500 dark:bg-green-700"
style="padding: 1.35rem"
:disabled="validationError"
@click="setLoyaltyPoints()"
@ -50,7 +50,7 @@
<div class="row-start-6 grid grid-cols-2 gap-4 mt-auto px-10">
<div class="col-span-2">
<Button
class="w-full bg-red-500"
class="w-full bg-red-500 dark:bg-red-700"
style="padding: 1.35rem"
@click="$emit('toggleModal', 'LoyaltyProgram')"
>
@ -85,11 +85,12 @@ export default defineComponent({
props: {
loyaltyPoints: {
type: Number,
required: true,
default: 0,
},
loyaltyProgram: {
type: String,
required: true,
default: '',
},
},
emits: ['setLoyaltyPoints', 'toggleModal'],
@ -130,6 +131,7 @@ export default defineComponent({
if (this.sinvDoc.baseGrandTotal?.lt(loyaltyPoint)) {
throw new Error(t`no need ${newValue} points to purchase this item`);
}
this.validationError = false;
} catch (error) {
this.validationError = true;

View File

@ -714,7 +714,7 @@ export default defineComponent({
});
this.loyaltyProgram = party[0]?.loyaltyProgram as string;
this.loyaltyPoints = party[0].loyaltyPoints as number;
this.loyaltyPoints = party[0]?.loyaltyPoints as number;
},
async saveOrder() {
try {