Skip to content

Commit

Permalink
fix(ui): Notes display in templates
Browse files Browse the repository at this point in the history
  • Loading branch information
18alantom committed Apr 4, 2022
1 parent 2db6dba commit d3af272
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 18 deletions.
2 changes: 1 addition & 1 deletion models/doctype/SalesInvoice/Templates/Basic.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<div class="px-6 mt-2 flex justify-end text-base">
<div class="w-1/2 bg-pink">
<div
class="uppercase text-sm tracking-widest font-semibold text-gray-800 mt-2"
class="text-sm tracking-widest text-gray-600 mt-2"
>
Notes
</div>
Expand Down
4 changes: 1 addition & 3 deletions models/doctype/SalesInvoice/Templates/Business.vue
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,14 @@
</div>
</div>
<div class="mt-12" v-if="doc.terms">
<template>
<div
class="uppercase text-sm tracking-widest font-semibold text-gray-800"
class="text-lg font-semibold"
>
Notes
</div>
<div class="mt-4 text-lg whitespace-pre-line">
{{ doc.terms }}
</div>
</template>
</div>
</div>
</div>
Expand Down
41 changes: 27 additions & 14 deletions models/doctype/SalesInvoice/Templates/Minimal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,14 @@
</div>
<div class="w-1/2" v-if="companyAddress">
<div
class="uppercase text-sm font-semibold tracking-widest text-gray-800 ml-8"
class="
uppercase
text-sm
font-semibold
tracking-widest
text-gray-800
ml-8
"
>
{{ isSalesInvoice ? 'From' : 'To' }}
</div>
Expand All @@ -74,7 +81,15 @@
</div>
<div class="px-12 py-10 border-b">
<div
class="mb-4 flex uppercase text-sm tracking-widest font-semibold text-gray-800"
class="
mb-4
flex
uppercase
text-sm
tracking-widest
font-semibold
text-gray-800
"
>
<div class="w-4/12">Item</div>
<div class="w-2/12 text-right">Quantity</div>
Expand All @@ -89,17 +104,15 @@
</div>
</div>
<div class="flex px-12 py-10">
<div class="w-1/2">
<template v-if="doc.terms">
<div
class="uppercase text-sm tracking-widest font-semibold text-gray-800"
>
Notes
</div>
<div class="mt-4 text-lg whitespace-pre-line">
{{ doc.terms }}
</div>
</template>
<div class="w-1/2" v-if="doc.terms">
<div
class="uppercase text-sm tracking-widest font-semibold text-gray-800"
>
Notes
</div>
<div class="mt-4 text-lg whitespace-pre-line">
{{ doc.terms }}
</div>
</div>
<div class="w-1/2 text-lg">
<div class="flex pl-2 justify-between py-1">
Expand Down Expand Up @@ -131,6 +144,6 @@ import Base from './Base';
export default {
name: 'Minimal',
extends: Base
extends: Base,
};
</script>

0 comments on commit d3af272

Please sign in to comment.