Merge branch 'master' of github.com:akaunting/akaunting

resources/assets/js/components/AkauntingSelectRemote.vue

@@ -842,7 +842,8 @@ export default {
                             if (!check) {
                                 this.sorted_options.push({
                                     key: option.id.toString(),
-                                    value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name
+                                    value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name,
+                                    level: (option.parent_id) ? 1 : 0 // 0: parent, 1: child. Level data get 0 via backend. This control will refactor.
                                 });
                             }
 

resources/assets/js/components/AkauntingWidget.vue

@@ -165,19 +165,19 @@ export default {
             widthOptions: [
                 {
                     label: '25%',
-                    value: 'w-full lg:w-1/4 px-6'
+                    value: 'w-full lg:w-1/4 lg:px-6'
                 },
                 {
                     label: '33%',
-                    value: 'w-full lg:w-1/3 px-6'
+                    value: 'w-full lg:w-1/3 lg:px-6'
                 },
                 {
                     label: '50%',
-                    value: 'w-full lg:w-2/4 px-12'
+                    value: 'w-full lg:w-2/4 lg:px-12'
                 },
                 {
                     label: '100%',
-                    value: 'w-full px-12'
+                    value: 'w-full lg:px-12'
                 }
             ],
             form: {

resources/assets/sass/app.css

@@ -203,6 +203,15 @@
         overflow: hidden; 
         height: 4rem;
     }
+    /* widget container name will change as lg:px-12 on database. When container class name change on database, this code will clean  */
+    .dashboard .px-12 {
+        @apply px-0 lg:pl-12 lg:pr-12;
+    }
+
+    .dashboard .px-6 {
+        @apply px-0 lg:pl-6 lg:pr-6;
+    }
+    /* widget container name will change as lg:px-12 on database. When container class name change on database, this code will clean  */
 }
 
 /* menu */

resources/views/auth/users/index.blade.php

@@ -58,11 +58,11 @@
                                 <x-table.td class="w-4/12 sm:w-5/12">
                                     <div class="flex items-center space-x-2">
                                         @if (setting('default.use_gravatar', '0') == '1')
-                                            <img src="{{ $item->picture }}" class="w-6 h-6 rounded-full mr-2 hidden lg:block" title="{{ $item->name }}" alt="{{ $item->name }}">
+                                            <img src="{{ $item->picture }}" class="w-6 h-6 rounded-full mr-2 hidden lg:block text-transparent" title="{{ $item->name }}" alt="{{ $item->name }}">
                                         @elseif (is_object($item->picture))
-                                            <img src="{{ Storage::url($item->picture->id) }}" class="w-6 h-6 rounded-full mr-2 hidden lg:block" alt="{{ $item->name }}" title="{{ $item->name }}">
+                                            <img src="{{ Storage::url($item->picture->id) }}" class="w-6 h-6 rounded-full mr-2 hidden lg:block text-transparent" alt="{{ $item->name }}" title="{{ $item->name }}">
                                         @else
-                                            <img src="{{ asset('public/img/user.svg') }}" class="w-6 h-6 rounded-full mr-2 hidden lg:block" alt="{{ $item->name }}"/>
+                                            <img src="{{ asset('public/img/user.svg') }}" class="w-6 h-6 rounded-full mr-2 hidden lg:block text-transparent" alt="{{ $item->name }}"/>
                                         @endif
 
                                         {{ !empty($item->name) ? $item->name : trans('general.na') }}

resources/views/banking/accounts/index.blade.php

@@ -64,9 +64,7 @@
 
                             <x-table.td class="w-6/12 sm:w-5/12">
                                 <x-slot name="first" class="flex font-bold">
-                                    <div class="truncate">
-                                        {{ $item->name }}
-                                    </div>
+                                    {{ $item->name }}
 
                                     @if (! $item->enabled)
                                         <x-index.disable text="{{ trans_choice('general.accounts', 1) }}" />

resources/views/common/items/index.blade.php

@@ -84,16 +84,14 @@
                                 </x-table.td>
 
                                 <x-table.td class="w-6/12 sm:w-4/12">
-                                    <x-slot name="first" class="flex items-center font-bold" override="class">
-                                        <div class="truncate">
-                                            {{ $item->name }}
-                                        </div>
-
+                                    <x-slot name="first" class="font-bold" override="class">
+                                        {{ $item->name }}
+                                        
                                         @if (! $item->enabled)
                                             <x-index.disable text="{{ trans_choice('general.items', 1) }}" />
                                         @endif
                                     </x-slot>
-                                    <x-slot name="second" class="font-normal truncate" override="class">
+                                    <x-slot name="second" class="font-normal" override="class">
                                         {{ $item->description }}
                                     </x-slot>
                                 </x-table.td>

resources/views/components/documents/form/totals.blade.php

@@ -3,10 +3,10 @@
         <div class="overflow-y-hidden py-6">
             <table id="totals" class="float-right">
                 <colgroup>
-                    <col style="width: 47.5%;">
-                    <col style="width: 30%;">
-                    <col style="width: 18%;">
-                    <col style="width: 50px;">
+                    <col class="small-col" style="width: 47.5%;">
+                    <col class="small-col" style="width: 30%;">
+                    <col class="small-col" style="width: 18%;">
+                    <col class="small-col" style="width: 50px;">
                 </colgroup>
 
                 <tbody id="invoice-total-rows">

resources/views/components/form/group/select.blade.php

@@ -139,6 +139,10 @@
         @visible-change="{{ $attributes['visible-change'] }}"
         @endif
 
+        @if (! empty($attributes['clear']))
+        @clear="{{ $attributes['clear'] }}($event)"
+        @endif
+
         @if (isset($attributes['readonly']))
         :readonly="{{ $attributes['readonly'] }}"
         @endif

resources/views/components/index/category.blade.php

@@ -1,9 +1,11 @@
-<span @class([
-        'w-3 h-3 rounded-full ltr:mr-1 rtl:ml-1', $backgroundColor, $textColor
-    ])
-    @if (! empty($backgroundStyle))
-    style="background-color: {{ $backgroundStyle }}"
-    @endif
->
-</span>
-<span class="w-24 truncate">{{ $name }}</span>
+<div class="flex items-center">
+    <span @class([
+            'w-3 h-3 rounded-full ltr:mr-1 rtl:ml-1', $backgroundColor, $textColor
+        ])
+        @if (! empty($backgroundStyle))
+        style="background-color: {{ $backgroundStyle }}"
+        @endif
+    >
+    </span>
+    <span class="w-24 truncate">{{ $name }}</span>
+</div>

resources/views/components/index/default.blade.php

@@ -1,5 +1,7 @@
-<x-tooltip id="{{ $id }}" placement="{{ $position }}" message="{{ $text }}">
-    <span class="material-icons{{ $iconType }} text-purple text-sm ml-2">
-        {{ $icon }}
-    </span>
-</x-tooltip>
+<div data-index-icon>
+    <x-tooltip id="{{ $id }}" placement="{{ $position }}" message="{{ $text }}">
+        <span class="material-icons{{ $iconType }} text-purple text-sm ml-2">
+            {{ $icon }}
+        </span>
+    </x-tooltip>
+</div>

resources/views/components/index/disable.blade.php

@@ -1,5 +1,7 @@
-<x-tooltip id="{{ $id }}" placement="{{ $position }}" message="{{ $disableText }}">
-    <span class="material-icons{{ $iconType }} text-red text-sm ml-2">
-        {{ $icon }}
-    </span>
-</x-tooltip>
+<div data-index-icon>
+    <x-tooltip id="{{ $id }}" placement="{{ $position }}" message="{{ $disableText }}">
+        <span class="material-icons{{ $iconType }} text-red text-sm ml-2">
+            {{ $icon }}
+        </span>
+    </x-tooltip>
+</div>

resources/views/components/layouts/admin/menu.blade.php

@@ -40,9 +40,9 @@
             </span>
 
             @if (setting('default.use_gravatar', '0') == '1')
-                <img src="{{ user()->picture }}" alt="{{ user()->name }}" class="w-8 h-8 m-auto rounded-full" alt="{{ user()->name }}" title="{{ user()->name }}">
+                <img src="{{ user()->picture }}" alt="{{ user()->name }}" class="w-8 h-8 m-auto rounded-full text-transparent" alt="{{ user()->name }}" title="{{ user()->name }}">
             @elseif (is_object(user()->picture))
-                <img src="{{ Storage::url(user()->picture->id) }}" class="w-8 h-8 m-auto rounded-full" alt="{{ user()->name }}" title="{{ user()->name }}">
+                <img src="{{ Storage::url(user()->picture->id) }}" class="w-8 h-8 m-auto rounded-full text-transparent" alt="{{ user()->name }}" title="{{ user()->name }}">
             @else
                 <span id="menu-profile-icon" name="account_circle" class="material-icons-outlined text-purple w-8 h-8 flex items-center justify-center text-center text-2xl pointer-events-none" alt="{{ user()->name }}" title="{{ user()->name }}">
                     account_circle

resources/views/components/layouts/portal/menu.blade.php

@@ -24,9 +24,9 @@
             </span>
 
             @if (setting('default.use_gravatar', '0') == '1')
-                <img src="{{ user()->picture }}" alt="{{ user()->name }}" class="w-8 h-8 m-auto rounded-full" alt="{{ user()->name }}" title="{{ user()->name }}">
+                <img src="{{ user()->picture }}" alt="{{ user()->name }}" class="w-8 h-8 m-auto rounded-full text-transparent" alt="{{ user()->name }}" title="{{ user()->name }}">
             @elseif (is_object(user()->picture))
-                <img src="{{ Storage::url(user()->picture->id) }}" class="w-8 h-8 m-auto rounded-full" alt="{{ user()->name }}" title="{{ user()->name }}">
+                <img src="{{ Storage::url(user()->picture->id) }}" class="w-8 h-8 m-auto rounded-full text-transparent" alt="{{ user()->name }}" title="{{ user()->name }}">
             @else
                 <span name="account_circle" class="material-icons-outlined text-purple w-8 h-8 flex items-center justify-center text-center text-2xl pointer-events-none" alt="{{ user()->name }}" title="{{ user()->name }}">
                     account_circle

resources/views/components/table/index.blade.php

@@ -1,6 +1,6 @@
 <div class="overflow-x-visible">
     <div class="py-2 align-middle">
-        <table class="flex flex-col divide-y divide-gray-200">
+        <table class="flex flex-col divide-y divide-gray-200" {{ $attributes }}>
             {{ $slot }}
         </table>
     </div>

resources/views/components/table/td.blade.php

@@ -8,7 +8,13 @@
         }
     @endphp
     <div {{ $first_attributes }}>
