shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2894 from novag/description-stacks

Browse Source 
fix 'description' field stack names in line item form
This commit is contained in:
Cüneyt Şentürk 2023-02-21 19:44:57 +03:00 committed by GitHub
commit ac3ddb8497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/components/documents/form/items.blade.php
View File

@ -15,6 +15,7 @@
<thead class="border-b"> <thead class="border-b">
<tr> <tr>
@stack('move_th_start') @stack('move_th_start')
<th class="w-6 block text-left border-t-0 border-r-0 border-b-0" style="vertical-align:bottom;"> <th class="w-6 block text-left border-t-0 border-r-0 border-b-0" style="vertical-align:bottom;">
@if (! $hideEditItemColumns) @if (! $hideEditItemColumns)
<x-documents.form.item-columns :type="$type" /> <x-documents.form.item-columns :type="$type" />
@ -31,11 +32,10 @@
{{ (trans_choice($textItemName, 2) != $textItemName) ? trans_choice($textItemName, 2) : trans($textItemName) }} {{ (trans_choice($textItemName, 2) != $textItemName) ? trans_choice($textItemName, 2) : trans($textItemName) }}
@endif @endif
</th> </th>
@stack('name_th_end') @stack('name_th_end')
@stack('move_th_start') @stack('description_th_start')
<th class="px-3 py-1 text-left text-xs font-normal border-t-0 border-r-0 border-b-0" style=" vertical-align:bottom;"> <th class="px-3 py-1 text-left text-xs font-normal border-t-0 border-r-0 border-b-0" style=" vertical-align:bottom;">
@if (! $hideItemDescription) @if (! $hideItemDescription)
@ -43,8 +43,7 @@
@endif @endif
</th> </th>
@stack('description_th_end')
@stack('move_th_end')
@endif @endif
@stack('quantity_th_start') @stack('quantity_th_start')
@ -54,7 +53,6 @@
{{ trans($textItemQuantity) }} {{ trans($textItemQuantity) }}
@endif @endif
</th> </th>
@stack('quantity_th_end') @stack('quantity_th_end')

3
resources/views/components/documents/form/line-item.blade.php
View File

@ -19,17 +19,20 @@
<tbody> <tbody>
<tr> <tr>
@stack('move_td_start') @stack('move_td_start')
<td class="align-middle border-b-0 flex items-center justify-center" style="width:24px; height:100px; color: #8898aa;"> <td class="align-middle border-b-0 flex items-center justify-center" style="width:24px; height:100px; color: #8898aa;">
<div class="handle mt-2 hidden lg:block cursor-move"> <div class="handle mt-2 hidden lg:block cursor-move">
<span class="w-6 material-icons">list</span> <span class="w-6 material-icons">list</span>
</div> </div>
</td> </td>
@stack('move_td_end') @stack('move_td_end')
@stack('items_td_start') @stack('items_td_start')
@if (! $hideItems || (! $hideItemName && ! $hideItemDescription)) @if (! $hideItems || (! $hideItemName && ! $hideItemDescription))
@stack('name_td_start') @stack('name_td_start')
<td class="px-3 py-3 ltr:pl-2 rtl:pr-2 ltr:text-left rtl:text-right align-middle border-b-0 name"> <td class="px-3 py-3 ltr:pl-2 rtl:pr-2 ltr:text-left rtl:text-right align-middle border-b-0 name">
@if (! $hideItemName) @if (! $hideItemName)
<span class="flex items-center text-sm" tabindex="0" v-if="row.item_id"> <span class="flex items-center text-sm" tabindex="0" v-if="row.item_id">