Merge Invoice and Bill into Document

resources/views/partials/admin/navbar.blade.php

@@ -11,7 +11,9 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-search"></i></span>
                             </div>
+
                             <input type="text" name="search" v-model="keyword" @input="onChange" v-click-outside="closeResult" class="form-control" autocomplete="off" placeholder="{{ trans('general.search') }}">
+
                             <div class="dropdown-menu dropdown-menu-xl dropdown-menu-center" ref="menu" :class="[{show: show}]">
                                 <div class="list-group list-group-flush">
                                     <a class="list-group-item list-group-item-action" :href="item.href" v-for="(item, index) in items">
@@ -32,6 +34,7 @@
                             </div>
                         </div>
                     </div>
+
                     <button type="button" class="close" data-action="search-close" data-target="#navbar-search-main" aria-label="Close">
                         <span aria-hidden="true">×</span>
                     </button>

resources/views/partials/documents/item/print.blade.php

@@ -1,22 +1,43 @@
 <tr>
     @stack('name_td_start')
-        <td class="item">
-            {{ $item->name }}
-            @if (!empty($item->item->description))
-                <br><small>{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!}</small>
-            @endif
-        </td>
+        @if (!$hideItems || (!$hideName && !$hideDescription))
+            <td class="item">
+                @if (!$hideName)
+                    {{ $item->name }}
+                @endif
+
+                @if (!$hideDescription)
+                    @if (!empty($item->item->description))
+                        <br><small>{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!}</small>
+                    @endif
+                @endif
+            </td>
+        @endif
     @stack('name_td_end')
 
     @stack('quantity_td_start')
-        <td class="quantity">{{ $item->quantity }}</td>
+        @if (!$hideQuantity)
+            <td class="quantity">{{ $item->quantity }}</td>
+        @endif
     @stack('quantity_td_end')
 
     @stack('price_td_start')
-        <td class="price">@money($item->price, $document->currency_code, true)</td>
+        @if (!$hidePrice)
+            <td class="price">@money($item->price, $document->currency_code, true)</td>
+        @endif
     @stack('price_td_end')
 
+    @if (!$hideDiscount)
+        @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+            @stack('discount_td_start')
+                <td class="discount">{{ $item->discount }}</td>
+            @stack('discount_td_end')
+        @endif
+    @endif
+
     @stack('total_td_start')
-        <td class="total">@money($item->total, $document->currency_code, true)</td>
+        @if (!$hideAmount)
+            <td class="total">@money($item->total, $document->currency_code, true)</td>
+        @endif
     @stack('total_td_end')
 </tr>

resources/views/partials/documents/item/show.blade.php

@@ -1,28 +1,43 @@
 <tr class="d-flex flex-nowrap">
     @stack('name_td_start')
-        <td class="col-xs-4 col-sm-5 pl-5">
-            {{ $item->name }}
-            @if (!empty($item->item->description))
-                <br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!}<small>
-            @endif
-        </td>
+        @if (!$hideItems || (!$hideName && !$hideDescription))
+            <td class="col-xs-4 col-sm-5 pl-5">
+                @if (!$hideName)
+                    {{ $item->name }}
+                @endif
+
+                @if (!$hideDescription)
+                    @if (!empty($item->item->description))
+                        <br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!}<small>
+                    @endif
+                @endif
+            </td>
+        @endif
     @stack('name_td_end')
 
     @stack('quantity_td_start')
-        <td class="col-xs-4 col-sm-1 text-center">{{ $item->quantity }}</td>
+        @if (!$hideQuantity)
+            <td class="col-xs-4 col-sm-1 text-center">{{ $item->quantity }}</td>
+        @endif
     @stack('quantity_td_end')
 
     @stack('price_td_start')
-        <td class="col-sm-3 text-right d-none d-sm-block">@money($item->price, $document->currency_code, true)</td>
+        @if (!$hidePrice)
+            <td class="col-sm-3 text-right d-none d-sm-block">@money($item->price, $document->currency_code, true)</td>
+        @endif
     @stack('price_td_end')
 
-    @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
-        @stack('discount_td_start')
-            <td class="col-sm-1 text-center d-none d-sm-block">{{ $item->discount }}</td>
-        @stack('discount_td_end')
+    @if (!$hideDiscount)
+        @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+            @stack('discount_td_start')
+                <td class="col-sm-1 text-center d-none d-sm-block">{{ $item->discount }}</td>
+            @stack('discount_td_end')
+        @endif
     @endif
 
     @stack('total_td_start')
-        <td class="col-xs-4 col-sm-3 text-right pr-5">@money($item->total, $document->currency_code, true)</td>
+        @if (!$hideAmount)
+            <td class="col-xs-4 col-sm-3 text-right pr-5">@money($item->total, $document->currency_code, true)</td>
+        @endif
     @stack('total_td_end')
 </tr>

resources/views/partials/form/bulk_action_row_group.blade.php

@@ -110,7 +110,7 @@
             </template>
         </akaunting-modal>
     @else
-        <div class="text-white" :class="[{'show': bulk_action.show}]">{{ trans('bulk_actions.no_action') }}</div>
+        <div class="text-white d-none" :class="[{'show': bulk_action.show}]">{{ trans('bulk_actions.no_action') }}</div>
     @endif
 
 @stack('bulk_action_row_input_end')

resources/views/partials/form/money_group.blade.php

@@ -66,6 +66,10 @@
         @else
         :form-error="form.errors.get('{{ $name }}')"
         @endif
+
+        @if (isset($attributes['row-input']))
+        :row-input="{{ $attributes['row-input'] }}"
+        @endif
     ></akaunting-money>
 
 @stack($name . '_input_end')