-        {!! $first !!}
+        <!--so that the animation does not overflow the width. With javascript will add (overflow-x-hidden) class name-->
+        <div>
+            <!-- this tag use for calculate width of text and parent element -->
+            <span data-truncate-marquee>
+                {!! $first !!}
+            </span>
+        </div>
     </div>
     @endif
 
@@ -21,9 +27,18 @@
         }
     @endphp
     <div {{ $second_attributes }}>
-        {!! $second !!}
+        <div>
+            <span data-truncate-marquee>
+                {!! $second !!}
+            </span>
+        </div>
+        
     </div>
     @endif
 
-    {{ $slot }}
+    <div>
+        <span data-truncate-marquee>
+            {{ $slot }}
+        </span>
+    </div>
 </td>

resources/views/components/table/th.blade.php

@@ -8,7 +8,13 @@
         }
     @endphp
     <div {{ $first_attributes }}>
-        {!! $first !!}
+        <!--so that the animation does not overflow the width. With javascript will add (overflow-x-hidden) class name-->
+        <div>
+            <!-- this tag use for calculate width of text and parent element -->
+            <span data-truncate-marquee>
+                {!! $first !!}
+            </span>
+        </div>
     </div>
     @endif
 
@@ -21,9 +27,17 @@
         }
     @endphp
     <div {{ $second_attributes }}>
