ui feedback & bugs fixed
This commit is contained in:
parent
9c2dccbf03
commit
1dd4fca8f2
31
public/css/app.css
vendored
31
public/css/app.css
vendored
@ -6977,9 +6977,6 @@ input[type="date"]::-webkit-inner-spin-button,
|
||||
.-mb-2{
|
||||
margin-bottom: -0.5rem;
|
||||
}
|
||||
.-ml-3{
|
||||
margin-left: -0.75rem;
|
||||
}
|
||||
.box-border{
|
||||
-webkit-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
@ -36434,10 +36431,6 @@ body{
|
||||
margin-right: 1rem;
|
||||
}
|
||||
|
||||
[dir="ltr"] .ltr\:ml-3{
|
||||
margin-left: 0.75rem;
|
||||
}
|
||||
|
||||
[dir="ltr"] .ltr\:ml-2{
|
||||
margin-left: 0.5rem;
|
||||
}
|
||||
@ -36446,6 +36439,10 @@ body{
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
|
||||
[dir="ltr"] .ltr\:ml-3{
|
||||
margin-left: 0.75rem;
|
||||
}
|
||||
|
||||
[dir="ltr"] .ltr\:mr-3{
|
||||
margin-right: 0.75rem;
|
||||
}
|
||||
@ -36482,6 +36479,10 @@ body{
|
||||
padding-right: 1.5rem;
|
||||
}
|
||||
|
||||
[dir="ltr"] .ltr\:pl-0{
|
||||
padding-left: 0px;
|
||||
}
|
||||
|
||||
[dir="ltr"] .ltr\:pl-6{
|
||||
padding-left: 1.5rem;
|
||||
}
|
||||
@ -36598,10 +36599,6 @@ body{
|
||||
margin-left: 1rem;
|
||||
}
|
||||
|
||||
[dir="rtl"] .rtl\:mr-3{
|
||||
margin-right: 0.75rem;
|
||||
}
|
||||
|
||||
[dir="rtl"] .rtl\:mr-2{
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
@ -36610,6 +36607,10 @@ body{
|
||||
margin-left: 0.5rem;
|
||||
}
|
||||
|
||||
[dir="rtl"] .rtl\:mr-3{
|
||||
margin-right: 0.75rem;
|
||||
}
|
||||
|
||||
[dir="rtl"] .rtl\:ml-3{
|
||||
margin-left: 0.75rem;
|
||||
}
|
||||
@ -36656,6 +36657,10 @@ body{
|
||||
padding-left: 1.5rem;
|
||||
}
|
||||
|
||||
[dir="rtl"] .rtl\:pr-0{
|
||||
padding-right: 0px;
|
||||
}
|
||||
|
||||
[dir="rtl"] .rtl\:pr-6{
|
||||
padding-right: 1.5rem;
|
||||
}
|
||||
@ -36664,10 +36669,6 @@ body{
|
||||
padding-left: 0px;
|
||||
}
|
||||
|
||||
[dir="rtl"] .rtl\:pr-0{
|
||||
padding-right: 0px;
|
||||
}
|
||||
|
||||
[dir="rtl"] .rtl\:pr-3{
|
||||
padding-right: 0.75rem;
|
||||
}
|
||||
|
8
public/css/print.css
vendored
8
public/css/print.css
vendored
@ -276,19 +276,19 @@ html[dir='rtl'] .border-radius-last {
|
||||
}
|
||||
|
||||
html[dir='ltr'] .text-alignment-left {
|
||||
text-align: left;
|
||||
text-align: left !important;
|
||||
}
|
||||
|
||||
html[dir='rtl'] .text-alignment-left {
|
||||
text-align: right;
|
||||
text-align: right !important;
|
||||
}
|
||||
|
||||
html[dir='lte'] .text-alignment-right {
|
||||
text-align: right;
|
||||
text-align: right !important;
|
||||
}
|
||||
|
||||
html[dir='rtl'] .text-alignment-right {
|
||||
text-align: left;
|
||||
text-align: left !important;
|
||||
}
|
||||
|
||||
.text-right
|
||||
|
@ -585,7 +585,7 @@ const app = new Vue({
|
||||
|
||||
this.component = Vue.component('add-new-component', (resolve, reject) => {
|
||||
resolve({
|
||||
template: '<div id="dynamic-payment-component"><akaunting-modal-add-new modal-dialog-class="max-w-screen-lg" :show="payment.modal" @submit="onSubmit" @cancel="onCancel" :buttons="payment.buttons" :title="payment.title" :is_component=true :message="payment.html"></akaunting-modal-add-new></div>',
|
||||
template: '<div id="dynamic-payment-component"><akaunting-modal-add-new modal-dialog-class="max-w-screen-md" :show="payment.modal" @submit="onSubmit" @cancel="onCancel" :buttons="payment.buttons" :title="payment.title" :is_component=true :message="payment.html"></akaunting-modal-add-new></div>',
|
||||
|
||||
mixins: [
|
||||
Global
|
||||
@ -819,7 +819,7 @@ const app = new Vue({
|
||||
|
||||
this.component = Vue.component('add-new-component', (resolve, reject) => {
|
||||
resolve({
|
||||
template: '<div id="dynamic-email-component"><akaunting-modal-add-new modal-dialog-class="max-w-screen-lg" :show="email.modal" @submit="onSubmit" @cancel="onCancel" :buttons="email.buttons" :title="email.title" :is_component=true :message="email.html"></akaunting-modal-add-new></div>',
|
||||
template: '<div id="dynamic-email-component"><akaunting-modal-add-new modal-dialog-class="max-w-screen-md" :show="email.modal" @submit="onSubmit" @cancel="onCancel" :buttons="email.buttons" :title="email.title" :is_component=true :message="email.html"></akaunting-modal-add-new></div>',
|
||||
|
||||
mixins: [
|
||||
Global
|
||||
|
@ -204,33 +204,33 @@
|
||||
<tr>
|
||||
@stack('name_th_start')
|
||||
@if (!$hideItems || (!$hideName && !$hideDescription))
|
||||
<th class="item text text-semibold text-alignment-left">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
|
||||
<th class="item text text-semibold text-alignment-left text-left">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
|
||||
@endif
|
||||
@stack('name_th_end')
|
||||
|
||||
@stack('quantity_th_start')
|
||||
@if (!$hideQuantity)
|
||||
<th class="quantity text text-semibold text-alignment-right">{{ trans($textQuantity) }}</th>
|
||||
<th class="quantity text text-semibold text-alignment-right text-right">{{ trans($textQuantity) }}</th>
|
||||
@endif
|
||||
@stack('quantity_th_end')
|
||||
|
||||
@stack('price_th_start')
|
||||
@if (!$hidePrice)
|
||||
<th class="price text text-semibold text-alignment-right">{{ trans($textPrice) }}</th>
|
||||
<th class="price text text-semibold text-alignment-right text-right">{{ trans($textPrice) }}</th>
|
||||
@endif
|
||||
@stack('price_th_end')
|
||||
|
||||
@if (!$hideDiscount)
|
||||
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
|
||||
@stack('discount_td_start')
|
||||
<th class="discount text text-semibold text-alignment-right">{{ trans('invoices.discount') }}</th>
|
||||
<th class="discount text text-semibold text-alignment-right text-right">{{ trans('invoices.discount') }}</th>
|
||||
@stack('discount_td_end')
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@stack('total_th_start')
|
||||
@if (!$hideAmount)
|
||||
<th class="total text text-semibold text-alignment-right">{{ trans($textAmount) }}</th>
|
||||
<th class="total text text-semibold text-alignment-right text-right">{{ trans($textAmount) }}</th>
|
||||
@endif
|
||||
@stack('total_th_end')
|
||||
</tr>
|
||||
|
@ -189,33 +189,33 @@
|
||||
<tr>
|
||||
@stack('name_th_start')
|
||||
@if (!$hideItems || (!$hideName && !$hideDescription))
|
||||
<th class="item text text-semibold text-alignment-left text-white border-radius-first">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
|
||||
<th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
|
||||
@endif
|
||||
@stack('name_th_end')
|
||||
|
||||
@stack('quantity_th_start')
|
||||
@if (!$hideQuantity)
|
||||
<th class="quantity text text-semibold text-alignment-right text-white">{{ trans($textQuantity) }}</th>
|
||||
<th class="quantity text text-semibold text-alignment-right text-right text-white">{{ trans($textQuantity) }}</th>
|
||||
@endif
|
||||
@stack('quantity_th_end')
|
||||
|
||||
@stack('price_th_start')
|
||||
@if (!$hidePrice)
|
||||
<th class="price text text-semibold text-alignment-right text-white">{{ trans($textPrice) }}</th>
|
||||
<th class="price text text-semibold text-alignment-right text-right text-white">{{ trans($textPrice) }}</th>
|
||||
@endif
|
||||
@stack('price_th_end')
|
||||
|
||||
@if (!$hideDiscount)
|
||||
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
|
||||
@stack('discount_td_start')
|
||||
<th class="discount text text-semibold text-alignment-right text-white">{{ trans('invoices.discount') }}</th>
|
||||
<th class="discount text text-semibold text-alignment-right text-right text-white">{{ trans('invoices.discount') }}</th>
|
||||
@stack('discount_td_end')
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@stack('total_th_start')
|
||||
@if (!$hideAmount)
|
||||
<th class="total text text-semibold text-white text-alignment-right border-radius-last">{{ trans($textAmount) }}</th>
|
||||
<th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">{{ trans($textAmount) }}</th>
|
||||
@endif
|
||||
@stack('total_th_end')
|
||||
</tr>
|
||||
|
@ -1,7 +1,7 @@
|
||||
<tr>
|
||||
@stack('name_td_start')
|
||||
@if (! $hideItems || (! $hideName && ! $hideDescription))
|
||||
<td class="item text text-alignment-left">
|
||||
<td class="item text text-alignment-left text-left">
|
||||
@if (! $hideName)
|
||||
{{ $item->name }} <br/>
|
||||
@endif
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
@stack('quantity_td_start')
|
||||
@if (! $hideQuantity)
|
||||
<td class="quantity text text-alignment-right">{{ $item->quantity }}</td>
|
||||
<td class="quantity text text-alignment-right text-right">{{ $item->quantity }}</td>
|
||||
@endif
|
||||
@stack('quantity_td_end')
|
||||
|
||||
@stack('price_td_start')
|
||||
@if (! $hidePrice)
|
||||
<td class="price text text-alignment-right">@money($item->price, $document->currency_code, true)</td>
|
||||
<td class="price text text-alignment-right text-right">@money($item->price, $document->currency_code, true)</td>
|
||||
@endif
|
||||
@stack('price_td_end')
|
||||
|
||||
@ -36,9 +36,9 @@
|
||||
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
|
||||
@stack('discount_td_start')
|
||||
@if ($item->discount_type === 'percentage')
|
||||
<td class="discount text text-alignment-right">{{ $item->discount }}</td>
|
||||
<td class="discount text text-alignment-right text-right">{{ $item->discount }}</td>
|
||||
@else
|
||||
<td class="discount text text-alignment-right">@money($item->discount, $document->currency_code, true)</td>
|
||||
<td class="discount text text-alignment-right text-right">@money($item->discount, $document->currency_code, true)</td>
|
||||
@endif
|
||||
@stack('discount_td_end')
|
||||
@endif
|
||||
@ -46,7 +46,7 @@
|
||||
|
||||
@stack('total_td_start')
|
||||
@if (! $hideAmount)
|
||||
<td class="total text text-alignment-right">@money($item->total, $document->currency_code, true)</td>
|
||||
<td class="total text text-alignment-right text-right">@money($item->total, $document->currency_code, true)</td>
|
||||
@endif
|
||||
@stack('total_td_end')
|
||||
</tr>
|
||||
|
@ -177,33 +177,33 @@
|
||||
<tr>
|
||||
@stack('name_th_start')
|
||||
@if (!$hideItems || (!$hideName && !$hideDescription))
|
||||
<th class="item text text-semibold text-alignment-left text-white border-radius-first">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
|
||||
<th class="item text text-semibold text-alignment-left text-left text-white border-radius-first">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
|
||||
@endif
|
||||
@stack('name_th_end')
|
||||
|
||||
@stack('quantity_th_start')
|
||||
@if (!$hideQuantity)
|
||||
<th class="quantity text text-semibold text-white text-alignment-right">{{ trans($textQuantity) }}</th>
|
||||
<th class="quantity text text-semibold text-white text-alignment-right text-right">{{ trans($textQuantity) }}</th>
|
||||
@endif
|
||||
@stack('quantity_th_end')
|
||||
|
||||
@stack('price_th_start')
|
||||
@if (!$hidePrice)
|
||||
<th class="price text text-semibold text-white text-alignment-right">{{ trans($textPrice) }}</th>
|
||||
<th class="price text text-semibold text-white text-alignment-right text-right">{{ trans($textPrice) }}</th>
|
||||
@endif
|
||||
@stack('price_th_end')
|
||||
|
||||
@if (!$hideDiscount)
|
||||
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
|
||||
@stack('discount_td_start')
|
||||
<th class="discount text text-semibold text-white text-alignment-right">{{ trans('invoices.discount') }}</th>
|
||||
<th class="discount text text-semibold text-white text-alignment-right text-right">{{ trans('invoices.discount') }}</th>
|
||||
@stack('discount_td_end')
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@stack('total_th_start')
|
||||
@if (!$hideAmount)
|
||||
<th class="total text text-semibold text-white text-alignment-right border-radius-last">{{ trans($textAmount) }}</th>
|
||||
<th class="total text text-semibold text-white text-alignment-right text-right border-radius-last">{{ trans($textAmount) }}</th>
|
||||
@endif
|
||||
@stack('total_th_end')
|
||||
</tr>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<x-tooltip id="{{ $id }}" placement="{{ $position }}" message="{{ $text }}">
|
||||
<span class="material-icons{{ $iconType }} text-purple text-xs ml-2">
|
||||
<span class="material-icons{{ $iconType }} text-purple text-xl ml-2 lg:mt-2">
|
||||
{{ $icon }}
|
||||
</span>
|
||||
</x-tooltip>
|
||||
|
@ -1,5 +1,5 @@
|
||||
<x-tooltip id="{{ $id }}" placement="{{ $position }}" message="{{ $disableText }}">
|
||||
<span class="material-icons{{ $iconType }} text-red text-xs ml-2">
|
||||
<span class="material-icons{{ $iconType }} text-red text-xl ml-2 lg:mt-2">
|
||||
{{ $icon }}
|
||||
</span>
|
||||
</x-tooltip>
|
||||
|
@ -183,7 +183,7 @@
|
||||
|
||||
@if (! $hideContactInfo)
|
||||
<tr>
|
||||
<td style="width: 60%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
|
||||
<td style="margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
|
||||
<strong>{{ trans($textContactInfo) }}</strong><br>
|
||||
</td>
|
||||
</tr>
|
||||
@ -276,7 +276,7 @@
|
||||
<table class="table" cellspacing="0" cellpadding="0" style="padding:15px 0 0 0;">
|
||||
<thead style="color:#424242; font-size:12px;">
|
||||
<tr class="border-bottom-1">
|
||||
<th class="item text-alignment-left" style="padding:5px 0;">
|
||||
<th class="item text-alignment-left text-left" style="padding:5px 0;">
|
||||
@if (!$hideRelatedDocumentNumber)
|
||||
<span style="font-size: 13px;">{{ trans_choice($textRelatedDocumentNumber, 1) }}</span> <br />
|
||||
@endif
|
||||
@ -294,7 +294,7 @@
|
||||
@endif
|
||||
|
||||
|
||||
<th class="price text-alignment-right" style="padding: 5px 0;">
|
||||
<th class="price text-alignment-right text-right" style="padding: 5px 0;">
|
||||
@if (!$hideRelatedDocumentAmount)
|
||||
<span style="font-size: 13px;">{{ trans($textRelatedDocumentAmount) }}</span><br />
|
||||
@endif
|
||||
@ -309,7 +309,7 @@
|
||||
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="item text-alignment-left" style="color:#424242; font-size:12px; padding-left:0;">
|
||||
<td class="item text-alignment-left text-left" style="color:#424242; font-size:12px; padding-left:0;">
|
||||
@if (!$hideRelatedDocumentNumber)
|
||||
<a class="text-medium" style="border-bottom:1px solid;" href="{{ route($routeDocumentShow, $transaction->document->id) }}">
|
||||
{{ $transaction->document->document_number }}
|
||||
@ -327,7 +327,7 @@
|
||||
</td>
|
||||
@endif
|
||||
|
||||
<td class="price text-alignment-right" style="color:#424242; font-size:12px; padding-right:0;">
|
||||
<td class="price text-alignment-right text-right" style="color:#424242; font-size:12px; padding-right:0;">
|
||||
@if (!$hideRelatedDocumentAmount)
|
||||
@money($transaction->document->amount, $transaction->document->currency_code, true) <br />
|
||||
@endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user