improve filters

resources/lang/en-GB/general.php

@@ -35,6 +35,7 @@ return [
     'languages'             => 'Language|Languages',
     'updates'               => 'Update|Updates',
     'numbers'               => 'Number|Numbers',
+    'statuses'              => 'Status|Statuses',
 
     'dashboard'             => 'Dashboard',
     'banking'               => 'Banking',
@@ -76,7 +77,6 @@ return [
     'color'                 => 'Colour',
     'save'                  => 'Save',
     'cancel'                => 'Cancel',
-    'status'                => 'Status',
     'from'                  => 'From',
     'to'                    => 'To',
     'print'                 => 'Print',
@@ -85,12 +85,12 @@ return [
     'filter'                => 'Filter',
     'create_user'           => 'Create User',
     'created_user'          => 'Created User',
-    'all_statuses'          => 'All Statuses',
     'bank'                  => 'Bank Transfer',
     'cash'                  => 'Cash',
     'paypal'                => 'PayPal',
     'help'                  => 'Help',
     'all'                   => 'All',
+    'all_type'              => 'All :type',
     'upcoming'              => 'Upcoming',
     'created'               => 'Created',
 

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

@@ -34,7 +34,7 @@
                         <th>@sortablelink('name', trans('general.name'))</th>
                         <th>@sortablelink('number', trans('accounts.number'))</th>
                         <th>@sortablelink('opening_balance', trans('accounts.current_balance'))</th>
-                        <th>@sortablelink('enabled', trans('general.status'))</th>
+                        <th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
                         <th style="width: 15%;">{{ trans('general.actions') }}</th>
                     </tr>
                 </thead>

resources/views/customers/dashboard/index.blade.php

@@ -24,7 +24,7 @@
                                 <th>{{ trans('invoices.invoice_number') }}</th>
                                 <th>{{ trans_choice('general.customers', 1) }}</th>
                                 <th>{{ trans('invoices.total_price') }}</th>
-                                <th>{{ trans('general.status') }}</th>
+                                <th>{{ trans_choice('general.statuses', 1) }}</th>
                                 <th>{{ trans('invoices.invoice_date') }}</th>
                                 <th style="width: 18%;">{{ trans('general.actions') }}</th>
                             </tr>

resources/views/customers/invoices/index.blade.php

@@ -34,7 +34,7 @@
                         <th>@sortablelink('invoice_number', trans('invoices.invoice_number'))</th>
                         <th>@sortablelink('customer_name', trans_choice('general.customers', 1))</th>
                         <th>@sortablelink('amount', trans('invoices.total_price'))</th>
-                        <th>@sortablelink('status.name', trans('general.status'))</th>
+                        <th>@sortablelink('status.name', trans_choice('general.statuses', 1))</th>
                         <th>@sortablelink('invoiced_at', trans('invoices.invoice_date'))</th>
                         <th>@sortablelink('due_at', trans('invoices.due_date'))</th>
                         <th style="width: 18%;">{{ trans('general.actions') }}</th>

resources/views/customers/invoices/show.blade.php

@@ -176,7 +176,7 @@
                         <thead>
                         <tr>
                             <th>{{ trans('general.date') }}</th>
-                            <th>{{ trans('general.status') }}</th>
+                            <th>{{ trans_choice('general.statuses', 1) }}</th>
                             <th>{{ trans('general.description') }}</th>
                         </tr>
                         </thead>

resources/views/expenses/bills/index.blade.php

@@ -16,6 +16,7 @@
         <div class="pull-left">
             <span class="title-filter">{{ trans('general.search') }}:</span>
             {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
+            {!! Form::select('vendor', $vendors, request('vendor'), ['class' => 'form-control input-filter input-sm']) !!}
             {!! Form::select('status', $status, request('status'), ['class' => 'form-control input-filter input-sm']) !!}
             {!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
         </div>
@@ -35,7 +36,7 @@
                         <th class="col-md-1">@sortablelink('bill_number', trans_choice('general.numbers', 1))</th>
                         <th class="col-md-3">@sortablelink('vendor_name', trans_choice('general.vendors', 1))</th>
                         <th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th>
-                        <th class="col-md-1">@sortablelink('status.name', trans('general.status'))</th>
+                        <th class="col-md-1">@sortablelink('status.name', trans_choice('general.statuses', 1))</th>
                         <th>@sortablelink('billed_at', trans('bills.bill_date'))</th>
                         <th>@sortablelink('due_at', trans('bills.due_date'))</th>
                         <th class="col-md-3">{{ trans('general.actions') }}</th>

resources/views/expenses/bills/show.blade.php

@@ -176,7 +176,7 @@
                         <thead>
                         <tr>
                             <th>{{ trans('general.date') }}</th>
-                            <th>{{ trans('general.status') }}</th>
+                            <th>{{ trans_choice('general.statuses', 1) }}</th>
                             <th>{{ trans('general.description') }}</th>
                         </tr>
                         </thead>

resources/views/expenses/payments/index.blade.php

@@ -16,6 +16,7 @@
         <div class="pull-left">
             <span class="title-filter">{{ trans('general.search') }}:</span>
             {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
+            {!! Form::select('vendor', $vendors, request('vendor'), ['class' => 'form-control input-filter input-sm']) !!}
             {!! Form::select('category', $categories, request('category'), ['class' => 'form-control input-filter input-sm']) !!}
             {!! Form::select('account', $accounts, request('account'), ['class' => 'form-control input-filter input-sm']) !!}
             {!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}

resources/views/expenses/vendors/index.blade.php

@@ -34,7 +34,7 @@
                         <th>@sortablelink('name', trans('general.name'))</th>
                         <th>@sortablelink('email', trans('general.email'))</th>
                         <th>@sortablelink('phone', trans('general.phone'))</th>
-                        <th>@sortablelink('enabled', trans('general.status'))</th>
+                        <th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
                         <th style="width: 15%;">{{ trans('general.actions') }}</th>
                     </tr>
                 </thead>

resources/views/incomes/customers/index.blade.php

@@ -34,7 +34,7 @@
                         <th>@sortablelink('name', trans('general.name'))</th>
                         <th>@sortablelink('email', trans('general.email'))</th>
                         <th>@sortablelink('phone', trans('general.phone'))</th>
-                        <th>@sortablelink('enabled', trans('general.status'))</th>
+                        <th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
                         <th style="width: 15%;">{{ trans('general.actions') }}</th>
                     </tr>
                 </thead>

resources/views/incomes/invoices/index.blade.php

@@ -16,6 +16,7 @@
         <div class="pull-left">
             <span class="title-filter">{{ trans('general.search') }}:</span>
             {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
+            {!! Form::select('customer', $customers, request('customer'), ['class' => 'form-control input-filter input-sm']) !!}
             {!! Form::select('status', $status, request('status'), ['class' => 'form-control input-filter input-sm']) !!}
             {!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
         </div>
@@ -34,7 +35,7 @@
                         <th class="col-md-1">@sortablelink('invoice_number', trans_choice('general.numbers', 1))</th>
                         <th class="col-md-3">@sortablelink('customer_name', trans_choice('general.customers', 1))</th>
                         <th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th>
-                        <th class="col-md-1">@sortablelink('status.name', trans('general.status'))</th>
+                        <th class="col-md-1">@sortablelink('status.name', trans_choice('general.statuses', 1))</th>
                         <th>@sortablelink('invoiced_at', trans('invoices.invoice_date'))</th>
                         <th>@sortablelink('due_at', trans('invoices.due_date'))</th>
                         <th class="col-md-3">{{ trans('general.actions') }}</th>

resources/views/incomes/invoices/show.blade.php

@@ -179,7 +179,7 @@
                         <thead>
                         <tr>
                             <th>{{ trans('general.date') }}</th>
-                            <th>{{ trans('general.status') }}</th>
+                            <th>{{ trans_choice('general.statuses', 1) }}</th>
                             <th>{{ trans('general.description') }}</th>
                         </tr>
                         </thead>

resources/views/incomes/revenues/index.blade.php

@@ -15,6 +15,7 @@
         {!! Form::open(['url' => 'incomes/revenues', 'role' => 'form', 'method' => 'GET']) !!}
         <div class="pull-left">
             <span class="title-filter">{{ trans('general.search') }}:</span>
+            {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
             {!! Form::select('customer', $customers, request('customer'), ['class' => 'form-control input-filter input-sm']) !!}
             {!! Form::select('category', $categories, request('category'), ['class' => 'form-control input-filter input-sm']) !!}
             {!! Form::select('account', $accounts, request('account'), ['class' => 'form-control input-filter input-sm']) !!}

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

@@ -38,7 +38,7 @@
                         <th class="col-md-1">@sortablelink('quantity', trans_choice('items.quantities', 1))</th>
                         <th>@sortablelink('sale_price', trans('items.sales_price'))</th>
                         <th>@sortablelink('purchase_price', trans('items.purchase_price'))</th>
-                        <th class="col-md-1">@sortablelink('enabled', trans('general.status'))</th>
+                        <th class="col-md-1">@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
                         <th class="col-md-2">{{ trans('general.actions') }}</th>
                     </tr>
                 </thead>

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

@@ -35,7 +35,7 @@
                         <th>@sortablelink('name', trans('general.name'))</th>
                         <th>@sortablelink('type', trans_choice('general.types', 1))</th>
                         <th>{{ trans('general.color') }}</th>
-                        <th>@sortablelink('enabled', trans('general.status'))</th>
+                        <th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
                         <th class="col-md-2">{{ trans('general.actions') }}</th>
                     </tr>
                 </thead>

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

@@ -32,7 +32,7 @@
                         <th>@sortablelink('name', trans('general.name'))</th>
                         <th>@sortablelink('code', trans('currencies.code'))</th>
                         <th>@sortablelink('rate', trans('currencies.rate'))</th>
-                        <th>@sortablelink('enabled', trans('general.status'))</th>
+                        <th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
                         <th class="col-md-2">{{ trans('general.actions') }}</th>
                     </tr>
                 </thead>

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

@@ -34,7 +34,7 @@
                     <tr>
                         <th>@sortablelink('name', trans('general.name'))</th>
                         <th>@sortablelink('rate', trans('taxes.rate_percent'))</th>
-                        <th>@sortablelink('enabled', trans('general.status'))</th>
+                        <th>@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
                         <th class="col-md-2">{{ trans('general.actions') }}</th>
                     </tr>
                 </thead>