-        {!! $second !!}
+        <div>
+            <span data-truncate-marquee>
+                {!! $second !!}
+            </span>
+        </div>
     </div>
     @endif
 
-    {{ $slot }}
+    <div>
+        <span data-truncate-marquee>
+            {{ $slot }}
+        </span>
+    </div>
 </th>

resources/views/modules/item/show.blade.php

@@ -15,7 +15,7 @@
 
     <x-slot name="content">
         <div class="flex flex-col space-y-16 py-4">
-            <div class="flex flex-col lg:flex-row w-full space-x-16 space-y-0">
+            <div class="flex flex-col lg:flex-row w-full space-x-16 rtl:space-x-reverse space-y-0">
                 <div class="w-full lg:w-7/12 flex flex-col space-x-2 banner">
                     @foreach ($module->files as $file)
                         @if ($loop->first)

resources/views/settings/currencies/index.blade.php

@@ -57,7 +57,7 @@
                             </x-table.td>
 
                             <x-table.td class="w-6/12 sm:w-4/12">
-                                <x-slot name="first" class="flex" override="class">
+                                <x-slot name="first" class="flex font-bold" override="class">
                                     <div class="font-bold truncate">
                                         {{ $item->name }}
                                     </div>

resources/views/widgets/bank_feeds.blade.php

@@ -17,7 +17,7 @@
         </div>
 
         <div class="relative flex justify-end -mt-28">
-            <img src="https://assets.akaunting.com/software/admin/bank-feeds.png" alt="Bank Feeds" />
+            <img src="https://assets.akaunting.com/software/admin/bank-feeds.png" class="rtl:-scale-x-100" alt="Bank Feeds" />
         </div>
     </div>
 @endif