Merge pull request #27 from denisdulici/improve-filters

Improved income/expense filters

app/Filters/Expenses/Bills.php

@@ -19,6 +19,11 @@ class Bills extends ModelFilter
         return $this->whereLike('vendor_name', $query);
     }
 
+    public function vendor($vendor)
+    {
+        return $this->where('vendor_id', $vendor);
+    }
+
     public function status($status)
     {
         return $this->where('bill_status_code', $status);

app/Filters/Expenses/Payments.php

@@ -19,6 +19,11 @@ class Payments extends ModelFilter
         return $this->whereLike('description', $query);
     }
 
+    public function vendor($vendor)
+    {
+        return $this->where('vendor_id', $vendor);
+    }
+
     public function category($category)
     {
         return $this->where('category_id', $category);

app/Filters/Incomes/Invoices.php

@@ -19,6 +19,11 @@ class Invoices extends ModelFilter
         return $this->whereLike('customer_name', $query);
     }
 
+    public function customer($customer)
+    {
+        return $this->where('customer_id', $customer);
+    }
+
     public function status($status)
     {
         return $this->where('invoice_status_code', $status);

app/Filters/Incomes/Revenues.php

@@ -14,6 +14,11 @@ class Revenues extends ModelFilter
      */
     public $relations = [];
 
+    public function search($query)
+    {
+        return $this->whereLike('description', $query);
+    }
+
     public function customer($customer)
     {
         return $this->where('customer_id', $customer);

app/Http/Controllers/Auth/Users.php

@@ -21,7 +21,7 @@ class Users extends Controller
         $users = User::with('roles')->collect();
 
         $roles = collect(Role::all()->pluck('display_name', 'id'))
-            ->prepend(trans('roles.all'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.roles', 2)]), '');
 
         return view('auth.users.index', compact('users', 'roles'));
     }

app/Http/Controllers/Banking/Transfers.php

@@ -27,7 +27,7 @@ class Transfers extends Controller
         $items = Transfer::with(['payment', 'revenue', 'account'])->collect('payment.paid_at');
 
         $accounts = collect(Account::enabled()->pluck('name', 'id'))
-            ->prepend(trans('accounts.all'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
 
         $transfers = array();
 

app/Http/Controllers/Customers/Invoices.php

@@ -46,7 +46,7 @@ class Invoices extends Controller
         }
 
         $status = collect(InvoiceStatus::all()->pluck('name', 'code'))
-            ->prepend(trans('general.all_statuses'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.statuses', 2)]), '');
 
         return view('customers.invoices.index', compact('invoices', 'status'));
     }

app/Http/Controllers/Customers/Payments.php

@@ -27,10 +27,10 @@ class Payments extends Controller
         $payment_methods = Modules::getPaymentMethods();
 
         $categories = collect(Category::enabled()->type('income')->pluck('name', 'id'))
-            ->prepend(trans('categories.all'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
 
         $accounts = collect(Account::enabled()->pluck('name', 'id'))
-            ->prepend(trans('accounts.all'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
 
         return view('customers.payments.index', compact('payments', 'payment_methods', 'categories', 'accounts'));
     }

app/Http/Controllers/Expenses/Bills.php

@@ -38,10 +38,13 @@ class Bills extends Controller
     {
         $bills = Bill::with('status')->collect();
 
-        $status = collect(BillStatus::all()->pluck('name', 'code'))
+        $vendors = collect(Vendor::enabled()->pluck('name', 'id'))
-            ->prepend(trans('general.all_statuses'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.vendors', 2)]), '');
 
-        return view('expenses.bills.index', compact('bills', 'status'));
+        $status = collect(BillStatus::all()->pluck('name', 'code'))
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.statuses', 2)]), '');
+
+        return view('expenses.bills.index', compact('bills', 'vendors', 'status'));
     }
 
     /**

app/Http/Controllers/Expenses/Payments.php

@@ -24,13 +24,16 @@ class Payments extends Controller
     {
         $payments = Payment::with(['account', 'category'])->collect();
 
+        $vendors = collect(Vendor::enabled()->pluck('name', 'id'))
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.vendors', 2)]), '');
+
         $categories = collect(Category::enabled()->type('expense')->pluck('name', 'id'))
-            ->prepend(trans('categories.all'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
 
         $accounts = collect(Account::enabled()->pluck('name', 'id'))
-            ->prepend(trans('accounts.all'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
 
-        return view('expenses.payments.index', compact('payments', 'categories', 'accounts'));
+        return view('expenses.payments.index', compact('payments', 'vendors', 'categories', 'accounts'));
     }
 
     /**

app/Http/Controllers/Incomes/Invoices.php

@@ -40,10 +40,13 @@ class Invoices extends Controller
     {
         $invoices = Invoice::with('status')->collect();
 
-        $status = collect(InvoiceStatus::all()->pluck('name', 'code'))
+        $customers = collect(Customer::enabled()->pluck('name', 'id'))
-            ->prepend(trans('general.all_statuses'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.customers', 2)]), '');
 
-        return view('incomes.invoices.index', compact('invoices', 'status'));
+        $status = collect(InvoiceStatus::all()->pluck('name', 'code'))
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.statuses', 2)]), '');
+
+        return view('incomes.invoices.index', compact('invoices', 'customers', 'status'));
     }
 
     /**

app/Http/Controllers/Incomes/Revenues.php

@@ -28,13 +28,13 @@ class Revenues extends Controller
         $revenues = Revenue::with(['account', 'category', 'customer'])->collect();
 
         $customers = collect(Customer::enabled()->pluck('name', 'id'))
-            ->prepend(trans('customer.all'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.customers', 2)]), '');
 
         $categories = collect(Category::enabled()->type('income')->pluck('name', 'id'))
-            ->prepend(trans('categories.all'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
 
         $accounts = collect(Account::enabled()->pluck('name', 'id'))
-            ->prepend(trans('accounts.all'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
 
         return view('incomes.revenues.index', compact('revenues', 'customers', 'categories', 'accounts'));
     }

app/Http/Controllers/Items/Items.php

@@ -23,7 +23,8 @@ class Items extends Controller
     {
         $items = Item::with('category')->collect();
 
-        $categories = Category::enabled()->type('item')->pluck('name', 'id')->prepend(trans('categories.all'), '');
+        $categories = Category::enabled()->type('item')->pluck('name', 'id')
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
 
         return view('items.items.index', compact('items', 'categories'));
     }

app/Http/Controllers/Settings/Categories.php

@@ -19,7 +19,7 @@ class Categories extends Controller
         $categories = Category::collect();
 
         $types = collect(['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other'])
-            ->prepend(trans('categories.all_types'), '');
+            ->prepend(trans('general.all_type', ['type' => trans_choice('general.types', 2)]), '');
 
         return view('settings.categories.index', compact('categories', 'types'));
     }

app/Http/ViewComposers/Modules.php

@@ -23,7 +23,7 @@ class Modules
         if (setting('general.api_token')) {
             $categories = Cache::remember('modules.categories', Date::now()->addHour(6), function () {
                 return collect($this->getCategories())->pluck('name', 'slug')
-                    ->prepend(trans('categories.all'), '');
+                    ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
             });
 
             $view->with(['categories' => $categories]);

resources/lang/en-GB/accounts.php

@@ -10,6 +10,5 @@ return [
     'bank_phone'            => 'Bank Phone',
     'bank_address'          => 'Bank Address',
     'default_account'       => 'Default Account',
-    'all'                   => 'All Accounts',
 
 ];

resources/lang/en-GB/categories.php

@@ -1,7 +0,0 @@
-<?php
-
-return [
-
-    'all'                   => 'All Categories',
-    'all_types'             => 'All Types'
-];

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/lang/en-GB/roles.php

@@ -1,7 +0,0 @@
-<?php
-
-return [
-
-    'all'                   => 'All Roles',
-
-];

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

@@ -16,7 +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('status', $status, request('status'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('status.all')]) !!}
+            {!! 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>
         <div class="pull-right">
@@ -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/customers/payments/index.blade.php

@@ -16,8 +16,8 @@
         <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('category_id', $categories, request('category_id'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('categories.all')]) !!}
+            {!! Form::select('category_id', $categories, request('category_id'), ['class' => 'form-control input-filter input-sm']) !!}
-            {!! Form::select('payment_method', $payment_methods, request('payment_method'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans_choice('general.payment_methods', 2)]) !!}
+            {!! Form::select('payment_method', $payment_methods, request('payment_method'), ['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>
         <div class="pull-right">

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>